diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00f64d2aedf..aed03f55536 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -284,7 +284,7 @@ jobs:
     with:
       platform: macos-aarch64
       runs-on: 'macos-14'
-      xcode-toolset-version: '14.3.1'
+      xcode-toolset-version: '15.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.macos-aarch64 == 'true'
@@ -354,6 +354,7 @@ jobs:
       platform: macos-x64
       bootjdk-platform: macos-x64
       runs-on: macos-13
+      xcode-toolset-version: '14.3.1'
 
   test-macos-aarch64:
     name: macos-aarch64
@@ -364,6 +365,7 @@ jobs:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
+      xcode-toolset-version: '15.4'
 
   test-windows-x64:
     name: windows-x64
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a8885866c12..3517fa53941 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,9 @@ on:
       runs-on:
         required: true
         type: string
+      xcode-toolset-version:
+        required: false
+        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -147,7 +150,7 @@ jobs:
         run: |
           # On macOS we need to install some dependencies for testing
           brew install make
-          sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
         if: runner.os == 'macOS'
diff --git a/make/Images.gmk b/make/Images.gmk
index 5703a74afa5..acdc594b009 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -96,6 +96,10 @@ JLINK_DISABLE_WARNINGS := | ( $(GREP) -v -e "WARNING: Using incubator module" ||
 JDK_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk
 JRE_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre
 
+ifeq ($(JLINK_PRODUCE_LINKABLE_RUNTIME), true)
+  JLINK_JDK_EXTRA_OPTS += --generate-linkable-runtime
+endif
+
 $(eval $(call SetupExecute, jlink_jdk, \
     WARN := Creating jdk image, \
     DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \
@@ -132,10 +136,16 @@ CDS_DUMP_FLAGS = -Xmx128M -Xms128M
 # Helper function for creating the CDS archives for the JDK and JRE
 #
 # Param1 - VM variant (e.g., server, client, zero, ...)
-# Param2 - _nocoops, or empty
+# Param2 - _nocoops, _coh, _nocoops_coh, or empty
 define CreateCDSArchive
-  $1_$2_DUMP_EXTRA_ARG := $(if $(filter _nocoops, $2), -XX:-UseCompressedOops, )
-  $1_$2_DUMP_TYPE      := $(if $(filter _nocoops, $2), -NOCOOPS, )
+  $1_$2_COOPS_OPTION := $(if $(findstring _nocoops, $2),-XX:-UseCompressedOops)
+  # enable and also explicitly disable coh as needed.
+  ifeq ($(call isTargetCpuBits, 64), true)
+    $1_$2_COH_OPTION := -XX:+UnlockExperimentalVMOptions \
+                        $(if $(findstring _coh, $2),-XX:+UseCompactObjectHeaders,-XX:-UseCompactObjectHeaders)
+  endif
+  $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
+  $1_$2_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
 
   # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
   $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
@@ -190,6 +200,14 @@ ifeq ($(BUILD_CDS_ARCHIVE), true)
     $(foreach v, $(JVM_VARIANTS), \
       $(eval $(call CreateCDSArchive,$v,_nocoops)) \
     )
+    ifeq ($(BUILD_CDS_ARCHIVE_COH), true)
+      $(foreach v, $(JVM_VARIANTS), \
+        $(eval $(call CreateCDSArchive,$v,_coh)) \
+      )
+      $(foreach v, $(JVM_VARIANTS), \
+        $(eval $(call CreateCDSArchive,$v,_nocoops_coh)) \
+      )
+    endif
   endif
 endif
 
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 585575240ea..f574174a12e 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -76,6 +76,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   fi
 
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+    if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
+      AC_MSG_ERROR([32-bit Windows builds are not supported])
+    fi
     BASIC_SETUP_PATHS_WINDOWS
   fi
 
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 21bf61a3fa1..66809127a75 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -261,6 +261,7 @@ JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
 JDKOPT_EXCLUDE_TRANSLATIONS
 JDKOPT_ENABLE_DISABLE_MANPAGES
 JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
+JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH
 JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
 JDKOPT_SETUP_MACOSX_SIGNING
 
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index bdbc898f987..851b3b7a0ef 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -74,7 +74,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       # Clang needs the lld linker to work correctly
       BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL"
       if test "x$CXX_IS_USER_SUPPLIED" = xfalse && test "x$CC_IS_USER_SUPPLIED" = xfalse; then
-        UTIL_REQUIRE_PROGS(LLD, lld)
+        UTIL_REQUIRE_PROGS(LLD, lld, $TOOLCHAIN_PATH:$PATH)
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 11c55c78930..cf8a856de96 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -586,13 +586,42 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JMOD_OPTIONS],
 ################################################################################
 #
 # jlink options.
-# We always keep packaged modules in JDK image.
 #
 AC_DEFUN_ONCE([JDKOPT_SETUP_JLINK_OPTIONS],
 [
-  UTIL_ARG_ENABLE(NAME: keep-packaged-modules, DEFAULT: true,
+
+  ################################################################################
+  #
+  # Configure option for building a JDK that is suitable for linking from the
+  # run-time image without JMODs.
+  #
+  # Determines whether or not a suitable run-time image is being produced from
+  # packaged modules. If set to 'true, changes the *default* of packaged
+  # modules to 'false'.
+  #
+  UTIL_ARG_ENABLE(NAME: linkable-runtime, DEFAULT: false,
+      RESULT: JLINK_PRODUCE_LINKABLE_RUNTIME,
+      DESC: [enable a JDK build suitable for linking from the run-time image],
+      CHECKING_MSG: [whether or not a JDK suitable for linking from the run-time image should be produced])
+  AC_SUBST(JLINK_PRODUCE_LINKABLE_RUNTIME)
+
+  if test "x$JLINK_PRODUCE_LINKABLE_RUNTIME" = xtrue; then
+    DEFAULT_PACKAGED_MODULES=false
+  else
+    DEFAULT_PACKAGED_MODULES=true
+  fi
+
+  ################################################################################
+  #
+  # Configure option for packaged modules
+  #
+  # We keep packaged modules in the JDK image unless --enable-linkable-runtime is
+  # requested.
+  #
+  UTIL_ARG_ENABLE(NAME: keep-packaged-modules, DEFAULT: $DEFAULT_PACKAGED_MODULES,
       RESULT: JLINK_KEEP_PACKAGED_MODULES,
       DESC: [enable keeping of packaged modules in jdk image],
+      DEFAULT_DESC: [enabled by default unless --enable-linkable-runtime is set],
       CHECKING_MSG: [if packaged modules are kept])
   AC_SUBST(JLINK_KEEP_PACKAGED_MODULES)
 ])
@@ -638,14 +667,11 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS],
 
 ################################################################################
 #
-# Optionally disable man pages
+# Optionally disable man pages (deprecated)
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES],
 [
-  UTIL_ARG_ENABLE(NAME: manpages, DEFAULT: true, RESULT: BUILD_MANPAGES,
-      DESC: [enable copying of static man pages],
-      CHECKING_MSG: [if static man pages should be copied])
-  AC_SUBST(BUILD_MANPAGES)
+  UTIL_DEPRECATED_ARG_ENABLE(manpages)
 ])
 
 ################################################################################
@@ -673,6 +699,37 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
   AC_SUBST(BUILD_CDS_ARCHIVE)
 ])
 
+################################################################################
+#
+# Enable or disable the default CDS archive generation for Compact Object Headers
+#
+AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH],
+[
+  UTIL_ARG_ENABLE(NAME: cds-archive-coh, DEFAULT: auto, RESULT: BUILD_CDS_ARCHIVE_COH,
+      DESC: [enable generation of default CDS archives for compact object headers (requires --enable-cds-archive)],
+      DEFAULT_DESC: [auto],
+      CHECKING_MSG: [if default CDS archives for compact object headers should be generated],
+      CHECK_AVAILABLE: [
+        AC_MSG_CHECKING([if CDS archive with compact object headers is available])
+        if test "x$BUILD_CDS_ARCHIVE" = "xfalse"; then
+          AC_MSG_RESULT([no (CDS default archive generation is disabled)])
+          AVAILABLE=false
+        elif test "x$OPENJDK_TARGET_CPU" != "xx86_64" &&
+             test "x$OPENJDK_TARGET_CPU" != "xaarch64" &&
+             test "x$OPENJDK_TARGET_CPU" != "xppc64" &&
+             test "x$OPENJDK_TARGET_CPU" != "xppc64le" &&
+             test "x$OPENJDK_TARGET_CPU" != "xriscv64" &&
+             test "x$OPENJDK_TARGET_CPU" != "xs390x"; then
+          AC_MSG_RESULT([no (compact object headers not supported for this platform)])
+          AVAILABLE=false
+        else
+          AC_MSG_RESULT([yes])
+          AVAILABLE=true
+        fi
+      ])
+  AC_SUBST(BUILD_CDS_ARCHIVE_COH)
+])
+
 ################################################################################
 #
 # Enable the alternative CDS core region alignment
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 9ca808c4c17..3f977058a51 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -666,14 +666,14 @@ AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
 [
   AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
       [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
-  if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
-    if test "x$enable_deprecated_ports" = "xyes"; then
-      AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])
-    else
-      AC_MSG_ERROR(m4_normalize([The Windows 32-bit x86 port is deprecated and may be removed in a future release.
-        Use --enable-deprecated-ports=yes to suppress this error.]))
-    fi
-  fi
+  # if test "x$OPENJDK_TARGET_CPU" = xx86; then
+  #   if test "x$enable_deprecated_ports" = "xyes"; then
+  #     AC_MSG_WARN([The x86 port is deprecated and may be removed in a future release.])
+  #   else
+  #     AC_MSG_ERROR(m4_normalize([The 32-bit x86 port is deprecated and may be removed in a future release.
+  #       Use --enable-deprecated-ports=yes to suppress this error.]))
+  #   fi
+  # fi
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index eb2b1a688e1..bcd54058c28 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -367,9 +367,8 @@ ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
 
 EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
 
-BUILD_MANPAGES := @BUILD_MANPAGES@
-
 BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
+BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@
 
 ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
 
@@ -707,6 +706,7 @@ NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
 
 JMOD_COMPRESS := @JMOD_COMPRESS@
 JLINK_KEEP_PACKAGED_MODULES := @JLINK_KEEP_PACKAGED_MODULES@
+JLINK_PRODUCE_LINKABLE_RUNTIME := @JLINK_PRODUCE_LINKABLE_RUNTIME@
 
 RCFLAGS := @RCFLAGS@
 
diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4
index 387e3717718..4f970df7b5f 100644
--- a/make/autoconf/toolchain_microsoft.m4
+++ b/make/autoconf/toolchain_microsoft.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -82,9 +82,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
       fi
 
       AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
-      if test "x$TARGET_CPU" = xx86; then
-        VCVARSFILES="vcvars32.bat vcvarsamd64_x86.bat"
-      elif test "x$TARGET_CPU" = xx86_64; then
+      if test "x$TARGET_CPU" = xx86_64; then
         VCVARSFILES="vcvars64.bat vcvarsx86_amd64.bat"
       elif test "x$TARGET_CPU" = xaarch64; then
         # for host x86-64, target aarch64
@@ -132,9 +130,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
       elif test -f "$WIN_SDK_BASE/bin/setenv.cmd"; then
         AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
         VS_ENV_CMD="$WIN_SDK_BASE/bin/setenv.cmd"
-        if test "x$TARGET_CPU" = xx86; then
-          VS_ENV_ARGS="/x86"
-        elif test "x$TARGET_CPU" = xx86_64; then
+        if test "x$TARGET_CPU" = xx86_64; then
           VS_ENV_ARGS="/x64"
         elif test "x$TARGET_CPU" = xaarch64; then
           VS_ENV_ARGS="/arm64"
@@ -438,9 +434,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
     # Need to check if the found msvcr is correct architecture
     AC_MSG_CHECKING([found $DLL_NAME architecture])
     MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
-    if test "x$OPENJDK_TARGET_CPU" = xx86; then
-      CORRECT_MSVCR_ARCH=386
-    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
       CORRECT_MSVCR_ARCH=x86-64
     elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
       # The cygwin 'file' command only returns "PE32+ executable (DLL) (console), for MS Windows",
@@ -466,9 +460,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
   DLL_HELP="$2"
   MSVC_DLL=
 
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    vs_target_cpu=x86
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+  if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     vs_target_cpu=x64
   elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
     vs_target_cpu=arm64
@@ -522,18 +514,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
     # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
     # (This was the original behaviour; kept since it might turn something up)
     if test "x$VCINSTALLDIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
-        POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-        | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $GREP -v arm64 | $HEAD --lines 1`
-        if test "x$POSSIBLE_MSVC_DLL" = x; then
-          # We're grasping at straws now...
-          POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-          | $HEAD --lines 1`
-        fi
-      else
-        POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-        | $GREP x64 | $HEAD --lines 1`
-      fi
+      POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
+      | $GREP x64 | $HEAD --lines 1`
 
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
           [search of VCINSTALLDIR])
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index 7c2cef58835..aa721a683d7 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -228,14 +228,11 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
     endif
   else
     # No markdown man pages present
-    ifeq ($(BUILD_MANPAGES), true)
-      # BUILD_MANPAGES is a mis-nomer. It really means "copy the pre-generated man pages".
-      $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \
-          DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \
-          FILES := $(MAN_FILES_TROFF), \
-      ))
+    $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \
+        DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \
+        FILES := $(MAN_FILES_TROFF), \
+    ))
 
-      TARGETS += $(COPY_MAN_PAGES)
-    endif
+    TARGETS += $(COPY_MAN_PAGES)
   endif
 endif
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index c43c424632e..dc026a800ad 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -252,7 +252,6 @@ var getJibProfilesCommon = function (input, data) {
         default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
         configure_args: concat(
             "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
-            "--disable-manpages",
             "--disable-jvm-feature-shenandoahgc",
             versionArgs(input, common))
     };
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index ce3f2684026..d43a8b8d3ab 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -109,9 +109,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
       ADLCFLAGS += -DR18_RESERVED
     endif
   else ifeq ($(call isTargetOs, windows), true)
-    ifeq ($(call isTargetCpuBits, 64), true)
-      ADLCFLAGS += -D_WIN64=1
-    endif
+    ADLCFLAGS += -D_WIN64=1
     ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
       ADLCFLAGS += -DR18_RESERVED
     endif
diff --git a/make/modules/java.base/Copy.gmk b/make/modules/java.base/Copy.gmk
index fea544a47a1..7e3a0e9c3ab 100644
--- a/make/modules/java.base/Copy.gmk
+++ b/make/modules/java.base/Copy.gmk
@@ -123,46 +123,6 @@ TARGETS += $(JVMCFG)
 
 ################################################################################
 
-POLICY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.policy
-POLICY_DST := $(CONF_DST_DIR)/security/java.policy
-
-POLICY_SRC_LIST := $(POLICY_SRC)
-
-$(POLICY_DST): $(POLICY_SRC_LIST)
-	$(call MakeTargetDir)
-	$(RM) $@ $@.tmp
-	$(foreach f, $(POLICY_SRC_LIST), $(CAT) $(f) >> $@.tmp;)
-	$(MV) $@.tmp $@
-
-TARGETS += $(POLICY_DST)
-
-################################################################################
-
-DEF_POLICY_SRC := $(TOPDIR)/src/java.base/share/lib/security/default.policy
-DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
-
-DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
-DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
-
-ifeq ($(call isTargetOs, windows), true)
-  DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
-endif
-
-# Allow imported modules to modify the java.policy
-ifneq ($(IMPORT_MODULES_CONF), )
-  DEF_POLICY_SRC_LIST += $(wildcard $(IMPORT_MODULES_CONF)/java.base/security/java.policy.extra)
-endif
-
-$(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST)
-	$(call MakeTargetDir)
-	$(RM) $@ $@.tmp
-	$(foreach f, $(DEF_POLICY_SRC_LIST), $(CAT) $(f) >> $@.tmp;)
-	$(MV) $@.tmp $@
-
-TARGETS += $(DEF_POLICY_DST)
-
-################################################################################
-
 # CACERTS_FILE is optionally set in configure to override the default cacerts
 # which is otherwise generated in Gendata-java.base.gmk
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index b2904f961fd..90eda1c4e64 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -85,11 +85,7 @@ LIBAWT_EXTRA_HEADER_DIRS := \
 LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
 
 ifeq ($(call isTargetOs, windows), true)
-  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
-  ifeq ($(call isTargetCpuBits, 64), true)
-    LIBAWT_CFLAGS += -DMLIB_OS64BIT
-  endif
-
+  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE -DMLIB_OS64BIT
   LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
   LIBAWT_VERSIONINFO_RESOURCE := \
       $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
diff --git a/make/modules/java.rmi/Launcher.gmk b/make/modules/java.rmi/Launcher.gmk
index 14b381a540e..8c335711da0 100644
--- a/make/modules/java.rmi/Launcher.gmk
+++ b/make/modules/java.rmi/Launcher.gmk
@@ -31,5 +31,4 @@ include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, rmiregistry, \
     MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
-    JAVA_ARGS := -Djava.security.manager=allow, \
 ))
diff --git a/make/modules/jdk.accessibility/Launcher.gmk b/make/modules/jdk.accessibility/Launcher.gmk
index 2499cf56616..86ad96b3a1e 100644
--- a/make/modules/jdk.accessibility/Launcher.gmk
+++ b/make/modules/jdk.accessibility/Launcher.gmk
@@ -48,63 +48,44 @@ ifeq ($(call isTargetOs, windows), true)
   TARGETS += $(BUILD_JABSWITCH)
 
   ##############################################################################
-  # Setup rules to create 32/64 bit version of jaccessinspector
-  #
-  # Parameter 1 File name suffix
-  # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
+  # Build jaccessinspector
   ##############################################################################
-  define SetupInspector
-    $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSINSPECTOR$1, \
-        NAME := jaccessinspector$1, \
-        SRC := jaccessinspector, \
-        EXTRA_SRC := \
-            bridge \
-            common \
-            toolscommon, \
-        EXTRA_HEADER_DIRS := include/bridge, \
-        CFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
-        CXXFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
-        LDFLAGS_windows := -stack:655360, \
-        LIBS_windows := advapi32.lib user32.lib, \
-        VERSIONINFO_RESOURCE := \
-            $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
-    ))
 
-    TARGETS += $$(BUILD_JACCESSINSPECTOR$1)
-  endef
+  $(eval $(call SetupJdkExecutable, BUILD_JACCESSINSPECTOR, \
+      NAME := jaccessinspector, \
+      EXTRA_SRC := \
+          bridge \
+          common \
+          toolscommon, \
+      EXTRA_HEADER_DIRS := include/bridge, \
+      CFLAGS := -DACCESSBRIDGE_ARCH_64 -EHsc, \
+      CXXFLAGS := -DACCESSBRIDGE_ARCH_64 -EHsc, \
+      LDFLAGS_windows := -stack:655360, \
+      LIBS_windows := advapi32.lib user32.lib, \
+      VERSIONINFO_RESOURCE := \
+          $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
+  ))
+
+  TARGETS += $(BUILD_JACCESSINSPECTOR)
 
   ##############################################################################
-  # Setup rules to create 32/64 bit version of jaccesswalker
-  # Parameter 1 File name suffix
-  # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
+  # Build jaccesswalker
   ##############################################################################
-  define SetupWalker
-    $$(eval $$(call SetupJdkExecutable, BUILD_JACCESSWALKER$1, \
-        NAME := jaccesswalker$1, \
-        SRC := jaccesswalker, \
-        EXTRA_SRC := \
-            bridge \
-            common \
-            toolscommon, \
-        EXTRA_HEADER_DIRS := include/bridge, \
-        CFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
-        CXXFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
-        LDFLAGS_windows := -stack:655360, \
-        LIBS_windows := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
-        VERSIONINFO_RESOURCE := \
-            $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
-    ))
 
-    TARGETS += $$(BUILD_JACCESSWALKER$1)
-  endef
+  $(eval $(call SetupJdkExecutable, BUILD_JACCESSWALKER, \
+      NAME := jaccesswalker, \
+      EXTRA_SRC := \
+          bridge \
+          common \
+          toolscommon, \
+      EXTRA_HEADER_DIRS := include/bridge, \
+      CFLAGS := -DACCESSBRIDGE_ARCH_64 -EHsc, \
+      CXXFLAGS := -DACCESSBRIDGE_ARCH_64 -EHsc, \
+      LDFLAGS_windows := -stack:655360, \
+      LIBS_windows := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
+      VERSIONINFO_RESOURCE := \
+          $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
+  ))
 
-  ifeq ($(call isTargetCpuBits, 32), true)
-    $(eval $(call SetupInspector,-32,32))
-    $(eval $(call SetupWalker,-32,32))
-    $(eval $(call SetupInspector,,LEGACY))
-    $(eval $(call SetupWalker,,LEGACY))
-  else
-    $(eval $(call SetupInspector,,64))
-    $(eval $(call SetupWalker,,64))
-  endif
+  TARGETS += $(BUILD_JACCESSWALKER)
 endif
diff --git a/make/modules/jdk.accessibility/Lib.gmk b/make/modules/jdk.accessibility/Lib.gmk
index 657eec2ad4e..6a429a56375 100644
--- a/make/modules/jdk.accessibility/Lib.gmk
+++ b/make/modules/jdk.accessibility/Lib.gmk
@@ -31,84 +31,50 @@ ifeq ($(call isTargetOs, windows), true)
   ACCESSIBILITY_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
 
   ##############################################################################
-  # Setup rules to create 32/64 bit version of javaaccessbridge
-  #
-  # Parameter 1 Suffix
-  # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
+  ## Build libjavaaccessbridge
   ##############################################################################
-  define SetupJavaDLL
-    $(call SetupJdkLibrary, BUILD_LIBJAVAACCESSBRIDGE$1, \
-        NAME := javaaccessbridge$1, \
-        SRC := libjavaaccessbridge, \
-        EXTRA_SRC := common, \
-        OPTIMIZATION := LOW, \
-        DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
-        CXXFLAGS_FILTER_OUT := -MD, \
-        CXXFLAGS := -MT -DACCESSBRIDGE_ARCH_$2, \
-        EXTRA_HEADER_DIRS := \
-            include/bridge \
-            java.desktop:include, \
-        JDK_LIBS := java.desktop:libjawt, \
-        LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
-            odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
-            user32.lib uuid.lib winspool.lib, \
-        VERSIONINFO_RESOURCE := \
-            $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
-    )
 
-    TARGETS += $$(BUILD_LIBJAVAACCESSBRIDGE$1)
-  endef
+  $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAACCESSBRIDGE, \
+      NAME := javaaccessbridge, \
+      EXTRA_SRC := common, \
+      OPTIMIZATION := LOW, \
+      DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
+      CXXFLAGS_FILTER_OUT := -MD, \
+      CXXFLAGS := -MT -DACCESSBRIDGE_ARCH_64, \
+      EXTRA_HEADER_DIRS := \
+          include/bridge \
+          java.desktop:include, \
+      JDK_LIBS := java.desktop:libjawt, \
+      LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
+          odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
+          user32.lib uuid.lib winspool.lib, \
+      VERSIONINFO_RESOURCE := \
+          $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
+  ))
+
+  TARGETS += $(BUILD_LIBJAVAACCESSBRIDGE)
 
   ##############################################################################
-  # Setup rules to create 32/64 bit version of windowsaccessbridge
-  #
-  # Parameter 1 Suffix
-  # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
+  ## Build libwindowsaccessbridge
   ##############################################################################
-  define SetupWinDLL
-    $(call SetupJdkLibrary, BUILD_LIBWINDOWSACCESSBRIDGE$1, \
-        NAME := windowsaccessbridge$1, \
-        SRC := libwindowsaccessbridge, \
-        EXTRA_SRC := common, \
-        OPTIMIZATION := LOW, \
-        DISABLED_WARNINGS_microsoft_WinAccessBridge.cpp := 4302 4311, \
-        CXXFLAGS := -DACCESSBRIDGE_ARCH_$2, \
-        EXTRA_HEADER_DIRS := \
-            include/bridge, \
-        LDFLAGS := \
-            -def:$(ACCESSIBILITY_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
-        LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
-            odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
-            user32.lib uuid.lib winspool.lib, \
-        VERSIONINFO_RESOURCE := \
-            $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
-    )
-
-    TARGETS += $$(BUILD_LIBWINDOWSACCESSBRIDGE$1)
-  endef
-
-  ifeq ($(call isTargetCpuBits, 32), true)
-    ############################################################################
-    # Build libjabsysinfo
-    ############################################################################
-
-    $(eval $(call SetupJdkLibrary, BUILD_LIBJABSYSINFO, \
-        NAME := jabsysinfo, \
-        OPTIMIZATION := LOW, \
-        VERSIONINFO_RESOURCE := \
-            $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
-    )
 
-    TARGETS += $(BUILD_LIBJABSYSINFO)
-  endif
+  $(eval $(call SetupJdkLibrary, BUILD_LIBWINDOWSACCESSBRIDGE, \
+      NAME := windowsaccessbridge-64, \
+      SRC := libwindowsaccessbridge, \
+      EXTRA_SRC := common, \
+      OPTIMIZATION := LOW, \
+      DISABLED_WARNINGS_microsoft_WinAccessBridge.cpp := 4302 4311, \
+      CXXFLAGS := -DACCESSBRIDGE_ARCH_64, \
+      EXTRA_HEADER_DIRS := \
+          include/bridge, \
+      LDFLAGS := \
+          -def:$(ACCESSIBILITY_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
+      LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
+          odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
+          user32.lib uuid.lib winspool.lib, \
+      VERSIONINFO_RESOURCE := \
+          $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
+  ))
 
-  ifeq ($(call isTargetCpuBits, 32), true)
-    $(eval $(call SetupJavaDLL,-32,32))
-    $(eval $(call SetupJavaDLL,,LEGACY))
-    $(eval $(call SetupWinDLL,-32,32))
-    $(eval $(call SetupWinDLL,,LEGACY))
-  else
-    $(eval $(call SetupJavaDLL,,64))
-    $(eval $(call SetupWinDLL,-64,64))
-  endif
+  TARGETS += $(BUILD_LIBWINDOWSACCESSBRIDGE)
 endif
diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index e81c460225c..cc2f4adf2ed 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -76,26 +76,13 @@ fi
 # disassembly, such as hard-coded addresses, to be able to catch "actual" differences.
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-  if [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
-    DIS_DIFF_FILTER="$SED -r \
-        -e 's/^  [0-9A-F]{16}: //' \
-        -e 's/^  [0-9A-F]{8}: /  <ADDR>: /' \
-        -e 's/(offset \?\?)_C@_.*/\1<SYM>/' \
-        -e 's/[@?][A-Za-z0-9_]{1,25}/<SYM>/' \
-        -e 's/([-,+])[0-9A-F]{2,16}/\1<HEXSTR>/g' \
-        -e 's/\[[0-9A-F]{4,16}h\]/[<HEXSTR>]/' \
-        -e 's/: ([a-z]{2}[a-z ]{2})        [0-9A-F]{2,16}h?$/: \1        <HEXSTR>/' \
-        -e 's/_20[0-9]{2}_[0-1][0-9]_[0-9]{2}/_<DATE>/' \
-        "
-  elif [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-    DIS_DIFF_FILTER="$SED -r \
-        -e 's/^  [0-9A-F]{16}: //' \
-        -e 's/\[[0-9A-F]{4,16}h\]/[<HEXSTR>]/' \
-        -e 's/([,+])[0-9A-F]{2,16}h/\1<HEXSTR>/' \
-        -e 's/([a-z]{2}[a-z ]{2})        [0-9A-F]{4,16}$/\1        <HEXSTR>/' \
-        -e 's/\[\?\?_C@_.*/[<SYM>]/' \
-        "
-  fi
+  DIS_DIFF_FILTER="$SED -r \
+      -e 's/^  [0-9A-F]{16}: //' \
+      -e 's/\[[0-9A-F]{4,16}h\]/[<HEXSTR>]/' \
+      -e 's/([,+])[0-9A-F]{2,16}h/\1<HEXSTR>/' \
+      -e 's/([a-z]{2}[a-z ]{2})        [0-9A-F]{4,16}$/\1        <HEXSTR>/' \
+      -e 's/\[\?\?_C@_.*/[<SYM>]/' \
+      "
 elif [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
   DIS_DIFF_FILTER="$SED \
       -e 's/0x[0-9a-f]\{3,16\}/<HEXSTR>/g' -e 's/^[0-9a-f]\{12,20\}/<ADDR>/' \
@@ -1467,11 +1454,7 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
         THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
         if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-            if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-                JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
-            else
-                JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
-            fi
+            JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
             OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
             OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
             THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index eedf29cc563..a97d01b7683 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1648,8 +1648,8 @@ int MachCallRuntimeNode::ret_addr_offset() {
   // for real runtime callouts it will be six instructions
   // see aarch64_enc_java_to_runtime
   //   adr(rscratch2, retaddr)
+  //   str(rscratch2, Address(rthread, JavaThread::last_Java_pc_offset()));
   //   lea(rscratch1, RuntimeAddress(addr)
-  //   stp(zr, rscratch2, Address(__ pre(sp, -2 * wordSize)))
   //   blr(rscratch1)
   CodeBlob *cb = CodeCache::find_blob(_entry_point);
   if (cb) {
@@ -3696,14 +3696,13 @@ encode %{
       __ post_call_nop();
     } else {
       Label retaddr;
+      // Make the anchor frame walkable
       __ adr(rscratch2, retaddr);
+      __ str(rscratch2, Address(rthread, JavaThread::last_Java_pc_offset()));
       __ lea(rscratch1, RuntimeAddress(entry));
-      // Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc()
-      __ stp(zr, rscratch2, Address(__ pre(sp, -2 * wordSize)));
       __ blr(rscratch1);
       __ bind(retaddr);
       __ post_call_nop();
-      __ add(sp, sp, 2 * wordSize);
     }
     if (Compile::current()->max_vector_size() > 0) {
       __ reinitialize_ptrue();
@@ -5756,6 +5755,10 @@ opclass memory(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indInde
                indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN, indirectX2P, indOffX2P);
 
 
+opclass memory_noindex(indirect,
+                       indOffI1, indOffL1,indOffI2, indOffL2, indOffI4, indOffL4, indOffI8, indOffL8,
+                       indirectN, indOffIN, indOffLN, indirectX2P, indOffX2P);
+
 // iRegIorL2I is used for src inputs in rules for 32 bit int (I)
 // operations. it allows the src to be either an iRegI or a (ConvL2I
 // iRegL). in the latter case the l2i normally planted for a ConvL2I
@@ -6682,7 +6685,7 @@ instruct loadKlass(iRegPNoSp dst, memory8 mem)
 instruct loadNKlass(iRegNNoSp dst, memory4 mem)
 %{
   match(Set dst (LoadNKlass mem));
-  predicate(!needs_acquiring_load(n));
+  predicate(!needs_acquiring_load(n) && !UseCompactObjectHeaders);
 
   ins_cost(4 * INSN_COST);
   format %{ "ldrw  $dst, $mem\t# compressed class ptr" %}
@@ -6692,6 +6695,20 @@ instruct loadNKlass(iRegNNoSp dst, memory4 mem)
   ins_pipe(iload_reg_mem);
 %}
 
+instruct loadNKlassCompactHeaders(iRegNNoSp dst, memory_noindex mem)
+%{
+  match(Set dst (LoadNKlass mem));
+  predicate(!needs_acquiring_load(n) && UseCompactObjectHeaders);
+
+  ins_cost(4 * INSN_COST);
+  format %{ "load_narrow_klass_compact  $dst, $mem\t# compressed class ptr" %}
+  ins_encode %{
+    assert($mem$$index$$Register == noreg, "must not have indexed address");
+    __ load_narrow_klass_compact_c2($dst$$Register, $mem$$base$$Register, $mem$$disp);
+  %}
+  ins_pipe(iload_reg_mem);
+%}
+
 // Load Float
 instruct loadF(vRegF dst, memory4 mem)
 %{
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 3d1be91e9b2..b01360c3f7e 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -2243,8 +2243,6 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
 
   Address src_length_addr = Address(src, arrayOopDesc::length_offset_in_bytes());
   Address dst_length_addr = Address(dst, arrayOopDesc::length_offset_in_bytes());
-  Address src_klass_addr = Address(src, oopDesc::klass_offset_in_bytes());
-  Address dst_klass_addr = Address(dst, oopDesc::klass_offset_in_bytes());
 
   // test for null
   if (flags & LIR_OpArrayCopy::src_null_check) {
@@ -2305,15 +2303,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // We don't know the array types are compatible
     if (basic_type != T_OBJECT) {
       // Simple test for basic type arrays
-      if (UseCompressedClassPointers) {
-        __ ldrw(tmp, src_klass_addr);
-        __ ldrw(rscratch1, dst_klass_addr);
-        __ cmpw(tmp, rscratch1);
-      } else {
-        __ ldr(tmp, src_klass_addr);
-        __ ldr(rscratch1, dst_klass_addr);
-        __ cmp(tmp, rscratch1);
-      }
+      __ cmp_klasses_from_objects(src, dst, tmp, rscratch1);
       __ br(Assembler::NE, *stub->entry());
     } else {
       // For object arrays, if src is a sub class of dst then we can
@@ -2435,36 +2425,14 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // but not necessarily exactly of type default_type.
     Label known_ok, halt;
     __ mov_metadata(tmp, default_type->constant_encoding());
-    if (UseCompressedClassPointers) {
-      __ encode_klass_not_null(tmp);
-    }
 
     if (basic_type != T_OBJECT) {
-
-      if (UseCompressedClassPointers) {
-        __ ldrw(rscratch1, dst_klass_addr);
-        __ cmpw(tmp, rscratch1);
-      } else {
-        __ ldr(rscratch1, dst_klass_addr);
-        __ cmp(tmp, rscratch1);
-      }
+      __ cmp_klass(dst, tmp, rscratch1);
       __ br(Assembler::NE, halt);
-      if (UseCompressedClassPointers) {
-        __ ldrw(rscratch1, src_klass_addr);
-        __ cmpw(tmp, rscratch1);
-      } else {
-        __ ldr(rscratch1, src_klass_addr);
-        __ cmp(tmp, rscratch1);
-      }
+      __ cmp_klass(src, tmp, rscratch1);
       __ br(Assembler::EQ, known_ok);
     } else {
-      if (UseCompressedClassPointers) {
-        __ ldrw(rscratch1, dst_klass_addr);
-        __ cmpw(tmp, rscratch1);
-      } else {
-        __ ldr(rscratch1, dst_klass_addr);
-        __ cmp(tmp, rscratch1);
-      }
+      __ cmp_klass(dst, tmp, rscratch1);
       __ br(Assembler::EQ, known_ok);
       __ cmp(src, dst);
       __ br(Assembler::EQ, known_ok);
@@ -2547,12 +2515,7 @@ void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
     add_debug_info_for_null_check_here(info);
   }
 
-  if (UseCompressedClassPointers) {
-    __ ldrw(result, Address (obj, oopDesc::klass_offset_in_bytes()));
-    __ decode_klass_not_null(result);
-  } else {
-    __ ldr(result, Address (obj, oopDesc::klass_offset_in_bytes()));
-  }
+  __ load_klass(result, obj);
 }
 
 void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index 8d1b3902ce4..fc6cadc8450 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -119,8 +119,8 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     cbnz(hdr, slow_case);
     // done
     bind(done);
+    inc_held_monitor_count(rscratch1);
   }
-  increment(Address(rthread, JavaThread::held_monitor_count_offset()));
   return null_check_offset;
 }
 
@@ -159,8 +159,8 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     }
     // done
     bind(done);
+    dec_held_monitor_count(rscratch1);
   }
-  decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
 }
 
 
@@ -175,15 +175,19 @@ void C1_MacroAssembler::try_allocate(Register obj, Register var_size_in_bytes, i
 
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
   assert_different_registers(obj, klass, len);
-  // This assumes that all prototype bits fit in an int32_t
-  mov(t1, (int32_t)(intptr_t)markWord::prototype().value());
-  str(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
 
-  if (UseCompressedClassPointers) { // Take care not to kill klass
-    encode_klass_not_null(t1, klass);
-    strw(t1, Address(obj, oopDesc::klass_offset_in_bytes()));
+  if (UseCompactObjectHeaders) {
+    ldr(t1, Address(klass, Klass::prototype_header_offset()));
+    str(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
   } else {
-    str(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+    mov(t1, checked_cast<int32_t>(markWord::prototype().value()));
+    str(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
+    if (UseCompressedClassPointers) { // Take care not to kill klass
+      encode_klass_not_null(t1, klass);
+      strw(t1, Address(obj, oopDesc::klass_offset_in_bytes()));
+    } else {
+      str(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+    }
   }
 
   if (len->is_valid()) {
@@ -194,7 +198,7 @@ void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register
       // Clear gap/first 4 bytes following the length field.
       strw(zr, Address(obj, base_offset));
     }
-  } else if (UseCompressedClassPointers) {
+  } else if (UseCompressedClassPointers && !UseCompactObjectHeaders) {
     store_klass_gap(obj, zr);
   }
 }
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 00b678d5405..19665d1b894 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -160,16 +160,15 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
 }
 
 enum return_state_t {
-  does_not_return, requires_return
+  does_not_return, requires_return, requires_pop_epilogue_return
 };
 
-
 // Implementation of StubFrame
 
 class StubFrame: public StackObj {
  private:
   StubAssembler* _sasm;
-  bool _return_state;
+  return_state_t _return_state;
 
  public:
   StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, return_state_t return_state=requires_return);
@@ -183,8 +182,17 @@ void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
   enter();
 }
 
-void StubAssembler::epilogue() {
-  leave();
+void StubAssembler::epilogue(bool use_pop) {
+  // Avoid using a leave instruction when this frame may
+  // have been frozen, since the current value of rfp
+  // restored from the stub would be invalid. We still
+  // must restore the rfp value saved on enter though.
+  if (use_pop) {
+    ldp(rfp, lr, Address(post(sp, 2 * wordSize)));
+    authenticate_return_address();
+  } else {
+    leave();
+  }
   ret(lr);
 }
 
@@ -203,10 +211,10 @@ void StubFrame::load_argument(int offset_in_words, Register reg) {
 }
 
 StubFrame::~StubFrame() {
-  if (_return_state == requires_return) {
-    __ epilogue();
-  } else {
+  if (_return_state == does_not_return) {
     __ should_not_reach_here();
+  } else {
+    __ epilogue(_return_state == requires_pop_epilogue_return);
   }
 }
 
@@ -252,7 +260,7 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
 
   for (int i = 0; i < FrameMap::nof_cpu_regs; i++) {
     Register r = as_Register(i);
-    if (i <= 18 && i != rscratch1->encoding() && i != rscratch2->encoding()) {
+    if (r == rthread || (i <= 18 && i != rscratch1->encoding() && i != rscratch2->encoding())) {
       int sp_offset = cpu_reg_save_offsets[i];
       oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset),
                                 r->as_VMReg());
@@ -337,6 +345,15 @@ void Runtime1::initialize_pd() {
   }
 }
 
+// return: offset in 64-bit words.
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+  CodeBlob* cb = f.cb();
+  assert(cb == Runtime1::blob_for(C1StubId::monitorenter_id) ||
+         cb == Runtime1::blob_for(C1StubId::monitorenter_nofpu_id), "must be");
+  assert(cb != nullptr && cb->is_runtime_stub(), "invalid frame");
+  int offset = cpu_reg_save_offsets[rthread->encoding()];
+  return offset / 2;   // SP offsets are in halfwords
+}
 
 // target: the entry point of the method that creates and posts the exception oop
 // has_argument: true if the exception needs arguments (passed in rscratch1 and rscratch2)
@@ -868,7 +885,7 @@ OopMapSet* Runtime1::generate_code_for(C1StubId id, StubAssembler* sasm) {
       // fall through
     case C1StubId::monitorenter_id:
       {
-        StubFrame f(sasm, "monitorenter", dont_gc_arguments);
+        StubFrame f(sasm, "monitorenter", dont_gc_arguments, requires_pop_epilogue_return);
         OopMap* map = save_live_registers(sasm, save_fpu_registers);
 
         // Called with store_parameter and not C abi
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 5ce76106c9e..4c22133c056 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -153,7 +153,7 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register
   Label count, no_count;
 
   assert(LockingMode != LM_LIGHTWEIGHT, "lightweight locking should use fast_lock_lightweight");
-  assert_different_registers(oop, box, tmp, disp_hdr);
+  assert_different_registers(oop, box, tmp, disp_hdr, rscratch2);
 
   // Load markWord from object into displaced_header.
   ldr(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
@@ -206,12 +206,10 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  // The object's monitor m is unlocked iff m->owner == nullptr,
-  // otherwise m->owner may contain a thread or a stack address.
-  //
-  // Try to CAS m->owner from null to current thread.
+  // Try to CAS owner (no owner => current thread's _lock_id).
+  ldr(rscratch2, Address(rthread, JavaThread::lock_id_offset()));
   add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset())-markWord::monitor_value));
-  cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
+  cmpxchg(tmp, zr, rscratch2, Assembler::xword, /*acquire*/ true,
           /*release*/ true, /*weak*/ false, tmp3Reg); // Sets flags for result
 
   // Store a non-null value into the box to avoid looking like a re-entrant
@@ -223,7 +221,7 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register
 
   br(Assembler::EQ, cont); // CAS success means locking succeeded
 
-  cmp(tmp3Reg, rthread);
+  cmp(tmp3Reg, rscratch2);
   br(Assembler::NE, cont); // Check for recursive locking
 
   // Recursive lock case
@@ -236,7 +234,9 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register
   br(Assembler::NE, no_count);
 
   bind(count);
-  increment(Address(rthread, JavaThread::held_monitor_count_offset()));
+  if (LockingMode == LM_LEGACY) {
+    inc_held_monitor_count(rscratch1);
+  }
 
   bind(no_count);
 }
@@ -343,7 +343,9 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Registe
   br(Assembler::NE, no_count);
 
   bind(count);
-  decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
+  if (LockingMode == LM_LEGACY) {
+    dec_held_monitor_count(rscratch1);
+  }
 
   bind(no_count);
 }
@@ -351,7 +353,7 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Registe
 void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Register t1,
                                               Register t2, Register t3) {
   assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-  assert_different_registers(obj, box, t1, t2, t3);
+  assert_different_registers(obj, box, t1, t2, t3, rscratch2);
 
   // Handle inflated monitor.
   Label inflated;
@@ -467,13 +469,14 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
     // Compute owner address.
     lea(t2_owner_addr, owner_address);
 
-    // CAS owner (null => current thread).
-    cmpxchg(t2_owner_addr, zr, rthread, Assembler::xword, /*acquire*/ true,
+    // Try to CAS owner (no owner => current thread's _lock_id).
+    ldr(rscratch2, Address(rthread, JavaThread::lock_id_offset()));
+    cmpxchg(t2_owner_addr, zr, rscratch2, Assembler::xword, /*acquire*/ true,
             /*release*/ false, /*weak*/ false, t3_owner);
     br(Assembler::EQ, monitor_locked);
 
     // Check if recursive.
-    cmp(t3_owner, rthread);
+    cmp(t3_owner, rscratch2);
     br(Assembler::NE, slow_path);
 
     // Recursive.
@@ -486,7 +489,6 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   }
 
   bind(locked);
-  increment(Address(rthread, JavaThread::held_monitor_count_offset()));
 
 #ifdef ASSERT
   // Check that locked label is reached with Flags == EQ.
@@ -655,7 +657,6 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Regi
   }
 
   bind(unlocked);
-  decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
   cmp(zr, zr); // Set Flags to EQ => fast path
 
 #ifdef ASSERT
@@ -2689,3 +2690,12 @@ bool C2_MacroAssembler::in_scratch_emit_size() {
   }
   return MacroAssembler::in_scratch_emit_size();
 }
+
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Register obj, int disp) {
+  // Note: Don't clobber obj anywhere in that method!
+
+  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
+  // obj-start, so that we can load from the object's mark-word instead.
+  ldr(dst, Address(obj, disp - oopDesc::klass_offset_in_bytes()));
+  lsr(dst, dst, markWord::klass_shift);
+}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index d61b050407d..c6ddcf46cba 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -186,4 +186,6 @@
   void vector_signum_sve(FloatRegister dst, FloatRegister src, FloatRegister zero,
                          FloatRegister one, FloatRegister vtmp, PRegister pgtmp, SIMD_RegVariant T);
 
+  void load_narrow_klass_compact_c2(Register dst, Register obj, int disp);
+
 #endif // CPU_AARCH64_C2_MACROASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
index fc78813c161..b96241aab19 100644
--- a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
@@ -117,19 +117,3 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
 
   return result;
 }
-
-void CompressedKlassPointers::initialize(address addr, size_t len) {
-  constexpr uintptr_t unscaled_max = nth_bit(32);
-  assert(len <= unscaled_max, "Klass range larger than 32 bits?");
-
-  // Shift is always 0 on aarch64.
-  _shift = 0;
-
-  // On aarch64, we don't bother with zero-based encoding (base=0 shift>0).
-  address const end = addr + len;
-  _base = (end <= (address)unscaled_max) ? nullptr : addr;
-
-  // Remember the Klass range:
-  _klass_range_start = addr;
-  _klass_range_end = addr + len;
-}
diff --git a/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
index d3b9e89773c..e82162df4ab 100644
--- a/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,6 +129,11 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   }
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  assert(f.interpreter_frame_last_sp() == nullptr, "should be null for top frame");
+  f.interpreter_frame_set_last_sp(f.unextended_sp());
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   assert(hf.fp() == hf.unextended_sp() + (f.fp() - f.unextended_sp()), "");
   assert((f.at(frame::interpreter_frame_last_sp_offset) != 0)
@@ -149,10 +154,16 @@ inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, co
   // extended_sp is already relativized by TemplateInterpreterGenerator::generate_normal_entry or
   // AbstractInterpreter::layout_activation
 
+  // The interpreter native wrapper code adds space in the stack equal to size_of_parameters()
+  // after the fixed part of the frame. For wait0 this is equal to 3 words (this + long parameter).
+  // We adjust by this size since otherwise the saved last sp will be less than the extended_sp.
+  DEBUG_ONLY(Method* m = hf.interpreter_frame_method();)
+  DEBUG_ONLY(int extra_space = m->is_object_wait0() ? m->size_of_parameters() : 0;)
+
   assert((hf.fp() - hf.unextended_sp()) == (f.fp() - f.unextended_sp()), "");
   assert(hf.unextended_sp() == (intptr_t*)hf.at(frame::interpreter_frame_last_sp_offset), "");
   assert(hf.unextended_sp() <= (intptr_t*)hf.at(frame::interpreter_frame_initial_sp_offset), "");
-  assert(hf.unextended_sp() >  (intptr_t*)hf.at(frame::interpreter_frame_extended_sp_offset), "");
+  assert(hf.unextended_sp() + extra_space >  (intptr_t*)hf.at(frame::interpreter_frame_extended_sp_offset), "");
   assert(hf.fp()            >  (intptr_t*)hf.at(frame::interpreter_frame_initial_sp_offset), "");
   assert(hf.fp()            <= (intptr_t*)hf.at(frame::interpreter_frame_locals_offset), "");
 }
@@ -213,7 +224,6 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     // If caller is interpreted it already made room for the callee arguments
     int overlap = caller.is_interpreted_frame() ? ContinuationHelper::InterpretedFrame::stack_argsize(hf) : 0;
     const int fsize = (int)(ContinuationHelper::InterpretedFrame::frame_bottom(hf) - hf.unextended_sp() - overlap);
-    const int locals = hf.interpreter_frame_method()->max_locals();
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     intptr_t* fp = frame_sp + (hf.fp() - heap_sp);
     if ((intptr_t)fp % frame::frame_alignment != 0) {
@@ -235,7 +245,7 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     int fsize = FKind::size(hf);
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     if (bottom || caller.is_interpreted_frame()) {
-      int argsize = hf.compiled_frame_stack_argsize();
+      int argsize = FKind::stack_argsize(hf);
 
       fsize += argsize;
       frame_sp   -= argsize;
@@ -252,8 +262,8 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
       // we need to recreate a "real" frame pointer, pointing into the stack
       fp = frame_sp + FKind::size(hf) - frame::sender_sp_offset;
     } else {
-      fp = FKind::stub
-        ? frame_sp + fsize - frame::sender_sp_offset // on AArch64, this value is used for the safepoint stub
+      fp = FKind::stub || FKind::native
+        ? frame_sp + fsize - frame::sender_sp_offset // fp always points to the address below the pushed return pc. We need correct address.
         : *(intptr_t**)(hf.sp() - frame::sender_sp_offset); // we need to re-read fp because it may be an oop and we might have fixed the frame.
     }
     return frame(frame_sp, frame_sp, fp, hf.pc(), hf.cb(), hf.oop_map(), false); // TODO PERF : this computes deopt state; is it necessary?
@@ -277,6 +287,22 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  intptr_t* fp = caller_sp - frame::sender_sp_offset;
+  patch_callee_link(f, fp);
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
+  sp[-2] = (intptr_t)enterSpecial.fp();
+
+  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+  return sp;
+}
+
 inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, const frame& f) {
   // Make sure that last_sp is kept relativized.
   assert((intptr_t*)f.at_relative(frame::interpreter_frame_last_sp_offset) == f.unextended_sp(), "");
@@ -285,7 +311,9 @@ inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, c
   assert(f.at_absolute(frame::interpreter_frame_monitor_block_top_offset) <= frame::interpreter_frame_initial_sp_offset, "");
 
   // Make sure that extended_sp is kept relativized.
-  assert((intptr_t*)f.at_relative(frame::interpreter_frame_extended_sp_offset) < f.unextended_sp(), "");
+  DEBUG_ONLY(Method* m = hf.interpreter_frame_method();)
+  DEBUG_ONLY(int extra_space = m->is_object_wait0() ? m->size_of_parameters() : 0;) // see comment in relativize_interpreted_frame_metadata()
+  assert((intptr_t*)f.at_relative(frame::interpreter_frame_extended_sp_offset) < f.unextended_sp() + extra_space, "");
 }
 
 #endif // CPU_AARCH64_CONTINUATIONFREEZETHAW_AARCH64_INLINE_HPP
diff --git a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
index 2715ebef8f0..e39580369db 100644
--- a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,22 @@ static inline intptr_t** link_address(const frame& f) {
             : (intptr_t**)(f.unextended_sp() + f.cb()->frame_size() - frame::sender_sp_offset);
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  if (f.is_runtime_frame()) {
+    // Unlike x86 we don't know where in the callee frame the return pc is
+    // saved so we can't patch the return from the VM call back to Java.
+    // Instead, we will patch the return from the runtime stub back to the
+    // compiled method so that the target returns to the preempt cleanup stub.
+    intptr_t* caller_sp = f.sp() + f.cb()->frame_size();
+    caller_sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
+  } else {
+    // The target will check for preemption once it returns to the interpreter
+    // or the native wrapper code and will manually jump to the preempt stub.
+    JavaThread *thread = JavaThread::current();
+    thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
+  }
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
 #ifdef _LP64
   return size & 1;
@@ -83,12 +99,12 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   anchor->set_last_Java_fp(entry->entry_fp());
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   intptr_t* fp = *(intptr_t**)(sp - frame::sender_sp_offset);
   anchor->set_last_Java_fp(fp);
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   intptr_t* sp = f.sp();
   address pc = ContinuationHelper::return_address_at(
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
index c2b127f31bb..361b913fd2e 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -420,6 +420,36 @@ frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
   return fr;
 }
 
+#if defined(ASSERT)
+static address get_register_address_in_stub(const frame& stub_fr, VMReg reg) {
+  RegisterMap map(nullptr,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  stub_fr.oop_map()->update_register_map(&stub_fr, &map);
+  return map.location(reg, stub_fr.sp());
+}
+#endif
+
+JavaThread** frame::saved_thread_address(const frame& f) {
+  CodeBlob* cb = f.cb();
+  assert(cb != nullptr && cb->is_runtime_stub(), "invalid frame");
+
+  JavaThread** thread_addr;
+#ifdef COMPILER1
+  if (cb == Runtime1::blob_for(C1StubId::monitorenter_id) ||
+      cb == Runtime1::blob_for(C1StubId::monitorenter_nofpu_id)) {
+    thread_addr = (JavaThread**)(f.sp() + Runtime1::runtime_blob_current_thread_offset(f));
+  } else
+#endif
+  {
+    // c2 only saves rbp in the stub frame so nothing to do.
+    thread_addr = nullptr;
+  }
+  assert(get_register_address_in_stub(f, SharedRuntime::thread_register()) == (address)thread_addr, "wrong thread address");
+  return thread_addr;
+}
+
 //------------------------------------------------------------------------------
 // frame::verify_deopt_original_pc
 //
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp
index 401e2c6ae97..da020b4234d 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp
@@ -73,7 +73,8 @@
     sender_sp_offset                                 =  2,
 
     // Interpreter frames
-    interpreter_frame_oop_temp_offset                =  3, // for native calls only
+    interpreter_frame_result_handler_offset          =  3, // for native calls only
+    interpreter_frame_oop_temp_offset                =  2, // for native calls only
 
     interpreter_frame_sender_sp_offset               = -1,
     // outgoing sp before a call to an invoked method
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index c6af74c3dcd..b892489af70 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -666,7 +666,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 {
   assert(lock_reg == c_rarg1, "The argument is only for looks. It must be c_rarg1");
   if (LockingMode == LM_MONITOR) {
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
   } else {
@@ -697,7 +697,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
-      b(count);
+      b(done);
     } else if (LockingMode == LM_LEGACY) {
       // Load (object->mark() | 1) into swap_reg
       ldr(rscratch1, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
@@ -747,18 +747,18 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
       // Save the test result, for recursive case, the result is zero
       str(swap_reg, Address(lock_reg, mark_offset));
-      br(Assembler::EQ, count);
+      br(Assembler::NE, slow_case);
+
+      bind(count);
+      inc_held_monitor_count(rscratch1);
+      b(done);
     }
     bind(slow_case);
 
     // Call the runtime routine for slow case
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
-    b(done);
-
-    bind(count);
-    increment(Address(rthread, JavaThread::held_monitor_count_offset()));
 
     bind(done);
   }
@@ -804,11 +804,10 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
     // Free entry
     str(zr, Address(lock_reg, BasicObjectLock::obj_offset()));
 
+    Label slow_case;
     if (LockingMode == LM_LIGHTWEIGHT) {
-      Label slow_case;
       lightweight_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
-      b(count);
-      bind(slow_case);
+      b(done);
     } else if (LockingMode == LM_LEGACY) {
       // Load the old header from BasicLock structure
       ldr(header_reg, Address(swap_reg,
@@ -818,16 +817,17 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
       cbz(header_reg, count);
 
       // Atomic swap back the old header
-      cmpxchg_obj_header(swap_reg, header_reg, obj_reg, rscratch1, count, /*fallthrough*/nullptr);
+      cmpxchg_obj_header(swap_reg, header_reg, obj_reg, rscratch1, count, &slow_case);
+
+      bind(count);
+      dec_held_monitor_count(rscratch1);
+      b(done);
     }
+
+    bind(slow_case);
     // Call the runtime routine for slow case.
     str(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset())); // restore obj
     call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), lock_reg);
-    b(done);
-
-    bind(count);
-    decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
-
     bind(done);
     restore_bcp();
   }
@@ -1531,6 +1531,55 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
   restore_locals();
 }
 
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                                    address entry_point,
+                                                    Register arg_1) {
+  assert(arg_1 == c_rarg1, "");
+  Label resume_pc, not_preempted;
+
+#ifdef ASSERT
+  {
+    Label L;
+    ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+    cbz(rscratch1, L);
+    stop("Should not have alternate return address set");
+    bind(L);
+  }
+#endif /* ASSERT */
+
+  // Force freeze slow path.
+  push_cont_fastpath();
+
+  // Make VM call. In case of preemption set last_pc to the one we want to resume to.
+  adr(rscratch1, resume_pc);
+  str(rscratch1, Address(rthread, JavaThread::last_Java_pc_offset()));
+  call_VM_base(oop_result, noreg, noreg, entry_point, 1, false /*check_exceptions*/);
+
+  pop_cont_fastpath();
+
+  // Check if preempted.
+  ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+  cbz(rscratch1, not_preempted);
+  str(zr, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+  br(rscratch1);
+
+  // In case of preemption, this is where we will resume once we finally acquire the monitor.
+  bind(resume_pc);
+  restore_after_resume(false /* is_native */);
+
+  bind(not_preempted);
+}
+
+void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
+  lea(rscratch1, ExternalAddress(Interpreter::cont_resume_interpreter_adapter()));
+  blr(rscratch1);
+  if (is_native) {
+    // On resume we need to set up stack as expected
+    push(dtos);
+    push(ltos);
+  }
+}
+
 void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr) {
   assert_different_registers(obj, rscratch1, mdo_addr.base(), mdo_addr.index());
   Label update, next, none;
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index 34dca56eaf7..bc2070d283d 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -58,6 +58,11 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1);
+  void restore_after_resume(bool is_native);
+
   void jump_to_entry(address entry);
 
   virtual void check_and_handle_popframe(Register java_thread);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 9f35a6e75a7..ce71d3a2262 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -39,6 +39,7 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
 #include "jvm.h"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -775,6 +776,10 @@ static void pass_arg3(MacroAssembler* masm, Register arg) {
   }
 }
 
+static bool is_preemptable(address entry_point) {
+  return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter);
+}
+
 void MacroAssembler::call_VM_base(Register oop_result,
                                   Register java_thread,
                                   Register last_java_sp,
@@ -810,7 +815,12 @@ void MacroAssembler::call_VM_base(Register oop_result,
   assert(last_java_sp != rfp, "can't use rfp");
 
   Label l;
-  set_last_Java_frame(last_java_sp, rfp, l, rscratch1);
+  if (is_preemptable(entry_point)) {
+    // skip setting last_pc since we already set it to desired value.
+    set_last_Java_frame(last_java_sp, rfp, noreg, rscratch1);
+  } else {
+    set_last_Java_frame(last_java_sp, rfp, l, rscratch1);
+  }
 
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
@@ -1002,10 +1012,11 @@ address MacroAssembler::ic_call(address entry, jint method_index) {
 }
 
 int MacroAssembler::ic_check_size() {
+  int extra_instructions = UseCompactObjectHeaders ? 1 : 0;
   if (target_needs_far_branch(CAST_FROM_FN_PTR(address, SharedRuntime::get_ic_miss_stub()))) {
-    return NativeInstruction::instruction_size * 7;
+    return NativeInstruction::instruction_size * (7 + extra_instructions);
   } else {
-    return NativeInstruction::instruction_size * 5;
+    return NativeInstruction::instruction_size * (5 + extra_instructions);
   }
 }
 
@@ -1023,7 +1034,11 @@ int MacroAssembler::ic_check(int end_alignment) {
 
   int uep_offset = offset();
 
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(tmp1, receiver);
+    ldrw(tmp2, Address(data, CompiledICData::speculated_klass_offset()));
+    cmpw(tmp1, tmp2);
+  } else if (UseCompressedClassPointers) {
     ldrw(tmp1, Address(receiver, oopDesc::klass_offset_in_bytes()));
     ldrw(tmp2, Address(data, CompiledICData::speculated_klass_offset()));
     cmpw(tmp1, tmp2);
@@ -5009,8 +5024,22 @@ void MacroAssembler::load_method_holder(Register holder, Register method) {
   ldr(holder, Address(holder, ConstantPool::pool_holder_offset()));          // InstanceKlass*
 }
 
+// Loads the obj's Klass* into dst.
+// Preserves all registers (incl src, rscratch1 and rscratch2).
+// Input:
+// src - the oop we want to load the klass from.
+// dst - output narrow klass.
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
+  assert(UseCompactObjectHeaders, "expects UseCompactObjectHeaders");
+  ldr(dst, Address(src, oopDesc::mark_offset_in_bytes()));
+  lsr(dst, dst, markWord::klass_shift);
+}
+
 void MacroAssembler::load_klass(Register dst, Register src) {
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(dst, src);
+    decode_klass_not_null(dst);
+  } else if (UseCompressedClassPointers) {
     ldrw(dst, Address(src, oopDesc::klass_offset_in_bytes()));
     decode_klass_not_null(dst);
   } else {
@@ -5065,28 +5094,50 @@ void MacroAssembler::load_mirror(Register dst, Register method, Register tmp1, R
   resolve_oop_handle(dst, tmp1, tmp2);
 }
 
-void MacroAssembler::cmp_klass(Register oop, Register trial_klass, Register tmp) {
+void MacroAssembler::cmp_klass(Register obj, Register klass, Register tmp) {
+  assert_different_registers(obj, klass, tmp);
   if (UseCompressedClassPointers) {
-    ldrw(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
+    if (UseCompactObjectHeaders) {
+      load_narrow_klass_compact(tmp, obj);
+    } else {
+      ldrw(tmp, Address(obj, oopDesc::klass_offset_in_bytes()));
+    }
     if (CompressedKlassPointers::base() == nullptr) {
-      cmp(trial_klass, tmp, LSL, CompressedKlassPointers::shift());
+      cmp(klass, tmp, LSL, CompressedKlassPointers::shift());
       return;
     } else if (((uint64_t)CompressedKlassPointers::base() & 0xffffffff) == 0
                && CompressedKlassPointers::shift() == 0) {
       // Only the bottom 32 bits matter
-      cmpw(trial_klass, tmp);
+      cmpw(klass, tmp);
       return;
     }
     decode_klass_not_null(tmp);
   } else {
-    ldr(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
+    ldr(tmp, Address(obj, oopDesc::klass_offset_in_bytes()));
+  }
+  cmp(klass, tmp);
+}
+
+void MacroAssembler::cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(tmp1, obj1);
+    load_narrow_klass_compact(tmp2,  obj2);
+    cmpw(tmp1, tmp2);
+  } else if (UseCompressedClassPointers) {
+    ldrw(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    ldrw(tmp2, Address(obj2, oopDesc::klass_offset_in_bytes()));
+    cmpw(tmp1, tmp2);
+  } else {
+    ldr(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    ldr(tmp2, Address(obj2, oopDesc::klass_offset_in_bytes()));
+    cmp(tmp1, tmp2);
   }
-  cmp(trial_klass, tmp);
 }
 
 void MacroAssembler::store_klass(Register dst, Register src) {
   // FIXME: Should this be a store release?  concurrent gcs assumes
   // klass length is valid if klass field is not null.
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     encode_klass_not_null(src);
     strw(src, Address(dst, oopDesc::klass_offset_in_bytes()));
@@ -5096,6 +5147,7 @@ void MacroAssembler::store_klass(Register dst, Register src) {
 }
 
 void MacroAssembler::store_klass_gap(Register dst, Register src) {
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     // Store to klass gap in destination
     strw(src, Address(dst, oopDesc::klass_gap_offset_in_bytes()));
@@ -5246,9 +5298,6 @@ MacroAssembler::KlassDecodeMode MacroAssembler::klass_decode_mode() {
     return _klass_decode_mode;
   }
 
-  assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift()
-         || 0 == CompressedKlassPointers::shift(), "decode alg wrong");
-
   if (CompressedKlassPointers::base() == nullptr) {
     return (_klass_decode_mode = KlassDecodeZero);
   }
@@ -5274,7 +5323,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
   switch (klass_decode_mode()) {
   case KlassDecodeZero:
     if (CompressedKlassPointers::shift() != 0) {
-      lsr(dst, src, LogKlassAlignmentInBytes);
+      lsr(dst, src, CompressedKlassPointers::shift());
     } else {
       if (dst != src) mov(dst, src);
     }
@@ -5283,7 +5332,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
   case KlassDecodeXor:
     if (CompressedKlassPointers::shift() != 0) {
       eor(dst, src, (uint64_t)CompressedKlassPointers::base());
-      lsr(dst, dst, LogKlassAlignmentInBytes);
+      lsr(dst, dst, CompressedKlassPointers::shift());
     } else {
       eor(dst, src, (uint64_t)CompressedKlassPointers::base());
     }
@@ -5291,7 +5340,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
 
   case KlassDecodeMovk:
     if (CompressedKlassPointers::shift() != 0) {
-      ubfx(dst, src, LogKlassAlignmentInBytes, 32);
+      ubfx(dst, src, CompressedKlassPointers::shift(), 32);
     } else {
       movw(dst, src);
     }
@@ -5313,7 +5362,7 @@ void  MacroAssembler::decode_klass_not_null(Register dst, Register src) {
   switch (klass_decode_mode()) {
   case KlassDecodeZero:
     if (CompressedKlassPointers::shift() != 0) {
-      lsl(dst, src, LogKlassAlignmentInBytes);
+      lsl(dst, src, CompressedKlassPointers::shift());
     } else {
       if (dst != src) mov(dst, src);
     }
@@ -5321,7 +5370,7 @@ void  MacroAssembler::decode_klass_not_null(Register dst, Register src) {
 
   case KlassDecodeXor:
     if (CompressedKlassPointers::shift() != 0) {
-      lsl(dst, src, LogKlassAlignmentInBytes);
+      lsl(dst, src, CompressedKlassPointers::shift());
       eor(dst, dst, (uint64_t)CompressedKlassPointers::base());
     } else {
       eor(dst, src, (uint64_t)CompressedKlassPointers::base());
@@ -5336,7 +5385,7 @@ void  MacroAssembler::decode_klass_not_null(Register dst, Register src) {
     movk(dst, shifted_base >> 32, 32);
 
     if (CompressedKlassPointers::shift() != 0) {
-      lsl(dst, dst, LogKlassAlignmentInBytes);
+      lsl(dst, dst, CompressedKlassPointers::shift());
     }
 
     break;
@@ -5497,6 +5546,38 @@ void MacroAssembler::tlab_allocate(Register obj,
   bs->tlab_allocate(this, obj, var_size_in_bytes, con_size_in_bytes, t1, t2, slow_case);
 }
 
+void MacroAssembler::inc_held_monitor_count(Register tmp) {
+  Address dst(rthread, JavaThread::held_monitor_count_offset());
+#ifdef ASSERT
+  ldr(tmp, dst);
+  increment(tmp);
+  str(tmp, dst);
+  Label ok;
+  tbz(tmp, 63, ok);
+  STOP("assert(held monitor count underflow)");
+  should_not_reach_here();
+  bind(ok);
+#else
+  increment(dst);
+#endif
+}
+
+void MacroAssembler::dec_held_monitor_count(Register tmp) {
+  Address dst(rthread, JavaThread::held_monitor_count_offset());
+#ifdef ASSERT
+  ldr(tmp, dst);
+  decrement(tmp);
+  str(tmp, dst);
+  Label ok;
+  tbz(tmp, 63, ok);
+  STOP("assert(held monitor count underflow)");
+  should_not_reach_here();
+  bind(ok);
+#else
+  decrement(dst);
+#endif
+}
+
 void MacroAssembler::verify_tlab() {
 #ifdef ASSERT
   if (UseTLAB && VerifyOops) {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index b23acc15718..d9686aec3a9 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -875,9 +875,11 @@ class MacroAssembler: public Assembler {
   void load_method_holder(Register holder, Register method);
 
   // oop manipulations
+  void load_narrow_klass_compact(Register dst, Register src);
   void load_klass(Register dst, Register src);
   void store_klass(Register dst, Register src);
-  void cmp_klass(Register oop, Register trial_klass, Register tmp);
+  void cmp_klass(Register obj, Register klass, Register tmp);
+  void cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2);
 
   void resolve_weak_handle(Register result, Register tmp1, Register tmp2);
   void resolve_oop_handle(Register result, Register tmp1, Register tmp2);
@@ -938,8 +940,11 @@ class MacroAssembler: public Assembler {
   void pop_CPU_state(bool restore_vectors = false, bool use_sve = false,
                      int sve_vector_size_in_bytes = 0, int total_predicate_in_bytes = 0);
 
-  void push_cont_fastpath(Register java_thread);
-  void pop_cont_fastpath(Register java_thread);
+  void push_cont_fastpath(Register java_thread = rthread);
+  void pop_cont_fastpath(Register java_thread = rthread);
+
+  void inc_held_monitor_count(Register tmp);
+  void dec_held_monitor_count(Register tmp);
 
   // Round up to a power of two
   void round_to(Register reg, int modulus);
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index fb8ae80cb49..94d73b6bc27 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1179,12 +1179,14 @@ static void gen_continuation_enter(MacroAssembler* masm,
 
   __ bind(call_thaw);
 
+  ContinuationEntry::_thaw_call_pc_offset = __ pc() - start;
   __ rt_call(CAST_FROM_FN_PTR(address, StubRoutines::cont_thaw()));
   oop_maps->add_gc_map(__ pc() - start, map->deep_copy());
   ContinuationEntry::_return_pc_offset = __ pc() - start;
   __ post_call_nop();
 
   __ bind(exit);
+  ContinuationEntry::_cleanup_offset = __ pc() - start;
   continuation_enter_cleanup(masm);
   __ leave();
   __ ret(lr);
@@ -1281,6 +1283,10 @@ static void gen_continuation_yield(MacroAssembler* masm,
     oop_maps->add_gc_map(the_pc - start, map);
 }
 
+void SharedRuntime::continuation_enter_cleanup(MacroAssembler* masm) {
+  ::continuation_enter_cleanup(masm);
+}
+
 static void gen_special_dispatch(MacroAssembler* masm,
                                  const methodHandle& method,
                                  const BasicType* sig_bt,
@@ -1747,11 +1753,20 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   // Change state to native (we save the return address in the thread, since it might not
-  // be pushed on the stack when we do a stack traversal).
-  // We use the same pc/oopMap repeatedly when we call out
+  // be pushed on the stack when we do a stack traversal). It is enough that the pc()
+  // points into the right code segment. It does not have to be the correct return pc.
+  // We use the same pc/oopMap repeatedly when we call out.
 
   Label native_return;
-  __ set_last_Java_frame(sp, noreg, native_return, rscratch1);
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // For convenience we use the pc we want to resume to in case of preemption on Object.wait.
+    __ set_last_Java_frame(sp, noreg, native_return, rscratch1);
+  } else {
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
+
+    __ set_last_Java_frame(sp, noreg, __ pc(), rscratch1);
+  }
 
   Label dtrace_method_entry, dtrace_method_entry_done;
   if (DTraceMethodProbes) {
@@ -1829,12 +1844,13 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // Save the test result, for recursive case, the result is zero
       __ str(swap_reg, Address(lock_reg, mark_word_offset));
       __ br(Assembler::NE, slow_path_lock);
+
+      __ bind(count);
+      __ inc_held_monitor_count(rscratch1);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ lightweight_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
     }
-    __ bind(count);
-    __ increment(Address(rthread, JavaThread::held_monitor_count_offset()));
 
     // Slow path will re-enter here
     __ bind(lock_done);
@@ -1853,11 +1869,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   __ rt_call(native_func);
 
-  __ bind(native_return);
-
-  intptr_t return_pc = (intptr_t) __ pc();
-  oop_maps->add_gc_map(return_pc - start, map);
-
   // Verify or restore cpu control state after JNI call
   __ restore_cpu_control_state_after_jni(rscratch1, rscratch2);
 
@@ -1916,6 +1927,18 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   __ stlrw(rscratch1, rscratch2);
   __ bind(after_transition);
 
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // Check preemption for Object.wait()
+    __ ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+    __ cbz(rscratch1, native_return);
+    __ str(zr, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+    __ br(rscratch1);
+    __ bind(native_return);
+
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
+  }
+
   Label reguard;
   Label reguard_done;
   __ ldrb(rscratch1, Address(rthread, JavaThread::stack_guard_state_offset()));
@@ -1939,7 +1962,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // Simple recursive lock?
       __ ldr(rscratch1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
       __ cbnz(rscratch1, not_recursive);
-      __ decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
+      __ dec_held_monitor_count(rscratch1);
       __ b(done);
     }
 
@@ -1962,11 +1985,10 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       Label count;
       __ cmpxchg_obj_header(r0, old_hdr, obj_reg, rscratch1, count, &slow_path_unlock);
       __ bind(count);
-      __ decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
+      __ dec_held_monitor_count(rscratch1);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       __ lightweight_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
-      __ decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
     }
 
     // slow path re-enters here
@@ -2033,8 +2055,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ mov(c_rarg1, lock_reg);
     __ mov(c_rarg2, rthread);
 
-    // Not a leaf but we have last_Java_frame setup as we want
+    // Not a leaf but we have last_Java_frame setup as we want.
+    // We don't want to unmount in case of contention since that would complicate preserving
+    // the arguments that had already been marshalled into the native convention. So we force
+    // the freeze slow path to find this native wrapper frame (see recurse_freeze_native_frame())
+    // and pin the vthread. Otherwise the fast path won't find it since we don't walk the stack.
+    __ push_cont_fastpath();
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C), 3);
+    __ pop_cont_fastpath();
     restore_args(masm, total_c_args, c_arg, out_regs);
 
 #ifdef ASSERT
@@ -2575,6 +2603,10 @@ uint SharedRuntime::out_preserve_stack_slots() {
 }
 
 
+VMReg SharedRuntime::thread_register() {
+  return rthread->as_VMReg();
+}
+
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
diff --git a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
index 7c5cf63e382..8a221f13772 100644
--- a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
@@ -116,6 +116,7 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const
   f.interpreted_frame_oop_map(&mask);
   return  mask.num_oops()
         + 1 // for the mirror oop
+        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
         + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
               (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
 }
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 26462eed7de..de5df5c1af1 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -7466,6 +7466,37 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_cont_preempt_stub() {
+    if (!Continuations::enabled()) return nullptr;
+    StubCodeMark mark(this, "StubRoutines","Continuation preempt stub");
+    address start = __ pc();
+
+    __ reset_last_Java_frame(true);
+
+    // Set sp to enterSpecial frame, i.e. remove all frames copied into the heap.
+    __ ldr(rscratch2, Address(rthread, JavaThread::cont_entry_offset()));
+    __ mov(sp, rscratch2);
+
+    Label preemption_cancelled;
+    __ ldrb(rscratch1, Address(rthread, JavaThread::preemption_cancelled_offset()));
+    __ cbnz(rscratch1, preemption_cancelled);
+
+    // Remove enterSpecial frame from the stack and return to Continuation.run() to unmount.
+    SharedRuntime::continuation_enter_cleanup(_masm);
+    __ leave();
+    __ ret(lr);
+
+    // We acquired the monitor after freezing the frames so call thaw to continue execution.
+    __ bind(preemption_cancelled);
+    __ strb(zr, Address(rthread, JavaThread::preemption_cancelled_offset()));
+    __ lea(rfp, Address(sp, checked_cast<int32_t>(ContinuationEntry::size())));
+    __ lea(rscratch1, ExternalAddress(ContinuationEntry::thaw_call_pc_address()));
+    __ ldr(rscratch1, Address(rscratch1));
+    __ br(rscratch1);
+
+    return start;
+  }
+
   // In sun.security.util.math.intpoly.IntegerPolynomial1305, integers
   // are represented as long[5], with BITS_PER_LIMB = 26.
   // Pack five 26-bit limbs into three 64-bit registers.
@@ -8620,6 +8651,7 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_cont_thaw          = generate_cont_thaw();
     StubRoutines::_cont_returnBarrier = generate_cont_returnBarrier();
     StubRoutines::_cont_returnBarrierExc = generate_cont_returnBarrier_exception();
+    StubRoutines::_cont_preempt_stub = generate_cont_preempt_stub();
   }
 
   void generate_final_stubs() {
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 9894841e933..8eefcba7ba2 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -607,6 +607,40 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  if (!Continuations::enabled()) return nullptr;
+  address start = __ pc();
+
+  __ restore_bcp();
+  __ restore_locals();
+
+  // Restore constant pool cache
+  __ ldr(rcpool, Address(rfp, frame::interpreter_frame_cache_offset * wordSize));
+
+  // Restore Java expression stack pointer
+  __ ldr(rscratch1, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ lea(esp, Address(rfp, rscratch1, Address::lsl(Interpreter::logStackElementSize)));
+  // and NULL it as marker that esp is now tos until next java call
+  __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+
+  // Restore machine SP
+  __ ldr(rscratch1, Address(rfp, frame::interpreter_frame_extended_sp_offset * wordSize));
+  __ lea(sp, Address(rfp, rscratch1, Address::lsl(LogBytesPerWord)));
+
+  // Restore method
+  __ ldr(rmethod, Address(rfp, frame::interpreter_frame_method_offset * wordSize));
+
+  // Restore dispatch
+  uint64_t offset;
+  __ adrp(rdispatch, ExternalAddress((address)Interpreter::dispatch_table()), offset);
+  __ add(rdispatch, rdispatch, offset);
+
+  __ ret(lr);
+
+  return start;
+}
+
+
 // Helpers for commoning out cases in the various type of method entries.
 //
 
@@ -1314,6 +1348,9 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // result handler is in r0
   // set result handler
   __ mov(result_handler, r0);
+  // Save it in the frame in case of preemption; we cannot rely on callee saved registers.
+  __ str(r0, Address(rfp, frame::interpreter_frame_result_handler_offset * wordSize));
+
   // pass mirror handle if static call
   {
     Label L;
@@ -1349,9 +1386,10 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // pass JNIEnv
   __ add(c_rarg0, rthread, in_bytes(JavaThread::jni_environment_offset()));
 
-  // Set the last Java PC in the frame anchor to be the return address from
-  // the call to the native method: this will allow the debugger to
-  // generate an accurate stack trace.
+  // It is enough that the pc() points into the right code
+  // segment. It does not have to be the correct return pc.
+  // For convenience we use the pc we want to resume to in
+  // case of preemption on Object.wait.
   Label native_return;
   __ set_last_Java_frame(esp, rfp, native_return, rscratch1);
 
@@ -1372,9 +1410,13 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ lea(rscratch2, Address(rthread, JavaThread::thread_state_offset()));
   __ stlrw(rscratch1, rscratch2);
 
+  __ push_cont_fastpath();
+
   // Call the native method.
   __ blr(r10);
-  __ bind(native_return);
+
+  __ pop_cont_fastpath();
+
   __ get_method(rmethod);
   // result potentially in r0 or v0
 
@@ -1432,6 +1474,23 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ lea(rscratch2, Address(rthread, JavaThread::thread_state_offset()));
   __ stlrw(rscratch1, rscratch2);
 
+  if (LockingMode != LM_LEGACY) {
+    // Check preemption for Object.wait()
+    Label not_preempted;
+    __ ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+    __ cbz(rscratch1, not_preempted);
+    __ str(zr, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+    __ br(rscratch1);
+    __ bind(native_return);
+    __ restore_after_resume(true /* is_native */);
+    // reload result_handler
+    __ ldr(result_handler, Address(rfp, frame::interpreter_frame_result_handler_offset*wordSize));
+    __ bind(not_preempted);
+  } else {
+    // any pc will do so just use this one for LM_LEGACY to keep code together.
+    __ bind(native_return);
+  }
+
   // reset_last_Java_frame
   __ reset_last_Java_frame(true);
 
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 48ff356f9a5..60d4c3c5110 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -3629,12 +3629,14 @@ void TemplateTable::_new() {
 
     // The object is initialized before the header.  If the object size is
     // zero, go directly to the header initialization.
-    __ sub(r3, r3, sizeof(oopDesc));
+    int header_size = oopDesc::header_size() * HeapWordSize;
+    assert(is_aligned(header_size, BytesPerLong), "oop header size must be 8-byte-aligned");
+    __ sub(r3, r3, header_size);
     __ cbz(r3, initialize_header);
 
     // Initialize object fields
     {
-      __ add(r2, r0, sizeof(oopDesc));
+      __ add(r2, r0, header_size);
       Label loop;
       __ bind(loop);
       __ str(zr, Address(__ post(r2, BytesPerLong)));
@@ -3644,10 +3646,15 @@ void TemplateTable::_new() {
 
     // initialize object header only.
     __ bind(initialize_header);
-    __ mov(rscratch1, (intptr_t)markWord::prototype().value());
-    __ str(rscratch1, Address(r0, oopDesc::mark_offset_in_bytes()));
-    __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
-    __ store_klass(r0, r4);      // store klass last
+    if (UseCompactObjectHeaders) {
+      __ ldr(rscratch1, Address(r4, Klass::prototype_header_offset()));
+      __ str(rscratch1, Address(r0, oopDesc::mark_offset_in_bytes()));
+    } else {
+      __ mov(rscratch1, (intptr_t)markWord::prototype().value());
+      __ str(rscratch1, Address(r0, oopDesc::mark_offset_in_bytes()));
+      __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
+      __ store_klass(r0, r4);      // store klass last
+    }
 
     if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
diff --git a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
index b5117dedc42..bae882ea93d 100644
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
@@ -251,6 +251,10 @@ void StubAssembler::restore_live_registers_without_return() {
 void Runtime1::initialize_pd() {
 }
 
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+  Unimplemented();
+  return 0;
+}
 
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
   OopMap* oop_map = save_live_registers(sasm);
diff --git a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
index 29af5681a67..fb588318170 100644
--- a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
@@ -48,6 +48,10 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   Unimplemented();
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  Unimplemented();
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   Unimplemented();
 }
@@ -83,6 +87,15 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   Unimplemented();
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  Unimplemented();
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp b/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
index 2f96ccaf322..445a013b3e5 100644
--- a/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
@@ -35,6 +35,10 @@ static inline intptr_t** link_address(const frame& f) {
   return nullptr;
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  Unimplemented();
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
   Unimplemented();
   return 0;
@@ -62,11 +66,11 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   Unimplemented();
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   Unimplemented();
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   Unimplemented();
   return false;
diff --git a/src/hotspot/cpu/arm/frame_arm.cpp b/src/hotspot/cpu/arm/frame_arm.cpp
index 6221191e926..13a5c471c6f 100644
--- a/src/hotspot/cpu/arm/frame_arm.cpp
+++ b/src/hotspot/cpu/arm/frame_arm.cpp
@@ -325,6 +325,11 @@ bool frame::upcall_stub_frame_is_first() const {
   return false;
 }
 
+JavaThread** frame::saved_thread_address(const frame& f) {
+  Unimplemented();
+  return nullptr;
+}
+
 //------------------------------------------------------------------------------
 // frame::verify_deopt_original_pc
 //
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 7c1f3aafe7d..a0cc2f44199 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1358,6 +1358,11 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
+VMReg SharedRuntime::thread_register() {
+  Unimplemented();
+  return nullptr;
+}
+
 //------------------------------generate_deopt_blob----------------------------
 void SharedRuntime::generate_deopt_blob() {
   ResourceMark rm;
diff --git a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
index ec9d237e50d..61f6026dbe3 100644
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
@@ -459,6 +459,10 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state,
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  return nullptr;
+}
+
 
 // Helpers for commoning out cases in the various type of method entries.
 //
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index b2711ac43b0..d2584cc1af3 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -1816,6 +1816,7 @@ class Assembler : public AbstractAssembler {
                          relocInfo::relocType rt = relocInfo::none);
 
   // helper function for b, bcxx
+  inline bool is_branch(address a);
   inline bool is_within_range_of_b(address a, address pc);
   inline bool is_within_range_of_bcxx(address a, address pc);
 
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index b0eaaccf0d0..07de57babfa 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -484,6 +484,12 @@ inline void Assembler::bclrl( int boint, int biint, int bhint, relocInfo::relocT
 inline void Assembler::bcctr( int boint, int biint, int bhint, relocInfo::relocType rt) { emit_data(BCCTR_OPCODE| bo(boint) | bi(biint) | bh(bhint) | aa(0) | lk(0), rt); }
 inline void Assembler::bcctrl(int boint, int biint, int bhint, relocInfo::relocType rt) { emit_data(BCCTR_OPCODE| bo(boint) | bi(biint) | bh(bhint) | aa(0) | lk(1), rt); }
 
+inline bool Assembler::is_branch(address a) {
+  int32_t instr = *(int32_t*) a;
+  int op = inv_op_ppc(instr);
+  return op == b_op || op == bc_op;
+}
+
 // helper function for b
 inline bool Assembler::is_within_range_of_b(address a, address pc) {
   // Guard against illegal branch targets, e.g. -1 (see CompiledDirectCall and ad-file).
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 36e1ac82334..b8a271ffc3b 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -1996,16 +1996,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // We don't know the array types are compatible.
     if (basic_type != T_OBJECT) {
       // Simple test for basic type arrays.
-      if (UseCompressedClassPointers) {
-        // We don't need decode because we just need to compare.
-        __ lwz(tmp, oopDesc::klass_offset_in_bytes(), src);
-        __ lwz(tmp2, oopDesc::klass_offset_in_bytes(), dst);
-        __ cmpw(CCR0, tmp, tmp2);
-      } else {
-        __ ld(tmp, oopDesc::klass_offset_in_bytes(), src);
-        __ ld(tmp2, oopDesc::klass_offset_in_bytes(), dst);
-        __ cmpd(CCR0, tmp, tmp2);
-      }
+      __ cmp_klasses_from_objects(CCR0, src, dst, tmp, tmp2);
       __ beq(CCR0, cont);
     } else {
       // For object arrays, if src is a sub class of dst then we can
@@ -2128,39 +2119,15 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // but not necessarily exactly of type default_type.
     Label known_ok, halt;
     metadata2reg(default_type->constant_encoding(), tmp);
-    if (UseCompressedClassPointers) {
-      // Tmp holds the default type. It currently comes uncompressed after the
-      // load of a constant, so encode it.
-      __ encode_klass_not_null(tmp);
-      // Load the raw value of the dst klass, since we will be comparing
-      // uncompressed values directly.
-      __ lwz(tmp2, oopDesc::klass_offset_in_bytes(), dst);
-      __ cmpw(CCR0, tmp, tmp2);
-      if (basic_type != T_OBJECT) {
-        __ bne(CCR0, halt);
-        // Load the raw value of the src klass.
-        __ lwz(tmp2, oopDesc::klass_offset_in_bytes(), src);
-        __ cmpw(CCR0, tmp, tmp2);
-        __ beq(CCR0, known_ok);
-      } else {
-        __ beq(CCR0, known_ok);
-        __ cmpw(CCR0, src, dst);
-        __ beq(CCR0, known_ok);
-      }
+    __ cmp_klass(CCR0, dst, tmp, R11_scratch1, R12_scratch2);
+    if (basic_type != T_OBJECT) {
+      __ bne(CCR0, halt);
+      __ cmp_klass(CCR0, src, tmp, R11_scratch1, R12_scratch2);
+      __ beq(CCR0, known_ok);
     } else {
-      __ ld(tmp2, oopDesc::klass_offset_in_bytes(), dst);
-      __ cmpd(CCR0, tmp, tmp2);
-      if (basic_type != T_OBJECT) {
-        __ bne(CCR0, halt);
-        // Load the raw value of the src klass.
-        __ ld(tmp2, oopDesc::klass_offset_in_bytes(), src);
-        __ cmpd(CCR0, tmp, tmp2);
-        __ beq(CCR0, known_ok);
-      } else {
-        __ beq(CCR0, known_ok);
-        __ cmpd(CCR0, src, dst);
-        __ beq(CCR0, known_ok);
-      }
+      __ beq(CCR0, known_ok);
+      __ cmpw(CCR0, src, dst);
+      __ beq(CCR0, known_ok);
     }
     __ bind(halt);
     __ stop("incorrect type information in arraycopy");
@@ -2738,12 +2705,7 @@ void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
     }
   }
 
-  if (UseCompressedClassPointers) {
-    __ lwz(result, oopDesc::klass_offset_in_bytes(), obj);
-    __ decode_klass_not_null(result);
-  } else {
-    __ ld(result, oopDesc::klass_offset_in_bytes(), obj);
-  }
+  __ load_klass(result, obj);
 }
 
 void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index ea4d76e200f..8cd21478d41 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -133,7 +133,9 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   }
 
   bind(done);
-  inc_held_monitor_count(Rmark /*tmp*/);
+  if (LockingMode == LM_LEGACY) {
+    inc_held_monitor_count(Rmark /*tmp*/);
+  }
 }
 
 
@@ -179,7 +181,9 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
 
   // Done
   bind(done);
-  dec_held_monitor_count(Rmark /*tmp*/);
+  if (LockingMode == LM_LEGACY) {
+    dec_held_monitor_count(Rmark /*tmp*/);
+  }
 }
 
 
@@ -201,12 +205,19 @@ void C1_MacroAssembler::try_allocate(
 
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
   assert_different_registers(obj, klass, len, t1, t2);
-  load_const_optimized(t1, (intx)markWord::prototype().value());
-  std(t1, oopDesc::mark_offset_in_bytes(), obj);
-  store_klass(obj, klass);
+
+  if (UseCompactObjectHeaders) {
+    ld(t1, in_bytes(Klass::prototype_header_offset()), klass);
+    std(t1, oopDesc::mark_offset_in_bytes(), obj);
+  } else {
+    load_const_optimized(t1, (intx)markWord::prototype().value());
+    std(t1, oopDesc::mark_offset_in_bytes(), obj);
+    store_klass(obj, klass);
+  }
+
   if (len->is_valid()) {
     stw(len, arrayOopDesc::length_offset_in_bytes(), obj);
-  } else if (UseCompressedClassPointers) {
+  } else if (UseCompressedClassPointers && !UseCompactObjectHeaders) {
     // Otherwise length is in the class gap.
     store_klass_gap(obj);
   }
diff --git a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
index 654626d66d8..47cafc45f33 100644
--- a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
@@ -64,7 +64,8 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result,
 
   address return_pc = call_c(entry_point);
 
-  reset_last_Java_frame();
+  // Last java sp can be null when the RT call was preempted
+  reset_last_Java_frame(false /* check_last_java_sp */);
 
   // Check for pending exceptions.
   {
@@ -257,6 +258,11 @@ void Runtime1::initialize_pd() {
   frame_size_in_bytes = align_up(sp_offset, frame::alignment_in_bytes);
 }
 
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+  // On PPC virtual threads don't save the JavaThread* in their context (e.g. C1 stub frames).
+  ShouldNotCallThis();
+  return 0;
+}
 
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
   // Make a frame and preserve the caller's caller-save registers.
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index 1147c3b42b2..82d9a046bc6 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -47,6 +47,15 @@ void C2_MacroAssembler::fast_unlock_lightweight(ConditionRegister flag, Register
   compiler_fast_unlock_lightweight_object(flag, obj, box, tmp1, tmp2, tmp3);
 }
 
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Register obj, int disp) {
+  // Note: Don't clobber obj anywhere in that method!
+
+  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
+  // obj-start, so that we can load from the object's mark-word instead.
+  ld(dst, disp - oopDesc::klass_offset_in_bytes(), obj);
+  srdi(dst, dst, markWord::klass_shift);
+}
+
 // Intrinsics for CompactStrings
 
 // Compress char[] to byte[] by compressing 16 bytes at once.
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 5096810ef91..48a362aa63c 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -34,6 +34,8 @@
   void fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box,
                                Register tmp1, Register tmp2, Register tmp3);
 
+  void load_narrow_klass_compact_c2(Register dst, Register obj, int disp);
+
   // Intrinsics for CompactStrings
   // Compress char[] to byte[] by compressing 16 bytes at once.
   void string_compress_16(Register src, Register dst, Register cnt,
diff --git a/src/hotspot/cpu/ppc/c2_init_ppc.cpp b/src/hotspot/cpu/ppc/c2_init_ppc.cpp
index d15f880e413..e517cdf7de1 100644
--- a/src/hotspot/cpu/ppc/c2_init_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_init_ppc.cpp
@@ -34,21 +34,5 @@
 // Processor dependent initialization of C2 compiler for ppc.
 
 void Compile::pd_compiler2_init() {
-
-  // Power7 and later.
-  if (PowerArchitecturePPC64 > 6) {
-    if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
-      FLAG_SET_ERGO(UsePopCountInstruction, true);
-    }
-  }
-
-  if (!VM_Version::has_isel() && FLAG_IS_DEFAULT(ConditionalMoveLimit)) {
-    FLAG_SET_ERGO(ConditionalMoveLimit, 0);
-  }
-
-  if (OptimizeFill) {
-    warning("OptimizeFill is not supported on this CPU.");
-    FLAG_SET_DEFAULT(OptimizeFill, false);
-  }
-
+  guarantee(CodeEntryAlignment >= InteriorEntryAlignment, "");
 }
diff --git a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
index c1a98b734da..e49bc548ad4 100644
--- a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
@@ -71,6 +71,12 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   // nothing to do
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  // nothing to do
+  DEBUG_ONLY( intptr_t* lspp = (intptr_t*) &(f.get_ijava_state()->top_frame_sp); )
+  assert(*lspp == f.unextended_sp() - f.fp(), "should be " INTPTR_FORMAT " usp:" INTPTR_FORMAT " fp:" INTPTR_FORMAT, *lspp, p2i(f.unextended_sp()), p2i(f.fp()));
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   intptr_t* vfp = f.fp();
   intptr_t* hfp = hf.fp();
@@ -350,6 +356,7 @@ inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
     if (is_entry_frame) {
       callers_sp = _cont.entryFP();
     } else {
+      assert(!Interpreter::contains(pc), "sp:" PTR_FORMAT " pc:" PTR_FORMAT, p2i(sp), p2i(pc));
       CodeBlob* cb = CodeCache::find_blob_fast(pc);
       callers_sp = sp + cb->frame_size();
     }
@@ -480,8 +487,8 @@ inline frame ThawBase::new_entry_frame() {
 template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame& caller, bool bottom) {
   assert(FKind::is_instance(hf), "");
 
-  assert(is_aligned(caller.fp(), frame::frame_alignment), "");
-  assert(is_aligned(caller.sp(), frame::frame_alignment), "");
+  assert(is_aligned(caller.fp(), frame::frame_alignment), PTR_FORMAT, p2i(caller.fp()));
+  // caller.sp() can be unaligned. This is fixed below.
   if (FKind::interpreted) {
     // Note: we have to overlap with the caller, at least if it is interpreted, to match the
     // max_thawing_size calculation during freeze. See also comment above.
@@ -510,7 +517,7 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     return f;
   } else {
     int fsize = FKind::size(hf);
-    int argsize = hf.compiled_frame_stack_argsize();
+    int argsize = FKind::stack_argsize(hf);
     intptr_t* frame_sp = caller.sp() - fsize;
 
     if ((bottom && argsize > 0) || caller.is_interpreted_frame()) {
@@ -543,12 +550,29 @@ inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, c
   // Keep top_frame_sp relativized.
 }
 
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  frame enterSpecial = new_entry_frame();
+  frame::common_abi* enterSpecial_abi = (frame::common_abi*)enterSpecial.sp();
+
+  enterSpecial_abi->lr = (intptr_t)ContinuationEntry::cleanup_pc();
+
+  log_develop_trace(continuations, preempt)("push_cleanup_continuation enterSpecial sp: " INTPTR_FORMAT " cleanup pc: " INTPTR_FORMAT,
+                                            p2i(enterSpecial_abi),
+                                            p2i(ContinuationEntry::cleanup_pc()));
+
+  return enterSpecial.sp();
+}
+
 inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
   // Prevent assertion if f gets deoptimized right away before it's fully initialized
   f.mark_not_fully_initialized();
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  assert(f.own_abi()->callers_sp == (uint64_t)caller_sp, "should have been fixed by patch_caller_links");
+}
+
 //
 // Interpreter Calling Procedure on PPC
 //
diff --git a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
index 528f1f8ad96..ae5a02451e2 100644
--- a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
@@ -27,10 +27,18 @@
 
 #include "runtime/continuationHelper.hpp"
 
-template<typename FKind>
-static inline intptr_t** link_address(const frame& f) {
-  Unimplemented();
-  return nullptr;
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  if (f.is_runtime_frame()) {
+    // Patch the pc of the now old last Java frame (we already set the anchor to enterSpecial)
+    // so that when target goes back to Java it will actually return to the preempt cleanup stub.
+    frame::common_abi* abi = (frame::common_abi*)f.sp();
+    abi->lr = (uint64_t)StubRoutines::cont_preempt_stub();
+  } else {
+    // The target will check for preemption once it returns to the interpreter
+    // or the native wrapper code and will manually jump to the preempt stub.
+    JavaThread *thread = JavaThread::current();
+    thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
+  }
 }
 
 inline int ContinuationHelper::frame_align_words(int size) {
@@ -59,11 +67,11 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   // nothing to do
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   // nothing to do
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   intptr_t* sp = f.sp();
   address pc = *(address*)(sp - frame::sender_sp_ret_address_offset());
diff --git a/src/hotspot/cpu/ppc/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp
index eb16af5e9db..935def11e1a 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.cpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.cpp
@@ -243,6 +243,11 @@ frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
   return fr;
 }
 
+JavaThread** frame::saved_thread_address(const frame& f) {
+  // The current thread (JavaThread*) is never stored on the stack
+  return nullptr;
+}
+
 frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
   // This is the sp before any possible extension (adapter/locals).
   intptr_t* unextended_sp = interpreter_frame_sender_sp();
diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
index 2beb7a84d34..c390449dc33 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -53,7 +53,10 @@ inline void frame::setup(kind knd) {
     // The back link for compiled frames on the heap is not valid
     if (is_heap_frame()) {
       // fp for interpreted frames should have been derelativized and passed to the constructor
-      assert(is_compiled_frame(), "");
+      assert(is_compiled_frame()
+             || is_native_frame()   // native wrapper (nmethod) for j.l.Object::wait0
+             || is_runtime_frame(), // e.g. Runtime1::monitorenter, SharedRuntime::complete_monitor_locking_C
+             "sp:" PTR_FORMAT " fp:" PTR_FORMAT " name:%s", p2i(_sp), p2i(_unextended_sp + _cb->frame_size()), _cb->name());
       // The back link for compiled frames on the heap is invalid.
       _fp = _unextended_sp + _cb->frame_size();
     } else {
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index dd0a597ec8d..4c39f88ce51 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -49,6 +49,14 @@ class InterpreterMacroAssembler: public MacroAssembler {
   virtual void check_and_handle_popframe(Register scratch_reg);
   virtual void check_and_handle_earlyret(Register scratch_reg);
 
+  void call_VM_preemptable(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true);
+  void restore_after_resume(Register fp);
+  // R22 and R31 are preserved when a vthread gets preempted in the interpreter.
+  // The interpreter already assumes that these registers are nonvolatile across native calls.
+  bool nonvolatile_accross_vthread_preemtion(Register r) const {
+    return r->is_nonvolatile() && ((r == R22) || (r == R31));
+  }
+
   // Base routine for all dispatches.
   void dispatch_base(TosState state, address* table);
 
@@ -182,7 +190,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // Special call VM versions that check for exceptions and forward exception
   // via short cut (not via expensive forward exception stub).
   void check_and_forward_exception(Register Rscratch1, Register Rscratch2);
-  void call_VM(Register oop_result, address entry_point, bool check_exceptions = true);
+  void call_VM(Register oop_result, address entry_point, bool check_exceptions = true, Label* last_java_pc = nullptr);
   void call_VM(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true);
   void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, bool check_exceptions = true);
   void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions = true);
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index aa77f0169ea..632eb97e852 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -932,7 +932,7 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
 //
 void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
   if (LockingMode == LM_MONITOR) {
-    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);
+    call_VM_preemptable(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);
   } else {
     // template code (for LM_LEGACY):
     //
@@ -953,8 +953,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
     const Register current_header   = R9_ARG7;
     const Register tmp              = R10_ARG8;
 
-    Label count_locking, done;
-    Label cas_failed, slow_case;
+    Label count_locking, done, slow_case, cas_failed;
 
     assert_different_registers(header, object_mark_addr, current_header, tmp);
 
@@ -969,7 +968,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(monitor, object, header, tmp, slow_case);
-      b(count_locking);
+      b(done);
     } else if (LockingMode == LM_LEGACY) {
       // Load markWord from object into header.
       ld(header, oopDesc::mark_offset_in_bytes(), object);
@@ -1035,12 +1034,15 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
     // None of the above fast optimizations worked so we have to get into the
     // slow case of monitor enter.
     bind(slow_case);
-    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);
-    b(done);
+    call_VM_preemptable(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);
     // }
-    align(32, 12);
-    bind(count_locking);
-    inc_held_monitor_count(current_header /*tmp*/);
+
+    if (LockingMode == LM_LEGACY) {
+      b(done);
+      align(32, 12);
+      bind(count_locking);
+      inc_held_monitor_count(current_header /*tmp*/);
+    }
     bind(done);
   }
 }
@@ -1137,7 +1139,9 @@ void InterpreterMacroAssembler::unlock_object(Register monitor) {
     bind(free_slot);
     li(R0, 0);
     std(R0, in_bytes(BasicObjectLock::obj_offset()), monitor);
-    dec_held_monitor_count(current_header /*tmp*/);
+    if (LockingMode == LM_LEGACY) {
+      dec_held_monitor_count(current_header /*tmp*/);
+    }
     bind(done);
   }
 }
@@ -2133,10 +2137,10 @@ void InterpreterMacroAssembler::check_and_forward_exception(Register Rscratch1,
   bind(Ldone);
 }
 
-void InterpreterMacroAssembler::call_VM(Register oop_result, address entry_point, bool check_exceptions) {
+void InterpreterMacroAssembler::call_VM(Register oop_result, address entry_point, bool check_exceptions, Label* last_java_pc) {
   save_interpreter_state(R11_scratch1);
 
-  MacroAssembler::call_VM(oop_result, entry_point, false);
+  MacroAssembler::call_VM(oop_result, entry_point, false /*check_exceptions*/, last_java_pc);
 
   restore_interpreter_state(R11_scratch1, /*bcp_and_mdx_only*/ true);
 
@@ -2155,6 +2159,74 @@ void InterpreterMacroAssembler::call_VM(Register oop_result, address entry_point
   call_VM(oop_result, entry_point, check_exceptions);
 }
 
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address entry_point,
+                                        Register arg_1, bool check_exceptions) {
+  if (!Continuations::enabled()) {
+    call_VM(oop_result, entry_point, arg_1, check_exceptions);
+    return;
+  }
+
+  Label resume_pc, not_preempted;
+
+  DEBUG_ONLY(ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread));
+  DEBUG_ONLY(cmpdi(CCR0, R0, 0));
+  asm_assert_eq("Should not have alternate return address set");
+
+  // Preserve 2 registers
+  assert(nonvolatile_accross_vthread_preemtion(R31) && nonvolatile_accross_vthread_preemtion(R22), "");
+  ld(R3_ARG1, _abi0(callers_sp), R1_SP); // load FP
+  std(R31, _ijava_state_neg(lresult), R3_ARG1);
+  std(R22, _ijava_state_neg(fresult), R3_ARG1);
+
+  // We set resume_pc as last java pc. It will be saved if the vthread gets preempted.
+  // Later execution will continue right there.
+  mr_if_needed(R4_ARG2, arg_1);
+  push_cont_fastpath();
+  call_VM(oop_result, entry_point, false /*check_exceptions*/, &resume_pc /* last_java_pc */);
+  pop_cont_fastpath();
+
+  // Jump to handler if the call was preempted
+  ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+  cmpdi(CCR0, R0, 0);
+  beq(CCR0, not_preempted);
+  mtlr(R0);
+  li(R0, 0);
+  std(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+  blr();
+
+  bind(resume_pc); // Location to resume execution
+  restore_after_resume(noreg /* fp */);
+  bind(not_preempted);
+}
+
+void InterpreterMacroAssembler::restore_after_resume(Register fp) {
+  if (!Continuations::enabled()) return;
+
+  const address resume_adapter = TemplateInterpreter::cont_resume_interpreter_adapter();
+  add_const_optimized(R31, R29_TOC, MacroAssembler::offset_to_global_toc(resume_adapter));
+  mtctr(R31);
+  bctrl();
+  // Restore registers that are preserved across vthread preemption
+  assert(nonvolatile_accross_vthread_preemtion(R31) && nonvolatile_accross_vthread_preemtion(R22), "");
+  ld(R3_ARG1, _abi0(callers_sp), R1_SP); // load FP
+  ld(R31, _ijava_state_neg(lresult), R3_ARG1);
+  ld(R22, _ijava_state_neg(fresult), R3_ARG1);
+#ifdef ASSERT
+  // Assert FP is in R11_scratch1 (see generate_cont_resume_interpreter_adapter())
+  {
+    Label ok;
+    ld(R12_scratch2, 0, R1_SP);  // load fp
+    cmpd(CCR0, R12_scratch2, R11_scratch1);
+    beq(CCR0, ok);
+    stop(FILE_AND_LINE ": FP is expected in R11_scratch1");
+    bind(ok);
+  }
+#endif
+  if (fp != noreg && fp != R11_scratch1) {
+    mr(fp, R11_scratch1);
+  }
+}
+
 void InterpreterMacroAssembler::call_VM(Register oop_result, address entry_point,
                                         Register arg_1, Register arg_2,
                                         bool check_exceptions) {
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 190e0c39fd7..994521ba48f 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -31,6 +31,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_ppc.hpp"
 #include "oops/compressedKlass.inline.hpp"
@@ -115,7 +116,8 @@ void MacroAssembler::align_prefix() {
 
 // Issue instructions that calculate given TOC from global TOC.
 void MacroAssembler::calculate_address_from_global_toc(Register dst, address addr, bool hi16, bool lo16,
-                                                       bool add_relocation, bool emit_dummy_addr) {
+                                                       bool add_relocation, bool emit_dummy_addr,
+                                                       bool add_addr_to_reloc) {
   int offset = -1;
   if (emit_dummy_addr) {
     offset = -128; // dummy address
@@ -129,7 +131,10 @@ void MacroAssembler::calculate_address_from_global_toc(Register dst, address add
   if (lo16) {
     if (add_relocation) {
       // Relocate at the addi to avoid confusion with a load from the method's TOC.
-      relocate(internal_word_Relocation::spec(addr));
+      RelocationHolder rh = add_addr_to_reloc ?
+          internal_word_Relocation::spec(addr) :
+          internal_word_Relocation::spec_for_immediate();
+      relocate(rh);
     }
     addi(dst, dst, MacroAssembler::largeoffset_si16_si16_lo(offset));
   }
@@ -714,6 +719,7 @@ address MacroAssembler::get_dest_of_bxx64_patchable_at(address instruction_addr,
   }
 }
 
+#ifdef ASSERT
 void MacroAssembler::clobber_volatile_gprs(Register excluded_register) {
   const int magic_number = 0x42;
 
@@ -729,6 +735,37 @@ void MacroAssembler::clobber_volatile_gprs(Register excluded_register) {
   }
 }
 
+void MacroAssembler::clobber_nonvolatile_registers() {
+  BLOCK_COMMENT("clobber nonvolatile registers {");
+  static const Register regs[] = {
+      R14,
+      R15,
+      // don't zap R16_thread
+      R17,
+      R18,
+      R19,
+      R20,
+      R21,
+      R22,
+      R23,
+      R24,
+      R25,
+      R26,
+      R27,
+      R28,
+      // don't zap R29_TOC
+      R30,
+      R31
+  };
+  Register bad = regs[0];
+  load_const_optimized(bad, 0xbad0101babe11111);
+  for (uint32_t i = 1; i < (sizeof(regs) / sizeof(Register)); i++) {
+    mr(regs[i], bad);
+  }
+  BLOCK_COMMENT("} clobber nonvolatile registers");
+}
+#endif // ASSERT
+
 void MacroAssembler::clobber_carg_stack_slots(Register tmp) {
   const int magic_number = 0x43;
 
@@ -1218,6 +1255,9 @@ int MacroAssembler::ic_check_size() {
     num_ins = 7;
     if (!implicit_null_checks_available) num_ins += 2;
   }
+
+  if (UseCompactObjectHeaders) num_ins++;
+
   return num_ins * BytesPerInstWord;
 }
 
@@ -1245,7 +1285,9 @@ int MacroAssembler::ic_check(int end_alignment) {
     if (use_trap_based_null_check) {
       trap_null_check(receiver);
     }
-    if (UseCompressedClassPointers) {
+    if (UseCompactObjectHeaders) {
+      load_narrow_klass_compact(tmp1, receiver);
+    } else if (UseCompressedClassPointers) {
       lwz(tmp1, oopDesc::klass_offset_in_bytes(), receiver);
     } else {
       ld(tmp1, oopDesc::klass_offset_in_bytes(), receiver);
@@ -1283,13 +1325,14 @@ int MacroAssembler::ic_check(int end_alignment) {
 void MacroAssembler::call_VM_base(Register oop_result,
                                   Register last_java_sp,
                                   address  entry_point,
-                                  bool     check_exceptions) {
+                                  bool     check_exceptions,
+                                  Label*   last_java_pc) {
   BLOCK_COMMENT("call_VM {");
   // Determine last_java_sp register.
   if (!last_java_sp->is_valid()) {
     last_java_sp = R1_SP;
   }
-  set_top_ijava_frame_at_SP_as_last_Java_frame(last_java_sp, R11_scratch1);
+  set_top_ijava_frame_at_SP_as_last_Java_frame(last_java_sp, R11_scratch1, last_java_pc);
 
   // ARG1 must hold thread address.
   mr(R3_ARG1, R16_thread);
@@ -1318,8 +1361,8 @@ void MacroAssembler::call_VM_leaf_base(address entry_point) {
   BLOCK_COMMENT("} call_VM_leaf");
 }
 
-void MacroAssembler::call_VM(Register oop_result, address entry_point, bool check_exceptions) {
-  call_VM_base(oop_result, noreg, entry_point, check_exceptions);
+void MacroAssembler::call_VM(Register oop_result, address entry_point, bool check_exceptions, Label* last_java_pc) {
+  call_VM_base(oop_result, noreg, entry_point, check_exceptions, last_java_pc);
 }
 
 void MacroAssembler::call_VM(Register oop_result, address entry_point, Register arg_1,
@@ -2620,15 +2663,15 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
 
   // Handle existing monitor.
   bind(object_has_monitor);
-  // The object's monitor m is unlocked iff m->owner is null,
-  // otherwise m->owner may contain a thread or a stack address.
 
-  // Try to CAS m->owner from null to current thread.
+  // Try to CAS owner (no owner => current thread's _lock_id).
   addi(temp, displaced_header, in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value);
+  Register thread_id = displaced_header;
+  ld(thread_id, in_bytes(JavaThread::lock_id_offset()), R16_thread);
   cmpxchgd(/*flag=*/flag,
            /*current_value=*/current_header,
            /*compare_value=*/(intptr_t)0,
-           /*exchange_value=*/R16_thread,
+           /*exchange_value=*/thread_id,
            /*where=*/temp,
            MacroAssembler::MemBarRel | MacroAssembler::MemBarAcq,
            MacroAssembler::cmpxchgx_hint_acquire_lock());
@@ -2638,7 +2681,7 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
   beq(flag, success);
 
   // Check for recursive locking.
-  cmpd(flag, current_header, R16_thread);
+  cmpd(flag, current_header, thread_id);
   bne(flag, failure);
 
   // Current thread already owns the lock. Just increment recursions.
@@ -2647,10 +2690,12 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
   addi(recursions, recursions, 1);
   std(recursions, in_bytes(ObjectMonitor::recursions_offset() - ObjectMonitor::owner_offset()), temp);
 
-  // flag == EQ indicates success, increment held monitor count
+  // flag == EQ indicates success, increment held monitor count if LM_LEGACY is enabled
   // flag == NE indicates failure
   bind(success);
-  inc_held_monitor_count(temp);
+  if (LockingMode == LM_LEGACY) {
+    inc_held_monitor_count(temp);
+  }
 #ifdef ASSERT
   // Check that unlocked label is reached with flag == EQ.
   Label flag_correct;
@@ -2670,7 +2715,7 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
                                                  Register temp, Register displaced_header, Register current_header) {
   assert(LockingMode != LM_LIGHTWEIGHT, "uses fast_unlock_lightweight");
   assert_different_registers(oop, box, temp, displaced_header, current_header);
-  Label success, failure, object_has_monitor, notRecursive;
+  Label success, failure, object_has_monitor, not_recursive;
 
   if (LockingMode == LM_LEGACY) {
     // Find the lock address and load the displaced header from the stack.
@@ -2716,7 +2761,7 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
 
   ld(displaced_header, in_bytes(ObjectMonitor::recursions_offset()), current_header);
   addic_(displaced_header, displaced_header, -1);
-  blt(CCR0, notRecursive); // Not recursive if negative after decrement.
+  blt(CCR0, not_recursive); // Not recursive if negative after decrement.
 
   // Recursive unlock
   std(displaced_header, in_bytes(ObjectMonitor::recursions_offset()), current_header);
@@ -2725,7 +2770,7 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
   }
   b(success);
 
-  bind(notRecursive);
+  bind(not_recursive);
 
   // Set owner to null.
   // Release to satisfy the JMM
@@ -2755,10 +2800,12 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
   std(current_header, in_bytes(JavaThread::unlocked_inflated_monitor_offset()), R16_thread);
   b(failure); // flag == NE
 
-  // flag == EQ indicates success, decrement held monitor count
+  // flag == EQ indicates success, decrement held monitor count if LM_LEGACY is enabled
   // flag == NE indicates failure
   bind(success);
-  dec_held_monitor_count(temp);
+  if (LockingMode == LM_LEGACY) {
+    dec_held_monitor_count(temp);
+  }
 #ifdef ASSERT
   // Check that unlocked label is reached with flag == EQ.
   Label flag_correct;
@@ -2777,6 +2824,7 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
 void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister flag, Register obj, Register box,
                                                            Register tmp1, Register tmp2, Register tmp3) {
   assert_different_registers(obj, box, tmp1, tmp2, tmp3);
+  assert(UseObjectMonitorTable || tmp3 == noreg, "tmp3 not needed");
   assert(flag == CCR0, "bad condition register");
 
   // Handle inflated monitor.
@@ -2799,8 +2847,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
     bne(CCR0, slow_path);
   }
 
-  const Register mark = tmp1;
-  const Register t = tmp3; // Usage of R0 allowed!
+  Register mark = tmp1;
 
   { // Lightweight locking
 
@@ -2818,15 +2865,15 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
     // when the lock stack is empty because of the _bad_oop_sentinel field.
 
     // Check if recursive.
-    subi(t, top, oopSize);
-    ldx(t, R16_thread, t);
-    cmpd(CCR0, obj, t);
+    subi(R0, top, oopSize);
+    ldx(R0, R16_thread, R0);
+    cmpd(CCR0, obj, R0);
     beq(CCR0, push);
 
     // Check for monitor (0b10) or locked (0b00).
     ld(mark, oopDesc::mark_offset_in_bytes(), obj);
-    andi_(t, mark, markWord::lock_mask_in_place);
-    cmpldi(CCR0, t, markWord::unlocked_value);
+    andi_(R0, mark, markWord::lock_mask_in_place);
+    cmpldi(CCR0, R0, markWord::unlocked_value);
     bgt(CCR0, inflated);
     bne(CCR0, slow_path);
 
@@ -2849,13 +2896,15 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
 
     // mark contains the tagged ObjectMonitor*.
     const uintptr_t monitor_tag = markWord::monitor_value;
-    const Register monitor = mark;
+    const Register monitor    = UseObjectMonitorTable ? tmp1 : noreg;
     const Register owner_addr = tmp2;
+    const Register thread_id  = UseObjectMonitorTable ? tmp3 : tmp1;
     Label monitor_locked;
 
     if (!UseObjectMonitorTable) {
       // Compute owner address.
       addi(owner_addr, mark, in_bytes(ObjectMonitor::owner_offset()) - monitor_tag);
+      mark = noreg;
     } else {
       Label monitor_found;
       Register cache_addr = tmp2;
@@ -2865,8 +2914,8 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
 
       const int num_unrolled = 2;
       for (int i = 0; i < num_unrolled; i++) {
-        ld(tmp3, 0, cache_addr);
-        cmpd(CCR0, tmp3, obj);
+        ld(R0, 0, cache_addr);
+        cmpd(CCR0, R0, obj);
         beq(CCR0, monitor_found);
         addi(cache_addr, cache_addr, in_bytes(OMCache::oop_to_oop_difference()));
       }
@@ -2877,13 +2926,13 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
       bind(loop);
 
       // Check for match.
-      ld(tmp3, 0, cache_addr);
-      cmpd(CCR0, tmp3, obj);
+      ld(R0, 0, cache_addr);
+      cmpd(CCR0, R0, obj);
       beq(CCR0, monitor_found);
 
       // Search until null encountered, guaranteed _null_sentinel at end.
       addi(cache_addr, cache_addr, in_bytes(OMCache::oop_to_oop_difference()));
-      cmpdi(CCR1, tmp3, 0);
+      cmpdi(CCR1, R0, 0);
       bne(CCR1, loop);
       // Cache Miss, CCR0.NE set from cmp above
       b(slow_path);
@@ -2895,18 +2944,20 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
       addi(owner_addr, monitor, in_bytes(ObjectMonitor::owner_offset()));
     }
 
-    // CAS owner (null => current thread).
+    // Try to CAS owner (no owner => current thread's _lock_id).
+    assert_different_registers(thread_id, monitor, owner_addr, box, R0);
+    ld(thread_id, in_bytes(JavaThread::lock_id_offset()), R16_thread);
     cmpxchgd(/*flag=*/CCR0,
-            /*current_value=*/t,
+            /*current_value=*/R0,
             /*compare_value=*/(intptr_t)0,
-            /*exchange_value=*/R16_thread,
+            /*exchange_value=*/thread_id,
             /*where=*/owner_addr,
             MacroAssembler::MemBarRel | MacroAssembler::MemBarAcq,
             MacroAssembler::cmpxchgx_hint_acquire_lock());
     beq(CCR0, monitor_locked);
 
     // Check if recursive.
-    cmpd(CCR0, t, R16_thread);
+    cmpd(CCR0, R0, thread_id);
     bne(CCR0, slow_path);
 
     // Recursive.
@@ -2929,7 +2980,6 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
   }
 
   bind(locked);
-  inc_held_monitor_count(tmp1);
 
 #ifdef ASSERT
   // Check that locked label is reached with flag == EQ.
@@ -3104,7 +3154,6 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
   }
 
   bind(unlocked);
-  dec_held_monitor_count(t);
 
 #ifdef ASSERT
   // Check that unlocked label is reached with flag == EQ.
@@ -3186,9 +3235,11 @@ void MacroAssembler::set_last_Java_frame(Register last_Java_sp, Register last_Ja
   std(last_Java_sp, in_bytes(JavaThread::last_Java_sp_offset()), R16_thread);
 }
 
-void MacroAssembler::reset_last_Java_frame(void) {
-  asm_assert_mem8_isnot_zero(in_bytes(JavaThread::last_Java_sp_offset()),
-                             R16_thread, "SP was not set, still zero");
+void MacroAssembler::reset_last_Java_frame(bool check_last_java_sp) {
+  if (check_last_java_sp) {
+    asm_assert_mem8_isnot_zero(in_bytes(JavaThread::last_Java_sp_offset()),
+                               R16_thread, "SP was not set, still zero");
+  }
 
   BLOCK_COMMENT("reset_last_Java_frame {");
   li(R0, 0);
@@ -3201,14 +3252,14 @@ void MacroAssembler::reset_last_Java_frame(void) {
   BLOCK_COMMENT("} reset_last_Java_frame");
 }
 
-void MacroAssembler::set_top_ijava_frame_at_SP_as_last_Java_frame(Register sp, Register tmp1) {
+void MacroAssembler::set_top_ijava_frame_at_SP_as_last_Java_frame(Register sp, Register tmp1, Label* jpc) {
   assert_different_registers(sp, tmp1);
 
-  // sp points to a TOP_IJAVA_FRAME, retrieve frame's PC via
-  // TOP_IJAVA_FRAME_ABI.
-  // FIXME: assert that we really have a TOP_IJAVA_FRAME here!
-  address entry = pc();
-  load_const_optimized(tmp1, entry);
+  if (jpc == nullptr || jpc->is_bound()) {
+    load_const_optimized(tmp1, jpc == nullptr ? pc() : target(*jpc));
+  } else {
+    load_const(tmp1, *jpc, R12_scratch2);
+  }
 
   set_last_Java_frame(/*sp=*/sp, /*pc=*/tmp1);
 }
@@ -3258,6 +3309,7 @@ Register MacroAssembler::encode_klass_not_null(Register dst, Register src) {
 }
 
 void MacroAssembler::store_klass(Register dst_oop, Register klass, Register ck) {
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     Register compressedKlass = encode_klass_not_null(ck, klass);
     stw(compressedKlass, oopDesc::klass_offset_in_bytes(), dst_oop);
@@ -3267,12 +3319,13 @@ void MacroAssembler::store_klass(Register dst_oop, Register klass, Register ck)
 }
 
 void MacroAssembler::store_klass_gap(Register dst_oop, Register val) {
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     if (val == noreg) {
       val = R0;
       li(val, 0);
     }
-    stw(val, oopDesc::klass_gap_offset_in_bytes(), dst_oop); // klass gap if compressed
+    stw(val, oopDesc::klass_gap_offset_in_bytes(), dst_oop);
   }
 }
 
@@ -3313,15 +3366,60 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
 }
 
 void MacroAssembler::load_klass(Register dst, Register src) {
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(dst, src);
+    decode_klass_not_null(dst);
+  } else if (UseCompressedClassPointers) {
     lwz(dst, oopDesc::klass_offset_in_bytes(), src);
-    // Attention: no null check here!
-    decode_klass_not_null(dst, dst);
+    decode_klass_not_null(dst);
   } else {
     ld(dst, oopDesc::klass_offset_in_bytes(), src);
   }
 }
 
+// Loads the obj's Klass* into dst.
+// Preserves all registers (incl src, rscratch1 and rscratch2).
+// Input:
+// src - the oop we want to load the klass from.
+// dst - output nklass.
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
+  assert(UseCompactObjectHeaders, "expects UseCompactObjectHeaders");
+  ld(dst, oopDesc::mark_offset_in_bytes(), src);
+  srdi(dst, dst, markWord::klass_shift);
+}
+
+void MacroAssembler::cmp_klass(ConditionRegister dst, Register obj, Register klass, Register tmp, Register tmp2) {
+  assert_different_registers(obj, klass, tmp);
+  if (UseCompressedClassPointers) {
+    if (UseCompactObjectHeaders) {
+      load_narrow_klass_compact(tmp, obj);
+    } else {
+      lwz(tmp, oopDesc::klass_offset_in_bytes(), obj);
+    }
+    Register encoded_klass = encode_klass_not_null(tmp2, klass);
+    cmpw(dst, tmp, encoded_klass);
+  } else {
+    ld(tmp, oopDesc::klass_offset_in_bytes(), obj);
+    cmpd(dst, tmp, klass);
+  }
+}
+
+void MacroAssembler::cmp_klasses_from_objects(ConditionRegister dst, Register obj1, Register obj2, Register tmp1, Register tmp2) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(tmp1, obj1);
+    load_narrow_klass_compact(tmp2, obj2);
+    cmpw(dst, tmp1, tmp2);
+  } else if (UseCompressedClassPointers) {
+    lwz(tmp1, oopDesc::klass_offset_in_bytes(), obj1);
+    lwz(tmp2, oopDesc::klass_offset_in_bytes(), obj2);
+    cmpw(dst, tmp1, tmp2);
+  } else {
+    ld(tmp1, oopDesc::klass_offset_in_bytes(), obj1);
+    ld(tmp2, oopDesc::klass_offset_in_bytes(), obj2);
+    cmpd(dst, tmp1, tmp2);
+  }
+}
+
 void MacroAssembler::load_klass_check_null(Register dst, Register src, Label* is_null) {
   null_check(src, oopDesc::klass_offset_in_bytes(), is_null);
   load_klass(dst, src);
@@ -4478,9 +4576,9 @@ void MacroAssembler::asm_assert(bool check_equal, const char *msg) {
 #endif
 }
 
+#ifdef ASSERT
 void MacroAssembler::asm_assert_mems_zero(bool check_equal, int size, int mem_offset,
                                           Register mem_base, const char* msg) {
-#ifdef ASSERT
   switch (size) {
     case 4:
       lwz(R0, mem_offset, mem_base);
@@ -4494,8 +4592,8 @@ void MacroAssembler::asm_assert_mems_zero(bool check_equal, int size, int mem_of
       ShouldNotReachHere();
   }
   asm_assert(check_equal, msg);
-#endif // ASSERT
 }
+#endif // ASSERT
 
 void MacroAssembler::verify_coop(Register coop, const char* msg) {
   if (!VerifyOops) { return; }
@@ -4639,6 +4737,8 @@ void MacroAssembler::cache_wbsync(bool is_presync) {
 }
 
 void MacroAssembler::push_cont_fastpath() {
+  if (!Continuations::enabled()) return;
+
   Label done;
   ld_ptr(R0, JavaThread::cont_fastpath_offset(), R16_thread);
   cmpld(CCR0, R1_SP, R0);
@@ -4648,6 +4748,8 @@ void MacroAssembler::push_cont_fastpath() {
 }
 
 void MacroAssembler::pop_cont_fastpath() {
+  if (!Continuations::enabled()) return;
+
   Label done;
   ld_ptr(R0, JavaThread::cont_fastpath_offset(), R16_thread);
   cmpld(CCR0, R1_SP, R0);
@@ -4659,6 +4761,7 @@ void MacroAssembler::pop_cont_fastpath() {
 
 // Note: Must preserve CCR0 EQ (invariant).
 void MacroAssembler::inc_held_monitor_count(Register tmp) {
+  assert(LockingMode == LM_LEGACY, "");
   ld(tmp, in_bytes(JavaThread::held_monitor_count_offset()), R16_thread);
 #ifdef ASSERT
   Label ok;
@@ -4674,6 +4777,7 @@ void MacroAssembler::inc_held_monitor_count(Register tmp) {
 
 // Note: Must preserve CCR0 EQ (invariant).
 void MacroAssembler::dec_held_monitor_count(Register tmp) {
+  assert(LockingMode == LM_LEGACY, "");
   ld(tmp, in_bytes(JavaThread::held_monitor_count_offset()), R16_thread);
 #ifdef ASSERT
   Label ok;
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index f0e7c644535..237024fa05e 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -115,7 +115,13 @@ class MacroAssembler: public Assembler {
   // Global TOC.
   void calculate_address_from_global_toc(Register dst, address addr,
                                          bool hi16 = true, bool lo16 = true,
-                                         bool add_relocation = true, bool emit_dummy_addr = false);
+                                         bool add_relocation = true, bool emit_dummy_addr = false,
+                                         bool add_addr_to_reloc = true);
+  void calculate_address_from_global_toc(Register dst, Label& addr,
+                                         bool hi16 = true, bool lo16 = true,
+                                         bool add_relocation = true, bool emit_dummy_addr = false) {
+    calculate_address_from_global_toc(dst, target(addr), hi16, lo16, add_relocation, emit_dummy_addr, false);
+  }
   inline void calculate_address_from_global_toc_hi16only(Register dst, address addr) {
     calculate_address_from_global_toc(dst, addr, true, false);
   };
@@ -284,7 +290,10 @@ class MacroAssembler: public Assembler {
   // Clobbers all volatile, (non-floating-point) general-purpose registers for debugging purposes.
   // This is especially useful for making calls to the JRT in places in which this hasn't been done before;
   // e.g. with the introduction of LRBs (load reference barriers) for concurrent garbage collection.
-  void clobber_volatile_gprs(Register excluded_register = noreg);
+  void clobber_volatile_gprs(Register excluded_register = noreg) NOT_DEBUG_RETURN;
+  // Load bad values into registers that are nonvolatile according to the ABI except R16_thread and R29_TOC.
+  // This is done after vthread preemption and before vthread resume.
+  void clobber_nonvolatile_registers() NOT_DEBUG_RETURN;
   void clobber_carg_stack_slots(Register tmp);
 
   void save_nonvolatile_gprs(   Register dst_base, int offset);
@@ -398,7 +407,8 @@ class MacroAssembler: public Assembler {
     // the entry point
     address         entry_point,
     // flag which indicates if exception should be checked
-    bool            check_exception = true
+    bool            check_exception = true,
+    Label* last_java_pc = nullptr
   );
 
   // Support for VM calls. This is the base routine called by the
@@ -411,7 +421,7 @@ class MacroAssembler: public Assembler {
   // Call into the VM.
   // Passes the thread pointer (in R3_ARG1) as a prepended argument.
   // Makes sure oop return values are visible to the GC.
-  void call_VM(Register oop_result, address entry_point, bool check_exceptions = true);
+  void call_VM(Register oop_result, address entry_point, bool check_exceptions = true, Label* last_java_pc = nullptr);
   void call_VM(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true);
   void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, bool check_exceptions = true);
   void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, Register arg3, bool check_exceptions = true);
@@ -695,8 +705,8 @@ class MacroAssembler: public Assembler {
   // Support for last Java frame (but use call_VM instead where possible):
   // access R16_thread->last_Java_sp.
   void set_last_Java_frame(Register last_java_sp, Register last_Java_pc);
-  void reset_last_Java_frame(void);
-  void set_top_ijava_frame_at_SP_as_last_Java_frame(Register sp, Register tmp1);
+  void reset_last_Java_frame(bool check_last_java_sp = true);
+  void set_top_ijava_frame_at_SP_as_last_Java_frame(Register sp, Register tmp1, Label* jpc = nullptr);
 
   // Read vm result from thread: oop_result = R16_thread->result;
   void get_vm_result  (Register oop_result);
@@ -757,6 +767,9 @@ class MacroAssembler: public Assembler {
 
   // Load/Store klass oop from klass field. Compress.
   void load_klass(Register dst, Register src);
+  void load_narrow_klass_compact(Register dst, Register src);
+  void cmp_klass(ConditionRegister dst, Register obj, Register klass, Register tmp, Register tmp2);
+  void cmp_klasses_from_objects(ConditionRegister dst, Register obj1, Register obj2, Register tmp1, Register tmp2);
   void load_klass_check_null(Register dst, Register src, Label* is_null = nullptr);
   void store_klass(Register dst_oop, Register klass, Register tmp = R0);
   void store_klass_gap(Register dst_oop, Register val = noreg); // Will store 0 if val not specified.
@@ -909,7 +922,7 @@ class MacroAssembler: public Assembler {
 
  private:
   void asm_assert_mems_zero(bool check_equal, int size, int mem_offset, Register mem_base,
-                            const char* msg);
+                            const char* msg) NOT_DEBUG_RETURN;
 
  public:
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index e9c6fd38f45..f98ad592388 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -191,8 +191,18 @@ inline void MacroAssembler::set_oop(AddressLiteral obj_addr, Register d) {
 }
 
 inline void MacroAssembler::pd_patch_instruction(address branch, address target, const char* file, int line) {
-  jint& stub_inst = *(jint*) branch;
-  stub_inst = patched_branch(target - branch, stub_inst, 0);
+  if (is_branch(branch)) {
+    jint& stub_inst = *(jint*) branch;
+    stub_inst = patched_branch(target - branch, stub_inst, 0);
+  } else if (is_calculate_address_from_global_toc_at(branch + BytesPerInstWord, branch)) {
+    const address inst1_addr = branch;
+    const address inst2_addr = branch + BytesPerInstWord;
+    patch_calculate_address_from_global_toc_at(inst2_addr, inst1_addr, target);
+  } else if (is_load_const_at(branch)) {
+    patch_const(branch, (long)target);
+  } else {
+    assert(false, "instruction at " PTR_FORMAT " not recognized", p2i(branch));
+  }
 }
 
 // Relocation of conditional far branches.
diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
index f61328fc736..dbc43c45e09 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
@@ -205,12 +205,14 @@ intptr_t NativeMovConstReg::data() const {
     // Therefore we use raw decoding.
     if (CompressedOops::is_null(no)) return 0;
     return cast_from_oop<intptr_t>(CompressedOops::decode_raw(no));
-  } else {
-    assert(MacroAssembler::is_load_const_from_method_toc_at(addr), "must be load_const_from_pool");
-
+  } else if (MacroAssembler::is_load_const_from_method_toc_at(addr)) {
     address ctable = cb->content_begin();
     int offset = MacroAssembler::get_offset_of_load_const_from_method_toc_at(addr);
     return *(intptr_t *)(ctable + offset);
+  } else {
+    assert(MacroAssembler::is_calculate_address_from_global_toc_at(addr, addr - BytesPerInstWord),
+           "must be calculate_address_from_global_toc");
+    return (intptr_t) MacroAssembler::get_address_of_calculate_address_from_global_toc_at(addr, addr - BytesPerInstWord);
   }
 }
 
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 6d3daa025e8..cfed8674e89 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -5496,6 +5496,7 @@ instruct loadP2X(iRegLdst dst, memoryAlg4 mem) %{
 // Load compressed klass pointer.
 instruct loadNKlass(iRegNdst dst, memory mem) %{
   match(Set dst (LoadNKlass mem));
+  predicate(!UseCompactObjectHeaders);
   ins_cost(MEMORY_REF_COST);
 
   format %{ "LWZ     $dst, $mem \t// compressed klass ptr" %}
@@ -5504,6 +5505,20 @@ instruct loadNKlass(iRegNdst dst, memory mem) %{
   ins_pipe(pipe_class_memory);
 %}
 
+instruct loadNKlassCompactHeaders(iRegNdst dst, memory mem) %{
+  match(Set dst (LoadNKlass mem));
+  predicate(UseCompactObjectHeaders);
+  ins_cost(MEMORY_REF_COST);
+
+  format %{ "load_narrow_klass_compact $dst, $mem \t// compressed class ptr" %}
+  size(8);
+  ins_encode %{
+    assert($mem$$index$$Register == R0, "must not have indexed address: %s[%s]", $mem$$base$$Register.name(), $mem$$index$$Register.name());
+    __ load_narrow_klass_compact_c2($dst$$Register, $mem$$base$$Register, $mem$$disp);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
 // Load Klass Pointer
 instruct loadKlass(iRegPdst dst, memoryAlg4 mem) %{
   match(Set dst (LoadKlass mem));
@@ -12093,15 +12108,31 @@ instruct cmpFastUnlock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp
   ins_pipe(pipe_class_compare);
 %}
 
-instruct cmpFastLockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, flagsRegCR1 cr1) %{
-  predicate(LockingMode == LM_LIGHTWEIGHT);
+instruct cmpFastLockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2) %{
+  predicate(LockingMode == LM_LIGHTWEIGHT && !UseObjectMonitorTable);
   match(Set crx (FastLock oop box));
-  effect(TEMP tmp1, TEMP tmp2, KILL cr1);
+  effect(TEMP tmp1, TEMP tmp2);
 
   format %{ "FASTLOCK  $oop, $box, $tmp1, $tmp2" %}
   ins_encode %{
     __ fast_lock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register,
-                             $tmp1$$Register, $tmp2$$Register, /*tmp3*/ R0);
+                             $tmp1$$Register, $tmp2$$Register, noreg /*tmp3*/);
+    // If locking was successful, crx should indicate 'EQ'.
+    // The compiler generates a branch to the runtime call to
+    // _complete_monitor_locking_Java for the case where crx is 'NE'.
+  %}
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct cmpFastLockMonitorTable(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3, flagsRegCR1 cr1) %{
+  predicate(LockingMode == LM_LIGHTWEIGHT && UseObjectMonitorTable);
+  match(Set crx (FastLock oop box));
+  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, KILL cr1);
+
+  format %{ "FASTLOCK  $oop, $box, $tmp1, $tmp2, $tmp3" %}
+  ins_encode %{
+    __ fast_lock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register,
+                             $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
     // If locking was successful, crx should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_locking_Java for the case where crx is 'NE'.
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index aa8ae6070b6..84102ef41e8 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -1602,6 +1602,7 @@ static void fill_continuation_entry(MacroAssembler* masm, Register reg_cont_obj,
 #ifdef ASSERT
   __ load_const_optimized(tmp2, ContinuationEntry::cookie_value());
   __ stw(tmp2, in_bytes(ContinuationEntry::cookie_offset()), R1_SP);
+  __ std(tmp2, _abi0(cr), R1_SP);
 #endif //ASSERT
 
   __ li(zero, 0);
@@ -1645,6 +1646,10 @@ static void continuation_enter_cleanup(MacroAssembler* masm) {
   __ ld_ptr(tmp1, JavaThread::cont_entry_offset(), R16_thread);
   __ cmpd(CCR0, R1_SP, tmp1);
   __ asm_assert_eq(FILE_AND_LINE ": incorrect R1_SP");
+  __ load_const_optimized(tmp1, ContinuationEntry::cookie_value());
+  __ ld(tmp2, _abi0(cr), R1_SP);
+  __ cmpd(CCR0, tmp1, tmp2);
+  __ asm_assert_eq(FILE_AND_LINE ": cookie not found");
 #endif
 
   __ ld_ptr(tmp1, ContinuationEntry::parent_cont_fastpath_offset(), R1_SP);
@@ -1853,6 +1858,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   // --- Thawing path
 
   __ bind(L_thaw);
+  ContinuationEntry::_thaw_call_pc_offset = __ pc() - start;
   __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(StubRoutines::cont_thaw()));
   __ mtctr(R0);
   __ bctrl();
@@ -1863,6 +1869,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   // --- Normal exit (resolve/thawing)
 
   __ bind(L_exit);
+  ContinuationEntry::_cleanup_offset = __ pc() - start;
   continuation_enter_cleanup(masm);
 
   // Pop frame and return
@@ -1970,6 +1977,10 @@ static void gen_continuation_yield(MacroAssembler* masm,
   __ bctr();
 }
 
+void SharedRuntime::continuation_enter_cleanup(MacroAssembler* masm) {
+  ::continuation_enter_cleanup(masm);
+}
+
 // ---------------------------------------------------------------------------
 // Generate a native wrapper for a given method. The method takes arguments
 // in the Java compiled code convention, marshals them to the native
@@ -2190,9 +2201,9 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   intptr_t start_pc = (intptr_t)__ pc();
   intptr_t vep_start_pc;
   intptr_t frame_done_pc;
-  intptr_t oopmap_pc;
 
   Label    handle_pending_exception;
+  Label    last_java_pc;
 
   Register r_callers_sp = R21;
   Register r_temp_1     = R22;
@@ -2201,7 +2212,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   Register r_temp_4     = R25;
   Register r_temp_5     = R26;
   Register r_temp_6     = R27;
-  Register r_return_pc  = R28;
+  Register r_last_java_pc = R28;
 
   Register r_carg1_jnienv        = noreg;
   Register r_carg2_classorobject = noreg;
@@ -2363,15 +2374,9 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   // We MUST NOT touch any outgoing regs from this point on.
   // So if we must call out we must push a new frame.
 
-  // Get current pc for oopmap, and load it patchable relative to global toc.
-  oopmap_pc = (intptr_t) __ pc();
-  __ calculate_address_from_global_toc(r_return_pc, (address)oopmap_pc, true, true, true, true);
-
-  // We use the same pc/oopMap repeatedly when we call out.
-  oop_maps->add_gc_map(oopmap_pc - start_pc, oop_map);
-
-  // r_return_pc now has the pc loaded that we will use when we finally call
-  // to native.
+  // The last java pc will also be used as resume pc if this is the wrapper for wait0.
+  // For this purpose the precise location matters but not for oopmap lookup.
+  __ calculate_address_from_global_toc(r_last_java_pc, last_java_pc, true, true, true, true);
 
   // Make sure that thread is non-volatile; it crosses a bunch of VM calls below.
   assert(R16_thread->is_nonvolatile(), "thread must be in non-volatile register");
@@ -2399,7 +2404,8 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     // Try fastpath for locking.
     if (LockingMode == LM_LIGHTWEIGHT) {
       // fast_lock kills r_temp_1, r_temp_2, r_temp_3.
-      __ compiler_fast_lock_lightweight_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3);
+      Register r_temp_3_or_noreg = UseObjectMonitorTable ? r_temp_3 : noreg;
+      __ compiler_fast_lock_lightweight_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3_or_noreg);
     } else {
       // fast_lock kills r_temp_1, r_temp_2, r_temp_3.
       __ compiler_fast_lock_object(CCR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3);
@@ -2416,9 +2422,14 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     RegisterSaver::push_frame_and_save_argument_registers(masm, R12_scratch2, frame_size, total_c_args, out_regs);
 
     // Do the call.
-    __ set_last_Java_frame(R11_scratch1, r_return_pc);
-    assert(r_return_pc->is_nonvolatile(), "expecting return pc to be in non-volatile register");
+    __ set_last_Java_frame(R11_scratch1, r_last_java_pc);
+    assert(r_last_java_pc->is_nonvolatile(), "r_last_java_pc needs to be preserved accross complete_monitor_locking_C call");
+    // The following call will not be preempted.
+    // push_cont_fastpath forces freeze slow path in case we try to preempt where we will pin the
+    // vthread to the carrier (see FreezeBase::recurse_freeze_native_frame()).
+    __ push_cont_fastpath();
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C), r_oop, r_box, R16_thread);
+    __ pop_cont_fastpath();
     __ reset_last_Java_frame();
 
     RegisterSaver::restore_argument_registers_and_pop_frame(masm, frame_size, total_c_args, out_regs);
@@ -2429,8 +2440,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     __ bind(locked);
   }
 
-  // Use that pc we placed in r_return_pc a while back as the current frame anchor.
-  __ set_last_Java_frame(R1_SP, r_return_pc);
+  __ set_last_Java_frame(R1_SP, r_last_java_pc);
 
   // Publish thread state
   // --------------------------------------------------------------------------
@@ -2490,8 +2500,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
       break;
   }
 
-  Label after_transition;
-
   // Publish thread state
   // --------------------------------------------------------------------------
 
@@ -2566,7 +2574,23 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     __ lwsync(); // Acquire safepoint and suspend state, release thread state.
     // TODO: PPC port assert(4 == JavaThread::sz_thread_state(), "unexpected field size");
     __ stw(R0, thread_(thread_state));
-    __ bind(after_transition);
+
+    // Check preemption for Object.wait()
+    if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+      Label not_preempted;
+      __ ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+      __ cmpdi(CCR0, R0, 0);
+      __ beq(CCR0, not_preempted);
+      __ mtlr(R0);
+      __ li(R0, 0);
+      __ std(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+      __ blr();
+      __ bind(not_preempted);
+    }
+    __ bind(last_java_pc);
+    // We use the same pc/oopMap repeatedly when we call out above.
+    intptr_t oopmap_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(oopmap_pc - start_pc, oop_map);
   }
 
   // Reguard any pages if necessary.
@@ -2648,7 +2672,9 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   // Clear "last Java frame" SP and PC.
   // --------------------------------------------------------------------------
 
-  __ reset_last_Java_frame();
+  // Last java frame won't be set if we're resuming after preemption
+  bool maybe_preempted = LockingMode != LM_LEGACY && method->is_object_wait0();
+  __ reset_last_Java_frame(!maybe_preempted /* check_last_java_sp */);
 
   // Unbox oop result, e.g. JNIHandles::resolve value.
   // --------------------------------------------------------------------------
@@ -2733,6 +2759,12 @@ uint SharedRuntime::out_preserve_stack_slots() {
 #endif
 }
 
+VMReg SharedRuntime::thread_register() {
+  // On PPC virtual threads don't save the JavaThread* in their context (e.g. C1 stub frames).
+  ShouldNotCallThis();
+  return nullptr;
+}
+
 #if defined(COMPILER1) || defined(COMPILER2)
 // Frame generation for deopt and uncommon trap blobs.
 static void push_skeleton_frame(MacroAssembler* masm, bool deopt,
diff --git a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
index cb4af1a3ff7..07f1c9c1c6f 100644
--- a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
@@ -184,8 +184,9 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const
   f.interpreted_frame_oop_map(&mask);
   return  mask.num_oops()
           + 1 // for the mirror oop
-          + ((intptr_t*)f.interpreter_frame_monitor_begin()
-             - (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
+          + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
+          + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
+                                 (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
 }
 
 template<>
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index b3ace8898ad..9f2b668b9c8 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -4483,6 +4483,10 @@ address generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
 
     address start = __ pc();
 
+    if (kind == Continuation::thaw_top) {
+      __ clobber_nonvolatile_registers(); // Except R16_thread and R29_TOC
+    }
+
     if (return_barrier) {
       __ mr(nvtmp, R3_RET); __ fmr(nvftmp, F1_RET); // preserve possible return value from a method returning to the return barrier
       DEBUG_ONLY(__ ld_ptr(tmp1, _abi0(callers_sp), R1_SP);)
@@ -4571,6 +4575,41 @@ address generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
     return generate_cont_thaw("Cont thaw return barrier exception", Continuation::thaw_return_barrier_exception);
   }
 
+  address generate_cont_preempt_stub() {
+    if (!Continuations::enabled()) return nullptr;
+    StubCodeMark mark(this, "StubRoutines","Continuation preempt stub");
+    address start = __ pc();
+
+    __ clobber_nonvolatile_registers(); // Except R16_thread and R29_TOC
+
+    __ reset_last_Java_frame(false /*check_last_java_sp*/);
+
+    // Set sp to enterSpecial frame, i.e. remove all frames copied into the heap.
+    __ ld_ptr(R1_SP, JavaThread::cont_entry_offset(), R16_thread);
+
+    Label preemption_cancelled;
+    __ lbz(R11_scratch1, in_bytes(JavaThread::preemption_cancelled_offset()), R16_thread);
+    __ cmpwi(CCR0, R11_scratch1, 0);
+    __ bne(CCR0, preemption_cancelled);
+
+    // Remove enterSpecial frame from the stack and return to Continuation.run() to unmount.
+    SharedRuntime::continuation_enter_cleanup(_masm);
+    __ pop_frame();
+    __ restore_LR(R11_scratch1);
+    __ blr();
+
+    // We acquired the monitor after freezing the frames so call thaw to continue execution.
+    __ bind(preemption_cancelled);
+    __ li(R11_scratch1, 0); // false
+    __ stb(R11_scratch1, in_bytes(JavaThread::preemption_cancelled_offset()), R16_thread);
+    int simm16_offs = __ load_const_optimized(R11_scratch1, ContinuationEntry::thaw_call_pc_address(), R0, true);
+    __ ld(R11_scratch1, simm16_offs, R11_scratch1);
+    __ mtctr(R11_scratch1);
+    __ bctr();
+
+    return start;
+  }
+
   // exception handler for upcall stubs
   address generate_upcall_stub_exception_handler() {
     StubCodeMark mark(this, "StubRoutines", "upcall stub exception handler");
@@ -4646,6 +4685,7 @@ address generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
     StubRoutines::_cont_thaw          = generate_cont_thaw();
     StubRoutines::_cont_returnBarrier = generate_cont_returnBarrier();
     StubRoutines::_cont_returnBarrierExc = generate_cont_returnBarrier_exception();
+    StubRoutines::_cont_preempt_stub  = generate_cont_preempt_stub();
   }
 
   void generate_final_stubs() {
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index cf3dd4cbd34..e320349583d 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -696,6 +696,17 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state,
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  if (!Continuations::enabled()) return nullptr;
+  address start = __ pc();
+
+  __ load_const_optimized(R25_templateTableBase, (address)Interpreter::dispatch_table((TosState)0), R12_scratch2);
+  __ restore_interpreter_state(R11_scratch1, false, true /*restore_top_frame_sp*/);
+  __ blr();
+
+  return start;
+}
+
 // Helpers for commoning out cases in the various type of method entries.
 
 // Increment invocation count & check for overflow.
@@ -1197,7 +1208,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   const Register signature_handler_fd = R11_scratch1;
   const Register pending_exception    = R0;
   const Register result_handler_addr  = R31;
-  const Register native_method_fd     = R11_scratch1;
+  const Register native_method_fd     = R12_scratch2; // preferred in MacroAssembler::branch_to
   const Register access_flags         = R22_tmp2;
   const Register active_handles       = R11_scratch1; // R26_monitor saved to state.
   const Register sync_state           = R12_scratch2;
@@ -1211,10 +1222,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   Label exception_return_sync_check;
   Label stack_overflow_return;
 
-  // Generate new interpreter state and jump to stack_overflow_return in case of
-  // a stack overflow.
-  //generate_compute_interpreter_state(stack_overflow_return);
-
   Register size_of_parameters = R22_tmp2;
 
   generate_fixed_frame(true, size_of_parameters, noreg /* unused */);
@@ -1253,8 +1260,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
   // access_flags = method->access_flags();
   // Load access flags.
-  assert(access_flags->is_nonvolatile(),
-         "access_flags must be in a non-volatile register");
+  assert(__ nonvolatile_accross_vthread_preemtion(access_flags),
+         "access_flags not preserved");
   // Type check.
   assert(4 == sizeof(AccessFlags), "unexpected field size");
   __ lwz(access_flags, method_(access_flags));
@@ -1315,8 +1322,12 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // convenient and the slow signature handler can use this same frame
   // anchor.
 
+  bool support_vthread_preemption = Continuations::enabled() && LockingMode != LM_LEGACY;
+
   // We have a TOP_IJAVA_FRAME here, which belongs to us.
-  __ set_top_ijava_frame_at_SP_as_last_Java_frame(R1_SP, R12_scratch2/*tmp*/);
+  Label last_java_pc;
+  Label *resume_pc = support_vthread_preemption ? &last_java_pc : nullptr;
+  __ set_top_ijava_frame_at_SP_as_last_Java_frame(R1_SP, R3_ARG1/*tmp*/, resume_pc);
 
   // Now the interpreter frame (and its call chain) have been
   // invalidated and flushed. We are now protected against eager
@@ -1335,16 +1346,11 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
   __ call_stub(signature_handler_fd);
 
-  // Remove the register parameter varargs slots we allocated in
-  // compute_interpreter_state. SP+16 ends up pointing to the ABI
-  // outgoing argument area.
-  //
-  // Not needed on PPC64.
-  //__ add(SP, SP, Argument::n_int_register_parameters_c*BytesPerWord);
-
-  assert(result_handler_addr->is_nonvolatile(), "result_handler_addr must be in a non-volatile register");
+  assert(__ nonvolatile_accross_vthread_preemtion(result_handler_addr),
+         "result_handler_addr not preserved");
   // Save across call to native method.
   __ mr(result_handler_addr, R3_RET);
+  __ ld(R11_scratch1, _abi0(callers_sp), R1_SP); // load FP
 
   __ isync(); // Acquire signature handler before trying to fetch the native entry point and klass mirror.
 
@@ -1358,12 +1364,11 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ testbitdi(CCR0, R0, access_flags, JVM_ACC_STATIC_BIT);
     __ bfalse(CCR0, method_is_not_static);
 
-    __ ld(R11_scratch1, _abi0(callers_sp), R1_SP);
-    // Load mirror from interpreter frame.
-    __ ld(R12_scratch2, _ijava_state_neg(mirror), R11_scratch1);
+    // Load mirror from interpreter frame (FP in R11_scratch1)
+    __ ld(R21_tmp1, _ijava_state_neg(mirror), R11_scratch1);
     // R4_ARG2 = &state->_oop_temp;
     __ addi(R4_ARG2, R11_scratch1, _ijava_state_neg(oop_tmp));
-    __ std(R12_scratch2/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
+    __ std(R21_tmp1/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
     BIND(method_is_not_static);
   }
 
@@ -1397,7 +1402,18 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // Call the native method. Argument registers must not have been
   // overwritten since "__ call_stub(signature_handler);" (except for
   // ARG1 and ARG2 for static methods).
+
+  if (support_vthread_preemption) {
+    // result_handler_addr is a nonvolatile register. Its value will be preserved across
+    // the native call but only if the call isn't preempted. To preserve its value even
+    // in the case of preemption we save it in the lresult slot. It is restored at
+    // resume_pc if, and only if the call was preempted. This works because only
+    // j.l.Object::wait calls are preempted which don't return a result.
+    __ std(result_handler_addr, _ijava_state_neg(lresult), R11_scratch1);
+  }
+  __ push_cont_fastpath();
   __ call_c(native_method_fd);
+  __ pop_cont_fastpath();
 
   __ li(R0, 0);
   __ ld(R11_scratch1, 0, R1_SP);
@@ -1495,6 +1511,35 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ lwsync(); // Acquire safepoint and suspend state, release thread state.
   __ stw(R0/*thread_state*/, thread_(thread_state));
 
+  if (support_vthread_preemption) {
+    // Check preemption for Object.wait()
+    Label not_preempted;
+    __ ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+    __ cmpdi(CCR0, R0, 0);
+    __ beq(CCR0, not_preempted);
+    __ mtlr(R0);
+    __ li(R0, 0);
+    __ std(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
+    __ blr();
+
+    // Execution will be resumed here when the vthread becomes runnable again.
+    __ bind(*resume_pc);
+    __ restore_after_resume(R11_scratch1 /* fp */);
+    // We saved the result handler before the call
+    __ ld(result_handler_addr, _ijava_state_neg(lresult), R11_scratch1);
+#ifdef ASSERT
+    // Clobber result slots. Only native methods returning void can be preemted currently.
+    __ load_const(R3_RET, UCONST64(0xbad01001));
+    __ std(R3_RET, _ijava_state_neg(lresult), R11_scratch1);
+    __ std(R3_RET, _ijava_state_neg(fresult), R11_scratch1);
+    // reset_last_Java_frame() below asserts that a last java sp is set
+    __ asm_assert_mem8_is_zero(in_bytes(JavaThread::last_Java_sp_offset()),
+        R16_thread, FILE_AND_LINE ": Last java sp should not be set when resuming");
+    __ std(R3_RET, in_bytes(JavaThread::last_Java_sp_offset()), R16_thread);
+#endif
+    __ bind(not_preempted);
+  }
+
   if (CheckJNICalls) {
     // clear_pending_jni_exception_check
     __ load_const_optimized(R0, 0L);
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index a55f30eb67d..0e88b2d3eb4 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -3840,8 +3840,9 @@ void TemplateTable::_new() {
       // Init1: Zero out newly allocated memory.
       // Initialize remaining object fields.
       Register Rbase = Rtags;
-      __ addi(Rinstance_size, Rinstance_size, 7 - (int)sizeof(oopDesc));
-      __ addi(Rbase, RallocatedObject, sizeof(oopDesc));
+      int header_size = oopDesc::header_size() * HeapWordSize;
+      __ addi(Rinstance_size, Rinstance_size, 7 - header_size);
+      __ addi(Rbase, RallocatedObject, header_size);
       __ srdi(Rinstance_size, Rinstance_size, 3);
 
       // Clear out object skipping header. Takes also care of the zero length case.
@@ -3851,12 +3852,15 @@ void TemplateTable::_new() {
     // --------------------------------------------------------------------------
     // Init2: Initialize the header: mark, klass
     // Init mark.
-    __ load_const_optimized(Rscratch, markWord::prototype().value(), R0);
-    __ std(Rscratch, oopDesc::mark_offset_in_bytes(), RallocatedObject);
-
-    // Init klass.
-    __ store_klass_gap(RallocatedObject);
-    __ store_klass(RallocatedObject, RinstanceKlass, Rscratch); // klass (last for cms)
+    if (UseCompactObjectHeaders) {
+      __ ld(Rscratch, in_bytes(Klass::prototype_header_offset()), RinstanceKlass);
+      __ std(Rscratch, oopDesc::mark_offset_in_bytes(), RallocatedObject);
+    } else {
+      __ load_const_optimized(Rscratch, markWord::prototype().value(), R0);
+      __ std(Rscratch, oopDesc::mark_offset_in_bytes(), RallocatedObject);
+      __ store_klass_gap(RallocatedObject);
+      __ store_klass(RallocatedObject, RinstanceKlass, Rscratch);
+    }
 
     // Check and trigger dtrace event.
     if (DTraceAllocProbes) {
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 20578ed3b8b..37e15548b4f 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -110,6 +110,17 @@ void VM_Version::initialize() {
     FLAG_SET_ERGO(TrapBasedRangeChecks, false);
   }
 
+  // Power7 and later.
+  if (PowerArchitecturePPC64 > 6) {
+    if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
+      FLAG_SET_ERGO(UsePopCountInstruction, true);
+    }
+  }
+
+  if (!VM_Version::has_isel() && FLAG_IS_DEFAULT(ConditionalMoveLimit)) {
+    FLAG_SET_ERGO(ConditionalMoveLimit, 0);
+  }
+
   if (PowerArchitecturePPC64 >= 8) {
     if (FLAG_IS_DEFAULT(SuperwordUseVSX)) {
       FLAG_SET_ERGO(SuperwordUseVSX, true);
@@ -169,6 +180,17 @@ void VM_Version::initialize() {
       FLAG_SET_DEFAULT(UseByteReverseInstructions, false);
     }
   }
+
+  if (OptimizeFill) {
+    warning("OptimizeFill is not supported on this CPU.");
+    FLAG_SET_DEFAULT(OptimizeFill, false);
+  }
+
+  if (OptoScheduling) {
+    // The OptoScheduling information is not maintained in ppd.ad.
+    warning("OptoScheduling is not supported on this CPU.");
+    FLAG_SET_DEFAULT(OptoScheduling, false);
+  }
 #endif
 
   // Create and print feature-string.
diff --git a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
index 4c1d4ad9f69..46af27a011f 100644
--- a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
@@ -316,7 +316,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
                   relocInfo::static_call_type);
   address call = __ reloc_call(resolve);
   if (call == nullptr) {
-    ce->bailout("trampoline stub overflow");
+    ce->bailout("reloc call address stub overflow");
     return;
   }
   ce->add_call_info_here(info());
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
index a45add1032a..7d673383cad 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
@@ -194,7 +194,10 @@ void LIR_Assembler::arraycopy_type_check(Register src, Register src_pos, Registe
   // We don't know the array types are compatible
   if (basic_type != T_OBJECT) {
     // Simple test for basic type arrays
-    if (UseCompressedClassPointers) {
+    if (UseCompactObjectHeaders) {
+      __ load_narrow_klass_compact(tmp, src);
+      __ load_narrow_klass_compact(t0, dst);
+    } else if (UseCompressedClassPointers) {
       __ lwu(tmp, Address(src, oopDesc::klass_offset_in_bytes()));
       __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
     } else {
@@ -244,7 +247,6 @@ void LIR_Assembler::arraycopy_type_check(Register src, Register src_pos, Registe
 void LIR_Assembler::arraycopy_assert(Register src, Register dst, Register tmp, ciArrayKlass *default_type, int flags) {
   assert(default_type != nullptr, "null default_type!");
   BasicType basic_type = default_type->element_type()->basic_type();
-
   if (basic_type == T_ARRAY) { basic_type = T_OBJECT; }
   if (basic_type != T_OBJECT || !(flags & LIR_OpArrayCopy::type_check)) {
     // Sanity check the known type with the incoming class.  For the
@@ -261,25 +263,10 @@ void LIR_Assembler::arraycopy_assert(Register src, Register dst, Register tmp, c
     }
 
     if (basic_type != T_OBJECT) {
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      }
-      __ bne(tmp, t0, halt);
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(src, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(src, oopDesc::klass_offset_in_bytes()));
-      }
-      __ beq(tmp, t0, known_ok);
+      __ cmp_klass_compressed(dst, tmp, t0, halt, false);
+      __ cmp_klass_compressed(src, tmp, t0, known_ok, true);
     } else {
-      if (UseCompressedClassPointers) {
-        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      } else {
-        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
-      }
-      __ beq(tmp, t0, known_ok);
+      __ cmp_klass_compressed(dst, tmp, t0, known_ok, true);
       __ beq(src, dst, known_ok);
     }
     __ bind(halt);
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index 542f8d8ba58..eb715227f7e 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -1346,7 +1346,7 @@ void LIR_Assembler::align_call(LIR_Code code) {
 void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
   address call = __ reloc_call(Address(op->addr(), rtype));
   if (call == nullptr) {
-    bailout("trampoline stub overflow");
+    bailout("reloc call address stub overflow");
     return;
   }
   add_call_info(code_offset(), op->info());
@@ -1356,7 +1356,7 @@ void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
 void LIR_Assembler::ic_call(LIR_OpJavaCall* op) {
   address call = __ ic_call(op->addr());
   if (call == nullptr) {
-    bailout("trampoline stub overflow");
+    bailout("reloc call address stub overflow");
     return;
   }
   add_call_info(code_offset(), op->info());
@@ -1518,12 +1518,7 @@ void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
     add_debug_info_for_null_check_here(info);
   }
 
-  if (UseCompressedClassPointers) {
-    __ lwu(result, Address(obj, oopDesc::klass_offset_in_bytes()));
-    __ decode_klass_not_null(result);
-  } else {
-    __ ld(result, Address(obj, oopDesc::klass_offset_in_bytes()));
-  }
+  __ load_klass(result, obj);
 }
 
 void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index 4ce7eb2bf73..22f1d694b92 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -65,17 +65,16 @@ friend class ArrayCopyStub;
   void deoptimize_trap(CodeEmitInfo *info);
 
   enum {
-    // See emit_static_call_stub for detail
-    // CompiledDirectCall::to_interp_stub_size() (14) + CompiledDirectCall::to_trampoline_stub_size() (1 + 3 + address)
-    _call_stub_size = 14 * MacroAssembler::instruction_size +
-                      (MacroAssembler::instruction_size + MacroAssembler::NativeShortCall::trampoline_size),
+    // call stub: CompiledDirectCall::to_interp_stub_size() +
+    //            CompiledDirectCall::to_trampoline_stub_size()
+    _call_stub_size = 11 * MacroAssembler::instruction_size +
+                      1 * MacroAssembler::instruction_size + wordSize,
     // See emit_exception_handler for detail
-    // verify_not_null_oop + far_call + should_not_reach_here + invalidate_registers(DEBUG_ONLY)
-    _exception_handler_size = DEBUG_ONLY(584) NOT_DEBUG(548), // or smaller
+    _exception_handler_size = DEBUG_ONLY(256) NOT_DEBUG(32), // or smaller
     // See emit_deopt_handler for detail
-    // auipc (1) + far_jump (6 or 2)
+    // auipc (1) + far_jump (2)
     _deopt_handler_size = 1 * MacroAssembler::instruction_size +
-                          6 * MacroAssembler::instruction_size // or smaller
+                          2 * MacroAssembler::instruction_size
   };
 
   void check_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp,
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
index 1e4b66069ee..ed932dddcd8 100644
--- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -83,8 +83,8 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     // displaced header address in the object header - if it is not the same, get the
     // object header instead
     la(temp, Address(obj, hdr_offset));
-    cmpxchgptr(hdr, disp_hdr, temp, t1, done, /*fallthough*/nullptr);
     // if the object header was the same, we're done
+    cmpxchgptr(hdr, disp_hdr, temp, t1, done, /*fallthough*/nullptr);
     // if the object header was not the same, it is now in the hdr register
     // => test if it is a stack pointer into the same stack (recursive locking), i.e.:
     //
@@ -106,11 +106,12 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     sd(hdr, Address(disp_hdr, 0));
     // otherwise we don't care about the result and handle locking via runtime call
     bnez(hdr, slow_case, /* is_far */ true);
+
     // done
     bind(done);
+    inc_held_monitor_count(t0);
   }
 
-  increment(Address(xthread, JavaThread::held_monitor_count_offset()));
   return null_check_offset;
 }
 
@@ -146,11 +147,11 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     } else {
       cmpxchgptr(disp_hdr, hdr, obj, t1, done, &slow_case);
     }
+
     // done
     bind(done);
+    dec_held_monitor_count(t0);
   }
-
-  decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
 }
 
 // Defines obj, preserves var_size_in_bytes
@@ -164,15 +165,19 @@ void C1_MacroAssembler::try_allocate(Register obj, Register var_size_in_bytes, i
 
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register tmp1, Register tmp2) {
   assert_different_registers(obj, klass, len, tmp1, tmp2);
-  // This assumes that all prototype bits fitr in an int32_t
-  mv(tmp1, (int32_t)(intptr_t)markWord::prototype().value());
-  sd(tmp1, Address(obj, oopDesc::mark_offset_in_bytes()));
-
-  if (UseCompressedClassPointers) { // Take care not to kill klass
-    encode_klass_not_null(tmp1, klass, tmp2);
-    sw(tmp1, Address(obj, oopDesc::klass_offset_in_bytes()));
+  if (UseCompactObjectHeaders) {
+    ld(tmp1, Address(klass, Klass::prototype_header_offset()));
+    sd(tmp1, Address(obj, oopDesc::mark_offset_in_bytes()));
   } else {
-    sd(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+    // This assumes that all prototype bits fitr in an int32_t
+    mv(tmp1, checked_cast<int32_t>(markWord::prototype().value()));
+    sd(tmp1, Address(obj, oopDesc::mark_offset_in_bytes()));
+    if (UseCompressedClassPointers) { // Take care not to kill klass
+      encode_klass_not_null(tmp1, klass, tmp2);
+      sw(tmp1, Address(obj, oopDesc::klass_offset_in_bytes()));
+    } else {
+      sd(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+    }
   }
 
   if (len->is_valid()) {
@@ -183,7 +188,7 @@ void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register
       // Clear gap/first 4 bytes following the length field.
       sw(zr, Address(obj, base_offset));
     }
-  } else if (UseCompressedClassPointers) {
+  } else if (UseCompressedClassPointers && !UseCompactObjectHeaders) {
     store_klass_gap(obj, zr);
   }
 }
diff --git a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
index 5e4031727c8..6f59f5c2b95 100644
--- a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
@@ -165,7 +165,7 @@ int StubAssembler::call_RT(Register oop_result, Register metadata_result, addres
 }
 
 enum return_state_t {
-  does_not_return, requires_return
+  does_not_return, requires_return, requires_pop_epilogue_return
 };
 
 // Implementation of StubFrame
@@ -173,7 +173,7 @@ enum return_state_t {
 class StubFrame: public StackObj {
  private:
   StubAssembler* _sasm;
-  bool _return_state;
+  return_state_t _return_state;
 
  public:
   StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, return_state_t return_state=requires_return);
@@ -187,8 +187,18 @@ void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
   enter();
 }
 
-void StubAssembler::epilogue() {
-  leave();
+void StubAssembler::epilogue(bool use_pop) {
+  // Avoid using a leave instruction when this frame may
+  // have been frozen, since the current value of fp
+  // restored from the stub would be invalid. We still
+  // must restore the fp value saved on enter though.
+  if (use_pop) {
+    ld(fp, Address(sp));
+    ld(ra, Address(sp, wordSize));
+    addi(sp, sp, 2 * wordSize);
+  } else {
+    leave();
+  }
   ret();
 }
 
@@ -208,10 +218,10 @@ void StubFrame::load_argument(int offset_in_words, Register reg) {
 
 
 StubFrame::~StubFrame() {
-  if (_return_state == requires_return) {
-    __ epilogue();
-  } else {
+  if (_return_state == does_not_return) {
     __ should_not_reach_here();
+  } else {
+    __ epilogue(_return_state == requires_pop_epilogue_return);
   }
   _sasm = nullptr;
 }
@@ -266,6 +276,10 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
                               r->as_VMReg());
   }
 
+  int sp_offset = cpu_reg_save_offsets[xthread->encoding()];
+  oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset),
+                            xthread->as_VMReg());
+
   // fpu_regs
   if (save_fpu_registers) {
     for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
@@ -354,6 +368,16 @@ void Runtime1::initialize_pd() {
   }
 }
 
+// return: offset in 64-bit words.
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+  CodeBlob* cb = f.cb();
+  assert(cb == Runtime1::blob_for(C1StubId::monitorenter_id) ||
+         cb == Runtime1::blob_for(C1StubId::monitorenter_nofpu_id), "must be");
+  assert(cb != nullptr && cb->is_runtime_stub(), "invalid frame");
+  int offset = cpu_reg_save_offsets[xthread->encoding()];
+  return offset / 2;   // SP offsets are in halfwords
+}
+
 // target: the entry point of the method that creates and posts the exception oop
 // has_argument: true if the exception needs arguments (passed in t0 and t1)
 
@@ -879,7 +903,7 @@ OopMapSet* Runtime1::generate_code_for(C1StubId id, StubAssembler* sasm) {
       // fall through
     case C1StubId::monitorenter_id:
       {
-        StubFrame f(sasm, "monitorenter", dont_gc_arguments);
+        StubFrame f(sasm, "monitorenter", dont_gc_arguments, requires_pop_epilogue_return);
         OopMap* map = save_live_registers(sasm, save_fpu_registers);
         assert_cond(map != nullptr);
 
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 0ffdcbca723..7b0316e208f 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -45,7 +45,7 @@
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
 void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg,
-                                  Register tmp1Reg, Register tmp2Reg, Register tmp3Reg) {
+                                  Register tmp1Reg, Register tmp2Reg, Register tmp3Reg, Register tmp4Reg) {
   // Use cr register to indicate the fast_lock result: zero for success; non-zero for failure.
   Register flag = t1;
   Register oop = objectReg;
@@ -104,9 +104,9 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg,
     // markWord of object (disp_hdr) with the stack pointer.
     sub(disp_hdr, disp_hdr, sp);
     mv(tmp, (intptr_t) (~(os::vm_page_size()-1) | (uintptr_t)markWord::lock_mask_in_place));
-    // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto label locked,
-    // hence we can store 0 as the displaced header in the box, which indicates that it is a
-    // recursive lock.
+    // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto label
+    // locked, hence we can store 0 as the displaced header in the box, which indicates that it
+    // is a recursive lock.
     andr(tmp/*==0?*/, disp_hdr, tmp);
     sd(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
     beqz(tmp, locked);
@@ -115,12 +115,12 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg,
 
   // Handle existing monitor.
   bind(object_has_monitor);
-  // The object's monitor m is unlocked iff m->owner == nullptr,
-  // otherwise m->owner may contain a thread or a stack address.
-  //
-  // Try to CAS m->owner from null to current thread.
+
+  // Try to CAS owner (no owner => current thread's _lock_id).
   add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value));
-  cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64,
+  Register tid = tmp4Reg;
+  ld(tid, Address(xthread, JavaThread::lock_id_offset()));
+  cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/tid, Assembler::int64,
           Assembler::aq, Assembler::rl, /*result*/tmp3Reg); // cas succeeds if tmp3Reg == zr(expected)
 
   // Store a non-null value into the box to avoid looking like a re-entrant
@@ -132,14 +132,16 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg,
 
   beqz(tmp3Reg, locked); // CAS success means locking succeeded
 
-  bne(tmp3Reg, xthread, slow_path); // Check for recursive locking
+  bne(tmp3Reg, tid, slow_path); // Check for recursive locking
 
   // Recursive lock case
   increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1, tmp2Reg, tmp3Reg);
 
   bind(locked);
   mv(flag, zr);
-  increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2Reg, tmp3Reg);
+  if (LockingMode == LM_LEGACY) {
+    inc_held_monitor_count(t0);
+  }
 
 #ifdef ASSERT
   // Check that locked label is reached with flag == 0.
@@ -253,7 +255,9 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg,
 
   bind(unlocked);
   mv(flag, zr);
-  decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp1Reg, tmp2Reg);
+  if (LockingMode == LM_LEGACY) {
+    dec_held_monitor_count(t0);
+  }
 
 #ifdef ASSERT
   // Check that unlocked label is reached with flag == 0.
@@ -273,12 +277,12 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg,
 }
 
 void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
-                                              Register tmp1, Register tmp2, Register tmp3) {
+                                              Register tmp1, Register tmp2, Register tmp3, Register tmp4) {
   // Flag register, zero for success; non-zero for failure.
   Register flag = t1;
 
   assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-  assert_different_registers(obj, box, tmp1, tmp2, tmp3, flag, t0);
+  assert_different_registers(obj, box, tmp1, tmp2, tmp3, tmp4, flag, t0);
 
   mv(flag, 1);
 
@@ -349,6 +353,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
     bind(inflated);
 
     const Register tmp1_monitor = tmp1;
+
     if (!UseObjectMonitorTable) {
       assert(tmp1_monitor == tmp1_mark, "should be the same here");
     } else {
@@ -395,13 +400,15 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
     // Compute owner address.
     la(tmp2_owner_addr, owner_address);
 
-    // CAS owner (null => current thread).
-    cmpxchg(/*addr*/ tmp2_owner_addr, /*expected*/ zr, /*new*/ xthread, Assembler::int64,
+    // Try to CAS owner (no owner => current thread's _lock_id).
+    Register tid = tmp4;
+    ld(tid, Address(xthread, JavaThread::lock_id_offset()));
+    cmpxchg(/*addr*/ tmp2_owner_addr, /*expected*/ zr, /*new*/ tid, Assembler::int64,
             /*acquire*/ Assembler::aq, /*release*/ Assembler::relaxed, /*result*/ tmp3_owner);
     beqz(tmp3_owner, monitor_locked);
 
     // Check if recursive.
-    bne(tmp3_owner, xthread, slow_path);
+    bne(tmp3_owner, tid, slow_path);
 
     // Recursive.
     increment(recursions_address, 1, tmp2, tmp3);
@@ -414,7 +421,6 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
 
   bind(locked);
   mv(flag, zr);
-  increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2, tmp3);
 
 #ifdef ASSERT
   // Check that locked label is reached with flag == 0.
@@ -586,7 +592,6 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box,
 
   bind(unlocked);
   mv(flag, zr);
-  decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, tmp2, tmp3);
 
 #ifdef ASSERT
   // Check that unlocked label is reached with flag == 0.
@@ -3119,3 +3124,13 @@ void C2_MacroAssembler::extract_fp_v(FloatRegister dst, VectorRegister src, Basi
     vfmv_f_s(dst, tmp);
   }
 }
+
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Address src) {
+  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
+  // obj-start, so that we can load from the object's mark-word instead. Usually the address
+  // comes as obj-start in obj and klass_offset_in_bytes in disp.
+  assert(UseCompactObjectHeaders, "must");
+  int offset = oopDesc::mark_offset_in_bytes() - oopDesc::klass_offset_in_bytes();
+  ld(dst, Address(src.base(), src.offset() + offset));
+  srli(dst, dst, markWord::klass_shift);
+}
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index 38351565cc6..8f9d9cd2ccd 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -44,11 +44,15 @@
 
  public:
   // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
-  void fast_lock(Register object, Register box, Register tmp1, Register tmp2, Register tmp3);
+  void fast_lock(Register object, Register box,
+                 Register tmp1, Register tmp2, Register tmp3, Register tmp4);
   void fast_unlock(Register object, Register box, Register tmp1, Register tmp2);
+
   // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file.
-  void fast_lock_lightweight(Register object, Register box, Register tmp1, Register tmp2, Register tmp3);
-  void fast_unlock_lightweight(Register object, Register box, Register tmp1, Register tmp2, Register tmp3);
+  void fast_lock_lightweight(Register object, Register box,
+                             Register tmp1, Register tmp2, Register tmp3, Register tmp4);
+  void fast_unlock_lightweight(Register object, Register box,
+                               Register tmp1, Register tmp2, Register tmp3);
 
   void string_compare(Register str1, Register str2,
                       Register cnt1, Register cnt2, Register result,
@@ -277,4 +281,6 @@
   void extract_v(Register dst, VectorRegister src, BasicType bt, int idx, VectorRegister tmp);
   void extract_fp_v(FloatRegister dst, VectorRegister src, BasicType bt, int idx, VectorRegister tmp);
 
+  void load_narrow_klass_compact_c2(Register dst, Address src);
+
 #endif // CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
index e772959ed08..e99183a5b5d 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
@@ -28,61 +28,6 @@
 #include "asm/codeBuffer.inline.hpp"
 #include "asm/macroAssembler.hpp"
 
-void CodeBuffer::share_trampoline_for(address dest, int caller_offset) {
-  if (_shared_trampoline_requests == nullptr) {
-    constexpr unsigned init_size = 8;
-    constexpr unsigned max_size  = 256;
-    _shared_trampoline_requests = new (mtCompiler)SharedTrampolineRequests(init_size, max_size);
-  }
-
-  bool created;
-  Offsets* offsets = _shared_trampoline_requests->put_if_absent(dest, &created);
-  if (created) {
-    _shared_trampoline_requests->maybe_grow();
-  }
-  offsets->add(caller_offset);
-  _finalize_stubs = true;
-}
-
-#define __ masm.
-
-static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampolineRequests* requests) {
-  if (requests == nullptr) {
-    return true;
-  }
-  assert(UseTrampolines, "We are not using trampolines");
-
-  MacroAssembler masm(cb);
-
-  auto emit = [&](address dest, const CodeBuffer::Offsets &offsets) {
-    assert(cb->stubs()->remaining() >= MacroAssembler::max_reloc_call_stub_size(), "pre-allocated trampolines");
-    LinkedListIterator<int> it(offsets.head());
-    int offset = *it.next();
-    address stub = __ emit_trampoline_stub(offset, dest);
-    assert(stub, "pre-allocated trampolines");
-
-    address reloc_pc = cb->stubs()->end() - MacroAssembler::NativeShortCall::trampoline_size;
-    while (!it.is_empty()) {
-      offset = *it.next();
-      address caller_pc = cb->insts()->start() + offset;
-      cb->stubs()->relocate(reloc_pc, trampoline_stub_Relocation::spec(caller_pc));
-    }
-    return true;
-  };
-
-  assert(requests->number_of_entries() >= 1, "at least one");
-  const int total_requested_size = MacroAssembler::max_reloc_call_stub_size() * requests->number_of_entries();
-  if (cb->stubs()->maybe_expand_to_ensure_remaining(total_requested_size) && cb->blob() == nullptr) {
-    return false;
-  }
-
-  requests->iterate(emit);
-  return true;
-}
-
-#undef __
-
 bool CodeBuffer::pd_finalize_stubs() {
-  return emit_shared_stubs_to_interp<MacroAssembler>(this, _shared_stub_to_interp_requests)
-         && emit_shared_trampolines(this, _shared_trampoline_requests);
+  return emit_shared_stubs_to_interp<MacroAssembler>(this, _shared_stub_to_interp_requests);
 }
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
index de70bc2ecc9..0d90c7d866e 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -33,8 +33,6 @@
 
 public:
   void flush_bundle(bool start_new_bundle) {}
-  static bool supports_shared_stubs() { return UseTrampolines; }
-
-  void share_trampoline_for(address dest, int caller_offset);
+  static bool supports_shared_stubs() { return false; }
 
 #endif // CPU_RISCV_CODEBUFFER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
index 4bbea8f356f..c95521a95bd 100644
--- a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
@@ -69,9 +69,9 @@ int CompiledDirectCall::to_interp_stub_size() {
 }
 
 int CompiledDirectCall::to_trampoline_stub_size() {
-  // We count instructions and an additional alignment nop.
-  // Trampoline stubs are always word aligned.
-  return MacroAssembler::max_reloc_call_stub_size();
+  // We count size of target address and an additional alignment nop.
+  // Reloc call address stubs are always word aligned.
+  return MacroAssembler::max_reloc_call_address_stub_size();
 }
 
 // Relocation entries for call stub, compiled java to interpreter.
diff --git a/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp b/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
index cffadb4189b..7c8d6b8f5bb 100644
--- a/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
@@ -56,9 +56,9 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
     result = reserve_address_space_for_zerobased_encoding(size, aslr);
   }
 
-  // Failing that, optimize for case (3) - a base with only bits set between [33-44)
+  // Failing that, optimize for case (3) - a base with only bits set between [32-44)
   if (result == nullptr) {
-    const uintptr_t from = nth_bit(32 + (optimize_for_zero_base ? LogKlassAlignmentInBytes : 0));
+    const uintptr_t from = nth_bit(32);
     constexpr uintptr_t to = nth_bit(44);
     constexpr size_t alignment = nth_bit(32);
     result = reserve_address_space_X(from, to, size, alignment, aslr);
diff --git a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
index cea43511514..283334bbf41 100644
--- a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
@@ -127,6 +127,11 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   }
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  assert(f.interpreter_frame_last_sp() == nullptr, "should be null for top frame");
+  f.interpreter_frame_set_last_sp(f.unextended_sp());
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   assert(hf.fp() == hf.unextended_sp() + (f.fp() - f.unextended_sp()), "");
   assert((f.at(frame::interpreter_frame_last_sp_offset) != 0)
@@ -147,10 +152,16 @@ inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, co
   // extended_sp is already relativized by TemplateInterpreterGenerator::generate_normal_entry or
   // AbstractInterpreter::layout_activation
 
+  // The interpreter native wrapper code adds space in the stack equal to size_of_parameters()
+  // after the fixed part of the frame. For wait0 this is equal to 3 words (this + long parameter).
+  // We adjust by this size since otherwise the saved last sp will be less than the extended_sp.
+  DEBUG_ONLY(Method* m = hf.interpreter_frame_method();)
+  DEBUG_ONLY(int extra_space = m->is_object_wait0() ? m->size_of_parameters() : 0;)
+
   assert((hf.fp() - hf.unextended_sp()) == (f.fp() - f.unextended_sp()), "");
   assert(hf.unextended_sp() == (intptr_t*)hf.at(frame::interpreter_frame_last_sp_offset), "");
   assert(hf.unextended_sp() <= (intptr_t*)hf.at(frame::interpreter_frame_initial_sp_offset), "");
-  assert(hf.unextended_sp() >  (intptr_t*)hf.at(frame::interpreter_frame_extended_sp_offset), "");
+  assert(hf.unextended_sp() + extra_space >  (intptr_t*)hf.at(frame::interpreter_frame_extended_sp_offset), "");
   assert(hf.fp()            >  (intptr_t*)hf.at(frame::interpreter_frame_initial_sp_offset), "");
 #ifdef ASSERT
   if (f.interpreter_frame_method()->max_locals() > 0) {
@@ -203,7 +214,8 @@ inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
 
 inline frame ThawBase::new_entry_frame() {
   intptr_t* sp = _cont.entrySP();
-  return frame(sp, sp, _cont.entryFP(), _cont.entryPC()); // TODO PERF: This finds code blob and computes deopt state
+  // TODO PERF: This finds code blob and computes deopt state
+  return frame(sp, sp, _cont.entryFP(), _cont.entryPC());
 }
 
 template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame& caller, bool bottom) {
@@ -215,7 +227,6 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     // If caller is interpreted it already made room for the callee arguments
     int overlap = caller.is_interpreted_frame() ? ContinuationHelper::InterpretedFrame::stack_argsize(hf) : 0;
     const int fsize = (int)(ContinuationHelper::InterpretedFrame::frame_bottom(hf) - hf.unextended_sp() - overlap);
-    const int locals = hf.interpreter_frame_method()->max_locals();
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     intptr_t* fp = frame_sp + (hf.fp() - heap_sp);
     if ((intptr_t)fp % frame::frame_alignment != 0) {
@@ -237,7 +248,7 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     int fsize = FKind::size(hf);
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     if (bottom || caller.is_interpreted_frame()) {
-      int argsize = hf.compiled_frame_stack_argsize();
+      int argsize = FKind::stack_argsize(hf);
 
       fsize += argsize;
       frame_sp -= argsize;
@@ -252,13 +263,16 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     intptr_t* fp;
     if (PreserveFramePointer) {
       // we need to recreate a "real" frame pointer, pointing into the stack
-      fp = frame_sp + FKind::size(hf) - 2;
+      fp = frame_sp + FKind::size(hf) - frame::sender_sp_offset;
     } else {
-      fp = FKind::stub
-        ? frame_sp + fsize - 2 // On RISCV, this value is used for the safepoint stub
-        : *(intptr_t**)(hf.sp() - 2); // we need to re-read fp because it may be an oop and we might have fixed the frame.
+      fp = FKind::stub || FKind::native
+        // fp always points to the address above the pushed return pc. We need correct address.
+        ? frame_sp + fsize - frame::sender_sp_offset
+        // we need to re-read fp because it may be an oop and we might have fixed the frame.
+        : *(intptr_t**)(hf.sp() - 2);
     }
-    return frame(frame_sp, frame_sp, fp, hf.pc(), hf.cb(), hf.oop_map(), false); // TODO PERF : this computes deopt state; is it necessary?
+    // TODO PERF : this computes deopt state; is it necessary?
+    return frame(frame_sp, frame_sp, fp, hf.pc(), hf.cb(), hf.oop_map(), false);
   }
 }
 
@@ -279,6 +293,22 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  intptr_t* fp = caller_sp - frame::sender_sp_offset;
+  patch_callee_link(f, fp);
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
+  sp[-2] = (intptr_t)enterSpecial.fp();
+
+  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+  return sp;
+}
+
 inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, const frame& f) {
   // Make sure that last_sp is kept relativized.
   assert((intptr_t*)f.at_relative(frame::interpreter_frame_last_sp_offset) == f.unextended_sp(), "");
@@ -286,8 +316,11 @@ inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, c
   // Make sure that monitor_block_top is still relativized.
   assert(f.at_absolute(frame::interpreter_frame_monitor_block_top_offset) <= frame::interpreter_frame_initial_sp_offset, "");
 
+  DEBUG_ONLY(Method* m = hf.interpreter_frame_method();)
+  DEBUG_ONLY(int extra_space = m->is_object_wait0() ? m->size_of_parameters() : 0;) // see comment in relativize_interpreted_frame_metadata()
+
   // Make sure that extended_sp is kept relativized.
-  assert((intptr_t*)f.at_relative(frame::interpreter_frame_extended_sp_offset) < f.unextended_sp(), "");
+  assert((intptr_t*)f.at_relative(frame::interpreter_frame_extended_sp_offset) < f.unextended_sp() + extra_space, "");
 }
 
 #endif // CPU_RISCV_CONTINUATIONFREEZETHAW_RISCV_INLINE_HPP
diff --git a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
index 1c668531a07..8c0fb728dc7 100644
--- a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
@@ -40,6 +40,22 @@ static inline intptr_t** link_address(const frame& f) {
             : (intptr_t**)(f.unextended_sp() + f.cb()->frame_size() - 2);
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  if (f.is_runtime_frame()) {
+    // Unlike x86 we don't know where in the callee frame the return pc is
+    // saved so we can't patch the return from the VM call back to Java.
+    // Instead, we will patch the return from the runtime stub back to the
+    // compiled method so that the target returns to the preempt cleanup stub.
+    intptr_t* caller_sp = f.sp() + f.cb()->frame_size();
+    caller_sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
+  } else {
+    // The target will check for preemption once it returns to the interpreter
+    // or the native wrapper code and will manually jump to the preempt stub.
+    JavaThread *thread = JavaThread::current();
+    thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
+  }
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
 #ifdef _LP64
   return size & 1;
@@ -72,12 +88,12 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   anchor->set_last_Java_fp(entry->entry_fp());
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   intptr_t* fp = *(intptr_t**)(sp - 2);
   anchor->set_last_Java_fp(fp);
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   intptr_t* sp = f.sp();
   address pc = *(address*)(sp - frame::sender_sp_ret_address_offset());
diff --git a/src/hotspot/cpu/riscv/frame_riscv.cpp b/src/hotspot/cpu/riscv/frame_riscv.cpp
index 96dca4704ad..ecc450bd6b2 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.cpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.cpp
@@ -393,6 +393,36 @@ frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
   return fr;
 }
 
+#if defined(ASSERT)
+static address get_register_address_in_stub(const frame& stub_fr, VMReg reg) {
+  RegisterMap map(nullptr,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  stub_fr.oop_map()->update_register_map(&stub_fr, &map);
+  return map.location(reg, stub_fr.sp());
+}
+#endif
+
+JavaThread** frame::saved_thread_address(const frame& f) {
+  CodeBlob* cb = f.cb();
+  assert(cb != nullptr && cb->is_runtime_stub(), "invalid frame");
+
+  JavaThread** thread_addr;
+#ifdef COMPILER1
+  if (cb == Runtime1::blob_for(C1StubId::monitorenter_id) ||
+      cb == Runtime1::blob_for(C1StubId::monitorenter_nofpu_id)) {
+    thread_addr = (JavaThread**)(f.sp() + Runtime1::runtime_blob_current_thread_offset(f));
+  } else
+#endif
+  {
+    // c2 only saves rbp in the stub frame so nothing to do.
+    thread_addr = nullptr;
+  }
+  assert(get_register_address_in_stub(f, SharedRuntime::thread_register()) == (address)thread_addr, "wrong thread address");
+  return thread_addr;
+}
+
 //------------------------------------------------------------------------------
 // frame::verify_deopt_original_pc
 //
diff --git a/src/hotspot/cpu/riscv/frame_riscv.hpp b/src/hotspot/cpu/riscv/frame_riscv.hpp
index 3692c99193e..b4540c45ab8 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.hpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.hpp
@@ -111,7 +111,8 @@
     sender_sp_offset                                 =  0,
 
     // Interpreter frames
-    interpreter_frame_oop_temp_offset                =  1, // for native calls only
+    interpreter_frame_result_handler_offset          =  1, // for native calls only
+    interpreter_frame_oop_temp_offset                =  0, // for native calls only
 
     interpreter_frame_sender_sp_offset               = -3,
     // outgoing sp before a call to an invoked method
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index e0b7a400cb8..cc3c3b4a63c 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -98,12 +98,12 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseRVA20U64, true, "Use RVA20U64 profile")                       \
   product(bool, UseRVA22U64, false, EXPERIMENTAL, "Use RVA22U64 profile")        \
   product(bool, UseRVA23U64, false, EXPERIMENTAL, "Use RVA23U64 profile")        \
-  product(bool, UseRVC, false, "Use RVC instructions")                           \
-  product(bool, UseRVV, false, "Use RVV instructions")                           \
-  product(bool, UseZba, false, "Use Zba instructions")                           \
-  product(bool, UseZbb, false, "Use Zbb instructions")                           \
-  product(bool, UseZbs, false, "Use Zbs instructions")                           \
-  product(bool, UseZfh, false, "Use Zfh instructions")                           \
+  product(bool, UseRVC, false, DIAGNOSTIC, "Use RVC instructions")               \
+  product(bool, UseRVV, false, DIAGNOSTIC, "Use RVV instructions")               \
+  product(bool, UseZba, false, DIAGNOSTIC, "Use Zba instructions")               \
+  product(bool, UseZbb, false, DIAGNOSTIC, "Use Zbb instructions")               \
+  product(bool, UseZbs, false, DIAGNOSTIC, "Use Zbs instructions")               \
+  product(bool, UseZfh, false, DIAGNOSTIC, "Use Zfh instructions")               \
   product(bool, UseZacas, false, EXPERIMENTAL, "Use Zacas instructions")         \
   product(bool, UseZcb, false, EXPERIMENTAL, "Use Zcb instructions")             \
   product(bool, UseZic64b, false, EXPERIMENTAL, "Use Zic64b instructions")       \
@@ -114,13 +114,11 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use Zihintpause instructions")                                        \
   product(bool, UseZtso, false, EXPERIMENTAL, "Assume Ztso memory model")        \
   product(bool, UseZvbb, false, EXPERIMENTAL, "Use Zvbb instructions")           \
-  product(bool, UseZvfh, false, "Use Zvfh instructions")                         \
+  product(bool, UseZvfh, false, DIAGNOSTIC, "Use Zvfh instructions")             \
   product(bool, UseZvkn, false, EXPERIMENTAL,                                    \
           "Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt")                \
   product(bool, UseRVVForBigIntegerShiftIntrinsics, true,                        \
           "Use RVV instructions for left/right shift of BigInteger")             \
-  product(bool, UseTrampolines, false, EXPERIMENTAL,                             \
-          "Far calls uses jal to trampoline.")                                   \
   product(bool, UseCtxFencei, false, EXPERIMENTAL,                               \
           "Use PR_RISCV_CTX_SW_FENCEI_ON to avoid explicit icache flush")
 
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index a1d806a17b3..b00b4474d69 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -721,7 +721,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 {
   assert(lock_reg == c_rarg1, "The argument is only for looks. It must be c_rarg1");
   if (LockingMode == LM_MONITOR) {
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
   } else {
@@ -752,7 +752,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
-      j(count);
+      j(done);
     } else if (LockingMode == LM_LEGACY) {
       // Load (object->mark() | 1) into swap_reg
       ld(t0, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
@@ -781,19 +781,19 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
       // Save the test result, for recursive case, the result is zero
       sd(swap_reg, Address(lock_reg, mark_offset));
-      beqz(swap_reg, count);
+      bnez(swap_reg, slow_case);
+
+      bind(count);
+      inc_held_monitor_count(t0);
+      j(done);
     }
 
     bind(slow_case);
 
     // Call the runtime routine for slow case
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
-    j(done);
-
-    bind(count);
-    increment(Address(xthread, JavaThread::held_monitor_count_offset()));
 
     bind(done);
   }
@@ -839,12 +839,10 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
     // Free entry
     sd(zr, Address(lock_reg, BasicObjectLock::obj_offset()));
 
+    Label slow_case;
     if (LockingMode == LM_LIGHTWEIGHT) {
-      Label slow_case;
       lightweight_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
-      j(count);
-
-      bind(slow_case);
+      j(done);
     } else if (LockingMode == LM_LEGACY) {
       // Load the old header from BasicLock structure
       ld(header_reg, Address(swap_reg,
@@ -854,20 +852,19 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
       beqz(header_reg, count);
 
       // Atomic swap back the old header
-      cmpxchg_obj_header(swap_reg, header_reg, obj_reg, tmp_reg, count, /*fallthrough*/nullptr);
+      cmpxchg_obj_header(swap_reg, header_reg, obj_reg, tmp_reg, count, &slow_case);
+
+      bind(count);
+      dec_held_monitor_count(t0);
+      j(done);
     }
 
+    bind(slow_case);
     // Call the runtime routine for slow case.
     sd(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset())); // restore obj
     call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), lock_reg);
 
-    j(done);
-
-    bind(count);
-    decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
-
     bind(done);
-
     restore_bcp();
   }
 }
@@ -1575,6 +1572,55 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
   restore_locals();
 }
 
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                                    address entry_point,
+                                                    Register arg_1) {
+  assert(arg_1 == c_rarg1, "");
+  Label resume_pc, not_preempted;
+
+#ifdef ASSERT
+  {
+    Label L;
+    ld(t0, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+    beqz(t0, L);
+    stop("Should not have alternate return address set");
+    bind(L);
+  }
+#endif /* ASSERT */
+
+  // Force freeze slow path.
+  push_cont_fastpath();
+
+  // Make VM call. In case of preemption set last_pc to the one we want to resume to.
+  la(t0, resume_pc);
+  sd(t0, Address(xthread, JavaThread::last_Java_pc_offset()));
+  call_VM_base(oop_result, noreg, noreg, entry_point, 1, false /*check_exceptions*/);
+
+  pop_cont_fastpath();
+
+  // Check if preempted.
+  ld(t1, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+  beqz(t1, not_preempted);
+  sd(zr, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+  jr(t1);
+
+  // In case of preemption, this is where we will resume once we finally acquire the monitor.
+  bind(resume_pc);
+  restore_after_resume(false /* is_native */);
+
+  bind(not_preempted);
+}
+
+void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
+  la(t1, ExternalAddress(Interpreter::cont_resume_interpreter_adapter()));
+  jalr(t1);
+  if (is_native) {
+    // On resume we need to set up stack as expected
+    push(dtos);
+    push(ltos);
+  }
+}
+
 void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr, Register tmp) {
   assert_different_registers(obj, tmp, t0, mdo_addr.base());
   Label update, next, none;
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index d3959d68d9c..ddc0a94a6e4 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -59,6 +59,11 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1);
+  void restore_after_resume(bool is_native);
+
   void jump_to_entry(address entry);
 
   virtual void check_and_handle_popframe(Register java_thread);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 1e7a3f65e8e..ac0445e5e4e 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -36,6 +36,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/accessDecorators.hpp"
@@ -226,6 +227,36 @@ void MacroAssembler::pop_cont_fastpath(Register java_thread) {
   bind(done);
 }
 
+void MacroAssembler::inc_held_monitor_count(Register tmp) {
+  Address dst(xthread, JavaThread::held_monitor_count_offset());
+  ld(tmp, dst);
+  addi(tmp, tmp, 1);
+  sd(tmp, dst);
+#ifdef ASSERT
+  Label ok;
+  test_bit(tmp, tmp, 63);
+  beqz(tmp, ok);
+  STOP("assert(held monitor count overflow)");
+  should_not_reach_here();
+  bind(ok);
+#endif
+}
+
+void MacroAssembler::dec_held_monitor_count(Register tmp) {
+  Address dst(xthread, JavaThread::held_monitor_count_offset());
+  ld(tmp, dst);
+  addi(tmp, tmp, -1);
+  sd(tmp, dst);
+#ifdef ASSERT
+  Label ok;
+  test_bit(tmp, tmp, 63);
+  beqz(tmp, ok);
+  STOP("assert(held monitor count underflow)");
+  should_not_reach_here();
+  bind(ok);
+#endif
+}
+
 int MacroAssembler::align(int modulus, int extra_offset) {
   CompressibleRegion cr(this);
   intptr_t before = offset();
@@ -407,6 +438,10 @@ void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
   sd(zr, Address(xthread, JavaThread::last_Java_pc_offset()));
 }
 
+static bool is_preemptable(address entry_point) {
+  return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter);
+}
+
 void MacroAssembler::call_VM_base(Register oop_result,
                                   Register java_thread,
                                   Register last_java_sp,
@@ -436,7 +471,12 @@ void MacroAssembler::call_VM_base(Register oop_result,
   assert(last_java_sp != fp, "can't use fp");
 
   Label l;
-  set_last_Java_frame(last_java_sp, fp, l, t0);
+  if (is_preemptable(entry_point)) {
+    // skip setting last_pc since we already set it to desired value.
+    set_last_Java_frame(last_java_sp, fp, noreg);
+  } else {
+    set_last_Java_frame(last_java_sp, fp, l, t0);
+  }
 
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
@@ -927,26 +967,6 @@ void MacroAssembler::li(Register Rd, int64_t imm) {
   }
 }
 
-void MacroAssembler::load_link_jump(const address source, Register temp) {
-  assert(temp != noreg && temp != x0, "expecting a register");
-  assert(temp != x5, "temp register must not be x5.");
-  assert_cond(source != nullptr);
-  int64_t distance = source - pc();
-  assert(is_simm32(distance), "Must be");
-  auipc(temp, (int32_t)distance + 0x800);
-  ld(temp, Address(temp, ((int32_t)distance << 20) >> 20));
-  jalr(temp);
-}
-
-void MacroAssembler::jump_link(const address dest, Register temp) {
-  assert(UseTrampolines, "Must be");
-  assert_cond(dest != nullptr);
-  int64_t distance = dest - pc();
-  assert(is_simm21(distance), "Must be");
-  assert((distance % 2) == 0, "Must be");
-  jal(x1, distance);
-}
-
 void MacroAssembler::j(const address dest, Register temp) {
   assert(CodeCache::contains(dest), "Must be");
   assert_cond(dest != nullptr);
@@ -2503,20 +2523,19 @@ void MacroAssembler::orptr(Address adr, RegisterOrConstant src, Register tmp1, R
   sd(tmp1, adr);
 }
 
-void MacroAssembler::cmp_klass(Register oop, Register trial_klass, Register tmp1, Register tmp2, Label &L) {
-  assert_different_registers(oop, trial_klass, tmp1, tmp2);
-  if (UseCompressedClassPointers) {
-    lwu(tmp1, Address(oop, oopDesc::klass_offset_in_bytes()));
-    if (CompressedKlassPointers::base() == nullptr) {
-      slli(tmp1, tmp1, CompressedKlassPointers::shift());
-      beq(trial_klass, tmp1, L);
-      return;
-    }
-    decode_klass_not_null(tmp1, tmp2);
+void MacroAssembler::cmp_klass_compressed(Register oop, Register trial_klass, Register tmp, Label &L, bool equal) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(tmp, oop);
+  } else if (UseCompressedClassPointers) {
+    lwu(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
   } else {
-    ld(tmp1, Address(oop, oopDesc::klass_offset_in_bytes()));
+    ld(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
+  }
+  if (equal) {
+    beq(trial_klass, tmp, L);
+  } else {
+    bne(trial_klass, tmp, L);
   }
-  beq(trial_klass, tmp1, L);
 }
 
 // Move an oop into a register.
@@ -2722,10 +2741,19 @@ void MacroAssembler::encode_heap_oop_not_null(Register dst, Register src) {
   }
 }
 
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
+  assert(UseCompactObjectHeaders, "expects UseCompactObjectHeaders");
+  ld(dst, Address(src, oopDesc::mark_offset_in_bytes()));
+  srli(dst, dst, markWord::klass_shift);
+}
+
 void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
   assert_different_registers(dst, tmp);
   assert_different_registers(src, tmp);
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(dst, src);
+    decode_klass_not_null(dst, tmp);
+  } else if (UseCompressedClassPointers) {
     lwu(dst, Address(src, oopDesc::klass_offset_in_bytes()));
     decode_klass_not_null(dst, tmp);
   } else {
@@ -2736,6 +2764,7 @@ void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
 void MacroAssembler::store_klass(Register dst, Register src, Register tmp) {
   // FIXME: Should this be a store release? concurrent gcs assumes
   // klass length is valid if klass field is not null.
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     encode_klass_not_null(src, tmp);
     sw(src, Address(dst, oopDesc::klass_offset_in_bytes()));
@@ -2745,6 +2774,7 @@ void MacroAssembler::store_klass(Register dst, Register src, Register tmp) {
 }
 
 void MacroAssembler::store_klass_gap(Register dst, Register src) {
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   if (UseCompressedClassPointers) {
     // Store to klass gap in destination
     sw(src, Address(dst, oopDesc::klass_gap_offset_in_bytes()));
@@ -2761,8 +2791,7 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src, Register
 
   if (CompressedKlassPointers::base() == nullptr) {
     if (CompressedKlassPointers::shift() != 0) {
-      assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-      slli(dst, src, LogKlassAlignmentInBytes);
+      slli(dst, src, CompressedKlassPointers::shift());
     } else {
       mv(dst, src);
     }
@@ -2778,9 +2807,9 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src, Register
   mv(xbase, (uintptr_t)CompressedKlassPointers::base());
 
   if (CompressedKlassPointers::shift() != 0) {
-    assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-    assert_different_registers(t0, xbase);
-    shadd(dst, src, xbase, t0, LogKlassAlignmentInBytes);
+    Register t = src == dst ? dst : t0;
+    assert_different_registers(t, xbase);
+    shadd(dst, src, xbase, t, CompressedKlassPointers::shift());
   } else {
     add(dst, xbase, src);
   }
@@ -2796,8 +2825,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src, Register
 
   if (CompressedKlassPointers::base() == nullptr) {
     if (CompressedKlassPointers::shift() != 0) {
-      assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-      srli(dst, src, LogKlassAlignmentInBytes);
+      srli(dst, src, CompressedKlassPointers::shift());
     } else {
       mv(dst, src);
     }
@@ -2819,8 +2847,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src, Register
   mv(xbase, (uintptr_t)CompressedKlassPointers::base());
   sub(dst, src, xbase);
   if (CompressedKlassPointers::shift() != 0) {
-    assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-    srli(dst, dst, LogKlassAlignmentInBytes);
+    srli(dst, dst, CompressedKlassPointers::shift());
   }
 }
 
@@ -4235,9 +4262,7 @@ void  MacroAssembler::set_narrow_klass(Register dst, Klass* k) {
   zero_extend(dst, dst, 32);
 }
 
-// Maybe emit a call via a trampoline. If the code cache is small
-// trampolines won't be emitted.
-address MacroAssembler::trampoline_call(Address entry) {
+address MacroAssembler::reloc_call(Address entry, Register tmp) {
   assert(entry.rspec().type() == relocInfo::runtime_call_type ||
          entry.rspec().type() == relocInfo::opt_virtual_call_type ||
          entry.rspec().type() == relocInfo::static_call_type ||
@@ -4245,45 +4270,8 @@ address MacroAssembler::trampoline_call(Address entry) {
 
   address target = entry.target();
 
-  // We need a trampoline if branches are far.
   if (!in_scratch_emit_size()) {
-    if (entry.rspec().type() == relocInfo::runtime_call_type) {
-      assert(CodeBuffer::supports_shared_stubs(), "must support shared stubs");
-      code()->share_trampoline_for(entry.target(), offset());
-    } else {
-      address stub = emit_trampoline_stub(offset(), target);
-      if (stub == nullptr) {
-        postcond(pc() == badAddress);
-        return nullptr; // CodeCache is full
-      }
-    }
-  }
-  target = pc();
-
-  address call_pc = pc();
-#ifdef ASSERT
-  if (entry.rspec().type() != relocInfo::runtime_call_type) {
-    assert_alignment(call_pc);
-  }
-#endif
-  relocate(entry.rspec(), [&] {
-    jump_link(target, t0);
-  });
-
-  postcond(pc() != badAddress);
-  return call_pc;
-}
-
-address MacroAssembler::load_and_call(Address entry) {
-  assert(entry.rspec().type() == relocInfo::runtime_call_type ||
-         entry.rspec().type() == relocInfo::opt_virtual_call_type ||
-         entry.rspec().type() == relocInfo::static_call_type ||
-         entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type");
-
-  address target = entry.target();
-
-  if (!in_scratch_emit_size()) {
-    address stub = emit_address_stub(offset(), target);
+    address stub = emit_reloc_call_address_stub(offset(), target);
     if (stub == nullptr) {
       postcond(pc() == badAddress);
       return nullptr; // CodeCache is full
@@ -4296,8 +4284,13 @@ address MacroAssembler::load_and_call(Address entry) {
     assert_alignment(call_pc);
   }
 #endif
+
+  // The relocation created while emitting the stub will ensure this
+  // call instruction is subsequently patched to call the stub.
   relocate(entry.rspec(), [&] {
-    load_link_jump(target, t1);
+    auipc(tmp, 0);
+    ld(tmp, Address(tmp, 0));
+    jalr(tmp);
   });
 
   postcond(pc() != badAddress);
@@ -4315,7 +4308,7 @@ address MacroAssembler::ic_call(address entry, jint method_index) {
 int MacroAssembler::ic_check_size() {
   // No compressed
   return (MacroAssembler::instruction_size * (2 /* 2 loads */ + 1 /* branch */)) +
-          far_branch_size();
+          far_branch_size() + (UseCompactObjectHeaders ? MacroAssembler::instruction_size * 1 : 0);
 }
 
 int MacroAssembler::ic_check(int end_alignment) {
@@ -4335,7 +4328,10 @@ int MacroAssembler::ic_check(int end_alignment) {
   align(end_alignment, ic_check_size());
   int uep_offset = offset();
 
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(tmp1, receiver);
+    lwu(tmp2, Address(data, CompiledICData::speculated_klass_offset()));
+  } else if (UseCompressedClassPointers) {
     lwu(tmp1, Address(receiver, oopDesc::klass_offset_in_bytes()));
     lwu(tmp2, Address(data, CompiledICData::speculated_klass_offset()));
   } else {
@@ -4354,95 +4350,50 @@ int MacroAssembler::ic_check(int end_alignment) {
   return uep_offset;
 }
 
-address MacroAssembler::emit_address_stub(int insts_call_instruction_offset, address dest) {
-  address stub = start_a_stub(max_reloc_call_stub_size());
-  if (stub == nullptr) {
-    return nullptr;  // CodeBuffer::expand failed
-  }
-
-  // We are always 4-byte aligned here.
-  assert_alignment(pc());
-
-  // Make sure the address of destination 8-byte aligned.
-  align(wordSize, 0);
-
-  RelocationHolder rh = trampoline_stub_Relocation::spec(code()->insts()->start() +
-                                                         insts_call_instruction_offset);
-  const int stub_start_offset = offset();
-  relocate(rh, [&] {
-    assert(offset() - stub_start_offset == 0,
-           "%ld - %ld == %ld : should be", (long)offset(), (long)stub_start_offset, (long)0);
-    assert(offset() % wordSize == 0, "bad alignment");
-    emit_int64((int64_t)dest);
-  });
-
-  const address stub_start_addr = addr_at(stub_start_offset);
-  end_a_stub();
-
-  return stub_start_addr;
-}
-
-// Emit a trampoline stub for a call to a target which is too far away.
+// Emit an address stub for a call to a target which is too far away.
+// Note that we only put the target address of the call in the stub.
 //
 // code sequences:
 //
 // call-site:
-//   branch-and-link to <destination> or <trampoline stub>
+//   load target address from stub
+//   jump-and-link target address
 //
-// Related trampoline stub for this call site in the stub section:
-//   load the call target from the constant pool
-//   branch (RA still points to the call site above)
-
-address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
-                                             address dest) {
-  // Max stub size: alignment nop, TrampolineStub.
-  address stub = start_a_stub(max_reloc_call_stub_size());
+// Related address stub for this call site in the stub section:
+//   alignment nop
+//   target address
+
+address MacroAssembler::emit_reloc_call_address_stub(int insts_call_instruction_offset, address dest) {
+  address stub = start_a_stub(max_reloc_call_address_stub_size());
   if (stub == nullptr) {
     return nullptr;  // CodeBuffer::expand failed
   }
 
-  assert(UseTrampolines, "Must be using trampos.");
-
   // We are always 4-byte aligned here.
   assert_alignment(pc());
 
-  // Create a trampoline stub relocation which relates this trampoline stub
-  // with the call instruction at insts_call_instruction_offset in the
-  // instructions code-section.
-
-  // Make sure the address of destination 8-byte aligned after 3 instructions.
-  align(wordSize, MacroAssembler::NativeShortCall::trampoline_data_offset);
+  // Make sure the address of destination 8-byte aligned.
+  align(wordSize, 0);
 
   RelocationHolder rh = trampoline_stub_Relocation::spec(code()->insts()->start() +
                                                          insts_call_instruction_offset);
   const int stub_start_offset = offset();
   relocate(rh, [&] {
-    // Now, create the trampoline stub's code:
-    // - load the call
-    // - call
-    Label target;
-    ld(t1, target);  // auipc + ld
-    jr(t1);          // jalr
-    bind(target);
-    assert(offset() - stub_start_offset == MacroAssembler::NativeShortCall::trampoline_data_offset,
-           "should be");
+    assert(offset() - stub_start_offset == 0,
+           "%ld - %ld == %ld : should be", (long)offset(), (long)stub_start_offset, (long)0);
     assert(offset() % wordSize == 0, "bad alignment");
     emit_int64((int64_t)dest);
   });
 
   const address stub_start_addr = addr_at(stub_start_offset);
-
   end_a_stub();
 
   return stub_start_addr;
 }
 
-int MacroAssembler::max_reloc_call_stub_size() {
-  // Max stub size: alignment nop, TrampolineStub.
-  if (UseTrampolines) {
-    return instruction_size + MacroAssembler::NativeShortCall::trampoline_size;
-  }
-  return instruction_size + wordSize;
+int MacroAssembler::max_reloc_call_address_stub_size() {
+  // Max stub size: alignment nop, target address.
+  return 1 * instruction_size + wordSize;
 }
 
 int MacroAssembler::static_call_stub_size() {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 8fca6357627..dc06708b0ff 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -195,8 +195,9 @@ class MacroAssembler: public Assembler {
   void access_store_at(BasicType type, DecoratorSet decorators, Address dst,
                        Register val, Register tmp1, Register tmp2, Register tmp3);
   void load_klass(Register dst, Register src, Register tmp = t0);
+  void load_narrow_klass_compact(Register dst, Register src);
   void store_klass(Register dst, Register src, Register tmp = t0);
-  void cmp_klass(Register oop, Register trial_klass, Register tmp1, Register tmp2, Label &L);
+  void cmp_klass_compressed(Register oop, Register trial_klass, Register tmp, Label &L, bool equal);
 
   void encode_klass_not_null(Register r, Register tmp = t0);
   void decode_klass_not_null(Register r, Register tmp = t0);
@@ -468,9 +469,8 @@ class MacroAssembler: public Assembler {
     return false;
   }
 
-  address emit_address_stub(int insts_call_instruction_offset, address target);
-  address emit_trampoline_stub(int insts_call_instruction_offset, address target);
-  static int max_reloc_call_stub_size();
+  address emit_reloc_call_address_stub(int insts_call_instruction_offset, address target);
+  static int max_reloc_call_address_stub_size();
 
   void emit_static_call_stub();
   static int static_call_stub_size();
@@ -626,9 +626,6 @@ class MacroAssembler: public Assembler {
   void bltz(Register Rs, const address dest);
   void bgtz(Register Rs, const address dest);
 
- private:
-  void load_link_jump(const address source, Register temp);
-  void jump_link(const address dest, Register temp);
  public:
   // We try to follow risc-v asm menomics.
   // But as we don't layout a reachable GOT,
@@ -811,8 +808,11 @@ class MacroAssembler: public Assembler {
   void push_CPU_state(bool save_vectors = false, int vector_size_in_bytes = 0);
   void pop_CPU_state(bool restore_vectors = false, int vector_size_in_bytes = 0);
 
-  void push_cont_fastpath(Register java_thread);
-  void pop_cont_fastpath(Register java_thread);
+  void push_cont_fastpath(Register java_thread = xthread);
+  void pop_cont_fastpath(Register java_thread = xthread);
+
+  void inc_held_monitor_count(Register tmp);
+  void dec_held_monitor_count(Register tmp);
 
   // if heap base register is used - reinit it with the correct value
   void reinit_heapbase();
@@ -1227,92 +1227,50 @@ class MacroAssembler: public Assembler {
   void get_polling_page(Register dest, relocInfo::relocType rtype);
   void read_polling_page(Register r, int32_t offset, relocInfo::relocType rtype);
 
-  // RISCV64 OpenJDK uses four different types of calls:
-  //   - direct call: jal pc_relative_offset
-  //     This is the shortest and the fastest, but the offset has the range: +/-1MB.
+  // RISCV64 OpenJDK uses three different types of calls:
   //
   //   - far call: auipc reg, pc_relative_offset; jalr ra, reg, offset
-  //     This is longer than a direct call. The offset has
-  //     the range [-(2G + 2K), 2G - 2K). Addresses out of the range in the code cache
-  //     requires indirect call.
-  //     If a jump is needed rather than a call, a far jump 'jalr x0, reg, offset' can
-  //     be used instead.
+  //     The offset has the range [-(2G + 2K), 2G - 2K). Addresses out of the
+  //     range in the code cache requires indirect call.
+  //     If a jump is needed rather than a call, a far jump 'jalr x0, reg, offset'
+  //     can be used instead.
   //     All instructions are embedded at a call site.
   //
   //   - indirect call: movptr + jalr
-  //     This too can reach anywhere in the address space, but it cannot be
-  //     patched while code is running, so it must only be modified at a safepoint.
-  //     This form of call is most suitable for targets at fixed addresses, which
-  //     will never be patched.
+  //     This can reach anywhere in the address space, but it cannot be patched
+  //     while code is running, so it must only be modified at a safepoint.
+  //     This form of call is most suitable for targets at fixed addresses,
+  //     which will never be patched.
   //
   //   - reloc call:
-  //     This is only available in C1/C2-generated code (nmethod).
+  //     This too can reach anywhere in the address space but is only available
+  //     in C1/C2-generated code (nmethod).
   //
   //     [Main code section]
   //       auipc
   //       ld <address_from_stub_section>
   //       jalr
+  //
   //     [Stub section]
-  //     trampoline:
+  //     address stub:
   //       <64-bit destination address>
   //
   //    To change the destination we simply atomically store the new
   //    address in the stub section.
-  //
-  // - trampoline call (old reloc call / -XX:+UseTrampolines):
-  //     This is only available in C1/C2-generated code (nmethod). It is a combination
-  //     of a direct call, which is used if the destination of a call is in range,
-  //     and a register-indirect call. It has the advantages of reaching anywhere in
-  //     the RISCV address space and being patchable at runtime when the generated
-  //     code is being executed by other threads.
-  //
-  //     [Main code section]
-  //       jal trampoline
-  //     [Stub code section]
-  //     trampoline:
-  //       ld    reg, pc + 8 (auipc + ld)
-  //       jr    reg
-  //       <64-bit destination address>
-  //
-  //     If the destination is in range when the generated code is moved to the code
-  //     cache, 'jal trampoline' is replaced with 'jal destination' and the trampoline
-  //     is not used.
-  //     The optimization does not remove the trampoline from the stub section.
-  //
-  //     This is necessary because the trampoline may well be redirected later when
-  //     code is patched, and the new destination may not be reachable by a simple JAL
-  //     instruction.
-  //
-  // To patch a trampoline call when the JAL can't reach, we first modify
-  // the 64-bit destination address in the trampoline, then modify the
-  // JAL to point to the trampoline, then flush the instruction cache to
-  // broadcast the change to all executing threads. See
-  // NativeCall::set_destination_mt_safe for the details.
-  //
-  // There is a benign race in that the other thread might observe the
-  // modified JAL before it observes the modified 64-bit destination
-  // address. That does not matter because the destination method has been
-  // invalidated, so there will be a trap at its start.
-  // For this to work, the destination address in the trampoline is
-  // always updated, even if we're not using the trampoline.
-  // --
-
-  // Emit a direct call if the entry address will always be in range,
-  // otherwise a reloc call.
+  //    There is a benign race in that the other thread might observe the old
+  //    64-bit destination address before it observes the new address. That does
+  //    not matter because the destination method has been invalidated, so there
+  //    will be a trap at its start.
+
+  // Emit a reloc call and create a stub to hold the entry point address.
   // Supported entry.rspec():
   // - relocInfo::runtime_call_type
   // - relocInfo::opt_virtual_call_type
   // - relocInfo::static_call_type
   // - relocInfo::virtual_call_type
   //
-  // Return: the call PC or null if CodeCache is full.
-  address reloc_call(Address entry) {
-    return UseTrampolines ? trampoline_call(entry) : load_and_call(entry);
-  }
- private:
-  address trampoline_call(Address entry);
-  address load_and_call(Address entry);
- public:
+  // Return: the call PC or nullptr if CodeCache is full.
+  address reloc_call(Address entry, Register tmp = t1);
 
   address ic_call(address entry, jint method_index = 0);
   static int ic_check_size();
@@ -1636,11 +1594,6 @@ class MacroAssembler: public Assembler {
     load_pc_relative_instruction_size = 2 * instruction_size // auipc, ld
   };
 
-  enum NativeShortCall {
-    trampoline_size        = 3 * instruction_size + wordSize,
-    trampoline_data_offset = 3 * instruction_size
-  };
-
   static bool is_load_pc_relative_at(address branch);
   static bool is_li16u_at(address instr);
 
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index 988a5b79332..3a273fdb3ed 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -46,264 +46,10 @@ bool NativeInstruction::is_call_at(address addr) {
   return NativeCall::is_at(addr);
 }
 
-//-----------------------------------------------------------------------------
-// NativeShortCallTrampoline
-//
-// Implements the trampoline part of reloc call - trampoline call.
-
-class NativeShortCall;
-
-class NativeShortCallTrampolineStub : public NativeInstruction {
- private:
-  friend NativeShortCall;
-  enum RISCV_specific_constants {
-    trampoline_data_offset = 3 * NativeInstruction::instruction_size // auipc + ld + jr
-  };
-
-  address destination() const;
-  void set_destination(address new_destination);
-
-  static bool is_at(address addr);
-  static NativeShortCallTrampolineStub* at(address addr);
-};
-
-address NativeShortCallTrampolineStub::destination() const {
-  return ptr_at(trampoline_data_offset);
-}
-
-void NativeShortCallTrampolineStub::set_destination(address new_destination) {
-  set_ptr_at(trampoline_data_offset, new_destination);
-  OrderAccess::release();
-}
-
-bool NativeShortCallTrampolineStub::is_at(address addr) {
-  // Ensure that the stub is exactly
-  //      ld   t0, L--->auipc + ld
-  //      jr   t0
-  // L:
-
-  // judge inst + register + imm
-  // 1). check the instructions: auipc + ld + jalr
-  // 2). check if auipc[11:7] == t0 and ld[11:7] == t0 and ld[19:15] == t0 && jr[19:15] == t0
-  // 3). check if the offset in ld[31:20] equals the data_offset
-  assert_cond(addr != nullptr);
-  const int instr_size = NativeInstruction::instruction_size;
-  if (MacroAssembler::is_auipc_at(addr) &&
-      MacroAssembler::is_ld_at(addr + instr_size) &&
-      MacroAssembler::is_jalr_at(addr + 2 * instr_size) &&
-      (MacroAssembler::extract_rd(addr)                    == x6) &&
-      (MacroAssembler::extract_rd(addr + instr_size)       == x6) &&
-      (MacroAssembler::extract_rs1(addr + instr_size)      == x6) &&
-      (MacroAssembler::extract_rs1(addr + 2 * instr_size)  == x6) &&
-      (Assembler::extract(Assembler::ld_instr(addr + 4), 31, 20) == trampoline_data_offset)) {
-    return true;
-  }
-  return false;
-}
-
-NativeShortCallTrampolineStub* NativeShortCallTrampolineStub::at(address addr) {
-  assert_cond(addr != nullptr);
-  assert(NativeShortCallTrampolineStub::is_at(addr), "no call trampoline found");
-  return (NativeShortCallTrampolineStub*)addr;
-}
-
-//-----------------------------------------------------------------------------
-// NativeShortCall
-//
-// Implements the trampoline call, a short call with a trampoline, version of reloc call.
-// Enabled by setting the experimental UseTrampolines to true.
-
-class NativeShortCall: private NativeInstruction {
- public:
-  enum RISCV_specific_constants {
-    return_address_offset       =    1 * NativeInstruction::instruction_size // jal
-  };
-
-  address instruction_address() const       { return addr_at(0); }
-  address next_instruction_address() const  { return addr_at(return_address_offset); }
-  address return_address() const            { return addr_at(return_address_offset); }
-  address destination() const;
-  address reloc_destination(address orig_address);
-
-  void set_destination(address dest);
-  void verify();
-  void print();
-
-  bool set_destination_mt_safe(address dest, bool assert_lock = true);
-  bool reloc_set_destination(address dest);
-
- private:
-  address get_trampoline();
-  bool has_trampoline();
-  address trampoline_destination();
- public:
-
-  static NativeShortCall* at(address addr);
-  static bool is_at(address addr);
-  static bool is_call_before(address return_address);
-};
-
-address NativeShortCall::destination() const {
-  address addr = instruction_address();
-  assert(MacroAssembler::is_jal_at(instruction_address()), "inst must be jal.");
-
-  address destination = MacroAssembler::target_addr_for_insn(instruction_address());
-
-  // Do we use a trampoline stub for this call?
-  CodeBlob* cb = CodeCache::find_blob(addr);
-  assert(cb && cb->is_nmethod(), "sanity");
-  nmethod *nm = (nmethod *)cb;
-  if (nm != nullptr && nm->stub_contains(destination) && NativeShortCallTrampolineStub::is_at(destination)) {
-    // Yes we do, so get the destination from the trampoline stub.
-    const address trampoline_stub_addr = destination;
-    destination = NativeShortCallTrampolineStub::at(trampoline_stub_addr)->destination();
-  }
-
-  return destination;
-}
-
-address NativeShortCall::reloc_destination(address orig_address) {
-  address addr = instruction_address();
-  if (NativeShortCall::is_at(addr)) {
-    NativeShortCall* call = NativeShortCall::at(addr);
-    if (call->has_trampoline()) {
-      return call->trampoline_destination();
-    }
-  }
-  if (orig_address != nullptr) {
-    // the extracted address from the instructions in address orig_addr
-    address new_addr = MacroAssembler::pd_call_destination(orig_address);
-    // If call is branch to self, don't try to relocate it, just leave it
-    // as branch to self. This happens during code generation if the code
-    // buffer expands. It will be relocated to the trampoline above once
-    // code generation is complete.
-    new_addr = (new_addr == orig_address) ? addr : new_addr;
-    return new_addr;
-  }
-  return MacroAssembler::pd_call_destination(addr);
-}
-
-void NativeShortCall::set_destination(address dest) {
-  assert(NativeShortCall::is_at(instruction_address()), "unexpected code at call site");
-  assert(is_jal(), "Should be jal instruction!");
-  intptr_t offset = (intptr_t)(dest - instruction_address());
-  assert((offset & 0x1) == 0, "bad alignment");
-  assert(Assembler::is_simm21(offset), "encoding constraint");
-  unsigned int insn = 0b1101111; // jal
-  address pInsn = (address)(&insn);
-  Assembler::patch(pInsn, 31, 31, (offset >> 20) & 0x1);
-  Assembler::patch(pInsn, 30, 21, (offset >> 1) & 0x3ff);
-  Assembler::patch(pInsn, 20, 20, (offset >> 11) & 0x1);
-  Assembler::patch(pInsn, 19, 12, (offset >> 12) & 0xff);
-  Assembler::patch(pInsn, 11, 7, ra->encoding()); // Rd must be x1, need ra
-  set_int_at(0, insn);
-}
-
-void NativeShortCall::verify() {
-  assert(NativeShortCall::is_at(instruction_address()),
-         "unexpected code at call site: %p", instruction_address());
-}
-
-void NativeShortCall::print() {
-  assert(NativeShortCall::is_at(instruction_address()), "unexpected code at call site");
-  tty->print_cr(PTR_FORMAT ": jal/auipc,ld,jalr x1, offset/reg", p2i(instruction_address()));
-}
-
-// The important thing is that threads are able to execute this
-// call instruction at all times. (cmodx)
-//
-// Used in the runtime linkage of calls; see class CompiledIC.
-//
-// Add parameter assert_lock to switch off assertion
-// during code generation, where no lock is needed.
-bool NativeShortCall::set_destination_mt_safe(address dest, bool assert_lock) {
-  assert(!assert_lock ||
-         (CodeCache_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
-         CompiledICLocker::is_safe(instruction_address()),
-         "concurrent code patching");
-
-  address call_addr = instruction_address();
-  assert(NativeCall::is_at(call_addr), "unexpected code at call site");
-
-  reloc_set_destination(dest);
-
-  ICache::invalidate_range(call_addr, instruction_size);
-  return true;
-}
-
-bool NativeShortCall::reloc_set_destination(address dest) {
-  address call_addr = instruction_address();
-  assert(NativeCall::is_at(call_addr), "unexpected code at call site");
-
-  // Patch the constant in the call's trampoline stub.
-  address trampoline_stub_addr = get_trampoline();
-  if (trampoline_stub_addr != nullptr) {
-    assert(!NativeShortCallTrampolineStub::is_at(dest), "chained trampolines");
-    NativeShortCallTrampolineStub::at(trampoline_stub_addr)->set_destination(dest);
-  }
-
-  // Patch the call.
-  if (Assembler::reachable_from_branch_at(call_addr, dest)) {
-    set_destination(dest);
-  } else {
-    assert (trampoline_stub_addr != nullptr, "we need a trampoline");
-    set_destination(trampoline_stub_addr);
-  }
-
-  return true;
-}
-
-address NativeShortCall::get_trampoline() {
-  address call_addr = instruction_address();
-
-  CodeBlob *code = CodeCache::find_blob(call_addr);
-  assert(code != nullptr, "Could not find the containing code blob");
-
-  address jal_destination = MacroAssembler::pd_call_destination(call_addr);
-  if (code != nullptr && code->contains(jal_destination) && NativeShortCallTrampolineStub::is_at(jal_destination)) {
-    return jal_destination;
-  }
-
-  if (code != nullptr && code->is_nmethod()) {
-    return trampoline_stub_Relocation::get_trampoline_for(call_addr, (nmethod*)code);
-  }
-
-  return nullptr;
-}
-
-bool NativeShortCall::has_trampoline() {
-  return NativeShortCall::get_trampoline() != nullptr;
-}
-
-address NativeShortCall::trampoline_destination() {
-  return NativeShortCallTrampolineStub::at(get_trampoline())->destination();
-}
-
-NativeShortCall* NativeShortCall::at(address addr) {
-  assert_cond(addr != nullptr);
-  assert(NativeShortCall::is_at(addr), "unexpected code at call site: %p", addr);
-  NativeShortCall* call = (NativeShortCall*)(addr);
-  return call;
-}
-
-bool NativeShortCall::is_at(address addr) {
-  if (MacroAssembler::is_jal_at(addr)) {
-    if (MacroAssembler::extract_rd(addr)  == x1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool NativeShortCall::is_call_before(address return_address) {
-  return NativeShortCall::is_at(return_address - instruction_size);
-}
-
 //-----------------------------------------------------------------------------
 // NativeFarCall
 //
 // Implements direct far calling loading an address from the stub section version of reloc call.
-// This is the default (experimental flag UseTrampolines, default false).
 
 class NativeFarCall: public NativeInstruction {
  public:
@@ -478,99 +224,51 @@ bool NativeFarCall::is_call_before(address return_address) {
 // NativeCall
 
 address NativeCall::instruction_address() const {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->instruction_address();
-  } else {
-    return NativeFarCall::at(addr_at(0))->instruction_address();
-  }
+  return NativeFarCall::at(addr_at(0))->instruction_address();
 }
 
 address NativeCall::next_instruction_address() const {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->next_instruction_address();
-  } else {
-    return NativeFarCall::at(addr_at(0))->next_instruction_address();
-  }
+  return NativeFarCall::at(addr_at(0))->next_instruction_address();
 }
 
 address NativeCall::return_address() const {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->return_address();
-  } else {
-    return NativeFarCall::at(addr_at(0))->return_address();
-  }
+  return NativeFarCall::at(addr_at(0))->return_address();
 }
 
 address NativeCall::destination() const {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->destination();
-  } else {
-    return NativeFarCall::at(addr_at(0))->destination();
-  }
+  return NativeFarCall::at(addr_at(0))->destination();
 }
 
 address NativeCall::reloc_destination(address orig_address) {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->reloc_destination(orig_address);
-  } else {
-    return NativeFarCall::at(addr_at(0))->reloc_destination(orig_address);
-  }
+  return NativeFarCall::at(addr_at(0))->reloc_destination(orig_address);
 }
 
 void NativeCall::set_destination(address dest) {
-  if (UseTrampolines) {
-    NativeShortCall::at(addr_at(0))->set_destination(dest);
-  } else {
-    NativeFarCall::at(addr_at(0))->set_destination(dest);
-  }
+  NativeFarCall::at(addr_at(0))->set_destination(dest);
 }
 
 void NativeCall::verify() {
-  if (UseTrampolines) {
-    NativeShortCall::at(addr_at(0))->verify();
-  } else {
-    NativeFarCall::at(addr_at(0))->verify();;
-  }
+  NativeFarCall::at(addr_at(0))->verify();;
 }
 
 void NativeCall::print() {
-  if (UseTrampolines) {
-    NativeShortCall::at(addr_at(0))->print();
-  } else {
-    NativeFarCall::at(addr_at(0))->print();;
-  }
+  NativeFarCall::at(addr_at(0))->print();;
 }
 
 bool NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->set_destination_mt_safe(dest, assert_lock);
-  } else {
-    return NativeFarCall::at(addr_at(0))->set_destination_mt_safe(dest, assert_lock);
-  }
+  return NativeFarCall::at(addr_at(0))->set_destination_mt_safe(dest, assert_lock);
 }
 
 bool NativeCall::reloc_set_destination(address dest) {
-  if (UseTrampolines) {
-    return NativeShortCall::at(addr_at(0))->reloc_set_destination(dest);
-  } else {
-    return NativeFarCall::at(addr_at(0))->reloc_set_destination(dest);
-  }
+  return NativeFarCall::at(addr_at(0))->reloc_set_destination(dest);
 }
 
 bool NativeCall::is_at(address addr) {
-  if (UseTrampolines) {
-    return NativeShortCall::is_at(addr);
-  } else {
-    return NativeFarCall::is_at(addr);
-  }
+  return NativeFarCall::is_at(addr);
 }
 
 bool NativeCall::is_call_before(address return_address) {
-  if (UseTrampolines) {
-    return NativeShortCall::is_call_before(return_address);
-  } else {
-    return NativeFarCall::is_call_before(return_address);
-  }
+  return NativeFarCall::is_call_before(return_address);
 }
 
 NativeCall* nativeCall_at(address addr) {
@@ -583,11 +281,7 @@ NativeCall* nativeCall_at(address addr) {
 NativeCall* nativeCall_before(address return_address) {
   assert_cond(return_address != nullptr);
   NativeCall* call = nullptr;
-  if (UseTrampolines) {
-    call = (NativeCall*)(return_address - NativeShortCall::return_address_offset);
-  } else {
-    call = (NativeCall*)(return_address - NativeFarCall::return_address_offset);
-  }
+  call = (NativeCall*)(return_address - NativeFarCall::return_address_offset);
   DEBUG_ONLY(call->verify());
   return call;
 }
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
index 0ac3a89969a..5b276dde368 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -124,12 +124,9 @@ class NativeCall: private NativeInstruction {
  public:
 
   static int byte_size() {
-    if (UseTrampolines) {
-      return NativeInstruction::instruction_size; // jal
-    } else {
-      return 3 * NativeInstruction::instruction_size; // auipc + ld + jalr
-    }
+    return 3 * NativeInstruction::instruction_size; // auipc + ld + jalr
   }
+
   // Creation
   friend NativeCall* nativeCall_at(address addr);
   friend NativeCall* nativeCall_before(address return_address);
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 6df41722d86..b944cc5b4b9 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1238,41 +1238,27 @@ bool needs_acquiring_load_reserved(const Node *n)
 
 int MachCallStaticJavaNode::ret_addr_offset()
 {
-  if (UseTrampolines) {
-    return 1 * NativeInstruction::instruction_size; // jal
-  }
   return 3 * NativeInstruction::instruction_size; // auipc + ld + jalr
 }
 
 int MachCallDynamicJavaNode::ret_addr_offset()
 {
-  if (UseTrampolines) {
-    return NativeMovConstReg::movptr2_instruction_size +  NativeInstruction::instruction_size; // movptr2, jal
-  }
   return NativeMovConstReg::movptr2_instruction_size + (3 * NativeInstruction::instruction_size); // movptr2, auipc + ld + jal
 }
 
 int MachCallRuntimeNode::ret_addr_offset() {
-  // For generated stubs the call will be:
-  //   auipc + ld + jalr
-  // Using trampos:
-  //   jal(addr)
-  // or with far branches
-  //   jal(trampoline_stub)
-  // for real runtime callouts it will be 9 instructions
+  // For address inside the code cache the call will be:
+  //   auipc + jalr
+  // For real runtime callouts it will be 8 instructions
   // see riscv_enc_java_to_runtime
-  //   la(t0, retaddr)                ->  auipc + addi
-  //   addi(sp, sp, -2 * wordSize)    ->  addi
-  //   sd(t0, Address(sp, wordSize))  ->  sd
-  //   movptr(t1, addr, offset, t0)   ->  lui + lui + slli + add
-  //   jalr(t1, offset)               ->  jalr
+  //   la(t0, retaddr)                                             ->  auipc + addi
+  //   sd(t0, Address(xthread, JavaThread::last_Java_pc_offset())) ->  sd
+  //   movptr(t1, addr, offset, t0)                                ->  lui + lui + slli + add
+  //   jalr(t1, offset)                                            ->  jalr
   if (CodeCache::contains(_entry_point)) {
-    if (UseTrampolines) {
-      return 1 * NativeInstruction::instruction_size;
-    }
-    return 3 * NativeInstruction::instruction_size;
+    return 2 * NativeInstruction::instruction_size;
   } else {
-    return 9 * NativeInstruction::instruction_size;
+    return 8 * NativeInstruction::instruction_size;
   }
 }
 
@@ -2434,10 +2420,8 @@ encode %{
       // The NOP here is purely to ensure that eliding a call to
       // JVM_EnsureMaterializedForStackWalk doesn't change the code size.
       __ nop();
-      if (!UseTrampolines) {
-        __ nop();
-        __ nop();
-      }
+      __ nop();
+      __ nop();
       __ block_comment("call JVM_EnsureMaterializedForStackWalk (elided)");
     } else {
       int method_index = resolved_method_index(masm);
@@ -2488,31 +2472,25 @@ encode %{
   enc_class riscv_enc_java_to_runtime(method meth) %{
     Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
 
-    // some calls to generated routines (arraycopy code) are scheduled
-    // by C2 as runtime calls. if so we can call them using a jr (they
-    // will be in a reachable segment) otherwise we have to use a jalr
-    // which loads the absolute address into a register.
+    // Some calls to generated routines (arraycopy code) are scheduled by C2
+    // as runtime calls. if so we can call them using a far call (they will be
+    // in the code cache, thus in a reachable segment) otherwise we have to use
+    // a movptr+jalr pair which loads the absolute address into a register.
     address entry = (address)$meth$$method;
     if (CodeCache::contains(entry)) {
-      address call = __ reloc_call(Address(entry, relocInfo::runtime_call_type));
-      if (call == nullptr) {
-        ciEnv::current()->record_failure("CodeCache is full");
-        return;
-      }
+      __ far_call(Address(entry, relocInfo::runtime_call_type));
       __ post_call_nop();
     } else {
       Label retaddr;
+      // Make the anchor frame walkable
       __ la(t0, retaddr);
-      // Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc()
-      __ addi(sp, sp, -2 * wordSize);
-      __ sd(t0, Address(sp, wordSize));
+      __ sd(t0, Address(xthread, JavaThread::last_Java_pc_offset()));
       int32_t offset = 0;
       // No relocation needed
       __ movptr(t1, entry, offset, t0); // lui + lui + slli + add
       __ jalr(t1, offset);
       __ bind(retaddr);
       __ post_call_nop();
-      __ addi(sp, sp, 2 * wordSize);
     }
   %}
 
@@ -4790,7 +4768,7 @@ instruct loadN(iRegNNoSp dst, memory mem)
   match(Set dst (LoadN mem));
 
   ins_cost(LOAD_COST);
-  format %{ "lwu  $dst, $mem\t# loadN, compressed ptr, #@loadN" %}
+  format %{ "lwu  $dst, $mem\t# compressed ptr, #@loadN" %}
 
   ins_encode %{
     __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
@@ -4817,10 +4795,11 @@ instruct loadKlass(iRegPNoSp dst, memory mem)
 // Load Narrow Klass Pointer
 instruct loadNKlass(iRegNNoSp dst, memory mem)
 %{
+  predicate(!UseCompactObjectHeaders);
   match(Set dst (LoadNKlass mem));
 
   ins_cost(LOAD_COST);
-  format %{ "lwu  $dst, $mem\t# loadNKlass, compressed class ptr, #@loadNKlass" %}
+  format %{ "lwu  $dst, $mem\t# compressed class ptr, #@loadNKlass" %}
 
   ins_encode %{
     __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
@@ -4829,6 +4808,21 @@ instruct loadNKlass(iRegNNoSp dst, memory mem)
   ins_pipe(iload_reg_mem);
 %}
 
+instruct loadNKlassCompactHeaders(iRegNNoSp dst, memory mem)
+%{
+  predicate(UseCompactObjectHeaders);
+  match(Set dst (LoadNKlass mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "load_narrow_klass_compact $dst, $mem\t# compressed class ptr, #@loadNKlassCompactHeaders" %}
+
+  ins_encode %{
+    __ load_narrow_klass_compact_c2(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
 // Load Float
 instruct loadF(fRegF dst, memory mem)
 %{
@@ -10523,17 +10517,19 @@ instruct tlsLoadP(javaThread_RegP dst)
 
 // inlined locking and unlocking
 // using t1 as the 'flag' register to bridge the BoolNode producers and consumers
-instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box,
+                     iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3, iRegPNoSp tmp4)
 %{
   predicate(LockingMode != LM_LIGHTWEIGHT);
   match(Set cr (FastLock object box));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3);
+  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4);
 
   ins_cost(10 * DEFAULT_COST);
-  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3, #@cmpFastLock" %}
+  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3,$tmp4 #@cmpFastLock" %}
 
   ins_encode %{
-    __ fast_lock($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_lock($object$$Register, $box$$Register,
+                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
   %}
 
   ins_pipe(pipe_serial);
@@ -10556,23 +10552,26 @@ instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iR
   ins_pipe(pipe_serial);
 %}
 
-instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP box,
+                                iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3, iRegPNoSp tmp4)
 %{
   predicate(LockingMode == LM_LIGHTWEIGHT);
   match(Set cr (FastLock object box));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3);
+  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4);
 
   ins_cost(10 * DEFAULT_COST);
-  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3 #@cmpFastLockLightweight" %}
+  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3,$tmp4 #@cmpFastLockLightweight" %}
 
   ins_encode %{
-    __ fast_lock_lightweight($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_lock_lightweight($object$$Register, $box$$Register,
+                             $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
   %}
 
   ins_pipe(pipe_serial);
 %}
 
-instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box,
+                                  iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
 %{
   predicate(LockingMode == LM_LIGHTWEIGHT);
   match(Set cr (FastUnlock object box));
@@ -10582,7 +10581,8 @@ instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNo
   format %{ "fastunlock $object,$box\t! kills $tmp1,$tmp2,$tmp3 #@cmpFastUnlockLightweight" %}
 
   ins_encode %{
-    __ fast_unlock_lightweight($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_unlock_lightweight($object$$Register, $box$$Register,
+                               $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
   %}
 
   ins_pipe(pipe_serial);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 29c96112ead..5ab2a9f00b9 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1050,12 +1050,14 @@ static void gen_continuation_enter(MacroAssembler* masm,
 
   __ bind(call_thaw);
 
+  ContinuationEntry::_thaw_call_pc_offset = __ pc() - start;
   __ rt_call(CAST_FROM_FN_PTR(address, StubRoutines::cont_thaw()));
   oop_maps->add_gc_map(__ pc() - start, map->deep_copy());
   ContinuationEntry::_return_pc_offset = __ pc() - start;
   __ post_call_nop();
 
   __ bind(exit);
+  ContinuationEntry::_cleanup_offset = __ pc() - start;
   continuation_enter_cleanup(masm);
   __ leave();
   __ ret();
@@ -1149,6 +1151,10 @@ static void gen_continuation_yield(MacroAssembler* masm,
   oop_maps->add_gc_map(the_pc - start, map);
 }
 
+void SharedRuntime::continuation_enter_cleanup(MacroAssembler* masm) {
+  ::continuation_enter_cleanup(masm);
+}
+
 static void gen_special_dispatch(MacroAssembler* masm,
                                  const methodHandle& method,
                                  const BasicType* sig_bt,
@@ -1629,11 +1635,20 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   // Change state to native (we save the return address in the thread, since it might not
-  // be pushed on the stack when we do a stack traversal).
-  // We use the same pc/oopMap repeatedly when we call out
+  // be pushed on the stack when we do a stack traversal). It is enough that the pc()
+  // points into the right code segment. It does not have to be the correct return pc.
+  // We use the same pc/oopMap repeatedly when we call out.
 
   Label native_return;
-  __ set_last_Java_frame(sp, noreg, native_return, t0);
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // For convenience we use the pc we want to resume to in case of preemption on Object.wait.
+    __ set_last_Java_frame(sp, noreg, native_return, t0);
+  } else {
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
+
+    __ set_last_Java_frame(sp, noreg, __ pc(), t0);
+  }
 
   Label dtrace_method_entry, dtrace_method_entry_done;
   if (DTraceMethodProbes) {
@@ -1709,14 +1724,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // Save the test result, for recursive case, the result is zero
       __ sd(swap_reg, Address(lock_reg, mark_word_offset));
       __ bnez(swap_reg, slow_path_lock);
+
+      __ bind(count);
+      __ inc_held_monitor_count(t0);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ lightweight_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
     }
 
-    __ bind(count);
-    __ increment(Address(xthread, JavaThread::held_monitor_count_offset()));
-
     // Slow path will re-enter here
     __ bind(lock_done);
   }
@@ -1736,11 +1751,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // Clobbers t1
   __ rt_call(native_func);
 
-  __ bind(native_return);
-
-  intptr_t return_pc = (intptr_t) __ pc();
-  oop_maps->add_gc_map(return_pc - start, map);
-
   // Verify or restore cpu control state after JNI call
   __ restore_cpu_control_state_after_jni(t0);
 
@@ -1791,6 +1801,18 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   __ sw(t0, Address(t1));
   __ bind(after_transition);
 
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // Check preemption for Object.wait()
+    __ ld(t1, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+    __ beqz(t1, native_return);
+    __ sd(zr, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+    __ jr(t1);
+    __ bind(native_return);
+
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
+  }
+
   Label reguard;
   Label reguard_done;
   __ lbu(t0, Address(xthread, JavaThread::stack_guard_state_offset()));
@@ -1814,7 +1836,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // Simple recursive lock?
       __ ld(t0, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
       __ bnez(t0, not_recursive);
-      __ decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
+      __ dec_held_monitor_count(t0);
       __ j(done);
     }
 
@@ -1837,11 +1859,10 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       Label count;
       __ cmpxchg_obj_header(x10, old_hdr, obj_reg, lock_tmp, count, &slow_path_unlock);
       __ bind(count);
-      __ decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
+      __ dec_held_monitor_count(t0);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       __ lightweight_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
-      __ decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
     }
 
     // slow path re-enters here
@@ -1909,8 +1930,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ mv(c_rarg1, lock_reg);
     __ mv(c_rarg2, xthread);
 
-    // Not a leaf but we have last_Java_frame setup as we want
+    // Not a leaf but we have last_Java_frame setup as we want.
+    // We don't want to unmount in case of contention since that would complicate preserving
+    // the arguments that had already been marshalled into the native convention. So we force
+    // the freeze slow path to find this native wrapper frame (see recurse_freeze_native_frame())
+    // and pin the vthread. Otherwise the fast path won't find it since we don't walk the stack.
+    __ push_cont_fastpath();
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C), 3);
+    __ pop_cont_fastpath();
     restore_args(masm, total_c_args, c_arg, out_regs);
 
 #ifdef ASSERT
@@ -2441,6 +2468,10 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
+VMReg SharedRuntime::thread_register() {
+  return xthread->as_VMReg();
+}
+
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
diff --git a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
index e226c7b7a53..fa8a8fb47f0 100644
--- a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
@@ -114,6 +114,7 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const
   f.interpreted_frame_oop_map(&mask);
   return mask.num_oops()
         + 1 // for the mirror oop
+        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
         + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
               (intptr_t*)f.interpreter_frame_monitor_end()) / BasicObjectLock::size();
 }
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index bce0c8f1f3d..e4ae4f3cfd1 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -4040,6 +4040,36 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_cont_preempt_stub() {
+    if (!Continuations::enabled()) return nullptr;
+    StubCodeMark mark(this, "StubRoutines","Continuation preempt stub");
+    address start = __ pc();
+
+    __ reset_last_Java_frame(true);
+
+    // Set sp to enterSpecial frame, i.e. remove all frames copied into the heap.
+    __ ld(sp, Address(xthread, JavaThread::cont_entry_offset()));
+
+    Label preemption_cancelled;
+    __ lbu(t0, Address(xthread, JavaThread::preemption_cancelled_offset()));
+    __ bnez(t0, preemption_cancelled);
+
+    // Remove enterSpecial frame from the stack and return to Continuation.run() to unmount.
+    SharedRuntime::continuation_enter_cleanup(_masm);
+    __ leave();
+    __ ret();
+
+    // We acquired the monitor after freezing the frames so call thaw to continue execution.
+    __ bind(preemption_cancelled);
+    __ sb(zr, Address(xthread, JavaThread::preemption_cancelled_offset()));
+    __ la(fp, Address(sp, checked_cast<int32_t>(ContinuationEntry::size() + 2 * wordSize)));
+    __ la(t1, ExternalAddress(ContinuationEntry::thaw_call_pc_address()));
+    __ ld(t1, Address(t1));
+    __ jr(t1);
+
+    return start;
+  }
+
 #if COMPILER2_OR_JVMCI
 
 #undef __
@@ -6402,6 +6432,7 @@ static const int64_t right_3_bits = right_n_bits(3);
     StubRoutines::_cont_thaw             = generate_cont_thaw();
     StubRoutines::_cont_returnBarrier    = generate_cont_returnBarrier();
     StubRoutines::_cont_returnBarrierExc = generate_cont_returnBarrier_exception();
+    StubRoutines::_cont_preempt_stub     = generate_cont_preempt_stub();
   }
 
   void generate_final_stubs() {
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
index 46b5461d777..3d1f4a61f00 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -39,7 +39,7 @@ enum platform_dependent_constants {
   // simply increase sizes if too small (assembler will crash if too small)
   _initial_stubs_code_size      = 10000,
   _continuation_stubs_code_size =  2000,
-  _compiler_stubs_code_size     = 25000 ZGC_ONLY(+5000),
+  _compiler_stubs_code_size     = 45000,
   _final_stubs_code_size        = 20000 ZGC_ONLY(+10000)
 };
 
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 0281c66b97d..ac28f4b3514 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -539,6 +539,38 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state,
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  if (!Continuations::enabled()) return nullptr;
+  address start = __ pc();
+
+  __ restore_bcp();
+  __ restore_locals();
+
+  // Restore constant pool cache
+  __ ld(xcpool, Address(fp, frame::interpreter_frame_cache_offset * wordSize));
+
+  // Restore Java expression stack pointer
+  __ ld(t0, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ shadd(esp, t0, fp, t0, Interpreter::logStackElementSize);
+  // and NULL it as marker that esp is now tos until next java call
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+
+  // Restore machine SP
+  __ ld(t0, Address(fp, frame::interpreter_frame_extended_sp_offset * wordSize));
+  __ shadd(sp, t0, fp, t0, LogBytesPerWord);
+
+  // Restore method
+  __ ld(xmethod, Address(fp, frame::interpreter_frame_method_offset * wordSize));
+
+  // Restore dispatch
+  __ la(xdispatch, ExternalAddress((address)Interpreter::dispatch_table()));
+
+  __ ret();
+
+  return start;
+}
+
+
 // Helpers for commoning out cases in the various type of method entries.
 //
 
@@ -1092,6 +1124,9 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // result handler is in x10
   // set result handler
   __ mv(result_handler, x10);
+  // Save it in the frame in case of preemption; we cannot rely on callee saved registers.
+  __ sd(x10, Address(fp, frame::interpreter_frame_result_handler_offset * wordSize));
+
   // pass mirror handle if static call
   {
     Label L;
@@ -1130,6 +1165,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
   // It is enough that the pc() points into the right code
   // segment. It does not have to be the correct return pc.
+  // For convenience we use the pc we want to resume to in
+  // case of preemption on Object.wait.
   Label native_return;
   __ set_last_Java_frame(esp, fp, native_return, x30);
 
@@ -1151,9 +1188,13 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
   __ sw(t0, Address(t1));
 
+  __ push_cont_fastpath();
+
   // Call the native method.
   __ jalr(x28);
-  __ bind(native_return);
+
+  __ pop_cont_fastpath();
+
   __ get_method(xmethod);
   // result potentially in x10 or f10
 
@@ -1219,6 +1260,23 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ mv(t0, _thread_in_Java);
   __ sw(t0, Address(xthread, JavaThread::thread_state_offset()));
 
+  if (LockingMode != LM_LEGACY) {
+    // Check preemption for Object.wait()
+    Label not_preempted;
+    __ ld(t1, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+    __ beqz(t1, not_preempted);
+    __ sd(zr, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+    __ jr(t1);
+    __ bind(native_return);
+    __ restore_after_resume(true /* is_native */);
+    // reload result_handler
+    __ ld(result_handler, Address(fp, frame::interpreter_frame_result_handler_offset * wordSize));
+    __ bind(not_preempted);
+  } else {
+    // any pc will do so just use this one for LM_LEGACY to keep code together.
+    __ bind(native_return);
+  }
+
   // reset_last_Java_frame
   __ reset_last_Java_frame(true);
 
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index a204c9fdd45..52b33c62616 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -3546,12 +3546,22 @@ void TemplateTable::_new() {
 
     // The object is initialized before the header. If the object size is
     // zero, go directly to the header initialization.
-    __ sub(x13, x13, sizeof(oopDesc));
+    if (UseCompactObjectHeaders) {
+      assert(is_aligned(oopDesc::base_offset_in_bytes(), BytesPerLong), "oop base offset must be 8-byte-aligned");
+      __ sub(x13, x13, oopDesc::base_offset_in_bytes());
+    } else {
+      __ sub(x13, x13, sizeof(oopDesc));
+    }
     __ beqz(x13, initialize_header);
 
     // Initialize object fields
     {
-      __ add(x12, x10, sizeof(oopDesc));
+      if (UseCompactObjectHeaders) {
+        assert(is_aligned(oopDesc::base_offset_in_bytes(), BytesPerLong), "oop base offset must be 8-byte-aligned");
+        __ add(x12, x10, oopDesc::base_offset_in_bytes());
+      } else {
+        __ add(x12, x10, sizeof(oopDesc));
+      }
       Label loop;
       __ bind(loop);
       __ sd(zr, Address(x12));
@@ -3562,10 +3572,15 @@ void TemplateTable::_new() {
 
     // initialize object hader only.
     __ bind(initialize_header);
-    __ mv(t0, (intptr_t)markWord::prototype().value());
-    __ sd(t0, Address(x10, oopDesc::mark_offset_in_bytes()));
-    __ store_klass_gap(x10, zr);   // zero klass gap for compressed oops
-    __ store_klass(x10, x14);      // store klass last
+    if (UseCompactObjectHeaders) {
+      __ ld(t0, Address(x14, Klass::prototype_header_offset()));
+      __ sd(t0, Address(x10, oopDesc::mark_offset_in_bytes()));
+    } else {
+      __ mv(t0, (intptr_t)markWord::prototype().value());
+      __ sd(t0, Address(x10, oopDesc::mark_offset_in_bytes()));
+      __ store_klass_gap(x10, zr);   // zero klass gap for compressed oops
+      __ store_klass(x10, x14);      // store klass last
+    }
 
     if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 5c4e3ec1df2..6e8ee1ab7e0 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -122,22 +122,6 @@ void VM_Version::common_initialize() {
     FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
   }
 
-  if (UseZba) {
-    if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
-      FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
-    }
-  } else {
-    if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
-      warning("CRC32 intrinsic requires Zba instructions (not available on this CPU)");
-    }
-    FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
-  }
-
-  if (UseCRC32CIntrinsics) {
-    warning("CRC32C intrinsics are not available on this CPU.");
-    FLAG_SET_DEFAULT(UseCRC32CIntrinsics, false);
-  }
-
   if (UseVectorizedMismatchIntrinsic) {
     warning("VectorizedMismatch intrinsic is not available on this CPU.");
     FLAG_SET_DEFAULT(UseVectorizedMismatchIntrinsic, false);
@@ -217,6 +201,24 @@ void VM_Version::common_initialize() {
       _initial_vector_length = cpu_vector_length();
     }
   }
+
+  // Misc Intrinsics could depend on RVV
+
+  if (UseZba || UseRVV) {
+    if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
+      FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
+    }
+  } else {
+    if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
+      warning("CRC32 intrinsic requires Zba or RVV instructions (not available on this CPU)");
+    }
+    FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
+  }
+
+  if (UseCRC32CIntrinsics) {
+    warning("CRC32C intrinsics are not available on this CPU.");
+    FLAG_SET_DEFAULT(UseCRC32CIntrinsics, false);
+  }
 }
 
 #ifdef COMPILER2
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index ab09460bd86..c98c100a068 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -56,24 +56,23 @@ class Immediate {
     }
 
     // Test if x is within signed immediate range for nbits.
-    static bool is_uimm(int64_t x, unsigned int nbits) {
+    static bool is_uimm(uint64_t x, unsigned int nbits) {
       // nbits == 0  --> false
       // nbits >= 64 --> true
       assert(1 <= nbits && nbits < 64, "don't call, use statically known result");
-      const uint64_t xu       = (unsigned long)x;
       const uint64_t maxplus1 = 1UL << nbits;
-      return xu < maxplus1; // Unsigned comparison. Negative inputs appear to be very large.
+      return x < maxplus1; // Unsigned comparison. Negative inputs appear to be very large.
     }
-    static bool is_uimm32(int64_t x) {
+    static bool is_uimm32(uint64_t x) {
       return is_uimm(x, 32);
     }
-    static bool is_uimm16(int64_t x) {
+    static bool is_uimm16(uint64_t x) {
       return is_uimm(x, 16);
     }
-    static bool is_uimm12(int64_t x) {
+    static bool is_uimm12(uint64_t x) {
       return is_uimm(x, 12);
     }
-    static bool is_uimm8(int64_t x) {
+    static bool is_uimm8(uint64_t x) {
       return is_uimm(x,  8);
     }
 };
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index d2e860aa320..213aa5efe1e 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -2047,8 +2047,6 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
 
   Address src_length_addr = Address(src, arrayOopDesc::length_offset_in_bytes());
   Address dst_length_addr = Address(dst, arrayOopDesc::length_offset_in_bytes());
-  Address src_klass_addr = Address(src, oopDesc::klass_offset_in_bytes());
-  Address dst_klass_addr = Address(dst, oopDesc::klass_offset_in_bytes());
 
   // Length and pos's are all sign extended at this point on 64bit.
 
@@ -2112,13 +2110,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // We don't know the array types are compatible.
     if (basic_type != T_OBJECT) {
       // Simple test for basic type arrays.
-      if (UseCompressedClassPointers) {
-        __ z_l(tmp, src_klass_addr);
-        __ z_c(tmp, dst_klass_addr);
-      } else {
-        __ z_lg(tmp, src_klass_addr);
-        __ z_cg(tmp, dst_klass_addr);
-      }
+      __ cmp_klasses_from_objects(src, dst, tmp, Z_R1_scratch);
       __ branch_optimized(Assembler::bcondNotEqual, *stub->entry());
     } else {
       // For object arrays, if src is a sub class of dst then we can
@@ -2252,15 +2244,13 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     }
 
     if (basic_type != T_OBJECT) {
-      if (UseCompressedClassPointers)         { __ z_c (tmp, dst_klass_addr); }
-      else                                    { __ z_cg(tmp, dst_klass_addr); }
+      __ cmp_klass(tmp, dst, Z_R1_scratch);
       __ branch_optimized(Assembler::bcondNotEqual, halt);
-      if (UseCompressedClassPointers)         { __ z_c (tmp, src_klass_addr); }
-      else                                    { __ z_cg(tmp, src_klass_addr); }
+
+      __ cmp_klass(tmp, src, Z_R1_scratch);
       __ branch_optimized(Assembler::bcondEqual, known_ok);
     } else {
-      if (UseCompressedClassPointers)         { __ z_c (tmp, dst_klass_addr); }
-      else                                    { __ z_cg(tmp, dst_klass_addr); }
+      __ cmp_klass(tmp, dst, Z_R1_scratch);
       __ branch_optimized(Assembler::bcondEqual, known_ok);
       __ compareU64_and_branch(src, dst, Assembler::bcondEqual, known_ok);
     }
@@ -2755,12 +2745,7 @@ void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
     add_debug_info_for_null_check_here(info);
   }
 
-  if (UseCompressedClassPointers) {
-    __ z_llgf(result, Address(obj, oopDesc::klass_offset_in_bytes()));
-    __ decode_klass_not_null(result);
-  } else {
-    __ z_lg(result, Address(obj, oopDesc::klass_offset_in_bytes()));
-  }
+  __ load_klass(result, obj);
 }
 void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
   ciMethod* method = op->profiled_method();
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index 41c2ae260a6..bc269f9353c 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -177,17 +177,21 @@ void C1_MacroAssembler::try_allocate(
 
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register Rzero, Register t1) {
   assert_different_registers(obj, klass, len, t1, Rzero);
-  // This assumes that all prototype bits fit in an int32_t.
-  load_const_optimized(t1, (intx)markWord::prototype().value());
-  z_stg(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
+  if (UseCompactObjectHeaders) {
+    z_lg(t1, Address(klass, in_bytes(Klass::prototype_header_offset())));
+    z_stg(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
+  } else {
+    load_const_optimized(t1, (intx)markWord::prototype().value());
+    z_stg(t1, Address(obj, oopDesc::mark_offset_in_bytes()));
+    store_klass(klass, obj, t1);
+  }
 
   if (len->is_valid()) {
     // Length will be in the klass gap, if one exists.
     z_st(len, Address(obj, arrayOopDesc::length_offset_in_bytes()));
-  } else if (UseCompressedClassPointers) {
+  } else if (UseCompressedClassPointers && !UseCompactObjectHeaders) {
     store_klass_gap(Rzero, obj);  // Zero klass gap for compressed oops.
   }
-  store_klass(klass, obj, t1);
 }
 
 void C1_MacroAssembler::initialize_body(Register objectFields, Register len_in_bytes, Register Rzero) {
diff --git a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
index 2f629c108c9..8b30adb4785 100644
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
@@ -208,6 +208,11 @@ void Runtime1::initialize_pd() {
   // Nothing to do.
 }
 
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+  Unimplemented();
+  return 0;
+}
+
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
   // Make a frame and preserve the caller's caller-save registers.
   OopMap* oop_map = save_live_registers(sasm);
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
index 025ef4c8915..378d5e4cfe1 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
@@ -42,6 +42,13 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Regi
   compiler_fast_unlock_lightweight_object(obj, box, temp1, temp2);
 }
 
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Address src) {
+  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
+  // obj-start, so that we can load from the object's mark-word instead.
+  z_lg(dst, src.plus_disp(-oopDesc::klass_offset_in_bytes()));
+  z_srlg(dst, dst, markWord::klass_shift); // TODO: could be z_sra
+}
+
 //------------------------------------------------------
 //   Special String Intrinsics. Implementation
 //------------------------------------------------------
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
index aecb483f0a6..26c3c9a2bb5 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
@@ -33,6 +33,8 @@
   void fast_lock_lightweight(Register obj, Register box, Register temp1, Register temp2);
   void fast_unlock_lightweight(Register obj, Register box, Register temp1, Register temp2);
 
+  void load_narrow_klass_compact_c2(Register dst, Address src);
+
   //-------------------------------------------
   // Special String Intrinsics Implementation.
   //-------------------------------------------
diff --git a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
index 084ee189211..7223facaaeb 100644
--- a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
@@ -48,6 +48,10 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   Unimplemented();
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  Unimplemented();
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   Unimplemented();
 }
@@ -83,6 +87,15 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   Unimplemented();
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  Unimplemented();
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp b/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
index 4cea0459551..8c57f1810e5 100644
--- a/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
@@ -35,6 +35,10 @@ static inline intptr_t** link_address(const frame& f) {
   return nullptr;
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  Unimplemented();
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
   Unimplemented();
   return 0;
@@ -62,11 +66,11 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   Unimplemented();
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   Unimplemented();
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   Unimplemented();
   return false;
diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
index 11c7386dfd7..75f29be13ab 100644
--- a/src/hotspot/cpu/s390/frame_s390.cpp
+++ b/src/hotspot/cpu/s390/frame_s390.cpp
@@ -246,6 +246,11 @@ frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
   return fr;
 }
 
+JavaThread** frame::saved_thread_address(const frame& f) {
+  Unimplemented();
+  return nullptr;
+}
+
 frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
   // Pass callers sender_sp as unextended_sp.
   return frame(sender_sp(), sender_pc(), (intptr_t*)(ijava_state()->sender_sp));
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 84d09b9c1dc..9e1c5cbced3 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -2160,7 +2160,16 @@ void MacroAssembler::call_VM_leaf_base(address entry_point) {
 }
 
 int MacroAssembler::ic_check_size() {
-  return 30 + (ImplicitNullChecks ? 0 : 6);
+  int ic_size = 24;
+  if (!ImplicitNullChecks) {
+    ic_size += 6;
+  }
+  if (UseCompactObjectHeaders) {
+    ic_size += 12;
+  } else {
+    ic_size += 6; // either z_llgf or z_lg
+  }
+  return ic_size;
 }
 
 int MacroAssembler::ic_check(int end_alignment) {
@@ -2181,7 +2190,9 @@ int MacroAssembler::ic_check(int end_alignment) {
     z_cgij(R2_receiver, 0, Assembler::bcondEqual, failure);
   }
 
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(R1_scratch, R2_receiver);
+  } else if (UseCompressedClassPointers) {
     z_llgf(R1_scratch, Address(R2_receiver, oopDesc::klass_offset_in_bytes()));
   } else {
     z_lg(R1_scratch, Address(R2_receiver, oopDesc::klass_offset_in_bytes()));
@@ -3492,7 +3503,7 @@ void MacroAssembler::increment_counter_eq(address counter_address, Register tmp1
 void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Register temp1, Register temp2) {
 
   assert(LockingMode != LM_LIGHTWEIGHT, "uses fast_lock_lightweight");
-  assert_different_registers(oop, box, temp1, temp2);
+  assert_different_registers(oop, box, temp1, temp2, Z_R0_scratch);
 
   Register displacedHeader = temp1;
   Register currentHeader   = temp1;
@@ -3561,14 +3572,13 @@ void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Regis
 
   Register zero = temp;
   Register monitor_tagged = displacedHeader; // Tagged with markWord::monitor_value.
-  // The object's monitor m is unlocked iff m->owner is null,
-  // otherwise m->owner may contain a thread or a stack address.
 
-  // Try to CAS m->owner from null to current thread.
-  // If m->owner is null, then csg succeeds and sets m->owner=THREAD and CR=EQ.
-  // Otherwise, register zero is filled with the current owner.
+  // Try to CAS owner (no owner => current thread's _lock_id).
+  // If csg succeeds then CR=EQ, otherwise, register zero is filled
+  // with the current owner.
   z_lghi(zero, 0);
-  z_csg(zero, Z_thread, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner), monitor_tagged);
+  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+  z_csg(zero, Z_R0_scratch, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner), monitor_tagged);
 
   // Store a non-null value into the box.
   z_stg(box, BasicLock::displaced_header_offset_in_bytes(), box);
@@ -3577,7 +3587,7 @@ void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Regis
 
   BLOCK_COMMENT("fast_path_recursive_lock {");
   // Check if we are already the owner (recursive lock)
-  z_cgr(Z_thread, zero); // owner is stored in zero by "z_csg" above
+  z_cgr(Z_R0_scratch, zero); // owner is stored in zero by "z_csg" above
   z_brne(done); // not a recursive lock
 
   // Current thread already owns the lock. Just increment recursion count.
@@ -3595,7 +3605,7 @@ void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Regis
 void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Register temp1, Register temp2) {
 
   assert(LockingMode != LM_LIGHTWEIGHT, "uses fast_unlock_lightweight");
-  assert_different_registers(oop, box, temp1, temp2);
+  assert_different_registers(oop, box, temp1, temp2, Z_R0_scratch);
 
   Register displacedHeader = temp1;
   Register currentHeader   = temp2;
@@ -3642,7 +3652,8 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  z_cg(Z_thread, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
+  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+  z_cg(Z_R0_scratch, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
   z_brne(done);
 
   BLOCK_COMMENT("fast_path_recursive_unlock {");
@@ -3852,7 +3863,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
 
 #ifdef ASSERT
   Label ok;
-  z_tmll(current, KlassAlignmentInBytes-1); // Check alignment.
+  z_tmll(current, CompressedKlassPointers::klass_alignment_in_bytes() - 1); // Check alignment.
   z_brc(Assembler::bcondAllZero, ok);
   // The plain disassembler does not recognize illtrap. It instead displays
   // a 32-bit value. Issuing two illtraps assures the disassembler finds
@@ -3866,7 +3877,6 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
   // We then can be sure we calculate an offset that fits into 32 bit.
   // More generally speaking: all subsequent calculations are purely 32-bit.
   if (shift != 0) {
-    assert (LogKlassAlignmentInBytes == shift, "decode alg wrong");
     z_srlg(dst, current, shift);
     current = dst;
   }
@@ -3996,7 +4006,7 @@ void MacroAssembler::decode_klass_not_null(Register dst) {
 
 #ifdef ASSERT
   Label ok;
-  z_tmll(dst, KlassAlignmentInBytes-1); // Check alignment.
+  z_tmll(dst, CompressedKlassPointers::klass_alignment_in_bytes() - 1); // Check alignment.
   z_brc(Assembler::bcondAllZero, ok);
   // The plain disassembler does not recognize illtrap. It instead displays
   // a 32-bit value. Issuing two illtraps assures the disassembler finds
@@ -4043,7 +4053,7 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
 
 #ifdef ASSERT
   Label ok;
-  z_tmll(dst, KlassAlignmentInBytes-1); // Check alignment.
+  z_tmll(dst, CompressedKlassPointers::klass_alignment_in_bytes() - 1); // Check alignment.
   z_brc(Assembler::bcondAllZero, ok);
   // The plain disassembler does not recognize illtrap. It instead displays
   // a 32-bit value. Issuing two illtraps assures the disassembler finds
@@ -4065,10 +4075,58 @@ void MacroAssembler::load_klass(Register klass, Address mem) {
   }
 }
 
+// Loads the obj's Klass* into dst.
+// Input:
+// src - the oop we want to load the klass from.
+// dst - output nklass.
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
+  BLOCK_COMMENT("load_narrow_klass_compact {");
+  assert(UseCompactObjectHeaders, "expects UseCompactObjectHeaders");
+  z_lg(dst, Address(src, oopDesc::mark_offset_in_bytes()));
+  z_srlg(dst, dst, markWord::klass_shift);
+  BLOCK_COMMENT("} load_narrow_klass_compact");
+}
+
+void MacroAssembler::cmp_klass(Register klass, Register obj, Register tmp) {
+  BLOCK_COMMENT("cmp_klass {");
+  assert_different_registers(obj, klass, tmp);
+  if (UseCompactObjectHeaders) {
+    assert(tmp != noreg, "required");
+    assert_different_registers(klass, obj, tmp);
+    load_narrow_klass_compact(tmp, obj);
+    z_cr(klass, tmp);
+  } else if (UseCompressedClassPointers) {
+    z_c(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+  } else {
+    z_cg(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+  }
+  BLOCK_COMMENT("} cmp_klass");
+}
+
+void MacroAssembler::cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2) {
+  BLOCK_COMMENT("cmp_klasses_from_objects {");
+  if (UseCompactObjectHeaders) {
+    assert(tmp1 != noreg && tmp2 != noreg, "required");
+    assert_different_registers(obj1, obj2, tmp1, tmp2);
+    load_narrow_klass_compact(tmp1, obj1);
+    load_narrow_klass_compact(tmp2, obj2);
+    z_cr(tmp1, tmp2);
+  } else if (UseCompressedClassPointers) {
+    z_l(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    z_c(tmp1, Address(obj2, oopDesc::klass_offset_in_bytes()));
+  } else {
+    z_lg(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    z_cg(tmp1, Address(obj2, oopDesc::klass_offset_in_bytes()));
+  }
+  BLOCK_COMMENT("} cmp_klasses_from_objects");
+}
+
 void MacroAssembler::load_klass(Register klass, Register src_oop) {
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(klass, src_oop);
+    decode_klass_not_null(klass);
+  } else if (UseCompressedClassPointers) {
     z_llgf(klass, oopDesc::klass_offset_in_bytes(), src_oop);
-    // Attention: no null check here!
     decode_klass_not_null(klass);
   } else {
     z_lg(klass, oopDesc::klass_offset_in_bytes(), src_oop);
@@ -4076,6 +4134,7 @@ void MacroAssembler::load_klass(Register klass, Register src_oop) {
 }
 
 void MacroAssembler::store_klass(Register klass, Register dst_oop, Register ck) {
+  assert(!UseCompactObjectHeaders, "Don't use with compact headers");
   if (UseCompressedClassPointers) {
     assert_different_registers(dst_oop, klass, Z_R0);
     if (ck == noreg) ck = klass;
@@ -4087,6 +4146,7 @@ void MacroAssembler::store_klass(Register klass, Register dst_oop, Register ck)
 }
 
 void MacroAssembler::store_klass_gap(Register s, Register d) {
+  assert(!UseCompactObjectHeaders, "Don't use with compact headers");
   if (UseCompressedClassPointers) {
     assert(s != d, "not enough registers");
     // Support s = noreg.
@@ -4112,7 +4172,11 @@ void MacroAssembler::compare_klass_ptr(Register Rop1, int64_t disp, Register Rba
     const int shift = CompressedKlassPointers::shift();
     address   base  = CompressedKlassPointers::base();
 
-    assert((shift == 0) || (shift == LogKlassAlignmentInBytes), "cKlass encoder detected bad shift");
+    if (UseCompactObjectHeaders) {
+      assert(shift >= 3, "cKlass encoder detected bad shift");
+    } else {
+      assert((shift == 0) || (shift == 3), "cKlass encoder detected bad shift");
+    }
     assert_different_registers(Rop1, Z_R0);
     assert_different_registers(Rop1, Rbase, Z_R1);
 
@@ -6164,7 +6228,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register temp1, Register t
 }
 
 void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Register box, Register tmp1, Register tmp2) {
-  assert_different_registers(obj, box, tmp1, tmp2);
+  assert_different_registers(obj, box, tmp1, tmp2, Z_R0_scratch);
 
   // Handle inflated monitor.
   NearLabel inflated;
@@ -6292,15 +6356,16 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
     const Address recursions_address(tmp1_monitor, ObjectMonitor::recursions_offset() - monitor_tag);
 
 
-    // Try to CAS m->owner from null to current thread.
-    // If m->owner is null, then csg succeeds and sets m->owner=THREAD and CR=EQ.
-    // Otherwise, register zero is filled with the current owner.
+    // Try to CAS owner (no owner => current thread's _lock_id).
+    // If csg succeeds then CR=EQ, otherwise, register zero is filled
+    // with the current owner.
     z_lghi(zero, 0);
-    z_csg(zero, Z_thread, owner_address);
+    z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+    z_csg(zero, Z_R0_scratch, owner_address);
     z_bre(monitor_locked);
 
     // Check if recursive.
-    z_cgr(Z_thread, zero); // zero contains the owner from z_csg instruction
+    z_cgr(Z_R0_scratch, zero); // zero contains the owner from z_csg instruction
     z_brne(slow_path);
 
     // Recursive
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
index 061817a1289..7806fef3ce8 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
@@ -803,6 +803,13 @@ class MacroAssembler: public Assembler {
   void load_klass(Register klass, Register src_oop);
   void store_klass(Register klass, Register dst_oop, Register ck = noreg); // Klass will get compressed if ck not provided.
   void store_klass_gap(Register s, Register dst_oop);
+  void load_narrow_klass_compact(Register dst, Register src);
+  // Compares the Klass pointer of an object to a given Klass (which might be narrow,
+  // depending on UseCompressedClassPointers).
+  void cmp_klass(Register klass, Register obj, Register tmp);
+  // Compares the Klass pointer of two objects obj1 and obj2. Result is in the condition flags.
+  // Uses tmp1 and tmp2 as temporary registers.
+  void cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2);
 
   // This function calculates the size of the code generated by
   //   decode_klass_not_null(register dst)
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 288de48c105..63e150c9e9c 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -2547,7 +2547,7 @@ operand uimmI8() %{
 //   operand type int
 // Unsigned Integer Immediate: 9-bit
 operand SSlenDW() %{
-  predicate(Immediate::is_uimm8(n->get_long()-1));
+  predicate(Immediate::is_uimm8((julong)n->get_long()-1));
   match(ConL);
   op_cost(1);
   format %{ %}
@@ -4410,6 +4410,7 @@ instruct loadN(iRegN dst, memory mem) %{
 
 // Load narrow Klass Pointer
 instruct loadNKlass(iRegN dst, memory mem) %{
+  predicate(!UseCompactObjectHeaders);
   match(Set dst (LoadNKlass mem));
   ins_cost(MEMORY_REF_COST);
   size(Z_DISP3_SIZE);
@@ -4419,6 +4420,21 @@ instruct loadNKlass(iRegN dst, memory mem) %{
   ins_pipe(pipe_class_dummy);
 %}
 
+instruct loadNKlassCompactHeaders(iRegN dst, memory mem, flagsReg cr) %{
+  match(Set dst (LoadNKlass mem));
+  predicate(UseCompactObjectHeaders);
+  effect(KILL cr);
+  ins_cost(MEMORY_REF_COST);
+  format %{ "load_narrow_klass_compact $dst,$mem \t# compressed class ptr" %}
+  // TODO: size()
+  ins_encode %{
+    __ block_comment("load_narrow_klass_compact_c2 {");
+    __ load_narrow_klass_compact_c2($dst$$Register, $mem$$Address);
+    __ block_comment("} load_narrow_klass_compact");
+  %}
+  ins_pipe(pipe_class_dummy);
+%}
+
 // Load constant Compressed Pointer
 
 instruct loadConN(iRegN dst, immN src) %{
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 468610b588e..c60f6ef3295 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2387,6 +2387,11 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return frame::z_jit_out_preserve_size/VMRegImpl::stack_slot_size;
 }
 
+VMReg SharedRuntime::thread_register() {
+  Unimplemented();
+  return nullptr;
+}
+
 //
 // Frame generation for deopt and uncommon trap blobs.
 //
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 2c2e8ed9e3b..820417fc743 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -721,6 +721,11 @@ address TemplateInterpreterGenerator::generate_safept_entry_for (TosState state,
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  return nullptr;
+}
+
+
 //
 // Helpers for commoning out cases in the various type of method entries.
 //
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index 0c9f9e031b0..3cb1aba810d 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -3952,7 +3952,12 @@ void TemplateTable::_new() {
     if (!ZeroTLAB) {
       // The object is initialized before the header. If the object size is
       // zero, go directly to the header initialization.
-      __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
+      if (UseCompactObjectHeaders) {
+        assert(is_aligned(oopDesc::base_offset_in_bytes(), BytesPerLong), "oop base offset must be 8-byte-aligned");
+        __ z_aghi(Rsize, (int)-oopDesc::base_offset_in_bytes());
+      } else {
+        __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
+      }
       __ z_bre(initialize_header);             // Jump if size of fields is zero.
 
       // Initialize object fields.
@@ -3964,17 +3969,25 @@ void TemplateTable::_new() {
 
       // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
       // and fill the object with the padding value 0.
-      __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
+      if (UseCompactObjectHeaders) {
+        __ add2reg(RobjectFields, oopDesc::base_offset_in_bytes(), RallocatedObject);
+      } else {
+        __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
+      }
       __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
     }
 
     // Initialize object header only.
     __ bind(initialize_header);
-    __ store_const(Address(RallocatedObject, oopDesc::mark_offset_in_bytes()),
-                   (long)markWord::prototype().value());
-
-    __ store_klass_gap(Rzero, RallocatedObject);  // Zero klass gap for compressed oops.
-    __ store_klass(iklass, RallocatedObject);     // Store klass last.
+    if (UseCompactObjectHeaders) {
+      __ z_lg(tmp, Address(iklass, in_bytes(Klass::prototype_header_offset())));
+      __ z_stg(tmp, Address(RallocatedObject, oopDesc::mark_offset_in_bytes()));
+    } else {
+      __ store_const(Address(RallocatedObject, oopDesc::mark_offset_in_bytes()),
+                     (long) markWord::prototype().value());
+      __ store_klass_gap(Rzero, RallocatedObject);  // Zero klass gap for compressed oops.
+      __ store_klass(iklass, RallocatedObject);     // Store klass last.
+    }
 
     if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath.
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 03ce06726c6..36a122d2946 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -2854,6 +2854,26 @@ void Assembler::leal(Register dst, Address src) {
   emit_operand(dst, src, 0);
 }
 
+#ifdef _LP64
+void Assembler::lea(Register dst, Label& L) {
+  emit_prefix_and_int8(get_prefixq(Address(), dst), (unsigned char)0x8D);
+  if (!L.is_bound()) {
+    // Patch @0x8D opcode
+    L.add_patch_at(code(), CodeBuffer::locator(offset() - 1, sect()));
+    // Register and [rip+disp] operand
+    emit_modrm(0b00, raw_encode(dst), 0b101);
+    emit_int32(0);
+  } else {
+    // Register and [rip+disp] operand
+    emit_modrm(0b00, raw_encode(dst), 0b101);
+    // Adjust displacement by sizeof lea instruction
+    int32_t disp = checked_cast<int32_t>(target(L) - (pc() + sizeof(int32_t)));
+    assert(is_simm32(disp), "must be 32bit offset [rip+offset]");
+    emit_int32(disp);
+  }
+}
+#endif
+
 void Assembler::lfence() {
   emit_int24(0x0F, (unsigned char)0xAE, (unsigned char)0xE8);
 }
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 420c28254d5..25be0d6a48d 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -954,20 +954,13 @@ class Assembler : public AbstractAssembler  {
   // the product flag UseIncDec value.
 
   void decl(Register dst);
-  void edecl(Register dst, Register src, bool no_flags);
   void decl(Address dst);
-  void edecl(Register dst, Address src, bool no_flags);
   void decq(Address dst);
-  void edecq(Register dst, Address src, bool no_flags);
 
   void incl(Register dst);
-  void eincl(Register dst, Register src, bool no_flags);
   void incl(Address dst);
-  void eincl(Register dst, Address src, bool no_flags);
   void incq(Register dst);
-  void eincq(Register dst, Register src, bool no_flags);
   void incq(Address dst);
-  void eincq(Register dst, Address src, bool no_flags);
 
   // New cpus require use of movsd and movss to avoid partial register stall
   // when loading from memory. But for old Opteron use movlpd instead of movsd.
@@ -1117,6 +1110,14 @@ class Assembler : public AbstractAssembler  {
   void addq(Register dst, Register src);
   void eaddq(Register dst, Register src1, Register src2, bool no_flags);
 
+  void edecl(Register dst, Register src, bool no_flags);
+  void edecl(Register dst, Address src, bool no_flags);
+  void edecq(Register dst, Address src, bool no_flags);
+  void eincl(Register dst, Register src, bool no_flags);
+  void eincl(Register dst, Address src, bool no_flags);
+  void eincq(Register dst, Register src, bool no_flags);
+  void eincq(Register dst, Address src, bool no_flags);
+
 #ifdef _LP64
  //Add Unsigned Integers with Carry Flag
   void adcxq(Register dst, Register src);
@@ -1625,6 +1626,10 @@ class Assembler : public AbstractAssembler  {
 
   void leaq(Register dst, Address src);
 
+#ifdef _LP64
+  void lea(Register dst, Label& L);
+#endif
+
   void lfence();
 
   void lock();
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 64265a96909..ff6d18e48e1 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -3046,6 +3046,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
   Register length  = op->length()->as_register();
   Register tmp = op->tmp()->as_register();
   Register tmp_load_klass = LP64_ONLY(rscratch1) NOT_LP64(noreg);
+  Register tmp2 = UseCompactObjectHeaders ? rscratch2 : noreg;
 
   CodeStub* stub = op->stub();
   int flags = op->flags();
@@ -3170,8 +3171,6 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
 
   Address src_length_addr = Address(src, arrayOopDesc::length_offset_in_bytes());
   Address dst_length_addr = Address(dst, arrayOopDesc::length_offset_in_bytes());
-  Address src_klass_addr = Address(src, oopDesc::klass_offset_in_bytes());
-  Address dst_klass_addr = Address(dst, oopDesc::klass_offset_in_bytes());
 
   // length and pos's are all sign extended at this point on 64bit
 
@@ -3237,13 +3236,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
     // We don't know the array types are compatible
     if (basic_type != T_OBJECT) {
       // Simple test for basic type arrays
-      if (UseCompressedClassPointers) {
-        __ movl(tmp, src_klass_addr);
-        __ cmpl(tmp, dst_klass_addr);
-      } else {
-        __ movptr(tmp, src_klass_addr);
-        __ cmpptr(tmp, dst_klass_addr);
-      }
+      __ cmp_klasses_from_objects(src, dst, tmp, tmp2);
       __ jcc(Assembler::notEqual, *stub->entry());
     } else {
       // For object arrays, if src is a sub class of dst then we can
@@ -3302,6 +3295,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
        store_parameter(src, 4);
 
 #ifndef _LP64
+       Address dst_klass_addr = Address(dst, oopDesc::klass_offset_in_bytes());
         __ movptr(tmp, dst_klass_addr);
         __ movptr(tmp, Address(tmp, ObjArrayKlass::element_klass_offset()));
         __ push(tmp);
@@ -3405,16 +3399,12 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
 #endif
 
     if (basic_type != T_OBJECT) {
-
-      if (UseCompressedClassPointers)          __ cmpl(tmp, dst_klass_addr);
-      else                   __ cmpptr(tmp, dst_klass_addr);
+      __ cmp_klass(tmp, dst, tmp2);
       __ jcc(Assembler::notEqual, halt);
-      if (UseCompressedClassPointers)          __ cmpl(tmp, src_klass_addr);
-      else                   __ cmpptr(tmp, src_klass_addr);
+      __ cmp_klass(tmp, src, tmp2);
       __ jcc(Assembler::equal, known_ok);
     } else {
-      if (UseCompressedClassPointers)          __ cmpl(tmp, dst_klass_addr);
-      else                   __ cmpptr(tmp, dst_klass_addr);
+      __ cmp_klass(tmp, dst, tmp2);
       __ jcc(Assembler::equal, known_ok);
       __ cmpptr(src, dst);
       __ jcc(Assembler::equal, known_ok);
@@ -3511,13 +3501,7 @@ void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
     add_debug_info_for_null_check_here(info);
   }
 
-#ifdef _LP64
-  if (UseCompressedClassPointers) {
-    __ movl(result, Address(obj, oopDesc::klass_offset_in_bytes()));
-    __ decode_klass_not_null(result, rscratch1);
-  } else
-#endif
-    __ movptr(result, Address(obj, oopDesc::klass_offset_in_bytes()));
+  __ load_klass(result, obj, rscratch1);
 }
 
 void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index bf5b90db5fc..f53a25ed3e6 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -109,10 +109,9 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     jcc(Assembler::notZero, slow_case);
     // done
     bind(done);
+    inc_held_monitor_count();
   }
 
-  inc_held_monitor_count();
-
   return null_check_offset;
 }
 
@@ -153,9 +152,9 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     // we do unlocking via runtime call
     jcc(Assembler::notEqual, slow_case);
     // done
+    bind(done);
+    dec_held_monitor_count();
   }
-  bind(done);
-  dec_held_monitor_count();
 }
 
 
@@ -170,16 +169,20 @@ void C1_MacroAssembler::try_allocate(Register obj, Register var_size_in_bytes, i
 
 
 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
-  assert_different_registers(obj, klass, len);
-  movptr(Address(obj, oopDesc::mark_offset_in_bytes()), checked_cast<int32_t>(markWord::prototype().value()));
+  assert_different_registers(obj, klass, len, t1, t2);
 #ifdef _LP64
-  if (UseCompressedClassPointers) { // Take care not to kill klass
+  if (UseCompactObjectHeaders) {
+    movptr(t1, Address(klass, Klass::prototype_header_offset()));
+    movptr(Address(obj, oopDesc::mark_offset_in_bytes()), t1);
+  } else if (UseCompressedClassPointers) { // Take care not to kill klass
+    movptr(Address(obj, oopDesc::mark_offset_in_bytes()), checked_cast<int32_t>(markWord::prototype().value()));
     movptr(t1, klass);
     encode_klass_not_null(t1, rscratch1);
     movl(Address(obj, oopDesc::klass_offset_in_bytes()), t1);
   } else
 #endif
   {
+    movptr(Address(obj, oopDesc::mark_offset_in_bytes()), checked_cast<int32_t>(markWord::prototype().value()));
     movptr(Address(obj, oopDesc::klass_offset_in_bytes()), klass);
   }
 
@@ -196,7 +199,7 @@ void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register
 #endif
   }
 #ifdef _LP64
-  else if (UseCompressedClassPointers) {
+  else if (UseCompressedClassPointers && !UseCompactObjectHeaders) {
     xorptr(t1, t1);
     store_klass_gap(obj, t1);
   }
@@ -230,7 +233,9 @@ void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register
   assert((con_size_in_bytes & MinObjAlignmentInBytesMask) == 0,
          "con_size_in_bytes is not multiple of alignment");
   const int hdr_size_in_bytes = instanceOopDesc::header_size() * HeapWordSize;
-
+  if (UseCompactObjectHeaders) {
+    assert(hdr_size_in_bytes == 8, "check object headers size");
+  }
   initialize_header(obj, klass, noreg, t1, t2);
 
   if (!(UseTLAB && ZeroTLAB && is_tlab_allocated)) {
diff --git a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
index 1ccb06df489..5cc8ffd9bef 100644
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
@@ -206,9 +206,10 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
 class StubFrame: public StackObj {
  private:
   StubAssembler* _sasm;
+  bool _use_pop_on_epilog;
 
  public:
-  StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments);
+  StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, bool use_pop_on_epilog = false);
   void load_argument(int offset_in_words, Register reg);
 
   ~StubFrame();
@@ -219,15 +220,20 @@ void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
   enter();
 }
 
-void StubAssembler::epilogue() {
-  leave();
+void StubAssembler::epilogue(bool use_pop) {
+  // Avoid using a leave instruction when this frame may
+  // have been frozen, since the current value of rbp
+  // restored from the stub would be invalid. We still
+  // must restore the rbp value saved on enter though.
+  use_pop ? pop(rbp) : leave();
   ret(0);
 }
 
 #define __ _sasm->
 
-StubFrame::StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments) {
+StubFrame::StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, bool use_pop_on_epilog) {
   _sasm = sasm;
+  _use_pop_on_epilog = use_pop_on_epilog;
   __ prologue(name, must_gc_arguments);
 }
 
@@ -239,7 +245,7 @@ void StubFrame::load_argument(int offset_in_words, Register reg) {
 
 
 StubFrame::~StubFrame() {
-  __ epilogue();
+  __ epilogue(_use_pop_on_epilog);
 }
 
 #undef __
@@ -632,6 +638,15 @@ void Runtime1::initialize_pd() {
   // nothing to do
 }
 
+// return: offset in 64-bit words.
+uint Runtime1::runtime_blob_current_thread_offset(frame f) {
+#ifdef _LP64
+  return r15_off / 2;  // rsp offsets are in halfwords
+#else
+  Unimplemented();
+  return 0;
+#endif
+}
 
 // Target: the entry point of the method that creates and posts the exception oop.
 // has_argument: true if the exception needs arguments (passed on the stack because
@@ -1308,7 +1323,7 @@ OopMapSet* Runtime1::generate_code_for(C1StubId id, StubAssembler* sasm) {
       // fall through
     case C1StubId::monitorenter_id:
       {
-        StubFrame f(sasm, "monitorenter", dont_gc_arguments);
+        StubFrame f(sasm, "monitorenter", dont_gc_arguments, true /* use_pop_on_epilog */);
         OopMap* map = save_live_registers(sasm, 3, save_fpu_registers);
 
         // Called with store_parameter and not C abi
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 3a8f1ab839d..06d93ddea26 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -311,61 +311,24 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
   // The object is inflated. tmpReg contains pointer to ObjectMonitor* + markWord::monitor_value
 
 #ifndef _LP64
-  // The object is inflated.
-
-  // boxReg refers to the on-stack BasicLock in the current frame.
-  // We'd like to write:
-  //   set box->_displaced_header = markWord::unused_mark().  Any non-0 value suffices.
-  // This is convenient but results a ST-before-CAS penalty.  The following CAS suffers
-  // additional latency as we have another ST in the store buffer that must drain.
-
-  // avoid ST-before-CAS
-  // register juggle because we need tmpReg for cmpxchgptr below
-  movptr(scrReg, boxReg);
-  movptr(boxReg, tmpReg);                   // consider: LEA box, [tmp-2]
-
-  // Optimistic form: consider XORL tmpReg,tmpReg
-  movptr(tmpReg, NULL_WORD);
-
-  // Appears unlocked - try to swing _owner from null to non-null.
-  // Ideally, I'd manifest "Self" with get_thread and then attempt
-  // to CAS the register containing Self into m->Owner.
-  // But we don't have enough registers, so instead we can either try to CAS
-  // rsp or the address of the box (in scr) into &m->owner.  If the CAS succeeds
-  // we later store "Self" into m->Owner.  Transiently storing a stack address
-  // (rsp or the address of the box) into  m->owner is harmless.
-  // Invariant: tmpReg == 0.  tmpReg is EAX which is the implicit cmpxchg comparand.
-  lock();
-  cmpxchgptr(scrReg, Address(boxReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
-  movptr(Address(scrReg, 0), 3);          // box->_displaced_header = 3
-  // If we weren't able to swing _owner from null to the BasicLock
-  // then take the slow path.
-  jccb  (Assembler::notZero, NO_COUNT);
-  // update _owner from BasicLock to thread
-  get_thread (scrReg);                    // beware: clobbers ICCs
-  movptr(Address(boxReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)), scrReg);
-  xorptr(boxReg, boxReg);                 // set icc.ZFlag = 1 to indicate success
-
-  // If the CAS fails we can either retry or pass control to the slow path.
-  // We use the latter tactic.
-  // Pass the CAS result in the icc.ZFlag into DONE_LABEL
-  // If the CAS was successful ...
-  //   Self has acquired the lock
-  //   Invariant: m->_recursions should already be 0, so we don't need to explicitly set it.
-  // Intentional fall-through into DONE_LABEL ...
-#else // _LP64
+  // Just take slow path to avoid dealing with 64 bit atomic instructions here.
+  orl(boxReg, 1);  // set ICC.ZF=0 to indicate failure
+#else
+  // Unconditionally set box->_displaced_header = markWord::unused_mark().
+  // Without cast to int32_t this style of movptr will destroy r10 which is typically obj.
+  movptr(Address(boxReg, 0), checked_cast<int32_t>(markWord::unused_mark().value()));
+
   // It's inflated and we use scrReg for ObjectMonitor* in this section.
+  movptr(boxReg, Address(r15_thread, JavaThread::lock_id_offset()));
   movq(scrReg, tmpReg);
   xorq(tmpReg, tmpReg);
   lock();
-  cmpxchgptr(thread, Address(scrReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
-  // Unconditionally set box->_displaced_header = markWord::unused_mark().
-  // Without cast to int32_t this style of movptr will destroy r10 which is typically obj.
-  movptr(Address(boxReg, 0), checked_cast<int32_t>(markWord::unused_mark().value()));
+  cmpxchgptr(boxReg, Address(scrReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
+
   // Propagate ICC.ZF from CAS above into DONE_LABEL.
-  jccb(Assembler::equal, COUNT);          // CAS above succeeded; propagate ZF = 1 (success)
+  jccb(Assembler::equal, COUNT);    // CAS above succeeded; propagate ZF = 1 (success)
 
-  cmpptr(thread, rax);                // Check if we are already the owner (recursive lock)
+  cmpptr(boxReg, rax);                // Check if we are already the owner (recursive lock)
   jccb(Assembler::notEqual, NO_COUNT);    // If not recursive, ZF = 0 at this point (fail)
   incq(Address(scrReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(recursions)));
   xorq(rax, rax); // Set ZF = 1 (success) for recursive lock, denoting locking success
@@ -377,9 +340,12 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
   jccb(Assembler::notZero, NO_COUNT); // jump if ZFlag == 0
 
   bind(COUNT);
-  // Count monitors in fast path
-  increment(Address(thread, JavaThread::held_monitor_count_offset()));
-
+  if (LockingMode == LM_LEGACY) {
+#ifdef _LP64
+    // Count monitors in fast path
+    increment(Address(thread, JavaThread::held_monitor_count_offset()));
+#endif
+  }
   xorl(tmpReg, tmpReg); // Set ZF == 1
 
   bind(NO_COUNT);
@@ -441,6 +407,11 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
 
   // It's inflated.
 
+#ifndef _LP64
+  // Just take slow path to avoid dealing with 64 bit atomic instructions here.
+  orl(boxReg, 1);  // set ICC.ZF=0 to indicate failure
+  jmpb(DONE_LABEL);
+#else
   // 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.
@@ -489,12 +460,7 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // Save the monitor pointer in the current thread, so we can try to
   // reacquire the lock in SharedRuntime::monitor_exit_helper().
   andptr(tmpReg, ~(int32_t)markWord::monitor_value);
-#ifndef _LP64
-  get_thread(boxReg);
-  movptr(Address(boxReg, JavaThread::unlocked_inflated_monitor_offset()), tmpReg);
-#else // _LP64
   movptr(Address(r15_thread, JavaThread::unlocked_inflated_monitor_offset()), tmpReg);
-#endif
 
   orl   (boxReg, 1);                      // set ICC.ZF=0 to indicate failure
   jmpb  (DONE_LABEL);
@@ -502,6 +468,7 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   bind  (LSuccess);
   testl (boxReg, 0);                      // set ICC.ZF=1 to indicate success
   jmpb  (DONE_LABEL);
+#endif  // _LP64
 
   if (LockingMode == LM_LEGACY) {
     bind  (Stacked);
@@ -518,13 +485,13 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   jccb(Assembler::notZero, NO_COUNT);
 
   bind(COUNT);
-  // Count monitors in fast path
-#ifndef _LP64
-  get_thread(tmpReg);
-  decrementl(Address(tmpReg, JavaThread::held_monitor_count_offset()));
-#else // _LP64
-  decrementq(Address(r15_thread, JavaThread::held_monitor_count_offset()));
+
+  if (LockingMode == LM_LEGACY) {
+    // Count monitors in fast path
+#ifdef _LP64
+    decrementq(Address(r15_thread, JavaThread::held_monitor_count_offset()));
 #endif
+  }
 
   xorl(tmpReg, tmpReg); // Set ZF == 1
 
@@ -602,6 +569,11 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   { // Handle inflated monitor.
     bind(inflated);
 
+#ifndef _LP64
+    // Just take slow path to avoid dealing with 64 bit atomic instructions here.
+    orl(box, 1);  // set ICC.ZF=0 to indicate failure
+    jmpb(slow_path);
+#else
     const Register monitor = t;
 
     if (!UseObjectMonitorTable) {
@@ -647,27 +619,30 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
     Label monitor_locked;
     // Lock the monitor.
 
-    // CAS owner (null => current thread).
+    if (UseObjectMonitorTable) {
+      // Cache the monitor for unlock before trashing box. On failure to acquire
+      // the lock, the slow path will reset the entry accordingly (see CacheSetter).
+      movptr(Address(box, BasicLock::object_monitor_cache_offset_in_bytes()), monitor);
+    }
+
+    // Try to CAS owner (no owner => current thread's _lock_id).
     xorptr(rax_reg, rax_reg);
-    lock(); cmpxchgptr(thread, owner_address);
+    movptr(box, Address(thread, JavaThread::lock_id_offset()));
+    lock(); cmpxchgptr(box, owner_address);
     jccb(Assembler::equal, monitor_locked);
 
     // Check if recursive.
-    cmpptr(thread, rax_reg);
+    cmpptr(box, rax_reg);
     jccb(Assembler::notEqual, slow_path);
 
     // Recursive.
     increment(recursions_address);
 
     bind(monitor_locked);
-    if (UseObjectMonitorTable) {
-      // Cache the monitor for unlock
-      movptr(Address(box, BasicLock::object_monitor_cache_offset_in_bytes()), monitor);
-    }
+#endif  // _LP64
   }
 
   bind(locked);
-  increment(Address(thread, JavaThread::held_monitor_count_offset()));
   // Set ZF = 1
   xorl(rax_reg, rax_reg);
 
@@ -777,6 +752,11 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
 
     bind(inflated);
 
+#ifndef _LP64
+    // Just take slow path to avoid dealing with 64 bit atomic instructions here.
+    orl(t, 1);  // set ICC.ZF=0 to indicate failure
+    jmpb(slow_path);
+#else
     if (!UseObjectMonitorTable) {
       assert(mark == monitor, "should be the same here");
     } else {
@@ -828,10 +808,10 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     // Recursive unlock.
     bind(recursive);
     decrement(recursions_address);
+#endif  // _LP64
   }
 
   bind(unlocked);
-  decrement(Address(thread, JavaThread::held_monitor_count_offset()));
   xorl(t, t); // Fast Unlock ZF = 1
 
 #ifdef ASSERT
@@ -7093,3 +7073,13 @@ void C2_MacroAssembler::vector_saturating_op(int ideal_opc, BasicType elem_bt, X
     vector_saturating_op(ideal_opc, elem_bt, dst, src1, src2, vlen_enc);
   }
 }
+
+#ifdef _LP64
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Address src) {
+  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
+  // obj-start, so that we can load from the object's mark-word instead. Usually the address
+  // comes as obj-start in obj and klass_offset_in_bytes in disp.
+  movq(dst, src.plus_disp(-oopDesc::klass_offset_in_bytes()));
+  shrq(dst, markWord::klass_shift);
+}
+#endif
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 3a36fd75e3f..523200486cc 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -583,4 +583,8 @@
 
   void select_from_two_vectors_evex(BasicType elem_bt, XMMRegister dst, XMMRegister src1, XMMRegister src2, int vlen_enc);
 
+#ifdef _LP64
+  void load_narrow_klass_compact_c2(Register dst, Address src);
+#endif
+
 #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp b/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
index 34f8bec8d11..2837a85800f 100644
--- a/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
+++ b/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "macroAssembler_x86.hpp"
 #include "stubGenerator_x86_64.hpp"
+#include "oops/arrayOop.hpp"
 #include "opto/c2_MacroAssembler.hpp"
 #include "opto/intrinsicnode.hpp"
 
@@ -160,6 +161,9 @@ static void highly_optimized_short_cases(StrIntrinsicNode::ArgEncoding ae, Regis
                                          Register needle_len, XMMRegister XMM0, XMMRegister XMM1,
                                          Register mask, Register tmp, MacroAssembler *_masm);
 
+static void copy_to_stack(Register haystack, Register haystack_len, bool isU, Register tmp,
+                          XMMRegister xtmp, MacroAssembler *_masm);
+
 static void setup_jump_tables(StrIntrinsicNode::ArgEncoding ae, Label &L_error, Label &L_checkRange,
                               Label &L_fixup, address *big_jump_table, address *small_jump_table,
                               MacroAssembler *_masm);
@@ -395,41 +399,21 @@ static void generate_string_indexof_stubs(StubGenerator *stubgen, address *fnptr
 
   // Do "big switch" if haystack size > 32
   __ cmpq(haystack_len, 0x20);
-  __ ja_b(L_bigSwitchTop);
+  __ ja(L_bigSwitchTop);
 
   // Copy the small (< 32 byte) haystack to the stack.  Allows for vector reads without page fault
   // Only done for small haystacks
   //
   // NOTE: This code assumes that the haystack points to a java array type AND there are
-  //       at least 16 bytes of header preceeding the haystack pointer.
+  //       at least 8 bytes of header preceeding the haystack pointer.
   //
-  // This means that we're copying up to 15 bytes of the header onto the stack along
+  // This means that we're copying up to 7 bytes of the header onto the stack along
   // with the haystack bytes.  After the copy completes, we adjust the haystack pointer
   // to the valid haystack bytes on the stack.
   {
-    Label L_moreThan16, L_adjustHaystack;
-
-    const Register index = rax;
+    const Register tmp = rax;
     const Register haystack = rbx;
-
-    // Only a single vector load/store of either 16 or 32 bytes
-    __ cmpq(haystack_len, 0x10);
-    __ ja_b(L_moreThan16);
-
-    __ movq(index, COPIED_HAYSTACK_STACK_OFFSET + 0x10);
-    __ movdqu(XMM_TMP1, Address(haystack, haystack_len, Address::times_1, -0x10));
-    __ movdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), XMM_TMP1);
-    __ jmpb(L_adjustHaystack);
-
-    __ bind(L_moreThan16);
-    __ movq(index, COPIED_HAYSTACK_STACK_OFFSET + 0x20);
-    __ vmovdqu(XMM_TMP1, Address(haystack, haystack_len, Address::times_1, -0x20));
-    __ vmovdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), XMM_TMP1);
-
-    // Point the haystack at the correct location of the first byte of the "real" haystack on the stack
-    __ bind(L_adjustHaystack);
-    __ subq(index, haystack_len);
-    __ leaq(haystack, Address(rsp, index, Address::times_1));
+    copy_to_stack(haystack, haystack_len, false, tmp, XMM_TMP1, _masm);
   }
 
   // Dispatch to handlers for small needle and small haystack
@@ -760,39 +744,39 @@ static void generate_string_indexof_stubs(StubGenerator *stubgen, address *fnptr
     __ ja(L_wideNoExpand);
 
     //
-    // Reads of existing needle are 16-byte chunks
-    // Writes to copied needle are 32-byte chunks
+    // Reads of existing needle are 8-byte chunks
+    // Writes to copied needle are 16-byte chunks
     // Don't read past the end of the existing needle
     //
-    // Start first read at [((ndlLen % 16) - 16) & 0xf]
-    // outndx += 32
-    // inndx += 16
+    // Start first read at [((ndlLen % 8) - 8) & 0x7]
+    // outndx += 16
+    // inndx += 8
     // cmp nndx, ndlLen
     // jae done
     //
-    // Final index of start of needle at ((16 - (ndlLen %16)) & 0xf) << 1
+    // Final index of start of needle at ((8 - (ndlLen % 8)) & 0x7) << 1
     //
-    // Starting read for needle at -(16 - (nLen % 16))
-    // Offset of needle in stack should be (16 - (nLen % 16)) * 2
+    // Starting read for needle at -(8 - (nLen % 8))
+    // Offset of needle in stack should be (8 - (nLen % 8)) * 2
 
     __ movq(index, needle_len);
-    __ andq(index, 0xf);  // nLen % 16
-    __ movq(offset, 0x10);
-    __ subq(offset, index);  // 16 - (nLen % 16)
+    __ andq(index, 0x7);  // nLen % 8
+    __ movq(offset, 0x8);
+    __ subq(offset, index);  // 8 - (nLen % 8)
     __ movq(index, offset);
     __ shlq(offset, 1);  // * 2
-    __ negq(index);      // -(16 - (nLen % 16))
+    __ negq(index);      // -(8 - (nLen % 8))
     __ xorq(wr_index, wr_index);
 
     __ bind(L_top);
     // load needle and expand
-    __ vpmovzxbw(xmm0, Address(needle, index, Address::times_1), Assembler::AVX_256bit);
+    __ vpmovzxbw(xmm0, Address(needle, index, Address::times_1), Assembler::AVX_128bit);
     // store expanded needle to stack
-    __ vmovdqu(Address(rsp, wr_index, Address::times_1, EXPANDED_NEEDLE_STACK_OFFSET), xmm0);
-    __ addq(index, 0x10);
+    __ movdqu(Address(rsp, wr_index, Address::times_1, EXPANDED_NEEDLE_STACK_OFFSET), xmm0);
+    __ addq(index, 0x8);
     __ cmpq(index, needle_len);
     __ jae(L_finished);
-    __ addq(wr_index, 32);
+    __ addq(wr_index, 16);
     __ jmpb(L_top);
 
     // adjust pointer and length of needle
@@ -1582,35 +1566,9 @@ static void highly_optimized_short_cases(StrIntrinsicNode::ArgEncoding ae, Regis
   assert((COPIED_HAYSTACK_STACK_OFFSET == 0), "Must be zero!");
   assert((COPIED_HAYSTACK_STACK_SIZE == 64), "Must be 64!");
 
-  // Copy incoming haystack onto stack
-  {
-    Label L_adjustHaystack, L_moreThan16;
-
-    // Copy haystack to stack (haystack <= 32 bytes)
-    __ subptr(rsp, COPIED_HAYSTACK_STACK_SIZE);
-    __ cmpq(haystack_len, isU ? 0x8 : 0x10);
-    __ ja_b(L_moreThan16);
-
-    __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 0x10);
-    __ movdqu(XMM0, Address(haystack, haystack_len, isU ? Address::times_2 : Address::times_1, -0x10));
-    __ movdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), XMM0);
-    __ jmpb(L_adjustHaystack);
-
-    __ bind(L_moreThan16);
-    __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 0x20);
-    __ vmovdqu(XMM0, Address(haystack, haystack_len, isU ? Address::times_2 : Address::times_1, -0x20));
-    __ vmovdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), XMM0);
-
-    __ bind(L_adjustHaystack);
-    __ subptr(tmp, haystack_len);
-
-    if (isU) {
-      // For UTF-16, lengths are half
-      __ subptr(tmp, haystack_len);
-    }
-    // Point the haystack to the stack
-    __ leaq(haystack, Address(rsp, tmp, Address::times_1));
-  }
+  // Copy incoming haystack onto stack (haystack <= 32 bytes)
+  __ subptr(rsp, COPIED_HAYSTACK_STACK_SIZE);
+  copy_to_stack(haystack, haystack_len, isU, tmp, XMM0, _masm);
 
   // Creates a mask of (n - k + 1) ones.  This prevents recognizing any false-positives
   // past the end of the valid haystack.
@@ -1672,6 +1630,86 @@ static void highly_optimized_short_cases(StrIntrinsicNode::ArgEncoding ae, Regis
   __ jmpb(L_out);
 }
 
+
+
+// Copy the small (<= 32 byte) haystack to the stack.  Allows for vector reads without page fault
+// Only done for small haystacks
+// NOTE: This code assumes that the haystack points to a java array type AND there are
+//       at least 8 bytes of header preceeding the haystack pointer.
+// We're copying up to 7 bytes of the header onto the stack along with the haystack bytes.
+// After the copy completes, we adjust the haystack pointer
+// to the valid haystack bytes on the stack.
+//
+// Copy haystack array elements to stack at region
+// (COPIED_HAYSTACK_STACK_OFFSET - COPIED_HAYSTACK_STACK_OFFSET+63) with the following conditions:
+//   It may copy up to 7 bytes that precede the array
+//   It doesn't read beyond the end of the array
+//   There are atleast 31 bytes of stack region beyond the end of array
+// Inputs:
+//   haystack - Address of haystack
+//   haystack_len - Number of elements in haystack
+//   isU - Boolean indicating if each element is Latin1 or UTF16
+//   tmp, xtmp - Scratch registers
+// Output:
+//   haystack - Address of copied string on stack
+
+static void copy_to_stack(Register haystack, Register haystack_len, bool isU,
+                          Register tmp, XMMRegister xtmp, MacroAssembler *_masm) {
+  Label L_moreThan8, L_moreThan16, L_moreThan24, L_adjustHaystack;
+
+  assert(arrayOopDesc::base_offset_in_bytes(isU ? T_CHAR : T_BYTE) >= 8,
+         "Needs at least 8 bytes preceding the array body");
+
+  // Copy haystack to stack (haystack <= 32 bytes)
+  int scale = isU ? 2 : 1; // bytes per char
+  Address::ScaleFactor addrScale = isU ? Address::times_2 : Address::times_1;
+
+  __ cmpq(haystack_len, 16/scale);
+  __ ja_b(L_moreThan16);
+
+  __ cmpq(haystack_len, 8/scale);
+  __ ja_b(L_moreThan8);
+  // haystack length <= 8 bytes, copy 8 bytes upto haystack end reading at most 7 bytes into the header
+  __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 8);
+  __ movq(xtmp, Address(haystack, haystack_len, addrScale, -8));
+  __ movq(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), xtmp);
+  __ jmpb(L_adjustHaystack);
+
+  __ bind(L_moreThan8);
+  // haystack length > 8 and <=16 bytes, copy 16 bytes upto haystack end reading at most 7 bytes into the header
+  __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 16);
+  __ movdqu(xtmp, Address(haystack, haystack_len, addrScale, -16));
+  __ movdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), xtmp);
+  __ jmpb(L_adjustHaystack);
+
+  __ bind(L_moreThan16);
+  __ cmpq(haystack_len, 24/scale);
+  __ ja_b(L_moreThan24);
+  // haystack length > 16 and <=24 bytes, copy 24 bytes upto haystack end reading at most 7 bytes into the header
+  __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 24);
+  __ movdqu(xtmp, Address(haystack, haystack_len, addrScale, -24));
+  __ movdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), xtmp);
+  __ movq(xtmp, Address(haystack, haystack_len, addrScale, -8));
+  __ movq(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET + 16), xtmp);
+  __ jmpb(L_adjustHaystack);
+
+  __ bind(L_moreThan24);
+  // haystack length > 24 and < 32 bytes, copy 32 bytes upto haystack end reading at most 7 bytes into the header
+  __ movq(tmp, COPIED_HAYSTACK_STACK_OFFSET + 32);
+  __ vmovdqu(xtmp, Address(haystack, haystack_len, addrScale, -32));
+  __ vmovdqu(Address(rsp, COPIED_HAYSTACK_STACK_OFFSET), xtmp);
+
+  __ bind(L_adjustHaystack);
+  __ subptr(tmp, haystack_len);
+
+  if (isU) {
+    __ subptr(tmp, haystack_len);
+  }
+
+  // Point the haystack to the stack
+  __ leaq(haystack, Address(rsp, tmp, Address::times_1));
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
index ecc2d81e672..ba8fcb3aa9c 100644
--- a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,6 +126,11 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   }
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  assert(f.interpreter_frame_last_sp() == nullptr, "should be null for top frame");
+  f.interpreter_frame_set_last_sp(f.unextended_sp());
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   assert(hf.fp() == hf.unextended_sp() + (f.fp() - f.unextended_sp()), "");
   assert((f.at(frame::interpreter_frame_last_sp_offset) != 0)
@@ -136,7 +141,10 @@ inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, co
   assert((intptr_t*)hf.at_relative(frame::interpreter_frame_last_sp_offset) == hf.unextended_sp(), "");
 
   // Make sure that locals is already relativized.
-  assert((*hf.addr_at(frame::interpreter_frame_locals_offset) == frame::sender_sp_offset + f.interpreter_frame_method()->max_locals() - 1), "");
+  DEBUG_ONLY(Method* m = f.interpreter_frame_method();)
+  // Frames for native methods have 2 extra words (temp oop/result handler) before fixed part of frame.
+  DEBUG_ONLY(int max_locals = !m->is_native() ? m->max_locals() : m->size_of_parameters() + 2;)
+  assert((*hf.addr_at(frame::interpreter_frame_locals_offset) == frame::sender_sp_offset + max_locals - 1), "");
 
   // Make sure that monitor_block_top is already relativized.
   assert(hf.at_absolute(frame::interpreter_frame_monitor_block_top_offset) <= frame::interpreter_frame_initial_sp_offset, "");
@@ -207,7 +215,6 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     // If caller is interpreted it already made room for the callee arguments
     int overlap = caller.is_interpreted_frame() ? ContinuationHelper::InterpretedFrame::stack_argsize(hf) : 0;
     const int fsize = (int)(ContinuationHelper::InterpretedFrame::frame_bottom(hf) - hf.unextended_sp() - overlap);
-    const int locals = hf.interpreter_frame_method()->max_locals();
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     intptr_t* fp = frame_sp + (hf.fp() - heap_sp);
     DEBUG_ONLY(intptr_t* unextended_sp = fp + *hf.addr_at(frame::interpreter_frame_last_sp_offset);)
@@ -217,7 +224,10 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     // we need to set the locals so that the caller of new_stack_frame() can call
     // ContinuationHelper::InterpretedFrame::frame_bottom
     intptr_t locals_offset = *hf.addr_at(frame::interpreter_frame_locals_offset);
-    assert((int)locals_offset == frame::sender_sp_offset + locals - 1, "");
+    DEBUG_ONLY(Method* m = hf.interpreter_frame_method();)
+    // Frames for native methods have 2 extra words (temp oop/result handler) before fixed part of frame.
+    DEBUG_ONLY(const int max_locals = !m->is_native() ? m->max_locals() : m->size_of_parameters() + 2;)
+    assert((int)locals_offset == frame::sender_sp_offset + max_locals - 1, "");
     // copy relativized locals from the heap frame
     *f.addr_at(frame::interpreter_frame_locals_offset) = locals_offset;
     return f;
@@ -225,7 +235,7 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
     int fsize = FKind::size(hf);
     intptr_t* frame_sp = caller.unextended_sp() - fsize;
     if (bottom || caller.is_interpreted_frame()) {
-      int argsize = hf.compiled_frame_stack_argsize();
+      int argsize = FKind::stack_argsize(hf);
 
       fsize += argsize;
       frame_sp   -= argsize;
@@ -242,8 +252,9 @@ template<typename FKind> frame ThawBase::new_stack_frame(const frame& hf, frame&
       // we need to recreate a "real" frame pointer, pointing into the stack
       fp = frame_sp + FKind::size(hf) - frame::sender_sp_offset;
     } else {
-       // we need to re-read fp because it may be an oop and we might have fixed the frame.
-      fp = *(intptr_t**)(hf.sp() - frame::sender_sp_offset);
+      fp = FKind::stub || FKind::native
+        ? frame_sp + fsize - frame::sender_sp_offset // fp always points to the address below the pushed return pc. We need correct address.
+        : *(intptr_t**)(hf.sp() - frame::sender_sp_offset); // we need to re-read fp because it may be an oop and we might have fixed the frame.
     }
     return frame(frame_sp, frame_sp, fp, hf.pc(), hf.cb(), hf.oop_map(), false); // TODO PERF : this computes deopt state; is it necessary?
   }
@@ -266,6 +277,22 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  intptr_t* fp = caller_sp - frame::sender_sp_offset;
+  patch_callee_link(f, fp);
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
+  sp[-2] = (intptr_t)enterSpecial.fp();
+
+  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+  return sp;
+}
+
 inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, const frame& f) {
   // Make sure that last_sp is kept relativized.
   assert((intptr_t*)f.at_relative(frame::interpreter_frame_last_sp_offset) == f.unextended_sp(), "");
diff --git a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
index dab6cec2a5f..46fe0946951 100644
--- a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,20 @@ static inline intptr_t** link_address(const frame& f) {
     : (intptr_t**)(f.unextended_sp() + f.cb()->frame_size() - frame::sender_sp_offset);
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  if (f.is_runtime_frame()) {
+    // Patch the pc of the now old last Java frame (we already set the anchor to enterSpecial)
+    // so that when target goes back to Java it will actually return to the preempt cleanup stub.
+    intptr_t* sp = f.sp();
+    sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
+  } else {
+    // The target will check for preemption once it returns to the interpreter
+    // or the native wrapper code and will manually jump to the preempt stub.
+    JavaThread *thread = JavaThread::current();
+    thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
+  }
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
 #ifdef _LP64
   return size & 1;
@@ -72,12 +86,12 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   anchor->set_last_Java_fp(entry->entry_fp());
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   intptr_t* fp = *(intptr_t**)(sp - frame::sender_sp_offset);
   anchor->set_last_Java_fp(fp);
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   intptr_t* sp = f.sp();
   address pc = *(address*)(sp - frame::sender_sp_ret_address_offset());
diff --git a/src/hotspot/cpu/x86/frame_x86.cpp b/src/hotspot/cpu/x86/frame_x86.cpp
index aeb77763e7f..4e28dc12534 100644
--- a/src/hotspot/cpu/x86/frame_x86.cpp
+++ b/src/hotspot/cpu/x86/frame_x86.cpp
@@ -409,6 +409,36 @@ frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
   return fr;
 }
 
+#if defined(ASSERT)
+static address get_register_address_in_stub(const frame& stub_fr, VMReg reg) {
+  RegisterMap map(nullptr,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  stub_fr.oop_map()->update_register_map(&stub_fr, &map);
+  return map.location(reg, stub_fr.sp());
+}
+#endif
+
+JavaThread** frame::saved_thread_address(const frame& f) {
+  CodeBlob* cb = f.cb();
+  assert(cb != nullptr && cb->is_runtime_stub(), "invalid frame");
+
+  JavaThread** thread_addr;
+#ifdef COMPILER1
+  if (cb == Runtime1::blob_for(C1StubId::monitorenter_id) ||
+      cb == Runtime1::blob_for(C1StubId::monitorenter_nofpu_id)) {
+    thread_addr = (JavaThread**)(f.sp() + Runtime1::runtime_blob_current_thread_offset(f));
+  } else
+#endif
+  {
+    // c2 only saves rbp in the stub frame so nothing to do.
+    thread_addr = nullptr;
+  }
+  assert(get_register_address_in_stub(f, SharedRuntime::thread_register()) == (address)thread_addr, "wrong thread address");
+  return thread_addr;
+}
+
 //------------------------------------------------------------------------------
 // frame::verify_deopt_original_pc
 //
diff --git a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
index 12ac26aff21..873cfbdcea0 100644
--- a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
+++ b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
@@ -34,7 +34,9 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define SUPPORTS_NATIVE_CX8
 
+#ifdef _LP64
 #define SUPPORT_MONITOR_COUNT
+#endif
 
 #define CPU_MULTI_COPY_ATOMIC
 
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index f4b95d846c6..3a3f01a6409 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -336,6 +336,66 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
   restore_locals();
 }
 
+#ifdef _LP64
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                                    address entry_point,
+                                                    Register arg_1) {
+  assert(arg_1 == c_rarg1, "");
+  Label resume_pc, not_preempted;
+
+#ifdef ASSERT
+  {
+    Label L;
+    cmpptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
+    jcc(Assembler::equal, L);
+    stop("Should not have alternate return address set");
+    bind(L);
+  }
+#endif /* ASSERT */
+
+  // Force freeze slow path.
+  push_cont_fastpath();
+
+  // Make VM call. In case of preemption set last_pc to the one we want to resume to.
+  // Note: call_VM_helper requires last_Java_pc for anchor to be at the top of the stack.
+  lea(rscratch1, resume_pc);
+  push(rscratch1);
+  MacroAssembler::call_VM_helper(oop_result, entry_point, 1, false /*check_exceptions*/);
+  pop(rscratch1);
+
+  pop_cont_fastpath();
+
+  // Check if preempted.
+  movptr(rscratch1, Address(r15_thread, JavaThread::preempt_alternate_return_offset()));
+  cmpptr(rscratch1, NULL_WORD);
+  jccb(Assembler::zero, not_preempted);
+  movptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
+  jmp(rscratch1);
+
+  // In case of preemption, this is where we will resume once we finally acquire the monitor.
+  bind(resume_pc);
+  restore_after_resume(false /* is_native */);
+
+  bind(not_preempted);
+}
+
+void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
+  lea(rscratch1, ExternalAddress(Interpreter::cont_resume_interpreter_adapter()));
+  call(rscratch1);
+  if (is_native) {
+    // On resume we need to set up stack as expected.
+    push(dtos);
+    push(ltos);
+  }
+}
+#else
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                         address entry_point,
+                         Register arg_1) {
+  MacroAssembler::call_VM(oop_result, entry_point, arg_1);
+}
+#endif  // _LP64
+
 void InterpreterMacroAssembler::check_and_handle_popframe(Register java_thread) {
   if (JvmtiExport::can_pop_frame()) {
     Label L;
@@ -1154,7 +1214,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
          "The argument is only for looks. It must be c_rarg1");
 
   if (LockingMode == LM_MONITOR) {
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
   } else {
@@ -1241,14 +1301,14 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
       jcc(Assembler::notZero, slow_case);
 
       bind(count_locking);
+      inc_held_monitor_count();
     }
-    inc_held_monitor_count();
     jmp(done);
 
     bind(slow_case);
 
     // Call the runtime routine for slow case
-    call_VM(noreg,
+    call_VM_preemptable(noreg,
             CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
             lock_reg);
     bind(done);
@@ -1321,8 +1381,8 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
       jcc(Assembler::notZero, slow_case);
 
       bind(count_locking);
+      dec_held_monitor_count();
     }
-    dec_held_monitor_count();
     jmp(done);
 
     bind(slow_case);
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index a23058486c3..a122161b1c7 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -63,6 +63,11 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1);
+  void restore_after_resume(bool is_native);
+
   // Interpreter-specific registers
   void save_bcp() {
     movptr(Address(rbp, frame::interpreter_frame_bcp_offset * wordSize), _bcp_register);
diff --git a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
index 52e4388c5d2..12336289412 100644
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
+++ b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
@@ -36,17 +36,6 @@
 
 #define BUFFER_SIZE 30
 
-#ifdef _WINDOWS
-GetBooleanField_t JNI_FastGetField::jni_fast_GetBooleanField_fp;
-GetByteField_t    JNI_FastGetField::jni_fast_GetByteField_fp;
-GetCharField_t    JNI_FastGetField::jni_fast_GetCharField_fp;
-GetShortField_t   JNI_FastGetField::jni_fast_GetShortField_fp;
-GetIntField_t     JNI_FastGetField::jni_fast_GetIntField_fp;
-GetLongField_t    JNI_FastGetField::jni_fast_GetLongField_fp;
-GetFloatField_t   JNI_FastGetField::jni_fast_GetFloatField_fp;
-GetDoubleField_t  JNI_FastGetField::jni_fast_GetDoubleField_fp;
-#endif
-
 // Instead of issuing lfence for LoadLoad barrier, we create data dependency
 // between loads, which is much more efficient than lfence.
 
@@ -119,12 +108,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
   // ca1 is data dependent on rax,.
   __ jcc (Assembler::notEqual, slow);
 
-#ifndef _WINDOWS
   __ ret (0);
-#else
-  // __stdcall calling convention
-  __ ret (3*wordSize);
-#endif
 
   slowcase_entry_pclist[count++] = __ pc();
   __ bind (slow);
@@ -142,18 +126,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
 
   __ flush ();
 
-#ifndef _WINDOWS
   return fast_entry;
-#else
-  switch (type) {
-  case T_BOOLEAN: jni_fast_GetBooleanField_fp = (GetBooleanField_t) fast_entry; break;
-  case T_BYTE:    jni_fast_GetByteField_fp    = (GetByteField_t)    fast_entry; break;
-  case T_CHAR:    jni_fast_GetCharField_fp    = (GetCharField_t)    fast_entry; break;
-  case T_SHORT:   jni_fast_GetShortField_fp   = (GetShortField_t)   fast_entry; break;
-  case T_INT:     jni_fast_GetIntField_fp     = (GetIntField_t)     fast_entry; break;
-  }
-  return os::win32::fast_jni_accessor_wrapper(type);
-#endif
 }
 
 address JNI_FastGetField::generate_fast_get_boolean_field() {
@@ -238,12 +211,7 @@ address JNI_FastGetField::generate_fast_get_long_field() {
 
   __ pop (rsi);
 
-#ifndef _WINDOWS
   __ ret (0);
-#else
-  // __stdcall calling convention
-  __ ret (3*wordSize);
-#endif
 
   slowcase_entry_pclist[count-1] = __ pc();
   slowcase_entry_pclist[count++] = __ pc();
@@ -255,12 +223,7 @@ address JNI_FastGetField::generate_fast_get_long_field() {
 
   __ flush ();
 
-#ifndef _WINDOWS
   return fast_entry;
-#else
-  jni_fast_GetLongField_fp = (GetLongField_t) fast_entry;
-  return os::win32::fast_jni_accessor_wrapper(T_LONG);
-#endif
 }
 
 address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
@@ -330,12 +293,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
   // access.
   __ jcc (Assembler::notEqual, slow_with_pop);
 
-#ifndef _WINDOWS
   __ ret (0);
-#else
-  // __stdcall calling convention
-  __ ret (3*wordSize);
-#endif
 
   __ bind (slow_with_pop);
   // invalid load. pop FPU stack.
@@ -354,15 +312,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
 
   __ flush ();
 
-#ifndef _WINDOWS
   return fast_entry;
-#else
-  switch (type) {
-  case T_FLOAT:  jni_fast_GetFloatField_fp  = (GetFloatField_t)  fast_entry; break;
-  case T_DOUBLE: jni_fast_GetDoubleField_fp = (GetDoubleField_t) fast_entry; break;
-  }
-  return os::win32::fast_jni_accessor_wrapper(type);
-#endif
 }
 
 address JNI_FastGetField::generate_fast_get_float_field() {
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 2da8fe68502..08e089455f2 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -35,6 +35,7 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
 #include "jvm.h"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -528,7 +529,6 @@ void MacroAssembler::call_VM_leaf_base(address entry_point, int num_args) {
   // restore stack pointer
   addq(rsp, frame::arg_reg_save_area_bytes);
 #endif
-
 }
 
 void MacroAssembler::cmp64(Register src1, AddressLiteral src2, Register rscratch) {
@@ -1350,7 +1350,8 @@ void MacroAssembler::ic_call(address entry, jint method_index) {
 }
 
 int MacroAssembler::ic_check_size() {
-  return LP64_ONLY(14) NOT_LP64(12);
+  return
+      LP64_ONLY(UseCompactObjectHeaders ? 17 : 14) NOT_LP64(12);
 }
 
 int MacroAssembler::ic_check(int end_alignment) {
@@ -1366,6 +1367,12 @@ int MacroAssembler::ic_check(int end_alignment) {
 
   int uep_offset = offset();
 
+#ifdef _LP64
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(temp, receiver);
+    cmpl(temp, Address(data, CompiledICData::speculated_klass_offset()));
+  } else
+#endif
   if (UseCompressedClassPointers) {
     movl(temp, Address(receiver, oopDesc::klass_offset_in_bytes()));
     cmpl(temp, Address(data, CompiledICData::speculated_klass_offset()));
@@ -1376,7 +1383,7 @@ int MacroAssembler::ic_check(int end_alignment) {
 
   // if inline cache check fails, then jump to runtime routine
   jump_cc(Assembler::notEqual, RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
-  assert((offset() % end_alignment) == 0, "Misaligned verified entry point");
+  assert((offset() % end_alignment) == 0, "Misaligned verified entry point (%d, %d, %d)", uep_offset, offset(), end_alignment);
 
   return uep_offset;
 }
@@ -3033,25 +3040,13 @@ void MacroAssembler::pop_cont_fastpath() {
 }
 
 void MacroAssembler::inc_held_monitor_count() {
-#ifndef _LP64
-  Register thread = rax;
-  push(thread);
-  get_thread(thread);
-  incrementl(Address(thread, JavaThread::held_monitor_count_offset()));
-  pop(thread);
-#else // LP64
+#ifdef _LP64
   incrementq(Address(r15_thread, JavaThread::held_monitor_count_offset()));
 #endif
 }
 
 void MacroAssembler::dec_held_monitor_count() {
-#ifndef _LP64
-  Register thread = rax;
-  push(thread);
-  get_thread(thread);
-  decrementl(Address(thread, JavaThread::held_monitor_count_offset()));
-  pop(thread);
-#else // LP64
+#ifdef _LP64
   decrementq(Address(r15_thread, JavaThread::held_monitor_count_offset()));
 #endif
 }
@@ -3148,6 +3143,17 @@ void MacroAssembler::set_last_Java_frame(Register java_thread,
   movptr(Address(java_thread, JavaThread::last_Java_sp_offset()), last_java_sp);
 }
 
+#ifdef _LP64
+void MacroAssembler::set_last_Java_frame(Register last_java_sp,
+                                         Register last_java_fp,
+                                         Label &L,
+                                         Register scratch) {
+  lea(scratch, L);
+  movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), scratch);
+  set_last_Java_frame(r15_thread, last_java_sp, last_java_fp, nullptr, scratch);
+}
+#endif
+
 void MacroAssembler::shlptr(Register dst, int imm8) {
   LP64_ONLY(shlq(dst, imm8)) NOT_LP64(shll(dst, imm8));
 }
@@ -4092,7 +4098,7 @@ RegSet MacroAssembler::call_clobbered_gp_registers() {
   RegSet regs;
 #ifdef _LP64
   regs += RegSet::of(rax, rcx, rdx);
-#ifndef WINDOWS
+#ifndef _WINDOWS
   regs += RegSet::of(rsi, rdi);
 #endif
   regs += RegSet::range(r8, r11);
@@ -4109,7 +4115,7 @@ RegSet MacroAssembler::call_clobbered_gp_registers() {
 
 XMMRegSet MacroAssembler::call_clobbered_xmm_registers() {
   int num_xmm_registers = XMMRegister::available_xmm_registers();
-#if defined(WINDOWS) && defined(_LP64)
+#if defined(_WINDOWS)
   XMMRegSet result = XMMRegSet::range(xmm0, xmm5);
   if (num_xmm_registers > 16) {
      result += XMMRegSet::range(xmm16, as_XMMRegister(num_xmm_registers - 1));
@@ -5948,19 +5954,33 @@ void MacroAssembler::load_method_holder(Register holder, Register method) {
   movptr(holder, Address(holder, ConstantPool::pool_holder_offset()));          // InstanceKlass*
 }
 
+#ifdef _LP64
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
+  assert(UseCompactObjectHeaders, "expect compact object headers");
+  movq(dst, Address(src, oopDesc::mark_offset_in_bytes()));
+  shrq(dst, markWord::klass_shift);
+}
+#endif
+
 void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
   assert_different_registers(src, tmp);
   assert_different_registers(dst, tmp);
 #ifdef _LP64
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    load_narrow_klass_compact(dst, src);
+    decode_klass_not_null(dst, tmp);
+  } else if (UseCompressedClassPointers) {
     movl(dst, Address(src, oopDesc::klass_offset_in_bytes()));
     decode_klass_not_null(dst, tmp);
   } else
 #endif
+  {
     movptr(dst, Address(src, oopDesc::klass_offset_in_bytes()));
+  }
 }
 
 void MacroAssembler::store_klass(Register dst, Register src, Register tmp) {
+  assert(!UseCompactObjectHeaders, "not with compact headers");
   assert_different_registers(src, tmp);
   assert_different_registers(dst, tmp);
 #ifdef _LP64
@@ -5972,6 +5992,41 @@ void MacroAssembler::store_klass(Register dst, Register src, Register tmp) {
     movptr(Address(dst, oopDesc::klass_offset_in_bytes()), src);
 }
 
+void MacroAssembler::cmp_klass(Register klass, Register obj, Register tmp) {
+#ifdef _LP64
+  if (UseCompactObjectHeaders) {
+    assert(tmp != noreg, "need tmp");
+    assert_different_registers(klass, obj, tmp);
+    load_narrow_klass_compact(tmp, obj);
+    cmpl(klass, tmp);
+  } else if (UseCompressedClassPointers) {
+    cmpl(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+  } else
+#endif
+  {
+    cmpptr(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+  }
+}
+
+void MacroAssembler::cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2) {
+#ifdef _LP64
+  if (UseCompactObjectHeaders) {
+    assert(tmp2 != noreg, "need tmp2");
+    assert_different_registers(obj1, obj2, tmp1, tmp2);
+    load_narrow_klass_compact(tmp1, obj1);
+    load_narrow_klass_compact(tmp2, obj2);
+    cmpl(tmp1, tmp2);
+  } else if (UseCompressedClassPointers) {
+    movl(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    cmpl(tmp1, Address(obj2, oopDesc::klass_offset_in_bytes()));
+  } else
+#endif
+  {
+    movptr(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));
+    cmpptr(tmp1, Address(obj2, oopDesc::klass_offset_in_bytes()));
+  }
+}
+
 void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                                     Register tmp1, Register thread_tmp) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
@@ -6019,6 +6074,7 @@ void MacroAssembler::store_heap_oop_null(Address dst) {
 
 #ifdef _LP64
 void MacroAssembler::store_klass_gap(Register dst, Register src) {
+  assert(!UseCompactObjectHeaders, "Don't use with compact headers");
   if (UseCompressedClassPointers) {
     // Store to klass gap in destination
     movl(Address(dst, oopDesc::klass_gap_offset_in_bytes()), src);
@@ -6183,8 +6239,7 @@ void MacroAssembler::encode_klass_not_null(Register r, Register tmp) {
     subq(r, tmp);
   }
   if (CompressedKlassPointers::shift() != 0) {
-    assert (LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-    shrq(r, LogKlassAlignmentInBytes);
+    shrq(r, CompressedKlassPointers::shift());
   }
 }
 
@@ -6197,8 +6252,7 @@ void MacroAssembler::encode_and_move_klass_not_null(Register dst, Register src)
     movptr(dst, src);
   }
   if (CompressedKlassPointers::shift() != 0) {
-    assert (LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-    shrq(dst, LogKlassAlignmentInBytes);
+    shrq(dst, CompressedKlassPointers::shift());
   }
 }
 
@@ -6210,8 +6264,7 @@ void  MacroAssembler::decode_klass_not_null(Register r, Register tmp) {
   // vtableStubs also counts instructions in pd_code_size_limit.
   // Also do not verify_oop as this is called by verify_oop.
   if (CompressedKlassPointers::shift() != 0) {
-    assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-    shlq(r, LogKlassAlignmentInBytes);
+    shlq(r, CompressedKlassPointers::shift());
   }
   if (CompressedKlassPointers::base() != nullptr) {
     mov64(tmp, (int64_t)CompressedKlassPointers::base());
@@ -6233,17 +6286,28 @@ void  MacroAssembler::decode_and_move_klass_not_null(Register dst, Register src)
     // a pointer that needs nothing but a register rename.
     movl(dst, src);
   } else {
-    if (CompressedKlassPointers::base() != nullptr) {
-      mov64(dst, (int64_t)CompressedKlassPointers::base());
-    } else {
-      xorq(dst, dst);
-    }
-    if (CompressedKlassPointers::shift() != 0) {
-      assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
-      assert(LogKlassAlignmentInBytes == Address::times_8, "klass not aligned on 64bits?");
-      leaq(dst, Address(dst, src, Address::times_8, 0));
+    if (CompressedKlassPointers::shift() <= Address::times_8) {
+      if (CompressedKlassPointers::base() != nullptr) {
+        mov64(dst, (int64_t)CompressedKlassPointers::base());
+      } else {
+        xorq(dst, dst);
+      }
+      if (CompressedKlassPointers::shift() != 0) {
+        assert(CompressedKlassPointers::shift() == Address::times_8, "klass not aligned on 64bits?");
+        leaq(dst, Address(dst, src, Address::times_8, 0));
+      } else {
+        addq(dst, src);
+      }
     } else {
+      if (CompressedKlassPointers::base() != nullptr) {
+        const uint64_t base_right_shifted =
+            (uint64_t)CompressedKlassPointers::base() >> CompressedKlassPointers::shift();
+        mov64(dst, base_right_shifted);
+      } else {
+        xorq(dst, dst);
+      }
       addq(dst, src);
+      shlq(dst, CompressedKlassPointers::shift());
     }
   }
 }
@@ -10560,10 +10624,6 @@ Assembler::Condition MacroAssembler::negate_condition(Assembler::Condition cond)
   ShouldNotReachHere(); return Assembler::overflow;
 }
 
-// 32-bit Windows has its own fast-path implementation
-// of get_thread
-#if !defined(WIN32) || defined(_LP64)
-
 // This is simply a call to Thread::current()
 void MacroAssembler::get_thread(Register thread) {
   if (thread != rax) {
@@ -10598,9 +10658,6 @@ void MacroAssembler::get_thread(Register thread) {
   }
 }
 
-
-#endif // !WIN32 || _LP64
-
 void MacroAssembler::check_stack_alignment(Register sp, const char* msg, unsigned bias, Register tmp) {
   Label L_stack_ok;
   if (bias == 0) {
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 618ec87da86..c6e5b2a115f 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -111,7 +111,8 @@ class MacroAssembler: public Assembler {
         op == 0xEB /* short jmp */ ||
         (op & 0xF0) == 0x70 /* short jcc */ ||
         (op == 0x0F && (branch[1] & 0xF0) == 0x80) /* jcc */ ||
-        (op == 0xC7 && branch[1] == 0xF8) /* xbegin */,
+        (op == 0xC7 && branch[1] == 0xF8) /* xbegin */ ||
+        (op == 0x8D) /* lea */,
         "Invalid opcode at patch point");
 
     if (op == 0xEB || (op & 0xF0) == 0x70) {
@@ -122,7 +123,7 @@ class MacroAssembler: public Assembler {
                 file == nullptr ? "<null>" : file, line);
       *disp = (char)imm8;
     } else {
-      int* disp = (int*) &branch[(op == 0x0F || op == 0xC7)? 2: 1];
+      int* disp = (int*) &branch[(op == 0x0F || op == 0xC7 || op == 0x8D) ? 2 : 1];
       int imm32 = checked_cast<int>(target - (address) &disp[1]);
       *disp = imm32;
     }
@@ -335,6 +336,13 @@ class MacroAssembler: public Assembler {
                            address  last_java_pc,
                            Register rscratch);
 
+#ifdef _LP64
+  void set_last_Java_frame(Register last_java_sp,
+                           Register last_java_fp,
+                           Label &last_java_pc,
+                           Register scratch);
+#endif
+
   void reset_last_Java_frame(Register thread, bool clear_fp);
 
   // thread in the default location (r15_thread on 64bit)
@@ -363,9 +371,20 @@ class MacroAssembler: public Assembler {
   void load_method_holder(Register holder, Register method);
 
   // oop manipulations
+#ifdef _LP64
+  void load_narrow_klass_compact(Register dst, Register src);
+#endif
   void load_klass(Register dst, Register src, Register tmp);
   void store_klass(Register dst, Register src, Register tmp);
 
+  // Compares the Klass pointer of an object to a given Klass (which might be narrow,
+  // depending on UseCompressedClassPointers).
+  void cmp_klass(Register klass, Register obj, Register tmp);
+
+  // Compares the Klass pointer of two objects obj1 and obj2. Result is in the condition flags.
+  // Uses tmp1 and tmp2 as temporary registers.
+  void cmp_klasses_from_objects(Register obj1, Register obj2, Register tmp1, Register tmp2);
+
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                       Register tmp1, Register thread_tmp);
   void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
@@ -943,7 +962,7 @@ class MacroAssembler: public Assembler {
   void atomic_incptr(AddressLiteral counter_addr, Register rscratch = noreg) { LP64_ONLY(atomic_incq(counter_addr, rscratch)) NOT_LP64(atomic_incl(counter_addr, rscratch)) ; }
   void atomic_incptr(Address counter_addr) { LP64_ONLY(atomic_incq(counter_addr)) NOT_LP64(atomic_incl(counter_addr)) ; }
 
-  void lea(Register dst, Address        adr) { Assembler::lea(dst, adr); }
+  using Assembler::lea;
   void lea(Register dst, AddressLiteral adr);
   void lea(Address  dst, AddressLiteral adr, Register rscratch);
 
diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index 192e959451f..3d8b0ed092f 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -93,7 +93,7 @@
   static bool narrow_klass_use_complex_address() {
     NOT_LP64(ShouldNotCallThis();)
     assert(UseCompressedClassPointers, "only for compressed klass code");
-    return (LogKlassAlignmentInBytes <= 3);
+    return (CompressedKlassPointers::shift() <= 3);
   }
 
   // Prefer ConN+DecodeN over ConP.
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index c6ab00cc9ee..ee99f49321a 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -2056,6 +2056,11 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
+VMReg SharedRuntime::thread_register() {
+  Unimplemented();
+  return nullptr;
+}
+
 //------------------------------generate_deopt_blob----------------------------
 void SharedRuntime::generate_deopt_blob() {
   // allocate space for the code
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 174e2e02779..b98a17848df 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -171,6 +171,7 @@ class RegisterSaver {
   static int rax_offset_in_bytes(void)    { return BytesPerInt * rax_off; }
   static int rdx_offset_in_bytes(void)    { return BytesPerInt * rdx_off; }
   static int rbx_offset_in_bytes(void)    { return BytesPerInt * rbx_off; }
+  static int r15_offset_in_bytes(void)    { return BytesPerInt * r15_off; }
   static int xmm0_offset_in_bytes(void)   { return BytesPerInt * xmm0_off; }
   static int return_offset_in_bytes(void) { return BytesPerInt * return_off; }
 
@@ -1420,7 +1421,7 @@ static void fill_continuation_entry(MacroAssembler* masm, Register reg_cont_obj,
 // Kills:
 //   rbx
 //
-void static continuation_enter_cleanup(MacroAssembler* masm) {
+static void continuation_enter_cleanup(MacroAssembler* masm) {
 #ifdef ASSERT
   Label L_good_sp;
   __ cmpptr(rsp, Address(r15_thread, JavaThread::cont_entry_offset()));
@@ -1610,6 +1611,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
 
   __ bind(L_thaw);
 
+  ContinuationEntry::_thaw_call_pc_offset = __ pc() - start;
   __ call(RuntimeAddress(StubRoutines::cont_thaw()));
 
   ContinuationEntry::_return_pc_offset = __ pc() - start;
@@ -1619,7 +1621,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   // --- Normal exit (resolve/thawing)
 
   __ bind(L_exit);
-
+  ContinuationEntry::_cleanup_offset = __ pc() - start;
   continuation_enter_cleanup(masm);
   __ pop(rbp);
   __ ret(0);
@@ -1712,6 +1714,10 @@ static void gen_continuation_yield(MacroAssembler* masm,
   __ ret(0);
 }
 
+void SharedRuntime::continuation_enter_cleanup(MacroAssembler* masm) {
+  ::continuation_enter_cleanup(masm);
+}
+
 static void gen_special_dispatch(MacroAssembler* masm,
                                  const methodHandle& method,
                                  const BasicType* sig_bt,
@@ -2180,11 +2186,16 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // points into the right code segment. It does not have to be the correct return pc.
   // We use the same pc/oopMap repeatedly when we call out
 
-  intptr_t the_pc = (intptr_t) __ pc();
-  oop_maps->add_gc_map(the_pc - start, map);
-
-  __ set_last_Java_frame(rsp, noreg, (address)the_pc, rscratch1);
+  Label native_return;
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // For convenience we use the pc we want to resume to in case of preemption on Object.wait.
+    __ set_last_Java_frame(rsp, noreg, native_return, rscratch1);
+  } else {
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
 
+    __ set_last_Java_frame(rsp, noreg, __ pc(), rscratch1);
+  }
 
   // We have all of the arguments setup at this point. We must not touch any register
   // argument registers at this point (what if we save/restore them there are no oop?
@@ -2271,12 +2282,13 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // Save the test result, for recursive case, the result is zero
       __ movptr(Address(lock_reg, mark_word_offset), swap_reg);
       __ jcc(Assembler::notEqual, slow_path_lock);
+
+      __ bind(count_mon);
+      __ inc_held_monitor_count();
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ lightweight_lock(lock_reg, obj_reg, swap_reg, r15_thread, rscratch1, slow_path_lock);
     }
-    __ bind(count_mon);
-    __ inc_held_monitor_count();
 
     // Slow path will re-enter here
     __ bind(lock_done);
@@ -2367,6 +2379,20 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   __ movl(Address(r15_thread, JavaThread::thread_state_offset()), _thread_in_Java);
   __ bind(after_transition);
 
+  if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
+    // Check preemption for Object.wait()
+    __ movptr(rscratch1, Address(r15_thread, JavaThread::preempt_alternate_return_offset()));
+    __ cmpptr(rscratch1, NULL_WORD);
+    __ jccb(Assembler::equal, native_return);
+    __ movptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
+    __ jmp(rscratch1);
+    __ bind(native_return);
+
+    intptr_t the_pc = (intptr_t) __ pc();
+    oop_maps->add_gc_map(the_pc - start, map);
+  }
+
+
   Label reguard;
   Label reguard_done;
   __ cmpl(Address(r15_thread, JavaThread::stack_guard_state_offset()), StackOverflow::stack_guard_yellow_reserved_disabled);
@@ -2416,7 +2442,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ lightweight_unlock(obj_reg, swap_reg, r15_thread, lock_reg, slow_path_unlock);
-      __ dec_held_monitor_count();
     }
 
     // slow path re-enters here
@@ -2490,8 +2515,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ mov(c_rarg1, lock_reg);
     __ mov(c_rarg2, r15_thread);
 
-    // Not a leaf but we have last_Java_frame setup as we want
+    // Not a leaf but we have last_Java_frame setup as we want.
+    // We don't want to unmount in case of contention since that would complicate preserving
+    // the arguments that had already been marshalled into the native convention. So we force
+    // the freeze slow path to find this native wrapper frame (see recurse_freeze_native_frame())
+    // and pin the vthread. Otherwise the fast path won't find it since we don't walk the stack.
+    __ push_cont_fastpath();
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C), 3);
+    __ pop_cont_fastpath();
     restore_args(masm, total_c_args, c_arg, out_regs);
 
 #ifdef ASSERT
@@ -2606,6 +2637,10 @@ uint SharedRuntime::in_preserve_stack_slots() {
   return 4 + 2 * VerifyStackAtCalls;
 }
 
+VMReg SharedRuntime::thread_register() {
+  return r15_thread->as_VMReg();
+}
+
 //------------------------------generate_deopt_blob----------------------------
 void SharedRuntime::generate_deopt_blob() {
   // Allocate space for the code
diff --git a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
index d69facadbea..6289b903ab1 100644
--- a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
@@ -114,6 +114,7 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const
   f.interpreted_frame_oop_map(&mask);
   return  mask.num_oops()
         + 1 // for the mirror oop
+        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
         + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
               (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
 }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 82d2fd1e73b..3979237619c 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -35,6 +35,7 @@
 #include "prims/jvmtiExport.hpp"
 #include "prims/upcallLinker.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/continuationEntry.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
@@ -3781,6 +3782,36 @@ address StubGenerator::generate_cont_returnBarrier_exception() {
   return generate_cont_thaw("Cont thaw return barrier exception", Continuation::thaw_return_barrier_exception);
 }
 
+address StubGenerator::generate_cont_preempt_stub() {
+  if (!Continuations::enabled()) return nullptr;
+  StubCodeMark mark(this, "StubRoutines","Continuation preempt stub");
+  address start = __ pc();
+
+  __ reset_last_Java_frame(true);
+
+  // Set rsp to enterSpecial frame, i.e. remove all frames copied into the heap.
+  __ movptr(rsp, Address(r15_thread, JavaThread::cont_entry_offset()));
+
+  Label preemption_cancelled;
+  __ movbool(rscratch1, Address(r15_thread, JavaThread::preemption_cancelled_offset()));
+  __ testbool(rscratch1);
+  __ jcc(Assembler::notZero, preemption_cancelled);
+
+  // Remove enterSpecial frame from the stack and return to Continuation.run() to unmount.
+  SharedRuntime::continuation_enter_cleanup(_masm);
+  __ pop(rbp);
+  __ ret(0);
+
+  // We acquired the monitor after freezing the frames so call thaw to continue execution.
+  __ bind(preemption_cancelled);
+  __ movbool(Address(r15_thread, JavaThread::preemption_cancelled_offset()), false);
+  __ lea(rbp, Address(rsp, checked_cast<int32_t>(ContinuationEntry::size())));
+  __ movptr(rscratch1, ExternalAddress(ContinuationEntry::thaw_call_pc_address()));
+  __ jmp(rscratch1);
+
+  return start;
+}
+
 // exception handler for upcall stubs
 address StubGenerator::generate_upcall_stub_exception_handler() {
   StubCodeMark mark(this, "StubRoutines", "upcall stub exception handler");
@@ -3953,6 +3984,7 @@ void StubGenerator::generate_continuation_stubs() {
   StubRoutines::_cont_thaw          = generate_cont_thaw();
   StubRoutines::_cont_returnBarrier = generate_cont_returnBarrier();
   StubRoutines::_cont_returnBarrierExc = generate_cont_returnBarrier_exception();
+  StubRoutines::_cont_preempt_stub = generate_cont_preempt_stub();
 }
 
 void StubGenerator::generate_final_stubs() {
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index c6fa31c5213..f883b6453a6 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -602,6 +602,8 @@ class StubGenerator: public StubCodeGenerator {
   address generate_cont_returnBarrier();
   address generate_cont_returnBarrier_exception();
 
+  address generate_cont_preempt_stub();
+
   // Continuation point for throwing of implicit exceptions that are
   // not handled in the current activation. Fabricates an exception
   // oop and initiates normal exception dispatching in this
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index b5ed3719897..af57fda23fd 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -34,10 +34,10 @@ static bool returns_to_call_stub(address return_pc) { return return_pc == _call_
 enum platform_dependent_constants {
   // simply increase sizes if too small (assembler will crash if too small)
   _initial_stubs_code_size      = 20000 WINDOWS_ONLY(+1000),
-  _continuation_stubs_code_size =  1000 LP64_ONLY(+1000),
+  _continuation_stubs_code_size =  1000 LP64_ONLY(+2000),
   // AVX512 intrinsics add more code in 64-bit VM,
   // Windows have more code to save/restore registers
-  _compiler_stubs_code_size     = 20000 LP64_ONLY(+46000) WINDOWS_ONLY(+2000),
+  _compiler_stubs_code_size     = 20000 LP64_ONLY(+47000) WINDOWS_ONLY(+2000),
   _final_stubs_code_size        = 10000 LP64_ONLY(+20000) WINDOWS_ONLY(+2000) ZGC_ONLY(+20000)
 };
 
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index 76ad498be0e..beb80d83e2e 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -387,6 +387,26 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(
   return entry;
 }
 
+address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter() {
+  if (!Continuations::enabled()) return nullptr;
+  address start = __ pc();
+
+  __ restore_bcp();
+  __ restore_locals();
+
+  // Get return address before adjusting rsp
+  __ movptr(rax, Address(rsp, 0));
+
+  // Restore stack bottom
+  __ movptr(rcx, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ lea(rsp, Address(rbp, rcx, Address::times_ptr));
+  // and NULL it as marker that esp is now tos until next java call
+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
+
+  __ jmp(rax);
+
+  return start;
+}
 
 
 // Helpers for commoning out cases in the various type of method entries.
@@ -1029,7 +1049,10 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
    // It is enough that the pc() points into the right code
    // segment. It does not have to be the correct return pc.
-   __ set_last_Java_frame(rsp, rbp, (address) __ pc(), rscratch1);
+   // For convenience we use the pc we want to resume to in
+   // case of preemption on Object.wait.
+   Label native_return;
+   __ set_last_Java_frame(rsp, rbp, native_return, rscratch1);
 #endif // _LP64
 
   // change thread state
@@ -1049,11 +1072,15 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ movl(Address(thread, JavaThread::thread_state_offset()),
           _thread_in_native);
 
+  __ push_cont_fastpath();
+
   // Call the native method.
   __ call(rax);
   // 32: result potentially in rdx:rax or ST0
   // 64: result potentially in rax or xmm0
 
+  __ pop_cont_fastpath();
+
   // Verify or restore cpu control state after JNI call
   __ restore_cpu_control_state_after_jni(rscratch1);
 
@@ -1077,10 +1104,10 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     Label push_double;
     ExternalAddress float_handler(AbstractInterpreter::result_handler(T_FLOAT));
     ExternalAddress double_handler(AbstractInterpreter::result_handler(T_DOUBLE));
-    __ cmpptr(Address(rbp, (frame::interpreter_frame_oop_temp_offset + 1)*wordSize),
+    __ cmpptr(Address(rbp, (frame::interpreter_frame_result_handler_offset)*wordSize),
               float_handler.addr(), noreg);
     __ jcc(Assembler::equal, push_double);
-    __ cmpptr(Address(rbp, (frame::interpreter_frame_oop_temp_offset + 1)*wordSize),
+    __ cmpptr(Address(rbp, (frame::interpreter_frame_result_handler_offset)*wordSize),
               double_handler.addr(), noreg);
     __ jcc(Assembler::notEqual, L);
     __ bind(push_double);
@@ -1150,6 +1177,24 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // change thread state
   __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
 
+#ifdef _LP64
+  if (LockingMode != LM_LEGACY) {
+    // Check preemption for Object.wait()
+    Label not_preempted;
+    __ movptr(rscratch1, Address(r15_thread, JavaThread::preempt_alternate_return_offset()));
+    __ cmpptr(rscratch1, NULL_WORD);
+    __ jccb(Assembler::equal, not_preempted);
+    __ movptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
+    __ jmp(rscratch1);
+    __ bind(native_return);
+    __ restore_after_resume(true /* is_native */);
+    __ bind(not_preempted);
+  } else {
+    // any pc will do so just use this one for LM_LEGACY to keep code together.
+    __ bind(native_return);
+  }
+#endif // _LP64
+
   // reset_last_Java_frame
   __ reset_last_Java_frame(thread, true);
 
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 527d961259e..441e4c8a0b8 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -4084,7 +4084,12 @@ void TemplateTable::_new() {
 
     // The object is initialized before the header.  If the object size is
     // zero, go directly to the header initialization.
-    __ decrement(rdx, sizeof(oopDesc));
+    if (UseCompactObjectHeaders) {
+      assert(is_aligned(oopDesc::base_offset_in_bytes(), BytesPerLong), "oop base offset must be 8-byte-aligned");
+      __ decrement(rdx, oopDesc::base_offset_in_bytes());
+    } else {
+      __ decrement(rdx, sizeof(oopDesc));
+    }
     __ jcc(Assembler::zero, initialize_header);
 
     // Initialize topmost object field, divide rdx by 8, check if odd and
@@ -4106,22 +4111,30 @@ void TemplateTable::_new() {
     // initialize remaining object fields: rdx was a multiple of 8
     { Label loop;
     __ bind(loop);
-    __ movptr(Address(rax, rdx, Address::times_8, sizeof(oopDesc) - 1*oopSize), rcx);
-    NOT_LP64(__ movptr(Address(rax, rdx, Address::times_8, sizeof(oopDesc) - 2*oopSize), rcx));
+    int header_size_bytes = oopDesc::header_size() * HeapWordSize;
+    assert(is_aligned(header_size_bytes, BytesPerLong), "oop header size must be 8-byte-aligned");
+    __ movptr(Address(rax, rdx, Address::times_8, header_size_bytes - 1*oopSize), rcx);
+    NOT_LP64(__ movptr(Address(rax, rdx, Address::times_8, header_size_bytes - 2*oopSize), rcx));
     __ decrement(rdx);
     __ jcc(Assembler::notZero, loop);
     }
 
     // initialize object header only.
     __ bind(initialize_header);
-    __ movptr(Address(rax, oopDesc::mark_offset_in_bytes()),
-              (intptr_t)markWord::prototype().value()); // header
-    __ pop(rcx);   // get saved klass back in the register.
+    if (UseCompactObjectHeaders) {
+      __ pop(rcx);   // get saved klass back in the register.
+      __ movptr(rbx, Address(rcx, Klass::prototype_header_offset()));
+      __ movptr(Address(rax, oopDesc::mark_offset_in_bytes()), rbx);
+    } else {
+      __ movptr(Address(rax, oopDesc::mark_offset_in_bytes()),
+                (intptr_t)markWord::prototype().value()); // header
+      __ pop(rcx);   // get saved klass back in the register.
 #ifdef _LP64
-    __ xorl(rsi, rsi); // use zero reg to clear memory (shorter code)
-    __ store_klass_gap(rax, rsi);  // zero klass gap for compressed oops
+      __ xorl(rsi, rsi); // use zero reg to clear memory (shorter code)
+      __ store_klass_gap(rax, rsi);  // zero klass gap for compressed oops
 #endif
-    __ store_klass(rax, rcx, rscratch1);  // klass
+      __ store_klass(rax, rcx, rscratch1);  // klass
+    }
 
     if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index f8c5de551cd..688cd4fa5a6 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -517,12 +517,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
       // https://msdn.microsoft.com/en-us/library/9z1stfyw.aspx
       __ subptr(rsp, 64);
       __ evmovdqul(Address(rsp, 0), xmm7, Assembler::AVX_512bit);
-#ifdef _LP64
       __ subptr(rsp, 64);
       __ evmovdqul(Address(rsp, 0), xmm8, Assembler::AVX_512bit);
       __ subptr(rsp, 64);
       __ evmovdqul(Address(rsp, 0), xmm31, Assembler::AVX_512bit);
-#endif // _LP64
 #endif // _WINDOWS
 
       // load value into all 64 bytes of zmm7 register
@@ -546,12 +544,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
 #ifdef _WINDOWS
     __ subptr(rsp, 32);
     __ vmovdqu(Address(rsp, 0), xmm7);
-#ifdef _LP64
     __ subptr(rsp, 32);
     __ vmovdqu(Address(rsp, 0), xmm8);
     __ subptr(rsp, 32);
     __ vmovdqu(Address(rsp, 0), xmm15);
-#endif // _LP64
 #endif // _WINDOWS
 
     // load value into all 32 bytes of ymm7 register
@@ -611,12 +607,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
 #endif
 
 #ifdef _WINDOWS
-#ifdef _LP64
       __ evmovdqul(xmm31, Address(rsp, 0), Assembler::AVX_512bit);
       __ addptr(rsp, 64);
       __ evmovdqul(xmm8, Address(rsp, 0), Assembler::AVX_512bit);
       __ addptr(rsp, 64);
-#endif // _LP64
       __ evmovdqul(xmm7, Address(rsp, 0), Assembler::AVX_512bit);
       __ addptr(rsp, 64);
 #endif // _WINDOWS
@@ -641,12 +635,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
 #endif
 
 #ifdef _WINDOWS
-#ifdef _LP64
     __ vmovdqu(xmm15, Address(rsp, 0));
     __ addptr(rsp, 32);
     __ vmovdqu(xmm8, Address(rsp, 0));
     __ addptr(rsp, 32);
-#endif // _LP64
     __ vmovdqu(xmm7, Address(rsp, 0));
     __ addptr(rsp, 32);
 #endif // _WINDOWS
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index 791f4a1fec7..004b64ebe6e 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -643,7 +643,7 @@ class VM_Version : public Abstract_VM_Version {
   static void set_avx_cpuFeatures() { _features |= (CPU_SSE | CPU_SSE2 | CPU_AVX | CPU_VZEROUPPER ); }
   static void set_evex_cpuFeatures() { _features |= (CPU_AVX512F | CPU_SSE | CPU_SSE2 | CPU_VZEROUPPER ); }
   static void set_apx_cpuFeatures() { _features |= CPU_APX_F; }
-  static void set_bmi_cpuFeatures() { _features |= (CPU_BMI1 | CPU_BMI2 | CPU_LZCNT); }
+  static void set_bmi_cpuFeatures() { _features |= (CPU_BMI1 | CPU_BMI2 | CPU_LZCNT | CPU_POPCNT); }
 
   // Initialization
   static void initialize();
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index b4eb4c313d3..fc083ecfa24 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -4351,6 +4351,7 @@ instruct loadKlass(rRegP dst, memory mem)
 // Load narrow Klass Pointer
 instruct loadNKlass(rRegN dst, memory mem)
 %{
+  predicate(!UseCompactObjectHeaders);
   match(Set dst (LoadNKlass mem));
 
   ins_cost(125); // XXX
@@ -4361,6 +4362,19 @@ instruct loadNKlass(rRegN dst, memory mem)
   ins_pipe(ialu_reg_mem); // XXX
 %}
 
+instruct loadNKlassCompactHeaders(rRegN dst, memory mem, rFlagsReg cr)
+%{
+  predicate(UseCompactObjectHeaders);
+  match(Set dst (LoadNKlass mem));
+  effect(KILL cr);
+  ins_cost(125); // XXX
+  format %{ "load_narrow_klass_compact    $dst, $mem\t# compressed klass ptr" %}
+  ins_encode %{
+    __ load_narrow_klass_compact_c2($dst$$Register, $mem$$Address);
+  %}
+  ins_pipe(pipe_slow); // XXX
+%}
+
 // Load Float
 instruct loadF(regF dst, memory mem)
 %{
@@ -11665,6 +11679,7 @@ instruct compN_rReg_imm_klass(rFlagsRegU cr, rRegN op1, immNKlass op2) %{
 
 instruct compN_mem_imm_klass(rFlagsRegU cr, memory mem, immNKlass src)
 %{
+  predicate(!UseCompactObjectHeaders);
   match(Set cr (CmpN src (LoadNKlass mem)));
 
   format %{ "cmpl    $mem, $src\t# compressed klass ptr" %}
diff --git a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
index cb05ab1389e..b1bd138e357 100644
--- a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
@@ -48,6 +48,10 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   Unimplemented();
 }
 
+inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
+  Unimplemented();
+}
+
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
   Unimplemented();
 }
@@ -83,6 +87,15 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   Unimplemented();
 }
 
+inline void ThawBase::patch_pd(frame& f, intptr_t* caller_sp) {
+  Unimplemented();
+}
+
+inline intptr_t* ThawBase::push_cleanup_continuation() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp b/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
index 56da168d9b1..9829d32dc7f 100644
--- a/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
@@ -33,6 +33,10 @@ static inline intptr_t** link_address(const frame& f) {
   return nullptr;
 }
 
+static inline void patch_return_pc_with_preempt_stub(frame& f) {
+  Unimplemented();
+}
+
 inline int ContinuationHelper::frame_align_words(int size) {
   Unimplemented();
   return 0;
@@ -60,11 +64,11 @@ inline void ContinuationHelper::set_anchor_to_entry_pd(JavaFrameAnchor* anchor,
   Unimplemented();
 }
 
-#ifdef ASSERT
 inline void ContinuationHelper::set_anchor_pd(JavaFrameAnchor* anchor, intptr_t* sp) {
   Unimplemented();
 }
 
+#ifdef ASSERT
 inline bool ContinuationHelper::Frame::assert_frame_laid_out(frame f) {
   Unimplemented();
   return false;
diff --git a/src/hotspot/cpu/zero/frame_zero.cpp b/src/hotspot/cpu/zero/frame_zero.cpp
index 5ddd23a9d59..400766298f5 100644
--- a/src/hotspot/cpu/zero/frame_zero.cpp
+++ b/src/hotspot/cpu/zero/frame_zero.cpp
@@ -72,6 +72,11 @@ bool frame::upcall_stub_frame_is_first() const {
   return false;
 }
 
+JavaThread** frame::saved_thread_address(const frame& f) {
+  Unimplemented();
+  return nullptr;
+}
+
 frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
   assert(zeroframe()->is_interpreter_frame() ||
          zeroframe()->is_fake_stub_frame(), "wrong type of frame");
diff --git a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
index 0f78b3eeefb..d05e5deb0f8 100644
--- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
+++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
@@ -36,8 +36,6 @@
 // The default padding size for data structures to avoid false sharing.
 #define DEFAULT_PADDING_SIZE DEFAULT_CACHE_LINE_SIZE
 
-#define SUPPORT_MONITOR_COUNT
-
 #include <ffi.h>
 
 // Indicates whether the C calling conventions require that
diff --git a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
index 18ceb9514d3..094ddc05a2e 100644
--- a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
+++ b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
@@ -85,6 +85,11 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
+VMReg SharedRuntime::thread_register() {
+  Unimplemented();
+  return nullptr;
+}
+
 JRT_LEAF(void, zero_stub())
   ShouldNotCallThis();
 JRT_END
diff --git a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
index aab43e73396..c7e6a139831 100644
--- a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
+++ b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
@@ -346,9 +346,6 @@ int ZeroInterpreter::native_entry(Method* method, intptr_t UNUSED, TRAPS) {
           success = false;
         }
       }
-      if (success) {
-        THREAD->inc_held_monitor_count();
-      }
     }
     if (!success) {
       CALL_VM_NOCHECK(InterpreterRuntime::monitorenter(thread, monitor));
@@ -499,9 +496,6 @@ int ZeroInterpreter::native_entry(Method* method, intptr_t UNUSED, TRAPS) {
           success = false;
         }
       }
-      if (success) {
-        THREAD->dec_held_monitor_count();
-      }
     }
     if (!success) {
       InterpreterRuntime::monitorexit(monitor);
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 842ab0c6eeb..44b9571e102 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -468,7 +468,7 @@ static void query_multipage_support() {
 
     // Can we use mmap with 64K pages? (Should be available with AIX7.3 TL1)
     {
-      void* p = mmap(NULL, 64*K, PROT_READ | PROT_WRITE, MAP_ANON_64K | MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+      void* p = mmap(nullptr, 64*K, PROT_READ | PROT_WRITE, MAP_ANON_64K | MAP_ANONYMOUS | MAP_SHARED, -1, 0);
       assert(p != (void*) -1, "mmap failed");
       if (p != (void*) -1) {
         g_multipage_support.can_use_64K_mmap_pages = (64*K == os::Aix::query_pagesize(p));
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index b50ebf22203..a1887aa5975 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -2148,13 +2148,12 @@ jint os::init_2(void) {
 
       // On macOS according to setrlimit(2), OPEN_MAX must be used instead
       // of RLIM_INFINITY, but testing on macOS >= 10.6, reveals that
-      // we can, in fact, use even RLIM_INFINITY, so try the max value
-      // that the system claims can be used first, same as other BSD OSes.
-      // However, some terminals (ksh) will internally use "int" type
-      // to store this value and since RLIM_INFINITY overflows an "int"
-      // we might end up with a negative value, so cap the system limit max
-      // at INT_MAX instead, just in case, for everyone.
-      nbr_files.rlim_cur = MIN(INT_MAX, nbr_files.rlim_max);
+      // we can, in fact, use even RLIM_INFINITY.
+      // However, we need to limit the value to 0x100000 (which is the max value
+      // allowed on Linux) so that any existing code that iterates over all allowed
+      // file descriptors, finishes in a reasonable time, without appearing
+      // to hang.
+      nbr_files.rlim_cur = MIN(0x100000, nbr_files.rlim_max);
 
       status = setrlimit(RLIMIT_NOFILE, &nbr_files);
       if (status != 0) {
diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
index d51499611a8..4a8fda432d8 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -167,7 +167,7 @@ static bool find_ro_opt(char* mount_opts) {
   char* token;
   char* mo_ptr = mount_opts;
   // mount options are comma-separated (man proc).
-  while ((token = strsep(&mo_ptr, ",")) != NULL) {
+  while ((token = strsep(&mo_ptr, ",")) != nullptr) {
     if (strcmp(token, "ro") == 0) {
       return true;
     }
diff --git a/src/hotspot/os/posix/include/jvm_md.h b/src/hotspot/os/posix/include/jvm_md.h
index 2c8ebe06d70..e550ecbb000 100644
--- a/src/hotspot/os/posix/include/jvm_md.h
+++ b/src/hotspot/os/posix/include/jvm_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,6 @@
 #include <stddef.h>             /* For ptrdiff_t */
 #include <stdint.h>             /* For uintptr_t */
 
-#define JNI_ONLOAD_SYMBOLS   {"JNI_OnLoad"}
-#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
-#define JVM_ONLOAD_SYMBOLS      {"JVM_OnLoad"}
-#define AGENT_ONLOAD_SYMBOLS    {"Agent_OnLoad"}
-#define AGENT_ONUNLOAD_SYMBOLS  {"Agent_OnUnload"}
-#define AGENT_ONATTACH_SYMBOLS  {"Agent_OnAttach"}
-
 #define JNI_LIB_PREFIX "lib"
 #ifdef __APPLE__
 #define JNI_LIB_SUFFIX ".dylib"
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 75253843593..72330190b53 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -696,14 +696,6 @@ void os::print_active_locale(outputStream* st) {
   }
 }
 
-void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-  // no prefix required
-}
-
-void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
-  // no suffix required
-}
-
 bool os::get_host_name(char* buf, size_t buflen) {
   struct utsname name;
   int retcode = uname(&name);
@@ -816,7 +808,7 @@ void* os::dll_lookup(void* handle, const char* name) {
   void* ret = ::dlsym(handle, name);
   if (ret == nullptr) {
     const char* tmp = ::dlerror();
-    // It is possible that we found a NULL symbol, hence no error.
+    // It is possible that we found a null symbol, hence no error.
     if (tmp != nullptr) {
       log_debug(os)("Symbol %s not found in dll: %s", name, tmp);
     }
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 17bf63092c2..4eb46169878 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -1086,7 +1086,7 @@ static char* mmap_create_shared(size_t size) {
 static void unmap_shared(char* addr, size_t bytes) {
   int res;
   if (MemTracker::enabled()) {
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     res = ::munmap(addr, bytes);
     if (res == 0) {
       MemTracker::record_virtual_memory_release((address)addr, bytes);
diff --git a/src/hotspot/os/windows/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp
index bfa377d52cf..5a34639a1cf 100644
--- a/src/hotspot/os/windows/attachListener_windows.cpp
+++ b/src/hotspot/os/windows/attachListener_windows.cpp
@@ -84,7 +84,8 @@ class PipeChannel : public AttachOperation::RequestReader, public AttachOperatio
                           0,              // default attributes
                           nullptr);       // no template file
     if (_hPipe == INVALID_HANDLE_VALUE) {
-      log_error(attach)("could not open (%d) pipe %s", GetLastError(), pipe);
+      log_error(attach)("could not open %s (%d) pipe %s",
+                        (write_only ? "write-only" : "read-write"), GetLastError(), pipe);
       return false;
     }
     return true;
@@ -106,7 +107,11 @@ class PipeChannel : public AttachOperation::RequestReader, public AttachOperatio
                              (DWORD)size,
                              &nread,
                              nullptr);   // not overlapped
-    return fSuccess ? (int)nread : -1;
+    if (!fSuccess) {
+      log_error(attach)("pipe read error (%d)", GetLastError());
+      return -1;
+    }
+    return (int)nread;
   }
 
   // ReplyWriter
@@ -118,7 +123,11 @@ class PipeChannel : public AttachOperation::RequestReader, public AttachOperatio
                               (DWORD)size,
                               &written,
                               nullptr);  // not overlapped
-    return fSuccess ? (int)written : -1;
+    if (!fSuccess) {
+        log_error(attach)("pipe write error (%d)", GetLastError());
+        return -1;
+    }
+    return (int)written;
   }
 
   void flush() override {
@@ -138,12 +147,12 @@ class Win32AttachOperation: public AttachOperation {
 
 public:
   // for v1 pipe must be write-only
-  void open_pipe(const char* pipe_name, bool write_only) {
-    _pipe.open(pipe_name, write_only);
+  bool open_pipe(const char* pipe_name, bool write_only) {
+    return _pipe.open(pipe_name, write_only);
   }
 
   bool read_request() {
-      return AttachOperation::read_request(&_pipe);
+    return AttachOperation::read_request(&_pipe);
   }
 
 public:
@@ -390,13 +399,17 @@ Win32AttachOperation* Win32AttachListener::dequeue() {
         for (int i = 0; i < AttachOperation::arg_count_max; i++) {
           op->append_arg(request->arg(i));
         }
-        op->open_pipe(request->pipe(), true/*write-only*/);
+        if (!op->open_pipe(request->pipe(), true/*write-only*/)) {
+          // error is already logged
+          delete op;
+          op = nullptr;
+        }
         break;
       case ATTACH_API_V2:
         op = new Win32AttachOperation();
-        op->open_pipe(request->pipe(), false/*write-only*/);
-        if (!op->read_request()) {
-          log_error(attach)("AttachListener::dequeue, reading request ERROR");
+        if (!op->open_pipe(request->pipe(), false/*write-only*/)
+            || !op->read_request()) {
+          // error is already logged
           delete op;
           op = nullptr;
         }
diff --git a/src/hotspot/os/windows/include/jvm_md.h b/src/hotspot/os/windows/include/jvm_md.h
index 4baba320855..a0e44a45613 100644
--- a/src/hotspot/os/windows/include/jvm_md.h
+++ b/src/hotspot/os/windows/include/jvm_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, 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
@@ -39,13 +39,6 @@
 
 typedef int socklen_t;
 
-#define JNI_ONLOAD_SYMBOLS   {"_JNI_OnLoad@8", "JNI_OnLoad"}
-#define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"}
-#define JVM_ONLOAD_SYMBOLS      {"_JVM_OnLoad@12", "JVM_OnLoad"}
-#define AGENT_ONLOAD_SYMBOLS    {"_Agent_OnLoad@12", "Agent_OnLoad"}
-#define AGENT_ONUNLOAD_SYMBOLS  {"_Agent_OnUnload@4", "Agent_OnUnload"}
-#define AGENT_ONATTACH_SYMBOLS  {"_Agent_OnAttach@12", "Agent_OnAttach"}
-
 #define JNI_LIB_PREFIX ""
 #define JNI_LIB_SUFFIX ".dll"
 
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 71efb57e0f2..9d514e584a4 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -133,7 +133,7 @@ static FILETIME process_kernel_time;
 #elif defined(_M_AMD64)
   #define __CPU__ amd64
 #else
-  #define __CPU__ i486
+  #error "Unknown CPU"
 #endif
 
 #if defined(USE_VECTORED_EXCEPTION_HANDLING)
@@ -282,11 +282,6 @@ void os::run_periodic_checks(outputStream* st) {
   return;
 }
 
-#ifndef _WIN64
-// previous UnhandledExceptionFilter, if there is one
-static LPTOP_LEVEL_EXCEPTION_FILTER prev_uef_handler = nullptr;
-#endif
-
 static LONG WINAPI Uncaught_Exception_Handler(struct _EXCEPTION_POINTERS* exceptionInfo);
 
 void os::init_system_properties_values() {
@@ -399,11 +394,6 @@ void os::init_system_properties_values() {
   #undef BIN_DIR
   #undef PACKAGE_DIR
 
-#ifndef _WIN64
-  // set our UnhandledExceptionFilter and save any previous one
-  prev_uef_handler = SetUnhandledExceptionFilter(Uncaught_Exception_Handler);
-#endif
-
   // Done
   return;
 }
@@ -517,7 +507,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo);
 
 // Thread start routine for all newly created threads.
 // Called with the associated Thread* as the argument.
-static unsigned __stdcall thread_native_entry(void* t) {
+static unsigned thread_native_entry(void* t) {
   Thread* thread = static_cast<Thread*>(t);
 
   thread->record_stack_base_and_size();
@@ -876,14 +866,8 @@ bool os::has_allocatable_memory_limit(size_t* limit) {
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
   GlobalMemoryStatusEx(&ms);
-#ifdef _LP64
   *limit = (size_t)ms.ullAvailVirtual;
   return true;
-#else
-  // Limit to 1400m because of the 2gb address space wall
-  *limit = MIN2((size_t)1400*M, (size_t)ms.ullAvailVirtual);
-  return true;
-#endif
 }
 
 int os::active_processor_count() {
@@ -1549,7 +1533,7 @@ void os::prepare_native_symbols() {
 
 //-----------------------------------------------------------
 // Helper functions for fatal error handler
-#ifdef _WIN64
+
 // Helper routine which returns true if address in
 // within the NTDLL address space.
 //
@@ -1571,7 +1555,6 @@ static bool _addr_in_ntdll(address addr) {
     return false;
   }
 }
-#endif
 
 struct _modinfo {
   address addr;
@@ -1749,7 +1732,6 @@ void * os::dll_load(const char *name, char *ebuf, int ebuflen) {
   } arch_t;
 
   static const arch_t arch_array[] = {
-    {IMAGE_FILE_MACHINE_I386,      (char*)"IA 32"},
     {IMAGE_FILE_MACHINE_AMD64,     (char*)"AMD 64"},
     {IMAGE_FILE_MACHINE_ARM64,     (char*)"ARM 64"}
   };
@@ -1757,11 +1739,9 @@ void * os::dll_load(const char *name, char *ebuf, int ebuflen) {
   static const uint16_t running_arch = IMAGE_FILE_MACHINE_ARM64;
 #elif (defined _M_AMD64)
   static const uint16_t running_arch = IMAGE_FILE_MACHINE_AMD64;
-#elif (defined _M_IX86)
-  static const uint16_t running_arch = IMAGE_FILE_MACHINE_I386;
 #else
   #error Method os::dll_load requires that one of following \
-         is defined :_M_AMD64 or _M_IX86 or _M_ARM64
+         is defined :_M_AMD64 or _M_ARM64
 #endif
 
 
@@ -2101,13 +2081,6 @@ void os::print_memory_info(outputStream* st) {
              (int64_t) ms.ullTotalPageFile >> 20);
     st->print("(AvailPageFile size " INT64_FORMAT "M)",
              (int64_t) ms.ullAvailPageFile >> 20);
-
-    // on 32bit Total/AvailVirtual are interesting (show us how close we get to 2-4 GB per process borders)
-#if defined(_M_IX86)
-    st->print(", user-mode portion of virtual address-space " INT64_FORMAT "M ",
-             (int64_t) ms.ullTotalVirtual >> 20);
-    st->print("(" INT64_FORMAT "M free)", (int64_t) ms.ullAvailVirtual >> 20);
-#endif
   } else {
     st->print(", GlobalMemoryStatusEx did not succeed so we miss some memory values.");
   }
@@ -2228,19 +2201,6 @@ void os::jvm_path(char *buf, jint buflen) {
 }
 
 
-void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-#ifndef _WIN64
-  st->print("_");
-#endif
-}
-
-
-void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
-#ifndef _WIN64
-  st->print("@%d", args_size  * sizeof(int));
-#endif
-}
-
 // This method is a copy of JDK's sysGetLastErrorString
 // from src/windows/hpi/src/system_md.c
 
@@ -2465,8 +2425,6 @@ LONG Handle_Exception(struct _EXCEPTION_POINTERS* exceptionInfo,
   #define PC_NAME Pc
 #elif defined(_M_AMD64)
   #define PC_NAME Rip
-#elif defined(_M_IX86)
-  #define PC_NAME Eip
 #else
   #error unknown architecture
 #endif
@@ -2590,21 +2548,12 @@ LONG Handle_IDiv_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
   ctx->Rdx = (DWORD)0;             // remainder
   // Continue the execution
 #else
-  PCONTEXT ctx = exceptionInfo->ContextRecord;
-  address pc = (address)ctx->Eip;
-  guarantee(pc[0] == 0xF7, "not an idiv opcode(0xF7), the actual value = 0x%x", pc[1]);
-  guarantee((pc[1] & ~0x7) == 0xF8, "cannot handle non-register operands, the actual value = 0x%x", pc[1]);
-  guarantee(ctx->Eax == min_jint, "unexpected idiv exception, the actual value = %d while the expected is %d", ctx->Eax, min_jint);
-  // set correct result values and continue after idiv instruction
-  ctx->Eip = (DWORD)pc + 2;        // idiv reg, reg  is 2 bytes
-  ctx->Eax = (DWORD)min_jint;      // result
-  ctx->Edx = (DWORD)0;             // remainder
-  // Continue the execution
+  #error unknown architecture
 #endif
   return EXCEPTION_CONTINUE_EXECUTION;
 }
 
-#if defined(_M_AMD64) || defined(_M_IX86)
+#if defined(_M_AMD64)
 //-----------------------------------------------------------------------------
 static bool handle_FLT_exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
   // handle exception caused by native method modifying control word
@@ -2619,16 +2568,6 @@ static bool handle_FLT_exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
   case EXCEPTION_FLT_STACK_CHECK:
   case EXCEPTION_FLT_UNDERFLOW: {
     PCONTEXT ctx = exceptionInfo->ContextRecord;
-#ifndef  _WIN64
-    jint fp_control_word = (* (jint*) StubRoutines::x86::addr_fpu_cntrl_wrd_std());
-    if (fp_control_word != ctx->FloatSave.ControlWord) {
-      // Restore FPCW and mask out FLT exceptions
-      ctx->FloatSave.ControlWord = fp_control_word | 0xffffffc0;
-      // Mask out pending FLT exceptions
-      ctx->FloatSave.StatusWord &=  0xffffff00;
-      return true;
-    }
-#else // !_WIN64
     // On Windows, the mxcsr control bits are non-volatile across calls
     // See also CR 6192333
     //
@@ -2639,7 +2578,6 @@ static bool handle_FLT_exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
       ctx->MxCsr = MxCsr;
       return true;
     }
-#endif // !_WIN64
   }
   }
 
@@ -2647,23 +2585,6 @@ static bool handle_FLT_exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
 }
 #endif
 
-#ifndef _WIN64
-static LONG WINAPI Uncaught_Exception_Handler(struct _EXCEPTION_POINTERS* exceptionInfo) {
-  if (handle_FLT_exception(exceptionInfo)) {
-    return EXCEPTION_CONTINUE_EXECUTION;
-  }
-
-  // we only override this on 32 bits, so only check it there
-  if (prev_uef_handler != nullptr) {
-    // We didn't handle this exception so pass it to the previous
-    // UnhandledExceptionFilter.
-    return (prev_uef_handler)(exceptionInfo);
-  }
-
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-#endif
-
 static inline void report_error(Thread* t, DWORD exception_code,
                                 address addr, void* siginfo, void* context) {
   VMError::report_and_die(t, exception_code, addr, siginfo, context);
@@ -2683,98 +2604,18 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
 #elif defined(_M_AMD64)
   address pc = (address) exceptionInfo->ContextRecord->Rip;
 #else
-  address pc = (address) exceptionInfo->ContextRecord->Eip;
+  #error unknown architecture
 #endif
   Thread* t = Thread::current_or_null_safe();
 
-#ifndef _WIN64
-  // Execution protection violation - win32 running on AMD64 only
-  // Handled first to avoid misdiagnosis as a "normal" access violation;
-  // This is safe to do because we have a new/unique ExceptionInformation
-  // code for this condition.
-  if (exception_code == EXCEPTION_ACCESS_VIOLATION) {
-    int exception_subcode = (int) exception_record->ExceptionInformation[0];
-    address addr = (address) exception_record->ExceptionInformation[1];
-
-    if (exception_subcode == EXCEPTION_INFO_EXEC_VIOLATION) {
-      size_t page_size = os::vm_page_size();
-
-      // Make sure the pc and the faulting address are sane.
-      //
-      // If an instruction spans a page boundary, and the page containing
-      // the beginning of the instruction is executable but the following
-      // page is not, the pc and the faulting address might be slightly
-      // different - we still want to unguard the 2nd page in this case.
-      //
-      // 15 bytes seems to be a (very) safe value for max instruction size.
-      bool pc_is_near_addr =
-        (pointer_delta((void*) addr, (void*) pc, sizeof(char)) < 15);
-      bool instr_spans_page_boundary =
-        (align_down((intptr_t) pc ^ (intptr_t) addr,
-                         (intptr_t) page_size) > 0);
-
-      if (pc == addr || (pc_is_near_addr && instr_spans_page_boundary)) {
-        static volatile address last_addr =
-          (address) os::non_memory_address_word();
-
-        // In conservative mode, don't unguard unless the address is in the VM
-        if (UnguardOnExecutionViolation > 0 && addr != last_addr &&
-            (UnguardOnExecutionViolation > 1 || os::address_is_in_vm(addr))) {
-
-          // Set memory to RWX and retry
-          address page_start = align_down(addr, page_size);
-          bool res = os::protect_memory((char*) page_start, page_size,
-                                        os::MEM_PROT_RWX);
-
-          log_debug(os)("Execution protection violation "
-                        "at " INTPTR_FORMAT
-                        ", unguarding " INTPTR_FORMAT ": %s", p2i(addr),
-                        p2i(page_start), (res ? "success" : os::strerror(errno)));
-
-          // Set last_addr so if we fault again at the same address, we don't
-          // end up in an endless loop.
-          //
-          // There are two potential complications here.  Two threads trapping
-          // at the same address at the same time could cause one of the
-          // threads to think it already unguarded, and abort the VM.  Likely
-          // very rare.
-          //
-          // The other race involves two threads alternately trapping at
-          // different addresses and failing to unguard the page, resulting in
-          // an endless loop.  This condition is probably even more unlikely
-          // than the first.
-          //
-          // Although both cases could be avoided by using locks or thread
-          // local last_addr, these solutions are unnecessary complication:
-          // this handler is a best-effort safety net, not a complete solution.
-          // It is disabled by default and should only be used as a workaround
-          // in case we missed any no-execute-unsafe VM code.
-
-          last_addr = addr;
-
-          return EXCEPTION_CONTINUE_EXECUTION;
-        }
-      }
-
-      // Last unguard failed or not unguarding
-      tty->print_raw_cr("Execution protection violation");
-#if !defined(USE_VECTORED_EXCEPTION_HANDLING)
-      report_error(t, exception_code, addr, exception_record,
-                   exceptionInfo->ContextRecord);
-#endif
-      return EXCEPTION_CONTINUE_SEARCH;
-    }
-  }
-#endif // _WIN64
-
-#if defined(_M_AMD64) || defined(_M_IX86)
+#if defined(_M_AMD64)
   if ((exception_code == EXCEPTION_ACCESS_VIOLATION) &&
       VM_Version::is_cpuinfo_segv_addr(pc)) {
     // Verify that OS save/restore AVX registers.
     return Handle_Exception(exceptionInfo, VM_Version::cpuinfo_cont_addr());
   }
 
-#if !defined(PRODUCT) && defined(_LP64)
+#if !defined(PRODUCT)
   if ((exception_code == EXCEPTION_ACCESS_VIOLATION) &&
       VM_Version::is_cpuinfo_segv_addr_apx(pc)) {
     // Verify that OS save/restore APX registers.
@@ -2842,7 +2683,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
             return Handle_Exception(exceptionInfo, stub);
           }
         }
-#ifdef _WIN64
         // If it's a legal stack address map the entire region in
         if (thread->is_in_usable_stack(addr)) {
           addr = (address)((uintptr_t)addr &
@@ -2851,7 +2691,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
                             !ExecMem);
           return EXCEPTION_CONTINUE_EXECUTION;
         }
-#endif
         // Null pointer exception.
         if (MacroAssembler::uses_implicit_null_check((void*)addr)) {
           address stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
@@ -2862,7 +2701,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         return EXCEPTION_CONTINUE_SEARCH;
       }
 
-#ifdef _WIN64
       // Special care for fast JNI field accessors.
       // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks
       // in and the heap gets shrunk before the field access.
@@ -2870,7 +2708,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
       if (slowcase_pc != (address)-1) {
         return Handle_Exception(exceptionInfo, slowcase_pc);
       }
-#endif
 
       // Stack overflow or null pointer exception in native code.
 #if !defined(USE_VECTORED_EXCEPTION_HANDLING)
@@ -2923,7 +2760,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
       } // switch
     }
 
-#if defined(_M_AMD64) || defined(_M_IX86)
+#if defined(_M_AMD64)
     if ((in_java || in_native) && handle_FLT_exception(exceptionInfo)) {
       return EXCEPTION_CONTINUE_EXECUTION;
     }
@@ -2967,7 +2804,7 @@ LONG WINAPI topLevelVectoredExceptionFilter(struct _EXCEPTION_POINTERS* exceptio
 #elif defined(_M_AMD64)
   address pc = (address) exceptionInfo->ContextRecord->Rip;
 #else
-  address pc = (address) exceptionInfo->ContextRecord->Eip;
+  #error unknown architecture
 #endif
 
   // Fast path for code part of the code cache
@@ -3009,63 +2846,6 @@ LONG WINAPI topLevelUnhandledExceptionFilter(struct _EXCEPTION_POINTERS* excepti
 }
 #endif
 
-#ifndef _WIN64
-// Special care for fast JNI accessors.
-// jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in and
-// the heap gets shrunk before the field access.
-// Need to install our own structured exception handler since native code may
-// install its own.
-LONG WINAPI fastJNIAccessorExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
-  DWORD exception_code = exceptionInfo->ExceptionRecord->ExceptionCode;
-  if (exception_code == EXCEPTION_ACCESS_VIOLATION) {
-    address pc = (address) exceptionInfo->ContextRecord->Eip;
-    address addr = JNI_FastGetField::find_slowcase_pc(pc);
-    if (addr != (address)-1) {
-      return Handle_Exception(exceptionInfo, addr);
-    }
-  }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-
-#define DEFINE_FAST_GETFIELD(Return, Fieldname, Result)                     \
-  Return JNICALL jni_fast_Get##Result##Field_wrapper(JNIEnv *env,           \
-                                                     jobject obj,           \
-                                                     jfieldID fieldID) {    \
-    __try {                                                                 \
-      return (*JNI_FastGetField::jni_fast_Get##Result##Field_fp)(env,       \
-                                                                 obj,       \
-                                                                 fieldID);  \
-    } __except(fastJNIAccessorExceptionFilter((_EXCEPTION_POINTERS*)        \
-                                              _exception_info())) {         \
-    }                                                                       \
-    return 0;                                                               \
-  }
-
-DEFINE_FAST_GETFIELD(jboolean, bool,   Boolean)
-DEFINE_FAST_GETFIELD(jbyte,    byte,   Byte)
-DEFINE_FAST_GETFIELD(jchar,    char,   Char)
-DEFINE_FAST_GETFIELD(jshort,   short,  Short)
-DEFINE_FAST_GETFIELD(jint,     int,    Int)
-DEFINE_FAST_GETFIELD(jlong,    long,   Long)
-DEFINE_FAST_GETFIELD(jfloat,   float,  Float)
-DEFINE_FAST_GETFIELD(jdouble,  double, Double)
-
-address os::win32::fast_jni_accessor_wrapper(BasicType type) {
-  switch (type) {
-  case T_BOOLEAN: return (address)jni_fast_GetBooleanField_wrapper;
-  case T_BYTE:    return (address)jni_fast_GetByteField_wrapper;
-  case T_CHAR:    return (address)jni_fast_GetCharField_wrapper;
-  case T_SHORT:   return (address)jni_fast_GetShortField_wrapper;
-  case T_INT:     return (address)jni_fast_GetIntField_wrapper;
-  case T_LONG:    return (address)jni_fast_GetLongField_wrapper;
-  case T_FLOAT:   return (address)jni_fast_GetFloatField_wrapper;
-  case T_DOUBLE:  return (address)jni_fast_GetDoubleField_wrapper;
-  default:        ShouldNotReachHere();
-  }
-  return (address)-1;
-}
-#endif
-
 // Virtual Memory
 
 // Windows large page support is available on Windows 2003. In order to use
@@ -3341,12 +3121,7 @@ size_t os::win32::large_page_init_decide_size() {
     return 0;
   }
 
-#if defined(IA32)
-  if (size > 4 * M || LargePageSizeInBytes > 4 * M) {
-    WARN("JVM cannot use large pages bigger than 4mb.");
-    return 0;
-  }
-#elif defined(AMD64)
+#if defined(AMD64)
   if (!EnableAllLargePageSizesForWindows) {
     if (size > 4 * M || LargePageSizeInBytes > 4 * M) {
       WARN("JVM cannot use large pages bigger than 4mb.");
@@ -3430,13 +3205,8 @@ char* os::map_memory_to_file(char* base, size_t size, int fd) {
   assert(fd != -1, "File descriptor is not valid");
 
   HANDLE fh = (HANDLE)_get_osfhandle(fd);
-#ifdef _LP64
   HANDLE fileMapping = CreateFileMapping(fh, nullptr, PAGE_READWRITE,
     (DWORD)(size >> 32), (DWORD)(size & 0xFFFFFFFF), nullptr);
-#else
-  HANDLE fileMapping = CreateFileMapping(fh, nullptr, PAGE_READWRITE,
-    0, (DWORD)size, nullptr);
-#endif
   if (fileMapping == nullptr) {
     if (GetLastError() == ERROR_DISK_FULL) {
       vm_exit_during_initialization(err_msg("Could not allocate sufficient disk space for Java heap"));
@@ -3825,8 +3595,7 @@ bool os::pd_release_memory(char* addr, size_t bytes) {
     if (err != nullptr) {
       log_warning(os)("bad release: [" PTR_FORMAT "-" PTR_FORMAT "): %s", p2i(start), p2i(end), err);
 #ifdef ASSERT
-      fileStream fs(stdout);
-      os::print_memory_mappings((char*)start, bytes, &fs);
+      os::print_memory_mappings((char*)start, bytes, tty);
       assert(false, "bad release: [" PTR_FORMAT "-" PTR_FORMAT "): %s", p2i(start), p2i(end), err);
 #endif
       return false;
@@ -4151,7 +3920,7 @@ void getWindowsInstallationType(char* buffer, int bufferSize) {
   }
 
   // Query the value
-  if (RegQueryValueExA(hKey, valueName, NULL, NULL, (LPBYTE)buffer, &valueLength) != ERROR_SUCCESS) {
+  if (RegQueryValueExA(hKey, valueName, nullptr, nullptr, (LPBYTE)buffer, &valueLength) != ERROR_SUCCESS) {
     RegCloseKey(hKey);
     buffer[0] = '\0';
     return;
@@ -4619,32 +4388,6 @@ bool os::message_box(const char* title, const char* message) {
   return result == IDYES;
 }
 
-#ifndef PRODUCT
-#ifndef _WIN64
-// Helpers to check whether NX protection is enabled
-int nx_exception_filter(_EXCEPTION_POINTERS *pex) {
-  if (pex->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION &&
-      pex->ExceptionRecord->NumberParameters > 0 &&
-      pex->ExceptionRecord->ExceptionInformation[0] ==
-      EXCEPTION_INFO_EXEC_VIOLATION) {
-    return EXCEPTION_EXECUTE_HANDLER;
-  }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-
-void nx_check_protection() {
-  // If NX is enabled we'll get an exception calling into code on the stack
-  char code[] = { (char)0xC3 }; // ret
-  void *code_ptr = (void *)code;
-  __try {
-    __asm call code_ptr
-  } __except(nx_exception_filter((_EXCEPTION_POINTERS*)_exception_info())) {
-    tty->print_raw_cr("NX protection detected.");
-  }
-}
-#endif // _WIN64
-#endif // PRODUCT
-
 // This is called _before_ the global arguments have been parsed
 void os::init(void) {
   _initial_pid = _getpid();
@@ -4664,9 +4407,6 @@ void os::init(void) {
     fatal("DuplicateHandle failed\n");
   }
   main_thread_id = (int) GetCurrentThreadId();
-
-  // initialize fast thread access - only used for 32-bit
-  win32::initialize_thread_ptr_offset();
 }
 
 // To install functions for atexit processing
@@ -4682,11 +4422,7 @@ static jint initSock();
 // HotSpot guard pages is added later.
 size_t os::_compiler_thread_min_stack_allowed = 48 * K;
 size_t os::_java_thread_min_stack_allowed = 40 * K;
-#ifdef _LP64
 size_t os::_vm_internal_thread_min_stack_allowed = 64 * K;
-#else
-size_t os::_vm_internal_thread_min_stack_allowed = (48 DEBUG_ONLY(+ 4)) * K;
-#endif // _LP64
 
 // If stack_commit_size is 0, windows will reserve the default size,
 // but only commit a small portion of it.  This stack size is the size of this
@@ -4714,16 +4450,6 @@ jint os::init_2(void) {
   previousUnhandledExceptionFilter = SetUnhandledExceptionFilter(topLevelUnhandledExceptionFilter);
 #endif
 
-  // for debugging float code generation bugs
-#if defined(ASSERT) && !defined(_WIN64)
-  static long fp_control_word = 0;
-  __asm { fstcw fp_control_word }
-  // see Intel PPro Manual, Vol. 2, p 7-16
-  const long invalid   = 0x01;
-  fp_control_word |= invalid;
-  __asm { fldcw fp_control_word }
-#endif
-
   // Check and sets minimum stack sizes against command line options
   if (set_minimum_stack_sizes() == JNI_ERR) {
     return JNI_ERR;
@@ -4747,11 +4473,6 @@ jint os::init_2(void) {
     }
   }
 
-#ifndef _WIN64
-  // Print something if NX is enabled (win32 on AMD64)
-  NOT_PRODUCT(if (PrintMiscellaneous && Verbose) nx_check_protection());
-#endif
-
   // initialize thread priority policy
   prio_init();
 
@@ -6007,13 +5728,6 @@ ssize_t os::raw_send(int fd, char* buf, size_t nBytes, uint flags) {
   return ::send(fd, buf, (int)nBytes, flags);
 }
 
-// WINDOWS CONTEXT Flags for THREAD_SAMPLING
-#if defined(IA32)
-  #define sampling_context_flags (CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS)
-#elif defined(AMD64) || defined(_M_ARM64)
-  #define sampling_context_flags (CONTEXT_FULL | CONTEXT_FLOATING_POINT)
-#endif
-
 // returns true if thread could be suspended,
 // false otherwise
 static bool do_suspend(HANDLE* h) {
@@ -6058,7 +5772,7 @@ void SuspendedThreadTask::internal_do_task() {
 
   // suspend the thread
   if (do_suspend(&h)) {
-    ctxt.ContextFlags = sampling_context_flags;
+    ctxt.ContextFlags = (CONTEXT_FULL | CONTEXT_FLOATING_POINT);
     // get thread context
     GetThreadContext(h, &ctxt);
     SuspendedThreadTaskContext context(_thread, &ctxt);
@@ -6104,7 +5818,6 @@ void* os::get_default_process_handle() {
 
 // Builds a platform dependent Agent_OnLoad_<lib_name> function name
 // which is used to find statically linked in agents.
-// Additionally for windows, takes into account __stdcall names.
 // Parameters:
 //            sym_name: Symbol in library we are looking for
 //            lib_name: Name of library to look in, null for shared libs.
@@ -6145,24 +5858,11 @@ char* os::build_agent_function_name(const char *sym_name, const char *lib_name,
   if (agent_entry_name == nullptr) {
     return nullptr;
   }
+
+  strcpy(agent_entry_name, sym_name);
   if (lib_name != nullptr) {
-    const char *p = strrchr(sym_name, '@');
-    if (p != nullptr && p != sym_name) {
-      // sym_name == _Agent_OnLoad@XX
-      strncpy(agent_entry_name, sym_name, (p - sym_name));
-      agent_entry_name[(p-sym_name)] = '\0';
-      // agent_entry_name == _Agent_OnLoad
-      strcat(agent_entry_name, "_");
-      strncat(agent_entry_name, lib_name, name_len);
-      strcat(agent_entry_name, p);
-      // agent_entry_name == _Agent_OnLoad_lib_name@XX
-    } else {
-      strcpy(agent_entry_name, sym_name);
-      strcat(agent_entry_name, "_");
-      strncat(agent_entry_name, lib_name, name_len);
-    }
-  } else {
-    strcpy(agent_entry_name, sym_name);
+    strcat(agent_entry_name, "_");
+    strncat(agent_entry_name, lib_name, name_len);
   }
   return agent_entry_name;
 }
@@ -6201,19 +5901,6 @@ int os::get_signal_number(const char* name) {
   return -1;
 }
 
-// Fast current thread access
-
-int os::win32::_thread_ptr_offset = 0;
-
-static void call_wrapper_dummy() {}
-
-// We need to call the os_exception_wrapper once so that it sets
-// up the offset from FS of the thread pointer.
-void os::win32::initialize_thread_ptr_offset() {
-  os::os_exception_wrapper((java_call_t)call_wrapper_dummy,
-                           nullptr, methodHandle(), nullptr, nullptr);
-}
-
 bool os::supports_map_sync() {
   return false;
 }
@@ -6288,7 +5975,7 @@ bool os::win32::find_mapping(address addr, mapping_info_t* mi) {
 // Helper for print_one_mapping: print n words, both as hex and ascii.
 // Use Safefetch for all values.
 static void print_snippet(const void* p, outputStream* st) {
-  static const int num_words = LP64_ONLY(3) NOT_LP64(6);
+  static const int num_words = 3;
   static const int num_bytes = num_words * sizeof(int);
   intptr_t v[num_words];
   const int errval = 0xDE210244;
@@ -6331,8 +6018,7 @@ static address print_one_mapping(MEMORY_BASIC_INFORMATION* minfo, address start,
     if (first_line) {
       st->print("Base " PTR_FORMAT ": ", p2i(allocation_base));
     } else {
-      st->print_raw(NOT_LP64 ("                 ")
-                    LP64_ONLY("                         "));
+      st->print_raw("                         ");
     }
     address region_start = (address)minfo->BaseAddress;
     address region_end = region_start + minfo->RegionSize;
@@ -6432,7 +6118,7 @@ void os::print_memory_mappings(char* addr, size_t bytes, outputStream* st) {
       // Here, we advance the probe pointer by alloc granularity. But if the range to print
       //  is large, this may take a long time. Therefore lets stop right away if the address
       //  is outside of what we know are valid addresses on Windows. Also, add a loop fuse.
-      static const address end_virt = (address)(LP64_ONLY(0x7ffffffffffULL) NOT_LP64(3*G));
+      static const address end_virt = (address)(0x7ffffffffffULL);
       if (p >= end_virt) {
         break;
       } else {
diff --git a/src/hotspot/os/windows/os_windows.hpp b/src/hotspot/os/windows/os_windows.hpp
index 1d523724300..1aba43fb3d2 100644
--- a/src/hotspot/os/windows/os_windows.hpp
+++ b/src/hotspot/os/windows/os_windows.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -146,22 +146,7 @@ class os::win32 {
   // return information about that area.
   static bool find_mapping(address p, mapping_info_t* mapping_info);
 
-#ifndef _WIN64
-  // A wrapper to install a structured exception handler for fast JNI accessors.
-  static address fast_jni_accessor_wrapper(BasicType);
-#endif
-
-  // Fast access to current thread
-protected:
-  static int _thread_ptr_offset;
-private:
-  static void initialize_thread_ptr_offset();
 public:
-  static inline void set_thread_ptr_offset(int offset) {
-    _thread_ptr_offset = offset;
-  }
-  static inline int get_thread_ptr_offset() { return _thread_ptr_offset; }
-
   // signal support
   static void* install_signal_handler(int sig, signal_handler_t handler);
   static void* user_handler();
diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index 959be982fab..06b057315cb 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -1803,7 +1803,7 @@ void PerfMemory::detach(char* addr, size_t bytes) {
 
   if (MemTracker::enabled()) {
     // it does not go through os api, the operation has to record from here
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     remove_file_mapping(addr);
     MemTracker::record_virtual_memory_release((address)addr, bytes);
   } else {
diff --git a/src/hotspot/os/windows/sharedRuntimeRem.cpp b/src/hotspot/os/windows/sharedRuntimeRem.cpp
index cb47cb7dfff..62a85e55a01 100644
--- a/src/hotspot/os/windows/sharedRuntimeRem.cpp
+++ b/src/hotspot/os/windows/sharedRuntimeRem.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "runtime/sharedRuntime.hpp"
 
-#ifdef _WIN64
 // These are copied defines originally from fdlibm.h.
 
 #define __HI(x) *(1+(int*)&x)
@@ -158,5 +157,3 @@ double SharedRuntime::fmod_winx64(double x, double y)
   }
   return x;               /* exact output */
 }
-
-#endif
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
index f83aa603062..45d91c60ed4 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -123,13 +123,13 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
-  // Avoid crash during crash if pc broken.
-  if (epc) {
-    frame fr(sp, epc, frame::kind::unknown);
-    return fr;
+  if (epc == nullptr || !is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
   }
-  frame fr(sp);
-  return fr;
+  return frame(sp, epc, frame::kind::unknown);
 }
 
 frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
@@ -447,23 +447,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Aix::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, sp */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index ba14cb2ac12..7702dbd17ad 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -159,6 +159,12 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+  if (!is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
+  }
   return frame(sp, fp, epc);
 }
 
@@ -442,23 +448,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Bsd::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 29 /* x0-x28 */ + 3 /* fp, lr, sp */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
index 437274a2cb1..153c5ad7e2b 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
@@ -333,6 +333,12 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+  if (!is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
+  }
   return frame(sp, fp, epc);
 }
 
@@ -836,23 +842,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Bsd::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = AMD64_ONLY(16) NOT_AMD64(8);
   int n = continuation;
diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
index 0fc9484ce23..4ecdbe93ebf 100644
--- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
+++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
@@ -228,10 +228,6 @@ void os::print_context(outputStream* st, const void* context) {
   ShouldNotCallThis();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  ShouldNotCallThis();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   ShouldNotCallThis();
 }
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
index 9f44fe3aa25..a7ec163f785 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -354,23 +354,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 32 /* r0-r31 */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
index 807fa765897..861d0d20153 100644
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
@@ -188,9 +188,27 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+  if (!is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
+  }
   return frame(sp, fp, epc);
 }
 
+frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  // In compiled code, the stack banging is performed before LR
+  // has been saved in the frame.  LR is live, and SP and FP
+  // belong to the caller.
+  intptr_t* fp = os::Linux::ucontext_get_fp(uc);
+  intptr_t* sp = os::Linux::ucontext_get_sp(uc);
+  address pc = (address)(uc->uc_mcontext.arm_lr
+                         - NativeInstruction::instruction_size);
+  return frame(sp, fp, pc);
+}
+
 frame os::get_sender_for_C_frame(frame* fr) {
 #ifdef __thumb__
   // We can't reliably get anything from a thumb C frame.
@@ -474,23 +492,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = ARM_REGS_IN_CONTEXT;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
index 1857097bd52..f3f9a3a88df 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -155,6 +155,12 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+  if (!is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
+  }
   return frame(sp, epc, frame::kind::unknown);
 }
 
@@ -461,23 +467,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, ctr */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
index fcb0e170af1..a00659f37cb 100644
--- a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
@@ -352,23 +352,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 32;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
index 9ac1152a013..bc8e3d10431 100644
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
@@ -140,6 +140,12 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   intptr_t* sp;
   intptr_t* fp;
   address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+  if (!is_readable_pointer(epc)) {
+    // Try to recover from calling into bad memory
+    // Assume new frame has not been set up, the same as
+    // compiled frame stack bang
+    return fetch_compiled_frame_from_context(ucVoid);
+  }
   return frame(sp, epc);
 }
 
@@ -442,23 +448,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 16 /* r0-r15 */ + 1 /* pc */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 8fdcbe63c7e..e357747bfea 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -578,23 +578,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const ucontext_t* uc = (const ucontext_t*)context;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = AMD64_ONLY(16) NOT_AMD64(8);
   int n = continuation;
diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
index d593c46d15d..d8498f104c2 100644
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
@@ -376,21 +376,6 @@ void os::print_context(outputStream* st, const void* ucVoid) {
   st->print_cr("No context information.");
 }
 
-void os::print_tos_pc(outputStream *st, const void* ucVoid) {
-  const ucontext_t* uc = (const ucontext_t*)ucVoid;
-
-  address sp = (address)os::Linux::ucontext_get_sp(uc);
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::Posix::ucontext_get_pc(uc);
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   st->print_cr("No register info.");
 }
diff --git a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
index 722c3c8dd60..24410ed9203 100644
--- a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
+++ b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
@@ -205,24 +205,6 @@ void os::print_context(outputStream *st, const void *context) {
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const CONTEXT* uc = (const CONTEXT*)context;
-
-  address sp = (address)uc->Sp;
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = (address)uc->Pc;
-  st->print_cr("Instructions: (pc=" PTR_FORMAT ")", pc);
-  print_hex_dump(st, pc - 32, pc + 32, sizeof(char), /* print_ascii=*/false);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
   const int register_count = 29 /* X0-X28 */;
   int n = continuation;
diff --git a/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
index aa1d5820637..c541213615c 100644
--- a/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
+++ b/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,41 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
-#include "os_windows.hpp"
-#include "runtime/os.hpp"
 
 void MacroAssembler::int3() {
   emit_int8((unsigned char)0xCC);
 }
-
-#ifndef _LP64
-//  The current scheme to accelerate access to the thread
-//  pointer is to store the current thread in the os_exception_wrapper
-//  and reference the current thread from stubs and compiled code
-//  via the FS register.  FS[0] contains a pointer to the structured
-//  exception block which is actually a stack address.  The first time
-//  we call the os exception wrapper, we calculate and store the
-//  offset from this exception block and use that offset here.
-//
-//  The last mechanism we used was problematic in that the
-//  the offset we had hard coded in the VM kept changing as Microsoft
-//  evolved the OS.
-//
-// Warning: This mechanism assumes that we only attempt to get the
-//          thread when we are nested below a call wrapper.
-//
-// movl reg, fs:[0]                        Get exception pointer
-// movl reg, [reg + thread_ptr_offset]     Load thread
-//
-void MacroAssembler::get_thread(Register thread) {
-  prefix(FS_segment);
-  movptr(thread, ExternalAddress(nullptr));
-  assert(os::win32::get_thread_ptr_offset() != 0,
-         "Thread Pointer Offset has not been initialized");
-  movl(thread, Address(thread, os::win32::get_thread_ptr_offset()));
-}
-
-// #else - use shared x86 implementation in cpu/x86/vm/macroAssembler_x86.cpp
-
-#endif
diff --git a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
index aa0fef3b83a..9f7da19b328 100644
--- a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,79 +111,4 @@ DEFINE_INTRINSIC_CMPXCHG(InterlockedCompareExchange64, __int64)
 
 #undef DEFINE_INTRINSIC_CMPXCHG
 
-#ifndef AMD64
-
-#pragma warning(disable: 4035) // Disables warnings reporting missing return statement
-
-template<>
-template<typename T>
-inline T Atomic::PlatformLoad<8>::operator()(T const volatile* src) const {
-  STATIC_ASSERT(8 == sizeof(T));
-  volatile T dest;
-  volatile T* pdest = &dest;
-  __asm {
-    mov eax, src
-    fild     qword ptr [eax]
-    mov eax, pdest
-    fistp    qword ptr [eax]
-  }
-  return dest;
-}
-
-template<>
-template<typename T>
-inline void Atomic::PlatformStore<8>::operator()(T volatile* dest,
-                                                 T store_value) const {
-  STATIC_ASSERT(8 == sizeof(T));
-  volatile T* src = &store_value;
-  __asm {
-    mov eax, src
-    fild     qword ptr [eax]
-    mov eax, dest
-    fistp    qword ptr [eax]
-  }
-}
-
-#pragma warning(default: 4035) // Enables warnings reporting missing return statement
-
-template<>
-struct Atomic::PlatformOrderedStore<1, RELEASE_X_FENCE>
-{
-  template <typename T>
-  void operator()(volatile T* p, T v) const {
-    __asm {
-      mov edx, p;
-      mov al, v;
-      xchg al, byte ptr [edx];
-    }
-  }
-};
-
-template<>
-struct Atomic::PlatformOrderedStore<2, RELEASE_X_FENCE>
-{
-  template <typename T>
-  void operator()(volatile T* p, T v) const {
-    __asm {
-      mov edx, p;
-      mov ax, v;
-      xchg ax, word ptr [edx];
-    }
-  }
-};
-
-template<>
-struct Atomic::PlatformOrderedStore<4, RELEASE_X_FENCE>
-{
-  template <typename T>
-  void operator()(volatile T* p, T v) const {
-    __asm {
-      mov edx, p;
-      mov eax, v;
-      xchg eax, dword ptr [edx];
-    }
-  }
-};
-#endif // AMD64
-
 #endif // OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp
index 6f4678e4a5c..4298542629b 100644
--- a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,35 +53,7 @@ static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
 }
 
 static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
-#ifdef AMD64
   pd_conjoint_atomic_helper(from, to, count);
-#else
-  // Guarantee use of fild/fistp or xmm regs via some asm code, because compilers won't.
-  __asm {
-    mov    eax, from;
-    mov    edx, to;
-    mov    ecx, count;
-    cmp    eax, edx;
-    jbe    downtest;
-    jmp    uptest;
-  up:
-    fild   qword ptr [eax];
-    fistp  qword ptr [edx];
-    add    eax, 8;
-    add    edx, 8;
-  uptest:
-    sub    ecx, 1;
-    jge    up;
-    jmp    done;
-  down:
-    fild   qword ptr [eax][ecx*8];
-    fistp  qword ptr [edx][ecx*8];
-  downtest:
-    sub    ecx, 1;
-    jge    down;
-  done:;
-  }
-#endif // AMD64
 }
 
 static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
@@ -89,11 +61,7 @@ static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
 }
 
 static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) {
-#ifdef AMD64
   pd_conjoint_bytes_atomic(from, to, count);
-#else
-  pd_conjoint_bytes(from, to, count);
-#endif // AMD64
 }
 
 static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) {
diff --git a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
index 43764b14a01..a1f1aa76912 100644
--- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,13 +48,7 @@ inline void OrderAccess::acquire()    { compiler_barrier(); }
 inline void OrderAccess::release()    { compiler_barrier(); }
 
 inline void OrderAccess::fence() {
-#ifdef AMD64
   StubRoutines_fence();
-#else
-  __asm {
-    lock add dword ptr [esp], 0;
-  }
-#endif // AMD64
   compiler_barrier();
 }
 
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
index de59a74cc24..9a23ac67335 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
@@ -56,15 +56,9 @@
 #undef REG_SP
 #undef REG_FP
 #undef REG_PC
-#ifdef AMD64
 #define REG_SP Rsp
 #define REG_FP Rbp
 #define REG_PC Rip
-#else
-#define REG_SP Esp
-#define REG_FP Ebp
-#define REG_PC Eip
-#endif // AMD64
 
 JNIEXPORT
 extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
@@ -72,52 +66,12 @@ extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
 // Install a win32 structured exception handler around thread.
 void os::os_exception_wrapper(java_call_t f, JavaValue* value, const methodHandle& method, JavaCallArguments* args, JavaThread* thread) {
   __try {
-
-#ifndef AMD64
-    // We store the current thread in this wrapperthread location
-    // and determine how far away this address is from the structured
-    // exception pointer that FS:[0] points to.  This get_thread
-    // code can then get the thread pointer via FS.
-    //
-    // Warning:  This routine must NEVER be inlined since we'd end up with
-    //           multiple offsets.
-    //
-    volatile Thread* wrapperthread = thread;
-
-    if (os::win32::get_thread_ptr_offset() == 0) {
-      int thread_ptr_offset;
-      __asm {
-        lea eax, dword ptr wrapperthread;
-        sub eax, dword ptr FS:[0H];
-        mov thread_ptr_offset, eax
-      };
-      os::win32::set_thread_ptr_offset(thread_ptr_offset);
-    }
-#ifdef ASSERT
-    // Verify that the offset hasn't changed since we initially captured
-    // it. This might happen if we accidentally ended up with an
-    // inlined version of this routine.
-    else {
-      int test_thread_ptr_offset;
-      __asm {
-        lea eax, dword ptr wrapperthread;
-        sub eax, dword ptr FS:[0H];
-        mov test_thread_ptr_offset, eax
-      };
-      assert(test_thread_ptr_offset == os::win32::get_thread_ptr_offset(),
-             "thread pointer offset from SEH changed");
-    }
-#endif // ASSERT
-#endif // !AMD64
-
     f(value, method, args, thread);
   } __except(topLevelExceptionFilter((_EXCEPTION_POINTERS*)_exception_info())) {
       // Nothing to do.
   }
 }
 
-#ifdef AMD64
-
 // This is the language specific handler for exceptions
 // originating from dynamically generated code.
 // We call the standard structured exception handler
@@ -157,7 +111,6 @@ typedef struct {
   UNWIND_INFO_EH_ONLY unw;
 } DynamicCodeData, *pDynamicCodeData;
 
-#endif // AMD64
 //
 // Register our CodeCache area with the OS so it will dispatch exceptions
 // to our topLevelExceptionFilter when we take an exception in our
@@ -167,8 +120,6 @@ typedef struct {
 // codeCache area
 //
 bool os::win32::register_code_area(char *low, char *high) {
-#ifdef AMD64
-
   ResourceMark rm;
 
   pDynamicCodeData pDCD;
@@ -206,7 +157,6 @@ bool os::win32::register_code_area(char *low, char *high) {
   guarantee(RtlAddFunctionTable(prt, 1, (ULONGLONG)low),
             "Failed to register Dynamic Code Exception Handler with RtlAddFunctionTable");
 
-#endif // AMD64
   return true;
 }
 
@@ -334,20 +284,6 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, epc);
 }
 
-#ifndef AMD64
-// Ignore "C4172: returning address of local variable or temporary" on 32bit
-PRAGMA_DIAG_PUSH
-PRAGMA_DISABLE_MSVC_WARNING(4172)
-// Returns an estimate of the current stack pointer. Result must be guaranteed
-// to point into the calling threads stack, and be no lower than the current
-// stack pointer.
-address os::current_stack_pointer() {
-  int dummy;
-  address sp = (address)&dummy;
-  return sp;
-}
-PRAGMA_DIAG_POP
-#else
 // Returns the current stack pointer. Accurate value needed for
 // os::verify_stack_alignment().
 address os::current_stack_pointer() {
@@ -356,7 +292,6 @@ address os::current_stack_pointer() {
                                      StubRoutines::x86::get_previous_sp_entry());
   return (*func)();
 }
-#endif
 
 bool os::win32::get_frame_at_stack_banging_point(JavaThread* thread,
         struct _EXCEPTION_POINTERS* exceptionInfo, address pc, frame* fr) {
@@ -414,7 +349,6 @@ void os::print_context(outputStream *st, const void *context) {
   const CONTEXT* uc = (const CONTEXT*)context;
 
   st->print_cr("Registers:");
-#ifdef AMD64
   st->print(  "RAX=" INTPTR_FORMAT, uc->Rax);
   st->print(", RBX=" INTPTR_FORMAT, uc->Rbx);
   st->print(", RCX=" INTPTR_FORMAT, uc->Rcx);
@@ -446,43 +380,12 @@ void os::print_context(outputStream *st, const void *context) {
                  i, xmm[1], xmm[0]);
   }
   st->print("  MXCSR=" UINT32_FORMAT_X_0, uc->MxCsr);
-#else
-  st->print(  "EAX=" INTPTR_FORMAT, uc->Eax);
-  st->print(", EBX=" INTPTR_FORMAT, uc->Ebx);
-  st->print(", ECX=" INTPTR_FORMAT, uc->Ecx);
-  st->print(", EDX=" INTPTR_FORMAT, uc->Edx);
-  st->cr();
-  st->print(  "ESP=" INTPTR_FORMAT, uc->Esp);
-  st->print(", EBP=" INTPTR_FORMAT, uc->Ebp);
-  st->print(", ESI=" INTPTR_FORMAT, uc->Esi);
-  st->print(", EDI=" INTPTR_FORMAT, uc->Edi);
-  st->cr();
-  st->print(  "EIP=" INTPTR_FORMAT, uc->Eip);
-  st->print(", EFLAGS=" INTPTR_FORMAT, uc->EFlags);
-#endif // AMD64
   st->cr();
   st->cr();
 }
 
-void os::print_tos_pc(outputStream *st, const void *context) {
-  if (context == nullptr) return;
-
-  const CONTEXT* uc = (const CONTEXT*)context;
-
-  address sp = (address)uc->REG_SP;
-  print_tos(st, sp);
-  st->cr();
-
-  // Note: it may be unsafe to inspect memory near pc. For example, pc may
-  // point to garbage if entry point in an nmethod is corrupted. Leave
-  // this at the end, and hope for the best.
-  address pc = os::fetch_frame_from_context(uc).pc();
-  print_instructions(st, pc);
-  st->cr();
-}
-
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = AMD64_ONLY(16) NOT_AMD64(8);
+  const int register_count = 16;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
@@ -495,7 +398,6 @@ void os::print_register_info(outputStream *st, const void *context, int& continu
     continuation = n + 1;
 # define CASE_PRINT_REG(n, str, id) case n: st->print(str); print_location(st, uc->id);
     switch (n) {
-#ifdef AMD64
     CASE_PRINT_REG( 0, "RAX=", Rax); break;
     CASE_PRINT_REG( 1, "RBX=", Rbx); break;
     CASE_PRINT_REG( 2, "RCX=", Rcx); break;
@@ -512,16 +414,6 @@ void os::print_register_info(outputStream *st, const void *context, int& continu
     CASE_PRINT_REG(13, "R13=", R13); break;
     CASE_PRINT_REG(14, "R14=", R14); break;
     CASE_PRINT_REG(15, "R15=", R15); break;
-#else
-    CASE_PRINT_REG(0, "EAX=", Eax); break;
-    CASE_PRINT_REG(1, "EBX=", Ebx); break;
-    CASE_PRINT_REG(2, "ECX=", Ecx); break;
-    CASE_PRINT_REG(3, "EDX=", Edx); break;
-    CASE_PRINT_REG(4, "ESP=", Esp); break;
-    CASE_PRINT_REG(5, "EBP=", Ebp); break;
-    CASE_PRINT_REG(6, "ESI=", Esi); break;
-    CASE_PRINT_REG(7, "EDI=", Edi); break;
-#endif // AMD64
     }
 # undef CASE_PRINT_REG
     ++n;
@@ -529,17 +421,7 @@ void os::print_register_info(outputStream *st, const void *context, int& continu
 }
 
 extern "C" int SpinPause () {
-#ifdef AMD64
    return 0 ;
-#else
-   // pause == rep:nop
-   // On systems that don't support pause a rep:nop
-   // is executed as a nop.  The rep: prefix is ignored.
-   _asm {
-      pause ;
-   };
-   return 1 ;
-#endif // AMD64
 }
 
 juint os::cpu_microcode_revision() {
@@ -561,21 +443,15 @@ juint os::cpu_microcode_revision() {
 }
 
 void os::setup_fpu() {
-#ifndef AMD64
-  int fpu_cntrl_word = StubRoutines::x86::fpu_cntrl_wrd_std();
-  __asm fldcw fpu_cntrl_word;
-#endif // !AMD64
 }
 
 #ifndef PRODUCT
 void os::verify_stack_alignment() {
-#ifdef AMD64
   // The current_stack_pointer() calls generated get_previous_sp stub routine.
   // Only enable the assert after the routine becomes available.
   if (StubRoutines::initial_stubs_code() != nullptr) {
     assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
   }
-#endif
 }
 #endif
 
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
index f7622611da7..0cc457609cc 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,11 @@
 #include "runtime/os.hpp"
 #include "os_windows.hpp"
 
-#ifdef AMD64
 #define HAVE_PLATFORM_PRINT_NATIVE_STACK 1
 inline bool os::platform_print_native_stack(outputStream* st, const void* context,
                                      char *buf, int buf_size, address& lastpc) {
   return os::win32::platform_print_native_stack(st, context, buf, buf_size, lastpc);
 }
-#endif
 
 inline jlong os::rdtsc() {
   // 32 bit: 64 bit result in edx:eax
diff --git a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
index 1f66e839fab..ca402a13675 100644
--- a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 #ifndef OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
 #define OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
 
-
-#ifdef AMD64
 typedef unsigned char UBYTE;
 
 // This structure is used to define an UNWIND_INFO that
@@ -54,6 +52,4 @@ typedef struct _RUNTIME_FUNCTION {
 } RUNTIME_FUNCTION, *PRUNTIME_FUNCTION;
 */
 
-#endif // AMD64
-
 #endif // OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
diff --git a/src/hotspot/share/adlc/adlc.hpp b/src/hotspot/share/adlc/adlc.hpp
index 8812066bafa..3e82fe0e210 100644
--- a/src/hotspot/share/adlc/adlc.hpp
+++ b/src/hotspot/share/adlc/adlc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ using namespace std;
 #ifdef _WIN64
 typedef __int64 intptr_t;
 #else
-typedef int intptr_t;
+#error "Unsupported platform"
 #endif
 #define _INTPTR_T_DEFINED
 #endif
@@ -59,7 +59,7 @@ typedef int intptr_t;
 #ifdef _WIN64
 typedef unsigned __int64 uintptr_t;
 #else
-typedef unsigned int uintptr_t;
+#error "Unsupported platform"
 #endif
 #define _UINTPTR_T_DEFINED
 #endif
diff --git a/src/hotspot/share/adlc/main.cpp b/src/hotspot/share/adlc/main.cpp
index fd270b09443..f15b6e8813f 100644
--- a/src/hotspot/share/adlc/main.cpp
+++ b/src/hotspot/share/adlc/main.cpp
@@ -491,8 +491,6 @@ int get_legal_text(FileBuff &fbuf, char **legal_text)
   return (int) (legal_end - legal_start);
 }
 
-#if !defined(_WIN32) || defined(_WIN64)
 void *operator new( size_t size, int, const char *, int ) throw() {
   return ::operator new( size );
 }
-#endif
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index e577e7fd90b..e950afc981d 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -346,11 +346,8 @@ class Instruction: public CompilationResourceObj {
     NeedsNullCheckFlag = 0,
     CanTrapFlag,
     DirectCompareFlag,
-    IsEliminatedFlag,
     IsSafepointFlag,
     IsStaticFlag,
-    NeedsStoreCheckFlag,
-    NeedsWriteBarrierFlag,
     PreservesStateFlag,
     TargetIsFinalFlag,
     TargetIsLoadedFlag,
@@ -361,7 +358,6 @@ class Instruction: public CompilationResourceObj {
     ProfileMDOFlag,
     IsLinkedInBlockFlag,
     NeedsRangeCheckFlag,
-    InWorkListFlag,
     DeoptimizeOnException,
     KillsMemoryFlag,
     OmitChecksFlag,
@@ -840,14 +836,12 @@ LEAF(StoreField, AccessField)
   : AccessField(obj, offset, field, is_static, state_before, needs_patching)
   , _value(value)
   {
-    set_flag(NeedsWriteBarrierFlag, as_ValueType(field_type())->is_object());
     ASSERT_VALUES
     pin();
   }
 
   // accessors
   Value value() const                            { return _value; }
-  bool needs_write_barrier() const               { return check_flag(NeedsWriteBarrierFlag); }
 
   // generic
   virtual void input_values_do(ValueVisitor* f)   { AccessField::input_values_do(f); f->visit(&_value); }
@@ -974,16 +968,12 @@ LEAF(StoreIndexed, AccessIndexed)
   : AccessIndexed(array, index, length, elt_type, state_before, mismatched)
   , _value(value), _profiled_method(nullptr), _profiled_bci(0), _check_boolean(check_boolean)
   {
-    set_flag(NeedsWriteBarrierFlag, (as_ValueType(elt_type)->is_object()));
-    set_flag(NeedsStoreCheckFlag, (as_ValueType(elt_type)->is_object()));
     ASSERT_VALUES
     pin();
   }
 
   // accessors
   Value value() const                            { return _value; }
-  bool needs_write_barrier() const               { return check_flag(NeedsWriteBarrierFlag); }
-  bool needs_store_check() const                 { return check_flag(NeedsStoreCheckFlag); }
   bool check_boolean() const                     { return _check_boolean; }
   // Helpers for MethodData* profiling
   void set_should_profile(bool value)                { set_flag(ProfileMDOFlag, value); }
diff --git a/src/hotspot/share/c1/c1_MacroAssembler.hpp b/src/hotspot/share/c1/c1_MacroAssembler.hpp
index 1e193ce0869..0fe0d0ff285 100644
--- a/src/hotspot/share/c1/c1_MacroAssembler.hpp
+++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ class StubAssembler: public C1_MacroAssembler {
   int call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3);
 
   void prologue(const char* name, bool must_gc_arguments);
-  void epilogue();
+  void epilogue(bool use_pop = false);
 };
 
 #endif // SHARE_C1_C1_MACROASSEMBLER_HPP
diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp
index 330c4067504..6aed71fdfe5 100644
--- a/src/hotspot/share/c1/c1_Runtime1.hpp
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp
@@ -135,6 +135,9 @@ class Runtime1: public AllStatic {
   static void initialize(BufferBlob* blob);
   static void initialize_pd();
 
+  // return offset in words
+  static uint runtime_blob_current_thread_offset(frame f);
+
   // stubs
   static CodeBlob* blob_for (C1StubId id);
   static address   entry_for(C1StubId id)          { return blob_for(id)->code_begin(); }
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 3c67216d4c5..a181257a519 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -227,8 +227,10 @@ bool ArchiveBuilder::gather_klass_and_symbol(MetaspaceClosure::Ref* ref, bool re
     if (!is_excluded(klass)) {
       _klasses->append(klass);
     }
-    // See RunTimeClassInfo::get_for()
-    _estimated_metaspaceobj_bytes += align_up(BytesPerWord, SharedSpaceObjectAlignment);
+    // See RunTimeClassInfo::get_for(): make sure we have enough space for both maximum
+    // Klass alignment as well as the RuntimeInfo* pointer we will embed in front of a Klass.
+    _estimated_metaspaceobj_bytes += align_up(BytesPerWord, CompressedKlassPointers::klass_alignment_in_bytes()) +
+        align_up(sizeof(void*), SharedSpaceObjectAlignment);
   } else if (ref->msotype() == MetaspaceObj::SymbolType) {
     // Make sure the symbol won't be GC'ed while we are dumping the archive.
     Symbol* sym = (Symbol*)ref->obj();
@@ -661,7 +663,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
 
   oldtop = dump_region->top();
   if (src_info->msotype() == MetaspaceObj::ClassType) {
-    // Save a pointer immediate in front of an InstanceKlass, so
+    // Allocate space for a pointer directly in front of the future InstanceKlass, so
     // we can do a quick lookup from InstanceKlass* -> RunTimeClassInfo*
     // without building another hashtable. See RunTimeClassInfo::get_for()
     // in systemDictionaryShared.cpp.
@@ -670,8 +672,19 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
       SystemDictionaryShared::validate_before_archiving(InstanceKlass::cast(klass));
       dump_region->allocate(sizeof(address));
     }
+    // Allocate space for the future InstanceKlass with proper alignment
+    const size_t alignment =
+#ifdef _LP64
+      UseCompressedClassPointers ?
+        nth_bit(ArchiveBuilder::precomputed_narrow_klass_shift()) :
+        SharedSpaceObjectAlignment;
+#else
+      SharedSpaceObjectAlignment;
+#endif
+    dest = dump_region->allocate(bytes, alignment);
+  } else {
+    dest = dump_region->allocate(bytes);
   }
-  dest = dump_region->allocate(bytes);
   newtop = dump_region->top();
 
   memcpy(dest, src, bytes);
@@ -702,6 +715,8 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
   src_info->set_buffered_addr((address)dest);
 
   _alloc_stats.record(src_info->msotype(), int(newtop - oldtop), src_info->read_only());
+
+  DEBUG_ONLY(_alloc_stats.verify((int)dump_region->used(), src_info->read_only()));
 }
 
 // This is used by code that hand-assembles data structures, such as the LambdaProxyClassKey, that are
@@ -780,6 +795,15 @@ void ArchiveBuilder::make_klasses_shareable() {
     const char* generated = "";
     Klass* k = get_buffered_addr(klasses()->at(i));
     k->remove_java_mirror();
+#ifdef _LP64
+    if (UseCompactObjectHeaders) {
+      Klass* requested_k = to_requested(k);
+      address narrow_klass_base = _requested_static_archive_bottom; // runtime encoding base == runtime mapping start
+      const int narrow_klass_shift = precomputed_narrow_klass_shift();
+      narrowKlass nk = CompressedKlassPointers::encode_not_null_without_asserts(requested_k, narrow_klass_base, narrow_klass_shift);
+      k->set_prototype_header(markWord::prototype().set_narrow_klass(nk));
+    }
+#endif //_LP64
     if (k->is_objArray_klass()) {
       // InstanceKlass and TypeArrayKlass will in turn call remove_unshareable_info
       // on their array classes.
@@ -872,14 +896,27 @@ uintx ArchiveBuilder::any_to_offset(address p) const {
   return buffer_to_offset(p);
 }
 
+address ArchiveBuilder::offset_to_buffered_address(u4 offset) const {
+  address requested_addr = _requested_static_archive_bottom + offset;
+  address buffered_addr = requested_addr - _buffer_to_requested_delta;
+  assert(is_in_buffer_space(buffered_addr), "bad offset");
+  return buffered_addr;
+}
+
 #if INCLUDE_CDS_JAVA_HEAP
 narrowKlass ArchiveBuilder::get_requested_narrow_klass(Klass* k) {
   assert(CDSConfig::is_dumping_heap(), "sanity");
   k = get_buffered_klass(k);
   Klass* requested_k = to_requested(k);
+  const int narrow_klass_shift = ArchiveBuilder::precomputed_narrow_klass_shift();
+#ifdef ASSERT
+  const size_t klass_alignment = MAX2(SharedSpaceObjectAlignment, (size_t)nth_bit(narrow_klass_shift));
+  assert(is_aligned(k, klass_alignment), "Klass " PTR_FORMAT " misaligned.", p2i(k));
+#endif
   address narrow_klass_base = _requested_static_archive_bottom; // runtime encoding base == runtime mapping start
-  const int narrow_klass_shift = ArchiveHeapWriter::precomputed_narrow_klass_shift;
-  return CompressedKlassPointers::encode_not_null(requested_k, narrow_klass_base, narrow_klass_shift);
+  // Note: use the "raw" version of encode that takes explicit narrow klass base and shift. Don't use any
+  // of the variants that do sanity checks, nor any of those that use the current - dump - JVM's encoding setting.
+  return CompressedKlassPointers::encode_not_null_without_asserts(requested_k, narrow_klass_base, narrow_klass_shift);
 }
 #endif // INCLUDE_CDS_JAVA_HEAP
 
@@ -959,6 +996,20 @@ class RelocateBufferToRequested : public BitMapClosure {
   }
 };
 
+#ifdef _LP64
+int ArchiveBuilder::precomputed_narrow_klass_shift() {
+  // Legacy Mode:
+  //    We use 32 bits for narrowKlass, which should cover the full 4G Klass range. Shift can be 0.
+  // CompactObjectHeader Mode:
+  //    narrowKlass is much smaller, and we use the highest possible shift value to later get the maximum
+  //    Klass encoding range.
+  //
+  // Note that all of this may change in the future, if we decide to correct the pre-calculated
+  // narrow Klass IDs at archive load time.
+  assert(UseCompressedClassPointers, "Only needed for compressed class pointers");
+  return UseCompactObjectHeaders ?  CompressedKlassPointers::max_shift() : 0;
+}
+#endif // _LP64
 
 void ArchiveBuilder::relocate_to_requested() {
   ro_region()->pack();
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index c17090ee53d..f306e4676b3 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -27,6 +27,7 @@
 
 #include "cds/archiveUtils.hpp"
 #include "cds/dumpAllocStats.hpp"
+#include "memory/metaspace.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "oops/array.hpp"
 #include "oops/klass.hpp"
@@ -43,9 +44,9 @@ class Klass;
 class MemRegion;
 class Symbol;
 
-// Metaspace::allocate() requires that all blocks must be aligned with KlassAlignmentInBytes.
-// We enforce the same alignment rule in blocks allocated from the shared space.
-const int SharedSpaceObjectAlignment = KlassAlignmentInBytes;
+// The minimum alignment for non-Klass objects inside the CDS archive. Klass objects need
+// to follow CompressedKlassPointers::klass_alignment_in_bytes().
+constexpr size_t SharedSpaceObjectAlignment = Metaspace::min_allocation_alignment_bytes;
 
 // Overview of CDS archive creation (for both static and dynamic dump):
 //
@@ -321,7 +322,7 @@ class ArchiveBuilder : public StackObj {
   }
 
 public:
-  static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
+  static const uintx MAX_SHARED_DELTA = ArchiveUtils::MAX_SHARED_DELTA;;
 
   // The address p points to an object inside the output buffer. When the archive is mapped
   // at the requested address, what's the offset of this object from _requested_static_archive_bottom?
@@ -331,6 +332,9 @@ class ArchiveBuilder : public StackObj {
   // inside the output buffer, or (b), an object in the currently mapped static archive.
   uintx any_to_offset(address p) const;
 
+  // The reverse of buffer_to_offset()
+  address offset_to_buffered_address(u4 offset) const;
+
   template <typename T>
   u4 buffer_to_offset_u4(T p) const {
     uintx offset = buffer_to_offset((address)p);
@@ -343,6 +347,11 @@ class ArchiveBuilder : public StackObj {
     return to_offset_u4(offset);
   }
 
+  template <typename T>
+  T offset_to_buffered(u4 offset) const {
+    return (T)offset_to_buffered_address(offset);
+  }
+
 public:
   ArchiveBuilder();
   ~ArchiveBuilder();
@@ -460,6 +469,29 @@ class ArchiveBuilder : public StackObj {
 
   void print_stats();
   void report_out_of_space(const char* name, size_t needed_bytes);
+
+#ifdef _LP64
+  // The CDS archive contains pre-computed narrow Klass IDs. It carries them in the headers of
+  // archived heap objects. With +UseCompactObjectHeaders, it also carries them in prototypes
+  // in Klass.
+  // When generating the archive, these narrow Klass IDs are computed using the following scheme:
+  // 1) The future encoding base is assumed to point to the first address of the generated mapping.
+  //    That means that at runtime, the narrow Klass encoding must be set up with base pointing to
+  //    the start address of the mapped CDS metadata archive (wherever that may be). This precludes
+  //    zero-based encoding.
+  // 2) The shift must be large enough to result in an encoding range that covers the future assumed
+  //    runtime Klass range. That future Klass range will contain both the CDS metadata archive and
+  //    the future runtime class space. Since we do not know the size of the future class space, we
+  //    need to chose an encoding base/shift combination that will result in a "large enough" size.
+  //    The details depend on whether we use compact object headers or legacy object headers.
+  //  In Legacy Mode, a narrow Klass ID is 32 bit. This gives us an encoding range size of 4G even
+  //    with shift = 0, which is all we need. Therefore, we use a shift=0 for pre-calculating the
+  //    narrow Klass IDs.
+  // TinyClassPointer Mode:
+  //    We use the highest possible shift value to maximize the encoding range size.
+  static int precomputed_narrow_klass_shift();
+#endif // _LP64
+
 };
 
 #endif // SHARE_CDS_ARCHIVEBUILDER_HPP
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index a55325978de..636b368117d 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -186,8 +186,12 @@ objArrayOop ArchiveHeapWriter::allocate_root_segment(size_t offset, int element_
   memset(mem, 0, objArrayOopDesc::object_size(element_count));
 
   // The initialization code is copied from MemAllocator::finish and ObjArrayAllocator::initialize.
-  oopDesc::set_mark(mem, markWord::prototype());
-  oopDesc::release_set_klass(mem, Universe::objectArrayKlass());
+  if (UseCompactObjectHeaders) {
+    oopDesc::release_set_mark(mem, Universe::objectArrayKlass()->prototype_header());
+  } else {
+    oopDesc::set_mark(mem, markWord::prototype());
+    oopDesc::release_set_klass(mem, Universe::objectArrayKlass());
+  }
   arrayOopDesc::set_length(mem, element_count);
   return objArrayOop(cast_to_oop(mem));
 }
@@ -350,9 +354,13 @@ HeapWord* ArchiveHeapWriter::init_filler_array_at_buffer_top(int array_length, s
   Klass* oak = Universe::objectArrayKlass(); // already relocated to point to archived klass
   HeapWord* mem = offset_to_buffered_address<HeapWord*>(_buffer_used);
   memset(mem, 0, fill_bytes);
-  oopDesc::set_mark(mem, markWord::prototype());
   narrowKlass nk = ArchiveBuilder::current()->get_requested_narrow_klass(oak);
-  cast_to_oop(mem)->set_narrow_klass(nk);
+  if (UseCompactObjectHeaders) {
+    oopDesc::release_set_mark(mem, markWord::prototype().set_narrow_klass(nk));
+  } else {
+    oopDesc::set_mark(mem, markWord::prototype());
+    cast_to_oop(mem)->set_narrow_klass(nk);
+  }
   arrayOopDesc::set_length(mem, array_length);
   return mem;
 }
@@ -556,7 +564,11 @@ void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop s
   address buffered_addr = requested_addr_to_buffered_addr(cast_from_oop<address>(requested_obj));
 
   oop fake_oop = cast_to_oop(buffered_addr);
-  fake_oop->set_narrow_klass(nk);
+  if (UseCompactObjectHeaders) {
+    fake_oop->set_mark(markWord::prototype().set_narrow_klass(nk));
+  } else {
+    fake_oop->set_narrow_klass(nk);
+  }
 
   if (src_obj == nullptr) {
     return;
@@ -565,7 +577,11 @@ void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop s
   // in the shared heap.
   if (!src_obj->fast_no_hash_check()) {
     intptr_t src_hash = src_obj->identity_hash();
-    fake_oop->set_mark(markWord::prototype().copy_set_hash(src_hash));
+    if (UseCompactObjectHeaders) {
+      fake_oop->set_mark(markWord::prototype().set_narrow_klass(nk).copy_set_hash(src_hash));
+    } else {
+      fake_oop->set_mark(markWord::prototype().copy_set_hash(src_hash));
+    }
     assert(fake_oop->mark().is_unlocked(), "sanity");
 
     DEBUG_ONLY(intptr_t archived_hash = fake_oop->identity_hash());
diff --git a/src/hotspot/share/cds/archiveHeapWriter.hpp b/src/hotspot/share/cds/archiveHeapWriter.hpp
index 29ea50ba5fe..70c1207bb91 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.hpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.hpp
@@ -240,17 +240,6 @@ class ArchiveHeapWriter : AllStatic {
   static oop buffered_addr_to_source_obj(address buffered_addr);
   static address buffered_addr_to_requested_addr(address buffered_addr);
 
-  // Archived heap object headers carry pre-computed narrow Klass ids calculated with the
-  // following scheme:
-  // 1) the encoding base must be the mapping start address.
-  // 2) shift must be large enough to result in an encoding range that covers the runtime Klass range.
-  //    That Klass range is defined by CDS archive size and runtime class space size. Luckily, the maximum
-  //    size can be predicted: archive size is assumed to be <1G, class space size capped at 3G, and at
-  //    runtime we put both regions adjacent to each other. Therefore, runtime Klass range size < 4G.
-  //    Since nKlass itself is 32 bit, our encoding range len is 4G, and since we set the base directly
-  //    at mapping start, these 4G are enough. Therefore, we don't need to shift at all (shift=0).
-  static constexpr int precomputed_narrow_klass_shift = 0;
-
 };
 #endif // INCLUDE_CDS_JAVA_HEAP
 #endif // SHARE_CDS_ARCHIVEHEAPWRITER_HPP
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 4622a27cbec..c7282f7d97c 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -241,9 +241,10 @@ void DumpRegion::commit_to(char* newtop) {
                  which, commit, _vs->actual_committed_size(), _vs->high());
 }
 
-
-char* DumpRegion::allocate(size_t num_bytes) {
-  char* p = (char*)align_up(_top, (size_t)SharedSpaceObjectAlignment);
+char* DumpRegion::allocate(size_t num_bytes, size_t alignment) {
+  // Always align to at least minimum alignment
+  alignment = MAX2(SharedSpaceObjectAlignment, alignment);
+  char* p = (char*)align_up(_top, alignment);
   char* newtop = p + align_up(num_bytes, (size_t)SharedSpaceObjectAlignment);
   expand_top_to(newtop);
   memset(p, 0, newtop - p);
@@ -320,9 +321,8 @@ void WriteClosure::do_ptr(void** p) {
 void ReadClosure::do_ptr(void** p) {
   assert(*p == nullptr, "initializing previous initialized pointer.");
   intptr_t obj = nextPtr();
-  assert((intptr_t)obj >= 0 || (intptr_t)obj < -100,
-         "hit tag while initializing ptrs.");
-  *p = (void*)obj != nullptr ? (void*)(SharedBaseAddress + obj) : (void*)obj;
+  assert(obj >= 0, "sanity.");
+  *p = (obj != 0) ? (void*)(_base_address + obj) : (void*)obj;
 }
 
 void ReadClosure::do_u4(u4* p) {
@@ -344,7 +344,7 @@ void ReadClosure::do_tag(int tag) {
   int old_tag;
   old_tag = (int)(intptr_t)nextPtr();
   // do_int(&old_tag);
-  assert(tag == old_tag, "old tag doesn't match");
+  assert(tag == old_tag, "tag doesn't match (%d, expected %d)", old_tag, tag);
   FileMapInfo::assert_mark(tag == old_tag);
 }
 
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 5a78bc26ee6..7fb8e538084 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -25,8 +25,10 @@
 #ifndef SHARE_CDS_ARCHIVEUTILS_HPP
 #define SHARE_CDS_ARCHIVEUTILS_HPP
 
+#include "cds/cds_globals.hpp"
 #include "cds/serializeClosure.hpp"
 #include "logging/log.hpp"
+#include "memory/metaspace.hpp"
 #include "memory/virtualspace.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/exceptions.hpp"
@@ -156,10 +158,11 @@ class DumpRegion {
 public:
   DumpRegion(const char* name, uintx max_delta = 0)
     : _name(name), _base(nullptr), _top(nullptr), _end(nullptr),
-      _max_delta(max_delta), _is_packed(false) {}
+      _max_delta(max_delta), _is_packed(false),
+      _rs(NULL), _vs(NULL) {}
 
   char* expand_top_to(char* newtop);
-  char* allocate(size_t num_bytes);
+  char* allocate(size_t num_bytes, size_t alignment = 0);
 
   void append_intptr_t(intptr_t n, bool need_to_mark = false) NOT_CDS_RETURN;
 
@@ -228,13 +231,14 @@ class WriteClosure : public SerializeClosure {
 class ReadClosure : public SerializeClosure {
 private:
   intptr_t** _ptr_array;
-
+  intptr_t _base_address;
   inline intptr_t nextPtr() {
     return *(*_ptr_array)++;
   }
 
 public:
-  ReadClosure(intptr_t** ptr_array) { _ptr_array = ptr_array; }
+  ReadClosure(intptr_t** ptr_array, intptr_t base_address) :
+    _ptr_array(ptr_array), _base_address(base_address) {}
 
   void do_ptr(void** p);
   void do_u4(u4* p);
@@ -247,7 +251,27 @@ class ReadClosure : public SerializeClosure {
 
 class ArchiveUtils {
 public:
+  static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
   static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
+
+  // offset must represent an object of type T in the mapped shared space. Return
+  // a direct pointer to this object.
+  template <typename T> T static from_offset(u4 offset) {
+    T p = (T)(SharedBaseAddress + offset);
+    assert(Metaspace::is_in_shared_metaspace(p), "must be");
+    return p;
+  }
+
+  // p must be an archived object. Get its offset from SharedBaseAddress
+  template <typename T> static u4 to_offset(T p) {
+    uintx pn = (uintx)p;
+    uintx base = (uintx)SharedBaseAddress;
+    assert(Metaspace::is_in_shared_metaspace(p), "must be");
+    assert(pn > base, "sanity"); // No valid object is stored at 0 offset from SharedBaseAddress
+    uintx offset = pn - base;
+    assert(offset <= MAX_SHARED_DELTA, "range check");
+    return static_cast<u4>(offset);
+  }
 };
 
 class HeapRootSegments {
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 9e8a46e105e..691a1983732 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -82,13 +82,20 @@ char* CDSConfig::default_archive_path() {
     os::jvm_path(jvm_path, sizeof(jvm_path));
     char *end = strrchr(jvm_path, *os::file_separator());
     if (end != nullptr) *end = '\0';
-    size_t jvm_path_len = strlen(jvm_path);
-    size_t file_sep_len = strlen(os::file_separator());
-    const size_t len = jvm_path_len + file_sep_len + 20;
-    _default_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments);
-    jio_snprintf(_default_archive_path, len,
-                LP64_ONLY(!UseCompressedOops ? "%s%sclasses_nocoops.jsa":) "%s%sclasses.jsa",
-                jvm_path, os::file_separator());
+    stringStream tmp;
+    tmp.print("%s%sclasses", jvm_path, os::file_separator());
+#ifdef _LP64
+    if (!UseCompressedOops) {
+      tmp.print_raw("_nocoops");
+    }
+    if (UseCompactObjectHeaders) {
+      // Note that generation of xxx_coh.jsa variants require
+      // --enable-cds-archive-coh at build time
+      tmp.print_raw("_coh");
+    }
+#endif
+    tmp.print_raw(".jsa");
+    _default_archive_path = os::strdup(tmp.base());
   }
   return _default_archive_path;
 }
diff --git a/src/hotspot/share/cds/dumpAllocStats.cpp b/src/hotspot/share/cds/dumpAllocStats.cpp
index a1dac41e322..25351f78d84 100644
--- a/src/hotspot/share/cds/dumpAllocStats.cpp
+++ b/src/hotspot/share/cds/dumpAllocStats.cpp
@@ -115,3 +115,15 @@ void DumpAllocStats::print_stats(int ro_all, int rw_all) {
            percent_of(_num_method_cp_entries_archived, _num_method_cp_entries),
            _num_method_cp_entries_reverted);
 }
+
+#ifdef ASSERT
+void DumpAllocStats::verify(int expected_byte_size, bool read_only) const {
+  int bytes = 0;
+  const int what = (int)(read_only ? RO : RW);
+  for (int type = 0; type < int(_number_of_types); type ++) {
+    bytes += _bytes[what][type];
+  }
+  assert(bytes == expected_byte_size, "counter mismatch (%s: %d vs %d)",
+         (read_only ? "RO" : "RW"), bytes, expected_byte_size);
+}
+#endif // ASSERT
diff --git a/src/hotspot/share/cds/dumpAllocStats.hpp b/src/hotspot/share/cds/dumpAllocStats.hpp
index 0332be73120..2ff81c52392 100644
--- a/src/hotspot/share/cds/dumpAllocStats.hpp
+++ b/src/hotspot/share/cds/dumpAllocStats.hpp
@@ -135,6 +135,9 @@ class DumpAllocStats : public StackObj {
   }
 
   void print_stats(int ro_all, int rw_all);
+
+  DEBUG_ONLY(void verify(int expected_byte_size, bool read_only) const);
+
 };
 
 #endif // SHARE_CDS_DUMPALLOCSTATS_HPP
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 223791cdd36..5e88b3c47e4 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -55,6 +55,7 @@
 #include "nmt/memTracker.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/compressedOops.inline.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
@@ -204,6 +205,7 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   _core_region_alignment = core_region_alignment;
   _obj_alignment = ObjectAlignmentInBytes;
   _compact_strings = CompactStrings;
+  _compact_headers = UseCompactObjectHeaders;
   if (CDSConfig::is_dumping_heap()) {
     _narrow_oop_mode = CompressedOops::mode();
     _narrow_oop_base = CompressedOops::base();
@@ -211,6 +213,14 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   }
   _compressed_oops = UseCompressedOops;
   _compressed_class_ptrs = UseCompressedClassPointers;
+  if (UseCompressedClassPointers) {
+#ifdef _LP64
+    _narrow_klass_pointer_bits = CompressedKlassPointers::narrow_klass_pointer_bits();
+    _narrow_klass_shift = ArchiveBuilder::precomputed_narrow_klass_shift();
+#endif
+  } else {
+    _narrow_klass_pointer_bits = _narrow_klass_shift = -1;
+  }
   _max_heap_size = MaxHeapSize;
   _use_optimized_module_handling = CDSConfig::is_using_optimized_module_handling();
   _has_full_module_graph = CDSConfig::is_dumping_full_module_graph();
@@ -269,11 +279,15 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- narrow_oop_base:                " INTPTR_FORMAT, p2i(_narrow_oop_base));
   st->print_cr("- narrow_oop_shift                %d", _narrow_oop_shift);
   st->print_cr("- compact_strings:                %d", _compact_strings);
+  st->print_cr("- compact_headers:                %d", _compact_headers);
   st->print_cr("- max_heap_size:                  " UINTX_FORMAT, _max_heap_size);
   st->print_cr("- narrow_oop_mode:                %d", _narrow_oop_mode);
   st->print_cr("- compressed_oops:                %d", _compressed_oops);
   st->print_cr("- compressed_class_ptrs:          %d", _compressed_class_ptrs);
+  st->print_cr("- narrow_klass_pointer_bits:      %d", _narrow_klass_pointer_bits);
+  st->print_cr("- narrow_klass_shift:             %d", _narrow_klass_shift);
   st->print_cr("- cloned_vtables_offset:          " SIZE_FORMAT_X, _cloned_vtables_offset);
+  st->print_cr("- early_serialized_data_offset:   " SIZE_FORMAT_X, _early_serialized_data_offset);
   st->print_cr("- serialized_data_offset:         " SIZE_FORMAT_X, _serialized_data_offset);
   st->print_cr("- jvm_ident:                      %s", _jvm_ident);
   st->print_cr("- shared_path_table_offset:       " SIZE_FORMAT_X, _shared_path_table_offset);
@@ -2082,22 +2096,23 @@ bool FileMapInfo::can_use_heap_region() {
   }
 
   // We pre-compute narrow Klass IDs with the runtime mapping start intended to be the base, and a shift of
-  // ArchiveHeapWriter::precomputed_narrow_klass_shift. We enforce this encoding at runtime (see
+  // ArchiveBuilder::precomputed_narrow_klass_shift. We enforce this encoding at runtime (see
   // CompressedKlassPointers::initialize_for_given_encoding()). Therefore, the following assertions must
   // hold:
   address archive_narrow_klass_base = (address)header()->mapped_base_address();
-  const int archive_narrow_klass_shift = ArchiveHeapWriter::precomputed_narrow_klass_shift;
+  const int archive_narrow_klass_pointer_bits = header()->narrow_klass_pointer_bits();
+  const int archive_narrow_klass_shift = header()->narrow_klass_shift();
 
   log_info(cds)("CDS archive was created with max heap size = " SIZE_FORMAT "M, and the following configuration:",
                 max_heap_size()/M);
-  log_info(cds)("    narrow_klass_base at mapping start address, narrow_klass_shift = %d",
-                archive_narrow_klass_shift);
+  log_info(cds)("    narrow_klass_base at mapping start address, narrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
+                archive_narrow_klass_pointer_bits, archive_narrow_klass_shift);
   log_info(cds)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
                 narrow_oop_mode(), p2i(narrow_oop_base()), narrow_oop_shift());
   log_info(cds)("The current max heap size = " SIZE_FORMAT "M, G1HeapRegion::GrainBytes = " SIZE_FORMAT,
                 MaxHeapSize/M, G1HeapRegion::GrainBytes);
-  log_info(cds)("    narrow_klass_base = " PTR_FORMAT ", narrow_klass_shift = %d",
-                p2i(CompressedKlassPointers::base()), CompressedKlassPointers::shift());
+  log_info(cds)("    narrow_klass_base = " PTR_FORMAT ", arrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
+                p2i(CompressedKlassPointers::base()), CompressedKlassPointers::narrow_klass_pointer_bits(), CompressedKlassPointers::shift());
   log_info(cds)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
                 CompressedOops::mode(), p2i(CompressedOops::base()), CompressedOops::shift());
   log_info(cds)("    heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
@@ -2106,10 +2121,35 @@ bool FileMapInfo::can_use_heap_region() {
                 UseCompressedOops ? p2i(CompressedOops::end()) :
                                     UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().end()) : 0L);
 
-  assert(archive_narrow_klass_base == CompressedKlassPointers::base(), "Unexpected encoding base encountered "
-         "(" PTR_FORMAT ", expected " PTR_FORMAT ")", p2i(CompressedKlassPointers::base()), p2i(archive_narrow_klass_base));
-  assert(archive_narrow_klass_shift == CompressedKlassPointers::shift(), "Unexpected encoding shift encountered "
-         "(%d, expected %d)", CompressedKlassPointers::shift(), archive_narrow_klass_shift);
+  int err = 0;
+  if ( archive_narrow_klass_base != CompressedKlassPointers::base() ||
+       (err = 1, archive_narrow_klass_pointer_bits != CompressedKlassPointers::narrow_klass_pointer_bits()) ||
+       (err = 2, archive_narrow_klass_shift != CompressedKlassPointers::shift()) ) {
+    stringStream ss;
+    switch (err) {
+    case 0:
+      ss.print("Unexpected encoding base encountered (" PTR_FORMAT ", expected " PTR_FORMAT ")",
+               p2i(CompressedKlassPointers::base()), p2i(archive_narrow_klass_base));
+      break;
+    case 1:
+      ss.print("Unexpected narrow Klass bit length encountered (%d, expected %d)",
+               CompressedKlassPointers::narrow_klass_pointer_bits(), archive_narrow_klass_pointer_bits);
+      break;
+    case 2:
+      ss.print("Unexpected narrow Klass shift encountered (%d, expected %d)",
+               CompressedKlassPointers::shift(), archive_narrow_klass_shift);
+      break;
+    default:
+      ShouldNotReachHere();
+    };
+    LogTarget(Info, cds) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      ls.print_raw(ss.base());
+      header()->print(&ls);
+    }
+    assert(false, "%s", ss.base());
+  }
 
   return true;
 }
@@ -2481,14 +2521,22 @@ bool FileMapHeader::validate() {
             "for testing purposes only and should not be used in a production environment");
   }
 
-  log_info(cds)("Archive was created with UseCompressedOops = %d, UseCompressedClassPointers = %d",
-                          compressed_oops(), compressed_class_pointers());
+  log_info(cds)("Archive was created with UseCompressedOops = %d, UseCompressedClassPointers = %d, UseCompactObjectHeaders = %d",
+                          compressed_oops(), compressed_class_pointers(), compact_headers());
   if (compressed_oops() != UseCompressedOops || compressed_class_pointers() != UseCompressedClassPointers) {
-    log_info(cds)("Unable to use shared archive.\nThe saved state of UseCompressedOops and UseCompressedClassPointers is "
+    log_warning(cds)("Unable to use shared archive.\nThe saved state of UseCompressedOops and UseCompressedClassPointers is "
                                "different from runtime, CDS will be disabled.");
     return false;
   }
 
+  if (compact_headers() != UseCompactObjectHeaders) {
+    log_warning(cds)("Unable to use shared archive.\nThe shared archive file's UseCompactObjectHeaders setting (%s)"
+                     " does not equal the current UseCompactObjectHeaders setting (%s).",
+                     _compact_headers          ? "enabled" : "disabled",
+                     UseCompactObjectHeaders   ? "enabled" : "disabled");
+    return false;
+  }
+
   if (!_use_optimized_module_handling) {
     CDSConfig::stop_using_optimized_module_handling();
     log_info(cds)("optimized module handling: disabled because archive was created without optimized module handling");
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index f7c2e9c19de..6a15ff03c3a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -188,11 +188,15 @@ class FileMapHeader: private CDSFileMapHeaderBase {
   address _narrow_oop_base;                       // compressed oop encoding base
   int    _narrow_oop_shift;                       // compressed oop encoding shift
   bool   _compact_strings;                        // value of CompactStrings
+  bool   _compact_headers;                        // value of UseCompactObjectHeaders
   uintx  _max_heap_size;                          // java max heap size during dumping
   CompressedOops::Mode _narrow_oop_mode;          // compressed oop encoding mode
   bool    _compressed_oops;                       // save the flag UseCompressedOops
   bool    _compressed_class_ptrs;                 // save the flag UseCompressedClassPointers
+  int     _narrow_klass_pointer_bits;             // save number of bits in narrowKlass
+  int     _narrow_klass_shift;                    // save shift width used to pre-compute narrowKlass IDs in archived heap objects
   size_t  _cloned_vtables_offset;                 // The address of the first cloned vtable
+  size_t  _early_serialized_data_offset;          // Data accessed using {ReadClosure,WriteClosure}::serialize()
   size_t  _serialized_data_offset;                // Data accessed using {ReadClosure,WriteClosure}::serialize()
   bool _has_non_jar_in_classpath;                 // non-jar file entry exists in classpath
   unsigned int _common_app_classpath_prefix_size; // size of the common prefix of app class paths
@@ -258,9 +262,11 @@ class FileMapHeader: private CDSFileMapHeaderBase {
   address narrow_oop_base()                const { return _narrow_oop_base; }
   int narrow_oop_shift()                   const { return _narrow_oop_shift; }
   bool compact_strings()                   const { return _compact_strings; }
+  bool compact_headers()                   const { return _compact_headers; }
   uintx max_heap_size()                    const { return _max_heap_size; }
   CompressedOops::Mode narrow_oop_mode()   const { return _narrow_oop_mode; }
   char* cloned_vtables()                   const { return from_mapped_offset(_cloned_vtables_offset); }
+  char* early_serialized_data()            const { return from_mapped_offset(_early_serialized_data_offset); }
   char* serialized_data()                  const { return from_mapped_offset(_serialized_data_offset); }
   const char* jvm_ident()                  const { return _jvm_ident; }
   char* requested_base_address()           const { return _requested_base_address; }
@@ -269,6 +275,8 @@ class FileMapHeader: private CDSFileMapHeaderBase {
   bool has_non_jar_in_classpath()          const { return _has_non_jar_in_classpath; }
   bool compressed_oops()                   const { return _compressed_oops; }
   bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
+  int narrow_klass_pointer_bits()          const { return _narrow_klass_pointer_bits; }
+  int narrow_klass_shift()                 const { return _narrow_klass_shift; }
   HeapRootSegments heap_root_segments()    const { return _heap_root_segments; }
   bool has_full_module_graph()             const { return _has_full_module_graph; }
   size_t heap_oopmap_start_pos()           const { return _heap_oopmap_start_pos; }
@@ -283,6 +291,7 @@ class FileMapHeader: private CDSFileMapHeaderBase {
 
   void set_has_platform_or_app_classes(bool v)   { _has_platform_or_app_classes = v; }
   void set_cloned_vtables(char* p)               { set_as_offset(p, &_cloned_vtables_offset); }
+  void set_early_serialized_data(char* p)        { set_as_offset(p, &_early_serialized_data_offset); }
   void set_serialized_data(char* p)              { set_as_offset(p, &_serialized_data_offset); }
   void set_mapped_base_address(char* p)          { _mapped_base_address = p; }
   void set_heap_root_segments(HeapRootSegments segments) { _heap_root_segments = segments; }
@@ -396,6 +405,8 @@ class FileMapInfo : public CHeapObj<mtInternal> {
 
   char* cloned_vtables()                      const { return header()->cloned_vtables(); }
   void  set_cloned_vtables(char* p)           const { header()->set_cloned_vtables(p); }
+  char* early_serialized_data()               const { return header()->early_serialized_data(); }
+  void  set_early_serialized_data(char* p)    const { header()->set_early_serialized_data(p); }
   char* serialized_data()                     const { return header()->serialized_data(); }
   void  set_serialized_data(char* p)          const { header()->set_serialized_data(p); }
 
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index 8a556a48624..88b1f9277ff 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
 #include "runtime/mutexLocker.hpp"
 
 GrowableArrayCHeap<char*, mtClassShared>* LambdaFormInvokers::_lambdaform_lines = nullptr;
-Array<Array<char>*>*  LambdaFormInvokers::_static_archive_invokers = nullptr;
+Array<u4>*  LambdaFormInvokers::_static_archive_invokers = nullptr;
 
 #define NUM_FILTER 4
 static const char* filter[NUM_FILTER] = {"java.lang.invoke.Invokers$Holder",
@@ -216,7 +216,7 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
       }
     }
     if (count > 0) {
-      _static_archive_invokers = ArchiveBuilder::new_ro_array<Array<char>*>(count);
+      _static_archive_invokers = ArchiveBuilder::new_ro_array<u4>(count);
       int index = 0;
       for (int i = 0; i < len; i++) {
         char* str = _lambdaform_lines->at(i);
@@ -225,8 +225,7 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
           Array<char>* line = ArchiveBuilder::new_ro_array<char>((int)str_len);
           strncpy(line->adr_at(0), str, str_len);
 
-          _static_archive_invokers->at_put(index, line);
-          ArchivePtrMarker::mark_pointer(_static_archive_invokers->adr_at(index));
+          _static_archive_invokers->at_put(index, ArchiveBuilder::current()->any_to_offset_u4(line));
           index++;
         }
       }
@@ -239,7 +238,8 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
 void LambdaFormInvokers::read_static_archive_invokers() {
   if (_static_archive_invokers != nullptr) {
     for (int i = 0; i < _static_archive_invokers->length(); i++) {
-      Array<char>* line = _static_archive_invokers->at(i);
+      u4 offset = _static_archive_invokers->at(i);
+      Array<char>* line = ArchiveUtils::from_offset<Array<char>*>(offset);
       char* str = line->adr_at(0);
       append(str);
     }
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.hpp b/src/hotspot/share/cds/lambdaFormInvokers.hpp
index e78ddb1a1bc..583a863a1c2 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.hpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.hpp
@@ -38,7 +38,7 @@ class LambdaFormInvokers : public AllStatic {
  private:
   static GrowableArrayCHeap<char*, mtClassShared>* _lambdaform_lines;
   // For storing LF form lines (LF_RESOLVE only) in read only table.
-  static Array<Array<char>*>* _static_archive_invokers;
+  static Array<u4>* _static_archive_invokers;
   static void regenerate_class(char* name, ClassFileStream& st, TRAPS);
  public:
   static void append(char* line);
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index 2eef543f9db..b8220a34047 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,6 @@ DumpTimeLambdaProxyClassInfo::~DumpTimeLambdaProxyClassInfo() {
   }
 }
 
-void LambdaProxyClassKey::init_for_archive(LambdaProxyClassKey& dumptime_key) {
-  ArchiveBuilder* b = ArchiveBuilder::current();
-
-  b->write_pointer_in_buffer(&_caller_ik,                dumptime_key._caller_ik);
-  b->write_pointer_in_buffer(&_instantiated_method_type, dumptime_key._instantiated_method_type);
-  b->write_pointer_in_buffer(&_invoked_name,             dumptime_key._invoked_name);
-  b->write_pointer_in_buffer(&_invoked_type,             dumptime_key._invoked_type);
-  b->write_pointer_in_buffer(&_member_method,            dumptime_key._member_method);
-  b->write_pointer_in_buffer(&_method_type,              dumptime_key._method_type);
-}
-
 unsigned int LambdaProxyClassKey::hash() const {
   return SystemDictionaryShared::hash_for_shared_dictionary((address)_caller_ik) +
          SystemDictionaryShared::hash_for_shared_dictionary((address)_invoked_name) +
@@ -53,6 +42,14 @@ unsigned int LambdaProxyClassKey::hash() const {
          SystemDictionaryShared::hash_for_shared_dictionary((address)_instantiated_method_type);
 }
 
+unsigned int RunTimeLambdaProxyClassKey::hash() const {
+  return primitive_hash<u4>(_caller_ik) +
+         primitive_hash<u4>(_invoked_name) +
+         primitive_hash<u4>(_invoked_type) +
+         primitive_hash<u4>(_method_type) +
+         primitive_hash<u4>(_instantiated_method_type);
+}
+
 #ifndef PRODUCT
 void LambdaProxyClassKey::print_on(outputStream* st) const {
   ResourceMark rm;
@@ -65,13 +62,24 @@ void LambdaProxyClassKey::print_on(outputStream* st) const {
   st->print_cr("_method_type              : %s", _method_type->as_C_string());
 }
 
+void RunTimeLambdaProxyClassKey::print_on(outputStream* st) const {
+  ResourceMark rm;
+  st->print_cr("LambdaProxyClassKey       : " INTPTR_FORMAT " hash: %0x08x", p2i(this), hash());
+  st->print_cr("_caller_ik                : %d", _caller_ik);
+  st->print_cr("_instantiated_method_type : %d", _instantiated_method_type);
+  st->print_cr("_invoked_name             : %d", _invoked_name);
+  st->print_cr("_invoked_type             : %d", _invoked_type);
+  st->print_cr("_member_method            : %d", _member_method);
+  st->print_cr("_method_type              : %d", _method_type);
+}
+
 void RunTimeLambdaProxyClassInfo::print_on(outputStream* st) const {
   _key.print_on(st);
 }
 #endif
 
 void RunTimeLambdaProxyClassInfo::init(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
-  _key.init_for_archive(key);
+  _key = RunTimeLambdaProxyClassKey::init_for_dumptime(key);
   ArchiveBuilder::current()->write_pointer_in_buffer(&_proxy_klass_head,
                                                      info._proxy_klasses->at(0));
 }
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
index b9766066484..2a9f87681db 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,9 +101,80 @@ class LambdaProxyClassKey {
     return (k1.equals(k2));
   }
 
-  InstanceKlass* caller_ik() const { return _caller_ik; }
+  InstanceKlass* caller_ik()         const { return _caller_ik; }
+  Symbol* invoked_name()             const { return _invoked_name; }
+  Symbol* invoked_type()             const { return _invoked_type; }
+  Symbol* method_type()              const { return _method_type; }
+  Method* member_method()            const { return _member_method; }
+  Symbol* instantiated_method_type() const { return _instantiated_method_type; }
 
-  void init_for_archive(LambdaProxyClassKey& dumptime_key);
+#ifndef PRODUCT
+  void print_on(outputStream* st) const;
+#endif
+};
+
+class RunTimeLambdaProxyClassKey {
+  u4 _caller_ik;
+  u4 _invoked_name;
+  u4 _invoked_type;
+  u4 _method_type;
+  u4 _member_method;
+  u4 _instantiated_method_type;
+
+  RunTimeLambdaProxyClassKey(u4 caller_ik,
+                             u4 invoked_name,
+                             u4 invoked_type,
+                             u4 method_type,
+                             u4 member_method,
+                             u4 instantiated_method_type) :
+    _caller_ik(caller_ik),
+    _invoked_name(invoked_name),
+    _invoked_type(invoked_type),
+    _method_type(method_type),
+    _member_method(member_method),
+    _instantiated_method_type(instantiated_method_type) {}
+
+public:
+  static RunTimeLambdaProxyClassKey init_for_dumptime(LambdaProxyClassKey& key) {
+    assert(ArchiveBuilder::is_active(), "sanity");
+    ArchiveBuilder* b = ArchiveBuilder::current();
+
+    u4 caller_ik                = b->any_to_offset_u4(key.caller_ik());
+    u4 invoked_name             = b->any_to_offset_u4(key.invoked_name());
+    u4 invoked_type             = b->any_to_offset_u4(key.invoked_type());
+    u4 method_type              = b->any_to_offset_u4(key.method_type());
+    u4 member_method            = b->any_to_offset_u4(key.member_method());
+    u4 instantiated_method_type = b->any_to_offset_u4(key.instantiated_method_type());
+
+    return RunTimeLambdaProxyClassKey(caller_ik, invoked_name, invoked_type, method_type,
+                                      member_method, instantiated_method_type);
+  }
+
+  static RunTimeLambdaProxyClassKey init_for_runtime(InstanceKlass* caller_ik,
+                                                     Symbol*        invoked_name,
+                                                     Symbol*        invoked_type,
+                                                     Symbol*        method_type,
+                                                     Method*        member_method,
+                                                     Symbol*        instantiated_method_type) {
+    // All parameters must be in shared space, or else you'd get an assert in
+    // ArchiveUtils::to_offset().
+    return RunTimeLambdaProxyClassKey(ArchiveUtils::to_offset(caller_ik),
+                                      ArchiveUtils::to_offset(invoked_name),
+                                      ArchiveUtils::to_offset(invoked_type),
+                                      ArchiveUtils::to_offset(method_type),
+                                      ArchiveUtils::to_offset(member_method),
+                                      ArchiveUtils::to_offset(instantiated_method_type));
+  }
+
+  unsigned int hash() const;
+  bool equals(RunTimeLambdaProxyClassKey const& other) const {
+    return _caller_ik == other._caller_ik &&
+           _invoked_name == other._invoked_name &&
+           _invoked_type == other._invoked_type &&
+           _method_type == other._method_type &&
+           _member_method == other._member_method &&
+           _instantiated_method_type == other._instantiated_method_type;
+  }
 
 #ifndef PRODUCT
   void print_on(outputStream* st) const;
@@ -133,17 +204,17 @@ class DumpTimeLambdaProxyClassInfo {
 };
 
 class RunTimeLambdaProxyClassInfo {
-  LambdaProxyClassKey _key;
+  RunTimeLambdaProxyClassKey _key;
   InstanceKlass* _proxy_klass_head;
 public:
-  RunTimeLambdaProxyClassInfo(LambdaProxyClassKey key, InstanceKlass* proxy_klass_head) :
+  RunTimeLambdaProxyClassInfo(RunTimeLambdaProxyClassKey key, InstanceKlass* proxy_klass_head) :
     _key(key), _proxy_klass_head(proxy_klass_head) {}
 
   InstanceKlass* proxy_klass_head() const { return _proxy_klass_head; }
 
   // Used by LambdaProxyClassDictionary to implement OffsetCompactHashtable::EQUALS
   static inline bool EQUALS(
-       const RunTimeLambdaProxyClassInfo* value, LambdaProxyClassKey* key, int len_unused) {
+       const RunTimeLambdaProxyClassInfo* value, RunTimeLambdaProxyClassKey* key, int len_unused) {
     return (value->_key.equals(*key));
   }
   void init(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info);
@@ -151,7 +222,7 @@ class RunTimeLambdaProxyClassInfo {
   unsigned int hash() const {
     return _key.hash();
   }
-  LambdaProxyClassKey key() const {
+  RunTimeLambdaProxyClassKey key() const {
     return _key;
   }
 #ifndef PRODUCT
@@ -173,7 +244,7 @@ class DumpTimeLambdaProxyClassDictionary
 };
 
 class LambdaProxyClassDictionary : public OffsetCompactHashtable<
-  LambdaProxyClassKey*,
+  RunTimeLambdaProxyClassKey*,
   const RunTimeLambdaProxyClassInfo*,
   RunTimeLambdaProxyClassInfo::EQUALS> {};
 
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 2a43fd2dd4f..3cb1374efb1 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -87,6 +87,7 @@
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/resourceHash.hpp"
 
@@ -359,8 +360,43 @@ void MetaspaceShared::read_extra_data(JavaThread* current, const char* filename)
   }
 }
 
-// Read/write a data stream for restoring/preserving metadata pointers and
-// miscellaneous data from/to the shared archive file.
+// About "serialize" --
+//
+// This is (probably a badly named) way to read/write a data stream of pointers and
+// miscellaneous data from/to the shared archive file. The usual code looks like this:
+//
+//     // These two global C++ variables are initialized during dump time.
+//     static int _archived_int;
+//     static MetaspaceObj* archived_ptr;
+//
+//     void MyClass::serialize(SerializeClosure* soc) {
+//         soc->do_int(&_archived_int);
+//         soc->do_int(&_archived_ptr);
+//     }
+//
+//     At dumptime, these two variables are stored into the CDS archive.
+//     At runtime, these two variables are loaded from the CDS archive.
+//     In addition, the pointer is relocated as necessary.
+//
+// Some of the xxx::serialize() functions may have side effects and assume that
+// the archive is already mapped. For example, SymbolTable::serialize_shared_table_header()
+// unconditionally makes the set of archived symbols available. Therefore, we put most
+// of these xxx::serialize() functions inside MetaspaceShared::serialize(), which
+// is called AFTER we made the decision to map the archive.
+//
+// However, some of the "serialized" data are used to decide whether an archive should
+// be mapped or not (e.g., for checking if the -Djdk.module.main property is compatible
+// with the archive). The xxx::serialize() functions for these data must be put inside
+// MetaspaceShared::early_serialize(). Such functions must not produce side effects that
+// assume we will always decides to map the archive.
+
+void MetaspaceShared::early_serialize(SerializeClosure* soc) {
+  int tag = 0;
+  soc->do_tag(--tag);
+  CDS_JAVA_HEAP_ONLY(Modules::serialize(soc);)
+  CDS_JAVA_HEAP_ONLY(Modules::serialize_addmods_names(soc);)
+  soc->do_tag(666);
+}
 
 void MetaspaceShared::serialize(SerializeClosure* soc) {
   int tag = 0;
@@ -402,8 +438,6 @@ void MetaspaceShared::serialize(SerializeClosure* soc) {
   SystemDictionaryShared::serialize_vm_classes(soc);
   soc->do_tag(--tag);
 
-  CDS_JAVA_HEAP_ONLY(Modules::serialize(soc);)
-  CDS_JAVA_HEAP_ONLY(Modules::serialize_addmods_names(soc);)
   CDS_JAVA_HEAP_ONLY(ClassLoaderDataShared::serialize(soc);)
 
   LambdaFormInvokers::serialize(soc);
@@ -455,6 +489,7 @@ class VM_PopulateDumpSharedSpace : public VM_Operation {
     log_info(cds)("Dumping symbol table ...");
     SymbolTable::write_to_archive(symbols);
   }
+  char* dump_early_read_only_tables();
   char* dump_read_only_tables();
 
 public:
@@ -494,6 +529,21 @@ class StaticArchiveBuilder : public ArchiveBuilder {
   }
 };
 
+char* VM_PopulateDumpSharedSpace::dump_early_read_only_tables() {
+  ArchiveBuilder::OtherROAllocMark mark;
+
+  // Write module name into archive
+  CDS_JAVA_HEAP_ONLY(Modules::dump_main_module_name();)
+  // Write module names from --add-modules into archive
+  CDS_JAVA_HEAP_ONLY(Modules::dump_addmods_names();)
+
+  DumpRegion* ro_region = ArchiveBuilder::current()->ro_region();
+  char* start = ro_region->top();
+  WriteClosure wc(ro_region);
+  MetaspaceShared::early_serialize(&wc);
+  return start;
+}
+
 char* VM_PopulateDumpSharedSpace::dump_read_only_tables() {
   ArchiveBuilder::OtherROAllocMark mark;
 
@@ -501,10 +551,7 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables() {
 
   // Write lambform lines into archive
   LambdaFormInvokers::dump_static_archive_invokers();
-  // Write module name into archive
-  CDS_JAVA_HEAP_ONLY(Modules::dump_main_module_name();)
-  // Write module names from --add-modules into archive
-  CDS_JAVA_HEAP_ONLY(Modules::dump_addmods_names();)
+
   // Write the other data to the output array.
   DumpRegion* ro_region = ArchiveBuilder::current()->ro_region();
   char* start = ro_region->top();
@@ -543,6 +590,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   log_info(cds)("Make classes shareable");
   _builder.make_klasses_shareable();
 
+  char* early_serialized_data = dump_early_read_only_tables();
   char* serialized_data = dump_read_only_tables();
 
   SystemDictionaryShared::adjust_lambda_proxy_class_dictionary();
@@ -556,6 +604,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   assert(static_archive != nullptr, "SharedArchiveFile not set?");
   _map_info = new FileMapInfo(static_archive, true);
   _map_info->populate_header(MetaspaceShared::core_region_alignment());
+  _map_info->set_early_serialized_data(early_serialized_data);
   _map_info->set_serialized_data(serialized_data);
   _map_info->set_cloned_vtables(CppVtables::vtables_serialized_base());
 }
@@ -1199,19 +1248,25 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
           address cds_base = (address)static_mapinfo->mapped_base();
           address ccs_end = (address)class_space_rs.end();
           assert(ccs_end > cds_base, "Sanity check");
-#if INCLUDE_CDS_JAVA_HEAP
-          // We archived objects with pre-computed narrow Klass id. Set up encoding such that these Ids stay valid.
-          address precomputed_narrow_klass_base = cds_base;
-          const int precomputed_narrow_klass_shift = ArchiveHeapWriter::precomputed_narrow_klass_shift;
-          CompressedKlassPointers::initialize_for_given_encoding(
-            cds_base, ccs_end - cds_base, // Klass range
-            precomputed_narrow_klass_base, precomputed_narrow_klass_shift // precomputed encoding, see ArchiveHeapWriter
-            );
-#else
-          CompressedKlassPointers::initialize (
-            cds_base, ccs_end - cds_base // Klass range
+          if (INCLUDE_CDS_JAVA_HEAP || UseCompactObjectHeaders) {
+            // The CDS archive may contain narrow Klass IDs that were precomputed at archive generation time:
+            // - every archived java object header (only if INCLUDE_CDS_JAVA_HEAP)
+            // - every archived Klass' prototype   (only if +UseCompactObjectHeaders)
+            //
+            // In order for those IDs to still be valid, we need to dictate base and shift: base should be the
+            // mapping start, shift the shift used at archive generation time.
+            address precomputed_narrow_klass_base = cds_base;
+            const int precomputed_narrow_klass_shift = ArchiveBuilder::precomputed_narrow_klass_shift();
+            CompressedKlassPointers::initialize_for_given_encoding(
+              cds_base, ccs_end - cds_base, // Klass range
+              precomputed_narrow_klass_base, precomputed_narrow_klass_shift // precomputed encoding, see ArchiveBuilder
             );
-#endif // INCLUDE_CDS_JAVA_HEAP
+          } else {
+            // Let JVM freely chose encoding base and shift
+            CompressedKlassPointers::initialize (
+              cds_base, ccs_end - cds_base // Klass range
+              );
+          }
           // map_or_load_heap_region() compares the current narrow oop and klass encodings
           // with the archived ones, so it must be done after all encodings are determined.
           static_mapinfo->map_or_load_heap_region();
@@ -1266,7 +1321,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
 //
 // If UseCompressedClassPointers=1, the range encompassing both spaces will be
 //  suitable to en/decode narrow Klass pointers: the base will be valid for
-//  encoding, the range [Base, End) not surpass KlassEncodingMetaspaceMax.
+//  encoding, the range [Base, End) and not surpass the max. range for that encoding.
 //
 // Return:
 //
@@ -1387,7 +1442,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
       // case we reserve wherever possible, but the start address needs to be encodable as narrow Klass
-      // encoding base since the archived heap objects contain nKlass IDs pre-calculated toward the start
+      // encoding base since the archived heap objects contain narrow Klass IDs pre-calculated toward the start
       // of the shared Metaspace. That prevents us from using zero-based encoding and therefore we won't
       // try allocating in low-address regions.
       total_space_rs = Metaspace::reserve_address_space_for_compressed_classes(total_range_size, false /* optimize_for_zero_base */);
@@ -1473,6 +1528,14 @@ MapArchiveResult MetaspaceShared::map_archive(FileMapInfo* mapinfo, char* mapped
     return MAP_ARCHIVE_OTHER_FAILURE;
   }
 
+  if (mapinfo->is_static()) {
+    // Currently, only static archive uses early serialized data.
+    char* buffer = mapinfo->early_serialized_data();
+    intptr_t* array = (intptr_t*)buffer;
+    ReadClosure rc(&array, (intptr_t)mapped_base_address);
+    early_serialize(&rc);
+  }
+
   mapinfo->set_is_mapped(true);
   return MAP_ARCHIVE_SUCCESS;
 }
@@ -1509,7 +1572,7 @@ void MetaspaceShared::initialize_shared_spaces() {
   // shared string/symbol tables.
   char* buffer = static_mapinfo->serialized_data();
   intptr_t* array = (intptr_t*)buffer;
-  ReadClosure rc(&array);
+  ReadClosure rc(&array, (intptr_t)SharedBaseAddress);
   serialize(&rc);
 
   // Finish up archived heap initialization. These must be
@@ -1526,7 +1589,7 @@ void MetaspaceShared::initialize_shared_spaces() {
   FileMapInfo *dynamic_mapinfo = FileMapInfo::dynamic_info();
   if (dynamic_mapinfo != nullptr) {
     intptr_t* buffer = (intptr_t*)dynamic_mapinfo->serialized_data();
-    ReadClosure rc(&buffer);
+    ReadClosure rc(&buffer, (intptr_t)SharedBaseAddress);
     ArchiveBuilder::serialize_dynamic_archivable_items(&rc);
     DynamicArchive::setup_array_klasses();
     dynamic_mapinfo->close();
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index ecc158cc3ef..0b4f6f2ecd4 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -111,6 +111,7 @@ class MetaspaceShared : AllStatic {
   static void unrecoverable_writing_error(const char* message = nullptr);
   static void writing_error(const char* message = nullptr);
 
+  static void early_serialize(SerializeClosure* sc) NOT_CDS_RETURN;
   static void serialize(SerializeClosure* sc) NOT_CDS_RETURN;
 
   // JVM/TI RedefineClasses() support:
diff --git a/src/hotspot/share/cds/runTimeClassInfo.cpp b/src/hotspot/share/cds/runTimeClassInfo.cpp
index 2536b533086..e1329d9d2f9 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.cpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
 
 void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
   ArchiveBuilder* builder = ArchiveBuilder::current();
-  builder->write_pointer_in_buffer(&_klass, info._klass);
+  InstanceKlass* k = info._klass;
+  _klass_offset = builder->any_to_offset_u4(k);
 
-  if (!SystemDictionaryShared::is_builtin(_klass)) {
+  if (!SystemDictionaryShared::is_builtin(k)) {
     CrcInfo* c = crc();
     c->_clsfile_size = info._clsfile_size;
     c->_clsfile_crc32 = info._clsfile_crc32;
@@ -61,10 +62,10 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
     }
   }
 
-  if (_klass->is_hidden()) {
-    builder->write_pointer_in_buffer(nest_host_addr(), info.nest_host());
+  if (k->is_hidden()) {
+    _nest_host_offset = builder->any_to_offset_u4(info.nest_host());
   }
-  if (_klass->has_archived_enum_objs()) {
+  if (k->has_archived_enum_objs()) {
     int num = info.num_enum_klass_static_fields();
     set_num_enum_klass_static_fields(num);
     for (int i = 0; i < num; i++) {
@@ -74,6 +75,14 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
   }
 }
 
+InstanceKlass* RunTimeClassInfo::klass() const {
+  if (ArchiveBuilder::is_active() && ArchiveBuilder::current()->is_in_buffer_space((address)this)) {
+    return ArchiveBuilder::current()->offset_to_buffered<InstanceKlass*>(_klass_offset);
+  } else {
+    return ArchiveUtils::from_offset<InstanceKlass*>(_klass_offset);
+  }
+}
+
 size_t RunTimeClassInfo::crc_size(InstanceKlass* klass) {
   if (!SystemDictionaryShared::is_builtin(klass)) {
     return sizeof(CrcInfo);
diff --git a/src/hotspot/share/cds/runTimeClassInfo.hpp b/src/hotspot/share/cds/runTimeClassInfo.hpp
index 50cf3d528b9..d0f02d1c095 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.hpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,24 +52,24 @@ class RunTimeClassInfo {
   struct RTVerifierConstraint {
     u4 _name;
     u4 _from_name;
-    Symbol* name() { return (Symbol*)(SharedBaseAddress + _name);}
-    Symbol* from_name() { return (Symbol*)(SharedBaseAddress + _from_name); }
+    Symbol* name() { return ArchiveUtils::from_offset<Symbol*>(_name); }
+    Symbol* from_name() { return ArchiveUtils::from_offset<Symbol*>(_from_name); }
   };
 
   struct RTLoaderConstraint {
     u4   _name;
     char _loader_type1;
     char _loader_type2;
-    Symbol* constraint_name() {
-      return (Symbol*)(SharedBaseAddress + _name);
-    }
+    Symbol* constraint_name() { return ArchiveUtils::from_offset<Symbol*>(_name); }
   };
   struct RTEnumKlassStaticFields {
     int _num;
     int _root_indices[1];
   };
 
-  InstanceKlass* _klass;
+private:
+  u4 _klass_offset;
+  u4 _nest_host_offset;
   int _num_verifier_constraints;
   int _num_loader_constraints;
 
@@ -80,7 +80,6 @@ class RunTimeClassInfo {
   // optional char                    _verifier_constraint_flags[_num_verifier_constraints]
   // optional RTEnumKlassStaticFields _enum_klass_static_fields;
 
-private:
   static size_t header_size_size() {
     return align_up(sizeof(RunTimeClassInfo), wordSize);
   }
@@ -108,6 +107,9 @@ class RunTimeClassInfo {
 
   static size_t crc_size(InstanceKlass* klass);
 public:
+  InstanceKlass* klass() const;
+  int num_verifier_constraints() const { return _num_verifier_constraints; }
+  int num_loader_constraints() const { return _num_loader_constraints; }
   static size_t byte_size(InstanceKlass* klass, int num_verifier_constraints, int num_loader_constraints,
                           int num_enum_klass_static_fields) {
     return header_size_size() +
@@ -125,11 +127,11 @@ class RunTimeClassInfo {
   }
 
   size_t nest_host_offset() const {
-    return crc_offset() + crc_size(_klass);
+    return crc_offset() + crc_size(klass());
   }
 
   size_t loader_constraints_offset() const  {
-    return nest_host_offset() + nest_host_size(_klass);
+    return nest_host_offset() + nest_host_size(klass());
   }
   size_t verifier_constraints_offset() const {
     return loader_constraints_offset() + loader_constraints_size(_num_loader_constraints);
@@ -150,13 +152,13 @@ class RunTimeClassInfo {
   }
 
   RTEnumKlassStaticFields* enum_klass_static_fields_addr() const {
-    assert(_klass->has_archived_enum_objs(), "sanity");
+    assert(klass()->has_archived_enum_objs(), "sanity");
     return (RTEnumKlassStaticFields*)(address(this) + enum_klass_static_fields_offset());
   }
 
 public:
   CrcInfo* crc() const {
-    assert(crc_size(_klass) > 0, "must be");
+    assert(crc_size(klass()) > 0, "must be");
     return (CrcInfo*)(address(this) + crc_offset());
   }
   RTVerifierConstraint* verifier_constraints() {
@@ -173,12 +175,9 @@ class RunTimeClassInfo {
     return (char*)(address(this) + verifier_constraint_flags_offset());
   }
 
-  InstanceKlass** nest_host_addr() {
-    assert(_klass->is_hidden(), "sanity");
-    return (InstanceKlass**)(address(this) + nest_host_offset());
-  }
   InstanceKlass* nest_host() {
-    return *nest_host_addr();
+    assert(!ArchiveBuilder::is_active(), "not called when dumping archive");
+    return ArchiveUtils::from_offset<InstanceKlass*>(_nest_host_offset);
   }
 
   RTLoaderConstraint* loader_constraints() {
@@ -248,7 +247,7 @@ class RunTimeClassInfo {
   // Used by RunTimeSharedDictionary to implement OffsetCompactHashtable::EQUALS
   static inline bool EQUALS(
        const RunTimeClassInfo* value, Symbol* key, int len_unused) {
-    return (value->_klass->name() == key);
+    return (value->klass()->name() == key);
   }
 };
 
diff --git a/src/hotspot/share/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp
index 91346a20085..d23ca8903e9 100644
--- a/src/hotspot/share/cds/unregisteredClasses.cpp
+++ b/src/hotspot/share/cds/unregisteredClasses.cpp
@@ -51,6 +51,7 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, T
                              PerfClassTraceTime::CLASS_LOAD);
 
   Symbol* path_symbol = SymbolTable::new_symbol(path);
+  Symbol* findClass = SymbolTable::new_symbol("findClass");
   Handle url_classloader = get_url_classloader(path_symbol, CHECK_NULL);
   Handle ext_class_name = java_lang_String::externalize_classname(name, CHECK_NULL);
 
@@ -58,11 +59,10 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, T
   JavaCallArguments args(2);
   args.set_receiver(url_classloader);
   args.push_oop(ext_class_name);
-  args.push_int(JNI_FALSE);
   JavaCalls::call_virtual(&result,
                           vmClasses::URLClassLoader_klass(),
-                          vmSymbols::loadClass_name(),
-                          vmSymbols::string_boolean_class_signature(),
+                          findClass,
+                          vmSymbols::string_class_signature(),
                           &args,
                           CHECK_NULL);
   assert(result.get_type() == T_OBJECT, "just checking");
diff --git a/src/hotspot/share/ci/ciKlass.cpp b/src/hotspot/share/ci/ciKlass.cpp
index efdd2512f90..f65d4a0311c 100644
--- a/src/hotspot/share/ci/ciKlass.cpp
+++ b/src/hotspot/share/ci/ciKlass.cpp
@@ -258,3 +258,23 @@ const char* ciKlass::external_name() const {
     return get_Klass()->external_name();
   )
 }
+
+// ------------------------------------------------------------------
+// ciKlass::prototype_header_offset
+juint ciKlass::prototype_header_offset() {
+  assert(is_loaded(), "must be loaded");
+
+  VM_ENTRY_MARK;
+  Klass* this_klass = get_Klass();
+  return in_bytes(this_klass->prototype_header_offset());
+}
+
+// ------------------------------------------------------------------
+// ciKlass::prototype_header
+uintptr_t ciKlass::prototype_header() {
+  assert(is_loaded(), "must be loaded");
+
+  VM_ENTRY_MARK;
+  Klass* this_klass = get_Klass();
+  return (uintptr_t)this_klass->prototype_header().to_pointer();
+}
diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp
index 10d8395ed7f..7b8d871eb56 100644
--- a/src/hotspot/share/ci/ciKlass.hpp
+++ b/src/hotspot/share/ci/ciKlass.hpp
@@ -139,6 +139,9 @@ class ciKlass : public ciType {
   void print_name_on(outputStream* st);
 
   const char* external_name() const;
+
+  juint prototype_header_offset();
+  uintptr_t prototype_header();
 };
 
 #endif // SHARE_CI_CIKLASS_HPP
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 93dd0af65e7..eb2d1b684d2 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -5836,6 +5836,15 @@ bool ClassFileParser::is_java_lang_ref_Reference_subclass() const {
   return _super_klass->reference_type() != REF_NONE;
 }
 
+// Returns true if the future Klass will need to be addressable with a narrow Klass ID.
+bool ClassFileParser::klass_needs_narrow_id() const {
+  // Classes that are never instantiated need no narrow Klass Id, since the
+  // only point of having a narrow id is to put it into an object header. Keeping
+  // never instantiated classes out of class space lessens the class space pressure.
+  // For more details, see JDK-8338526.
+  return !is_interface() && !is_abstract();
+}
+
 // ----------------------------------------------------------------------------
 // debugging
 
diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
index a8a388f8ded..18cdeec7d8e 100644
--- a/src/hotspot/share/classfile/classFileParser.hpp
+++ b/src/hotspot/share/classfile/classFileParser.hpp
@@ -511,6 +511,10 @@ class ClassFileParser {
   bool is_interface() const { return _access_flags.is_interface(); }
   bool is_abstract() const { return _access_flags.is_abstract(); }
 
+  // Returns true if the Klass to be generated will need to be addressable
+  // with a narrow Klass ID.
+  bool klass_needs_narrow_id() const;
+
   ClassLoaderData* loader_data() const { return _loader_data; }
   const Symbol* class_name() const { return _class_name; }
   const InstanceKlass* super_klass() const { return _super_klass; }
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 9a68e264044..cb155bdeb19 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1242,7 +1242,7 @@ static char decode_percent_encoded(const char *str, size_t& index) {
     hex[1] = str[index + 2];
     hex[2] = '\0';
     index += 2;
-    return (char) strtol(hex, NULL, 16);
+    return (char) strtol(hex, nullptr, 16);
   }
   return str[index];
 }
diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
index f25c453582f..eecfc9e88a0 100644
--- a/src/hotspot/share/classfile/dictionary.cpp
+++ b/src/hotspot/share/classfile/dictionary.cpp
@@ -347,68 +347,6 @@ void Dictionary::check_package_access(InstanceKlass* klass,
 
   assert(class_loader() != nullptr, "Should not call this");
   assert(protection_domain() != nullptr, "Should not call this");
-
-  if (!java_lang_System::allow_security_manager()) {
-    // No need for any further checking. Package access always allowed.
-    return;
-  }
-
-  if (is_in_package_access_cache(THREAD, klass->name(), protection_domain)) {
-    // No need to check again.
-    return;
-  }
-
-  // We only have to call checkPackageAccess if there's a security manager installed.
-  if (java_lang_System::has_security_manager()) {
-
-    // This handle and the class_loader handle passed in keeps this class from
-    // being unloaded through several GC points.
-    // The class_loader handle passed in is the initiating loader.
-    Handle mirror(THREAD, klass->java_mirror());
-
-    // Now we have to call back to java to check if the initating class has access
-    InstanceKlass* system_loader = vmClasses::ClassLoader_klass();
-    JavaValue result(T_VOID);
-    JavaCalls::call_special(&result,
-                           class_loader,
-                           system_loader,
-                           vmSymbols::checkPackageAccess_name(),
-                           vmSymbols::class_protectiondomain_signature(),
-                           mirror,
-                           protection_domain,
-                           THREAD);
-
-    LogTarget(Debug, protectiondomain) lt;
-    if (lt.is_enabled()) {
-      ResourceMark rm(THREAD);
-      // Print out trace information
-      LogStream ls(lt);
-      ls.print_cr("Checking package access");
-      ls.print("class loader: ");
-      class_loader()->print_value_on(&ls);
-      ls.print(" protection domain: ");
-      protection_domain()->print_value_on(&ls);
-      ls.print(" loading: "); klass->print_value_on(&ls);
-      if (HAS_PENDING_EXCEPTION) {
-        ls.print_cr(" DENIED !!!!!!!!!!!!!!!!!!!!!");
-      } else {
-        ls.print_cr(" granted");
-      }
-    }
-
-    if (HAS_PENDING_EXCEPTION) return;
-  }
-
-  // If no exception has been thrown, we have checked that the protection_domain can access
-  // this klass. Always add it to the cache (even if no SecurityManager is installed yet).
-  //
-  // This ensures that subsequent calls to Dictionary::find(THREAD, klass->name(), protection_domain)
-  // will always succeed. I.e., a new SecurityManager installed in the future cannot retroactively
-  // revoke the granted access.
-  {
-    MutexLocker mu(THREAD, SystemDictionary_lock);
-    add_to_package_access_cache(THREAD, klass, protection_domain);
-  }
 }
 
 // During class loading we may have cached a protection domain that has
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 3dce1a343d8..0dd183e06d4 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -412,12 +412,6 @@ Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRA
   if (_to_java_string_fn == nullptr) {
     void *lib_handle = os::native_java_library();
     _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "JNU_NewStringPlatform"));
-#if defined(_WIN32) && !defined(_WIN64)
-    if (_to_java_string_fn == nullptr) {
-      // On 32 bit Windows, also try __stdcall decorated name
-      _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "_JNU_NewStringPlatform@8"));
-    }
-#endif
     if (_to_java_string_fn == nullptr) {
       fatal("JNU_NewStringPlatform missing");
     }
@@ -1599,7 +1593,6 @@ oop java_lang_Thread_Constants::get_VTHREAD_GROUP() {
 int java_lang_Thread::_holder_offset;
 int java_lang_Thread::_name_offset;
 int java_lang_Thread::_contextClassLoader_offset;
-int java_lang_Thread::_inheritedAccessControlContext_offset;
 int java_lang_Thread::_eetop_offset;
 int java_lang_Thread::_jvmti_thread_state_offset;
 int java_lang_Thread::_jvmti_VTMS_transition_disable_count_offset;
@@ -1616,7 +1609,6 @@ JFR_ONLY(int java_lang_Thread::_jfr_epoch_offset;)
   macro(_holder_offset,        k, "holder", thread_fieldholder_signature, false); \
   macro(_name_offset,          k, vmSymbols::name_name(), string_signature, false); \
   macro(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), classloader_signature, false); \
-  macro(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), accesscontrolcontext_signature, false); \
   macro(_eetop_offset,         k, "eetop", long_signature, false); \
   macro(_interrupted_offset,   k, "interrupted", bool_signature, false); \
   macro(_interruptLock_offset, k, "interruptLock", object_signature, false); \
@@ -1686,6 +1678,7 @@ bool java_lang_Thread::is_in_VTMS_transition(oop java_thread) {
 }
 
 void java_lang_Thread::set_is_in_VTMS_transition(oop java_thread, bool val) {
+  assert(is_in_VTMS_transition(java_thread) != val, "already %s transition", val ? "inside" : "outside");
   java_thread->bool_field_put_volatile(_jvmti_is_in_VTMS_transition_offset, val);
 }
 
@@ -1793,10 +1786,6 @@ oop java_lang_Thread::context_class_loader(oop java_thread) {
   return java_thread->obj_field(_contextClassLoader_offset);
 }
 
-oop java_lang_Thread::inherited_access_control_context(oop java_thread) {
-  return java_thread->obj_field(_inheritedAccessControlContext_offset);
-}
-
 
 jlong java_lang_Thread::stackSize(oop java_thread) {
   GET_FIELDHOLDER_FIELD(java_thread, stackSize, 0);
@@ -2021,12 +2010,20 @@ int java_lang_VirtualThread::static_vthread_scope_offset;
 int java_lang_VirtualThread::_carrierThread_offset;
 int java_lang_VirtualThread::_continuation_offset;
 int java_lang_VirtualThread::_state_offset;
+int java_lang_VirtualThread::_next_offset;
+int java_lang_VirtualThread::_onWaitingList_offset;
+int java_lang_VirtualThread::_notified_offset;
+int java_lang_VirtualThread::_timeout_offset;
 
 #define VTHREAD_FIELDS_DO(macro) \
   macro(static_vthread_scope_offset,       k, "VTHREAD_SCOPE",      continuationscope_signature, true);  \
   macro(_carrierThread_offset,             k, "carrierThread",      thread_signature,            false); \
   macro(_continuation_offset,              k, "cont",               continuation_signature,      false); \
-  macro(_state_offset,                     k, "state",              int_signature,               false)
+  macro(_state_offset,                     k, "state",              int_signature,               false); \
+  macro(_next_offset,                      k, "next",               vthread_signature,           false); \
+  macro(_onWaitingList_offset,             k, "onWaitingList",      bool_signature,              false); \
+  macro(_notified_offset,                  k, "notified",           bool_signature,              false); \
+  macro(_timeout_offset,                   k, "timeout",            long_signature,              false);
 
 
 void java_lang_VirtualThread::compute_offsets() {
@@ -2052,6 +2049,56 @@ int java_lang_VirtualThread::state(oop vthread) {
   return vthread->int_field_acquire(_state_offset);
 }
 
+void java_lang_VirtualThread::set_state(oop vthread, int state) {
+  vthread->release_int_field_put(_state_offset, state);
+}
+
+int java_lang_VirtualThread::cmpxchg_state(oop vthread, int old_state, int new_state) {
+  jint* addr = vthread->field_addr<jint>(_state_offset);
+  int res = Atomic::cmpxchg(addr, old_state, new_state);
+  return res;
+}
+
+oop java_lang_VirtualThread::next(oop vthread) {
+  return vthread->obj_field(_next_offset);
+}
+
+void java_lang_VirtualThread::set_next(oop vthread, oop next_vthread) {
+  vthread->obj_field_put(_next_offset, next_vthread);
+}
+
+// Add vthread to the waiting list if it's not already in it. Multiple threads
+// could be trying to add vthread to the list at the same time, so we control
+// access with a cmpxchg on onWaitingList. The winner adds vthread to the list.
+// Method returns true if we added vthread to the list, false otherwise.
+bool java_lang_VirtualThread::set_onWaitingList(oop vthread, OopHandle& list_head) {
+  jboolean* addr = vthread->field_addr<jboolean>(_onWaitingList_offset);
+  jboolean vthread_on_list = Atomic::load(addr);
+  if (!vthread_on_list) {
+    vthread_on_list = Atomic::cmpxchg(addr, (jboolean)JNI_FALSE, (jboolean)JNI_TRUE);
+    if (!vthread_on_list) {
+      for (;;) {
+        oop head = list_head.resolve();
+        java_lang_VirtualThread::set_next(vthread, head);
+        if (list_head.cmpxchg(head, vthread) == head) return true;
+      }
+    }
+  }
+  return false; // already on waiting list
+}
+
+void java_lang_VirtualThread::set_notified(oop vthread, jboolean value) {
+  vthread->bool_field_put_volatile(_notified_offset, value);
+}
+
+jlong java_lang_VirtualThread::timeout(oop vthread) {
+  return vthread->long_field(_timeout_offset);
+}
+
+void java_lang_VirtualThread::set_timeout(oop vthread, jlong value) {
+  vthread->long_field_put(_timeout_offset, value);
+}
+
 JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state) {
   JavaThreadStatus status = JavaThreadStatus::NEW;
   switch (state & ~SUSPENDED) {
@@ -2065,6 +2112,9 @@ JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state)
     case UNPARKED:
     case YIELDING:
     case YIELDED:
+    case UNBLOCKED:
+    case WAITING:
+    case TIMED_WAITING:
       status = JavaThreadStatus::RUNNABLE;
       break;
     case PARKED:
@@ -2075,6 +2125,16 @@ JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state)
     case TIMED_PINNED:
       status = JavaThreadStatus::PARKED_TIMED;
       break;
+    case BLOCKING:
+    case BLOCKED:
+      status = JavaThreadStatus::BLOCKED_ON_MONITOR_ENTER;
+      break;
+    case WAIT:
+      status = JavaThreadStatus::IN_OBJECT_WAIT;
+      break;
+    case TIMED_WAIT:
+      status = JavaThreadStatus::IN_OBJECT_WAIT_TIMED;
+      break;
     case TERMINATED:
       status = JavaThreadStatus::TERMINATED;
       break;
@@ -2084,6 +2144,13 @@ JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state)
   return status;
 }
 
+bool java_lang_VirtualThread::is_preempted(oop vthread) {
+  oop continuation = java_lang_VirtualThread::continuation(vthread);
+  assert(continuation != nullptr, "vthread with no continuation");
+  stackChunkOop chunk = jdk_internal_vm_Continuation::tail(continuation);
+  return chunk != nullptr && chunk->preempted();
+}
+
 #if INCLUDE_CDS
 void java_lang_VirtualThread::serialize_offsets(SerializeClosure* f) {
    VTHREAD_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
@@ -4782,17 +4849,11 @@ oop java_lang_ClassLoader::unnamedModule(oop loader) {
 int java_lang_System::_static_in_offset;
 int java_lang_System::_static_out_offset;
 int java_lang_System::_static_err_offset;
-int java_lang_System::_static_security_offset;
-int java_lang_System::_static_allow_security_offset;
-int java_lang_System::_static_never_offset;
 
 #define SYSTEM_FIELDS_DO(macro) \
   macro(_static_in_offset,  k, "in",  input_stream_signature, true); \
   macro(_static_out_offset, k, "out", print_stream_signature, true); \
-  macro(_static_err_offset, k, "err", print_stream_signature, true); \
-  macro(_static_security_offset, k, "security", security_manager_signature, true); \
-  macro(_static_allow_security_offset, k, "allowSecurityManager", int_signature, true); \
-  macro(_static_never_offset, k, "NEVER", int_signature, true)
+  macro(_static_err_offset, k, "err", print_stream_signature, true);
 
 void java_lang_System::compute_offsets() {
   InstanceKlass* k = vmClasses::System_klass();
@@ -4802,21 +4863,12 @@ void java_lang_System::compute_offsets() {
 // This field tells us that a security manager can never be installed so we
 // can completely skip populating the ProtectionDomainCacheTable.
 bool java_lang_System::allow_security_manager() {
-  static int initialized = false;
-  static bool allowed = true; // default
-  if (!initialized) {
-    oop base = vmClasses::System_klass()->static_field_base_raw();
-    int never = base->int_field(_static_never_offset);
-    allowed = (base->int_field(_static_allow_security_offset) != never);
-    initialized = true;
-  }
-  return allowed;
+  return false;
 }
 
 // This field tells us that a security manager is installed.
 bool java_lang_System::has_security_manager() {
-  oop base = vmClasses::System_klass()->static_field_base_raw();
-  return base->obj_field(_static_security_offset) != nullptr;
+  return false;
 }
 
 #if INCLUDE_CDS
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 6ab73b161f4..e0123595810 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -358,7 +358,6 @@ class java_lang_Thread : AllStatic {
   static int _holder_offset;
   static int _name_offset;
   static int _contextClassLoader_offset;
-  static int _inheritedAccessControlContext_offset;
   static int _eetop_offset;
   static int _jvmti_thread_state_offset;
   static int _jvmti_VTMS_transition_disable_count_offset;
@@ -405,8 +404,6 @@ class java_lang_Thread : AllStatic {
   static void set_daemon(oop java_thread);
   // Context ClassLoader
   static oop context_class_loader(oop java_thread);
-  // Control context
-  static oop inherited_access_control_context(oop java_thread);
   // Stack size hint
   static jlong stackSize(oop java_thread);
   // Thread ID
@@ -530,6 +527,11 @@ class java_lang_VirtualThread : AllStatic {
   static int _carrierThread_offset;
   static int _continuation_offset;
   static int _state_offset;
+  static int _next_offset;
+  static int _onWaitingList_offset;
+  static int _notified_offset;
+  static int _recheckInterval_offset;
+  static int _timeout_offset;
   JFR_ONLY(static int _jfr_epoch_offset;)
  public:
   enum {
@@ -545,6 +547,13 @@ class java_lang_VirtualThread : AllStatic {
     UNPARKED      = 9,
     YIELDING      = 10,
     YIELDED       = 11,
+    BLOCKING      = 12,
+    BLOCKED       = 13,
+    UNBLOCKED     = 14,
+    WAITING       = 15,
+    WAIT          = 16,  // waiting in Object.wait
+    TIMED_WAITING = 17,
+    TIMED_WAIT    = 18,  // waiting in timed-Object.wait
     TERMINATED    = 99,
 
     // additional state bits
@@ -564,6 +573,15 @@ class java_lang_VirtualThread : AllStatic {
   static oop carrier_thread(oop vthread);
   static oop continuation(oop vthread);
   static int state(oop vthread);
+  static void set_state(oop vthread, int state);
+  static int cmpxchg_state(oop vthread, int old_state, int new_state);
+  static oop next(oop vthread);
+  static void set_next(oop vthread, oop next_vthread);
+  static bool set_onWaitingList(oop vthread, OopHandle& list_head);
+  static jlong timeout(oop vthread);
+  static void set_timeout(oop vthread, jlong value);
+  static void set_notified(oop vthread, jboolean value);
+  static bool is_preempted(oop vthread);
   static JavaThreadStatus map_state_to_thread_status(int state);
 };
 
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 94e407d045f..2a8f8bd2424 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -599,6 +599,9 @@ void Modules::serialize(SerializeClosure* soc) {
     }
     log_info(cds)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
     log_info(cds)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
+
+    // Don't hold onto the pointer, in case we might decide to unmap the archive.
+    _archived_main_module_name = nullptr;
   }
 }
 
@@ -641,6 +644,9 @@ void Modules::serialize_addmods_names(SerializeClosure* soc) {
     }
     log_info(cds)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
     log_info(cds)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
+
+    // Don't hold onto the pointer, in case we might decide to unmap the archive.
+    _archived_addmods_names = nullptr;
   }
 }
 
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 05f6ace9b8a..08f224d969f 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -59,6 +59,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayKlass.hpp"
@@ -83,6 +84,16 @@ DumpTimeLambdaProxyClassDictionary* SystemDictionaryShared::_dumptime_lambda_pro
 // Used by NoClassLoadingMark
 DEBUG_ONLY(bool SystemDictionaryShared::_class_loading_may_happen = true;)
 
+#ifdef ASSERT
+static void check_klass_after_loading(const Klass* k) {
+#ifdef _LP64
+  if (k != nullptr && UseCompressedClassPointers && k->needs_narrow_id()) {
+    CompressedKlassPointers::check_encodable(k);
+  }
+#endif
+}
+#endif
+
 InstanceKlass* SystemDictionaryShared::load_shared_class_for_builtin_loader(
                  Symbol* class_name, Handle class_loader, TRAPS) {
   assert(CDSConfig::is_using_archive(), "must be");
@@ -134,7 +145,7 @@ InstanceKlass* SystemDictionaryShared::lookup_from_stream(Symbol* class_name,
     return nullptr;
   }
 
-  return acquire_class_for_current_thread(record->_klass, class_loader,
+  return acquire_class_for_current_thread(record->klass(), class_loader,
                                           protection_domain, cfs,
                                           THREAD);
 }
@@ -425,6 +436,9 @@ InstanceKlass* SystemDictionaryShared::find_or_load_shared_class(
       }
     }
   }
+
+  DEBUG_ONLY(check_klass_after_loading(k);)
+
   return k;
 }
 
@@ -789,9 +803,20 @@ InstanceKlass* SystemDictionaryShared::get_shared_lambda_proxy_class(InstanceKla
                                                                      Symbol* method_type,
                                                                      Method* member_method,
                                                                      Symbol* instantiated_method_type) {
+  if (!caller_ik->is_shared()     ||
+      !invoked_name->is_shared()  ||
+      !invoked_type->is_shared()  ||
+      !method_type->is_shared()   ||
+      !member_method->is_shared() ||
+      !instantiated_method_type->is_shared()) {
+    // These can't be represented as u4 offset, but we wouldn't have archived a lambda proxy in this case anyway.
+    return nullptr;
+  }
+
   MutexLocker ml(CDSLambda_lock, Mutex::_no_safepoint_check_flag);
-  LambdaProxyClassKey key(caller_ik, invoked_name, invoked_type,
-                          method_type, member_method, instantiated_method_type);
+  RunTimeLambdaProxyClassKey key =
+    RunTimeLambdaProxyClassKey::init_for_runtime(caller_ik, invoked_name, invoked_type,
+                                                 method_type, member_method, instantiated_method_type);
 
   // Try to retrieve the lambda proxy class from static archive.
   const RunTimeLambdaProxyClassInfo* info = _static_archive.lookup_lambda_proxy_class(&key);
@@ -899,7 +924,7 @@ void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass
   assert(!CDSConfig::is_dumping_static_archive() && CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
   RunTimeClassInfo* record = RunTimeClassInfo::get_for(klass);
 
-  int length = record->_num_verifier_constraints;
+  int length = record->num_verifier_constraints();
   if (length > 0) {
     for (int i = 0; i < length; i++) {
       RunTimeClassInfo::RTVerifierConstraint* vc = record->verifier_constraint_at(i);
@@ -1015,9 +1040,9 @@ bool SystemDictionaryShared::check_linking_constraints(Thread* current, Instance
   if (klass->is_shared_platform_class() || klass->is_shared_app_class()) {
     RunTimeClassInfo* info = RunTimeClassInfo::get_for(klass);
     assert(info != nullptr, "Sanity");
-    if (info->_num_loader_constraints > 0) {
+    if (info->num_loader_constraints() > 0) {
       HandleMark hm(current);
-      for (int i = 0; i < info->_num_loader_constraints; i++) {
+      for (int i = 0; i < info->num_loader_constraints(); i++) {
         RunTimeClassInfo::RTLoaderConstraint* lc = info->loader_constraint_at(i);
         Symbol* name = lc->constraint_name();
         Handle loader1(current, get_class_loader_by(lc->_loader_type1));
@@ -1333,14 +1358,14 @@ InstanceKlass* SystemDictionaryShared::find_builtin_class(Symbol* name) {
                                                &_dynamic_archive._builtin_dictionary,
                                                name);
   if (record != nullptr) {
-    assert(!record->_klass->is_hidden(), "hidden class cannot be looked up by name");
-    assert(check_alignment(record->_klass), "Address not aligned");
+    assert(!record->klass()->is_hidden(), "hidden class cannot be looked up by name");
+    DEBUG_ONLY(check_klass_after_loading(record->klass());)
     // We did not save the classfile data of the generated LambdaForm invoker classes,
     // so we cannot support CLFH for such classes.
-    if (record->_klass->is_generated_shared_class() && JvmtiExport::should_post_class_file_load_hook()) {
+    if (record->klass()->is_generated_shared_class() && JvmtiExport::should_post_class_file_load_hook()) {
        return nullptr;
     }
-    return record->_klass;
+    return record->klass();
   } else {
     return nullptr;
   }
@@ -1378,10 +1403,10 @@ class SharedDictionaryPrinter : StackObj {
 
   void do_value(const RunTimeClassInfo* record) {
     ResourceMark rm;
-    _st->print_cr("%4d: %s %s", _index++, record->_klass->external_name(),
-        class_loader_name_for_shared(record->_klass));
-    if (record->_klass->array_klasses() != nullptr) {
-      record->_klass->array_klasses()->cds_print_value_on(_st);
+    _st->print_cr("%4d: %s %s", _index++, record->klass()->external_name(),
+        class_loader_name_for_shared(record->klass()));
+    if (record->klass()->array_klasses() != nullptr) {
+      record->klass()->array_klasses()->cds_print_value_on(_st);
       _st->cr();
     }
   }
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 070f671e7a7..c79821036e0 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ class SystemDictionaryShared: public SystemDictionary {
     RunTimeSharedDictionary _unregistered_dictionary;
     LambdaProxyClassDictionary _lambda_proxy_class_dictionary;
 
-    const RunTimeLambdaProxyClassInfo* lookup_lambda_proxy_class(LambdaProxyClassKey* key) {
+    const RunTimeLambdaProxyClassInfo* lookup_lambda_proxy_class(RunTimeLambdaProxyClassKey* key) {
       return _lambda_proxy_class_dictionary.lookup(key, key->hash(), 0);
     }
 
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index d8018cd0c8a..34861b52d54 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -439,10 +439,8 @@ class SerializeClosure;
   template(getProperty_name,                          "getProperty")                              \
   template(context_name,                              "context")                                  \
   template(contextClassLoader_name,                   "contextClassLoader")                       \
-  template(inheritedAccessControlContext_name,        "inheritedAccessControlContext")            \
   template(getClassContext_name,                      "getClassContext")                          \
   template(wait_name,                                 "wait0")                                    \
-  template(checkPackageAccess_name,                   "checkPackageAccess")                       \
   template(forName_name,                              "forName")                                  \
   template(forName0_name,                             "forName0")                                 \
   template(isJavaIdentifierStart_name,                "isJavaIdentifierStart")                    \
@@ -516,6 +514,8 @@ class SerializeClosure;
   template(checkIndex_name,                           "checkIndex")                               \
   template(jfr_epoch_name,                            "jfr_epoch")                                \
   template(maxThawingSize_name,                       "maxThawingSize")                           \
+  template(lockStackSize_name,                        "lockStackSize")                            \
+  template(objectWaiter_name,                         "objectWaiter")                             \
                                                                                                   \
   /* name symbols needed by intrinsics */                                                         \
   VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \
@@ -564,6 +564,7 @@ class SerializeClosure;
   template(continuation_signature,                    "Ljdk/internal/vm/Continuation;")           \
   template(continuationscope_signature,               "Ljdk/internal/vm/ContinuationScope;")      \
   template(stackchunk_signature,                      "Ljdk/internal/vm/StackChunk;")             \
+  template(vthread_signature,                         "Ljava/lang/VirtualThread;")                \
   template(object_void_signature,                     "(Ljava/lang/Object;)V")                    \
   template(object_int_signature,                      "(Ljava/lang/Object;)I")                    \
   template(long_object_long_signature,                "(JLjava/lang/Object;)J")                   \
diff --git a/src/hotspot/share/code/debugInfo.cpp b/src/hotspot/share/code/debugInfo.cpp
index 5376e8ade9b..ccee142c938 100644
--- a/src/hotspot/share/code/debugInfo.cpp
+++ b/src/hotspot/share/code/debugInfo.cpp
@@ -382,7 +382,7 @@ void ConstantOopReadValue::print_on(outputStream* st) const {
   if (value()() != nullptr) {
     value()()->print_value_on(st);
   } else {
-    st->print("nullptr");
+    st->print("null");
   }
 }
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 7fb72997749..754a7786605 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -708,7 +708,8 @@ void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map
 
   // handle the case of an anchor explicitly set in continuation code that doesn't have a callee
   JavaThread* thread = reg_map->thread();
-  if (thread->has_last_Java_frame() && fr.sp() == thread->last_Java_sp()) {
+  if ((thread->has_last_Java_frame() && fr.sp() == thread->last_Java_sp())
+      JVMTI_ONLY(|| (method()->is_continuation_enter_intrinsic() && thread->on_monitor_waited_event()))) {
     return;
   }
 
@@ -1298,7 +1299,7 @@ nmethod::nmethod(
     _comp_level              = CompLevel_none;
     _compiler_type           = type;
     _orig_pc_offset          = 0;
-    _num_stack_arg_slots     = _method->constMethod()->num_stack_arg_slots();
+    _num_stack_arg_slots     = 0;
 
     if (offsets->value(CodeOffsets::Exceptions) != -1) {
       // Continuation enter intrinsic
diff --git a/src/hotspot/share/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp
index 7b091d8ade5..ad3d14012ff 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.cpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.cpp
@@ -560,11 +560,6 @@ void CompilerConfig::ergo_initialize() {
 
   if (has_c1()) {
     if (!is_compilation_mode_selected()) {
-#if defined(_WINDOWS) && !defined(_LP64)
-      if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) {
-        FLAG_SET_ERGO(NeverActAsServerClassMachine, true);
-      }
-#endif
       if (NeverActAsServerClassMachine) {
         set_client_emulation_mode_flags();
       }
@@ -628,4 +623,3 @@ void CompilerConfig::ergo_initialize() {
   }
 #endif // COMPILER2
 }
-
diff --git a/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
index 4593c8d934d..dbd13d29b78 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
@@ -35,6 +35,7 @@ class G1Predictions;
 // Container for TruncatedSeqs that need separate predictors by GC phase.
 class G1PhaseDependentSeq {
   TruncatedSeq _young_only_seq;
+  double _initial_value;
   TruncatedSeq _mixed_seq;
 
   NONCOPYABLE(G1PhaseDependentSeq);
diff --git a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
index d3520487caa..02a54e2a035 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
@@ -34,6 +34,7 @@ bool G1PhaseDependentSeq::enough_samples_to_use_mixed_seq() const {
 
 G1PhaseDependentSeq::G1PhaseDependentSeq(int length) :
   _young_only_seq(length),
+  _initial_value(0.0),
   _mixed_seq(length)
 { }
 
@@ -42,7 +43,7 @@ TruncatedSeq* G1PhaseDependentSeq::seq_raw(bool use_young_only_phase_seq) {
 }
 
 void G1PhaseDependentSeq::set_initial(double value) {
-  _young_only_seq.add(value);
+  _initial_value = value;
 }
 
 void G1PhaseDependentSeq::add(double value, bool for_young_only_phase) {
@@ -51,8 +52,12 @@ void G1PhaseDependentSeq::add(double value, bool for_young_only_phase) {
 
 double G1PhaseDependentSeq::predict(const G1Predictions* predictor, bool use_young_only_phase_seq) const {
   if (use_young_only_phase_seq || !enough_samples_to_use_mixed_seq()) {
+    if (_young_only_seq.num() == 0) {
+      return _initial_value;
+    }
     return predictor->predict(&_young_only_seq);
   } else {
+    assert(_mixed_seq.num() > 0, "must not ask this with no samples");
     return predictor->predict(&_mixed_seq);
   }
 }
diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp
index 3d4ce0d780d..35dfbb7290e 100644
--- a/src/hotspot/share/gc/g1/g1Arguments.cpp
+++ b/src/hotspot/share/gc/g1/g1Arguments.cpp
@@ -34,6 +34,7 @@
 #include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/shared/cardTable.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "runtime/globals.hpp"
@@ -247,6 +248,7 @@ void G1Arguments::initialize() {
 
 void G1Arguments::initialize_heap_flags_and_sizes() {
   GCArguments::initialize_heap_flags_and_sizes();
+  FullGCForwarding::initialize_flags(heap_reserved_size_bytes());
 }
 
 CollectedHeap* G1Arguments::create_heap() {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 57236d6f6db..daf7eb5371b 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -77,6 +77,7 @@
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcBehaviours.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcId.hpp"
@@ -85,7 +86,6 @@
 #include "gc/shared/isGCActiveMark.hpp"
 #include "gc/shared/locationPrinter.inline.hpp"
 #include "gc/shared/oopStorageParState.hpp"
-#include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
@@ -1435,6 +1435,8 @@ jint G1CollectedHeap::initialize() {
 
   G1InitLogger::print();
 
+  FullGCForwarding::initialize(heap_rs.region());
+
   return JNI_OK;
 }
 
diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
index 05f66959243..bee3656ead5 100644
--- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCCompactTask.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
@@ -41,7 +42,7 @@ void G1FullGCCompactTask::G1CompactRegionClosure::clear_in_bitmap(oop obj) {
 
 size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
   size_t size = obj->size();
-  if (obj->is_forwarded()) {
+  if (FullGCForwarding::is_forwarded(obj)) {
     G1FullGCCompactTask::copy_object_to_new_location(obj);
   }
 
@@ -52,13 +53,13 @@ size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
 }
 
 void G1FullGCCompactTask::copy_object_to_new_location(oop obj) {
-  assert(obj->is_forwarded(), "Sanity!");
-  assert(obj->forwardee() != obj, "Object must have a new location");
+  assert(FullGCForwarding::is_forwarded(obj), "Sanity!");
+  assert(FullGCForwarding::forwardee(obj) != obj, "Object must have a new location");
 
   size_t size = obj->size();
   // Copy object and reinit its mark.
   HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
-  HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
+  HeapWord* destination = cast_from_oop<HeapWord*>(FullGCForwarding::forwardee(obj));
   Copy::aligned_conjoint_words(obj_addr, destination, size);
 
   // There is no need to transform stack chunks - marking already did that.
@@ -121,7 +122,7 @@ void G1FullGCCompactTask::compact_humongous_obj(G1HeapRegion* src_hr) {
   size_t word_size = obj->size();
 
   uint num_regions = (uint)G1CollectedHeap::humongous_obj_size_in_regions(word_size);
-  HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
+  HeapWord* destination = cast_from_oop<HeapWord*>(FullGCForwarding::forwardee(obj));
 
   assert(collector()->mark_bitmap()->is_marked(obj), "Should only compact marked objects");
   collector()->mark_bitmap()->clear(obj);
diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
index 019484c810a..ddd1b7c0999 100644
--- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "gc/g1/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/debug.hpp"
@@ -106,10 +107,10 @@ void G1FullGCCompactionPoint::forward(oop object, size_t size) {
     if (!object->is_forwarded()) {
       preserved_stack()->push_if_necessary(object, object->mark());
     }
-    object->forward_to(cast_to_oop(_compaction_top));
-    assert(object->is_forwarded(), "must be forwarded");
+    FullGCForwarding::forward_to(object, cast_to_oop(_compaction_top));
+    assert(FullGCForwarding::is_forwarded(object), "must be forwarded");
   } else {
-    assert(!object->is_forwarded(), "must not be forwarded");
+    assert(!FullGCForwarding::is_forwarded(object), "must not be forwarded");
   }
 
   // Update compaction values.
@@ -172,8 +173,8 @@ void G1FullGCCompactionPoint::forward_humongous(G1HeapRegion* hr) {
   preserved_stack()->push_if_necessary(obj, obj->mark());
 
   G1HeapRegion* dest_hr = _compaction_regions->at(range_begin);
-  obj->forward_to(cast_to_oop(dest_hr->bottom()));
-  assert(obj->is_forwarded(), "Object must be forwarded!");
+  FullGCForwarding::forward_to(obj, cast_to_oop(dest_hr->bottom()));
+  assert(FullGCForwarding::is_forwarded(obj), "Object must be forwarded!");
 
   // Add the humongous object regions to the compaction point.
   add_humongous(hr);
diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
index f10f884b242..b20593ac290 100644
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "gc/g1/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCMarker.inline.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
@@ -65,8 +66,8 @@ template <class T> inline void G1AdjustClosure::adjust_pointer(T* p) {
     return;
   }
 
-  if (obj->is_forwarded()) {
-    oop forwardee = obj->forwardee();
+  if (FullGCForwarding::is_forwarded(obj)) {
+    oop forwardee = FullGCForwarding::forwardee(obj);
     // Forwarded, just update.
     assert(G1CollectedHeap::heap()->is_in_reserved(forwardee), "should be in object space");
     RawAccess<IS_NOT_NULL>::oop_store(p, forwardee);
diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp
index 2fb61cc5934..1d2a023ed3a 100644
--- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "gc/g1/g1FullGCCompactionPoint.hpp"
 #include "gc/g1/g1FullGCScope.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 
 void G1DetermineCompactionQueueClosure::free_empty_humongous_region(G1HeapRegion* hr) {
   _g1h->free_humongous_region(hr, nullptr);
@@ -114,10 +115,10 @@ inline bool G1DetermineCompactionQueueClosure::do_heap_region(G1HeapRegion* hr)
 }
 
 inline size_t G1SerialRePrepareClosure::apply(oop obj) {
-  if (obj->is_forwarded()) {
+  if (FullGCForwarding::is_forwarded(obj)) {
     // We skip objects compiled into the first region or
     // into regions not part of the serial compaction point.
-    if (cast_from_oop<HeapWord*>(obj->forwardee()) < _dense_prefix_top) {
+    if (cast_from_oop<HeapWord*>(FullGCForwarding::forwardee(obj)) < _dense_prefix_top) {
       return obj->size();
     }
   }
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 32a56d71205..9e48a16018e 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,6 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) :
   _gc_par_phases[UpdateDerivedPointers] = new WorkerDataArray<double>("UpdateDerivedPointers", "Update Derived Pointers (ms):", max_gc_threads);
 #endif
   _gc_par_phases[EagerlyReclaimHumongousObjects] = new WorkerDataArray<double>("EagerlyReclaimHumongousObjects", "Eagerly Reclaim Humongous Objects (ms):", max_gc_threads);
-  _gc_par_phases[RestorePreservedMarks] = new WorkerDataArray<double>("RestorePreservedMarks", "Restore Preserved Marks (ms):", max_gc_threads);
   _gc_par_phases[ProcessEvacuationFailedRegions] = new WorkerDataArray<double>("ProcessEvacuationFailedRegions", "Process Evacuation Failed Regions (ms):", max_gc_threads);
 
   _gc_par_phases[ScanHR]->create_thread_work_items("Scanned Cards:", ScanHRScannedCards);
@@ -512,7 +511,6 @@ double G1GCPhaseTimes::print_post_evacuate_collection_set(bool evacuation_failed
   debug_time("Post Evacuate Cleanup 2", _cur_post_evacuate_cleanup_2_time_ms);
   if (evacuation_failed) {
     debug_phase(_gc_par_phases[RecalculateUsed], 1);
-    debug_phase(_gc_par_phases[RestorePreservedMarks], 1);
     debug_phase(_gc_par_phases[ProcessEvacuationFailedRegions], 1);
   }
 #if COMPILER2_OR_JVMCI
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
index 40abfd60533..a54ef431abd 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,6 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
     UpdateDerivedPointers,
 #endif
     EagerlyReclaimHumongousObjects,
-    RestorePreservedMarks,
     ProcessEvacuationFailedRegions,
     ResetMarkingState,
     NoteStartOfMark,
diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
index 26cc88de0be..5b3bbedfeb2 100644
--- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
@@ -228,7 +228,7 @@ void G1ParCopyClosure<barrier, should_mark>::do_oop_work(T* p) {
     oop forwardee;
     markWord m = obj->mark();
     if (m.is_forwarded()) {
-      forwardee = m.forwardee();
+      forwardee = obj->forwardee(m);
     } else {
       forwardee = _par_scan_state->copy_to_survivor_space(state, obj, m);
     }
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index f81c3241a1a..ad924b2fad4 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -37,7 +37,6 @@
 #include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.inline.hpp"
-#include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "memory/allocation.inline.hpp"
@@ -59,7 +58,6 @@
 
 G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
                                            G1RedirtyCardsQueueSet* rdcqs,
-                                           PreservedMarks* preserved_marks,
                                            uint worker_id,
                                            uint num_workers,
                                            G1CollectionSet* collection_set,
@@ -90,7 +88,6 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
     _numa(g1h->numa()),
     _obj_alloc_stat(nullptr),
     ALLOCATION_FAILURE_INJECTOR_ONLY(_allocation_failure_inject_counter(0) COMMA)
-    _preserved_marks(preserved_marks),
     _evacuation_failed_info(),
     _evac_failure_regions(evac_failure_regions),
     _evac_failure_enqueued_cards(0)
@@ -216,7 +213,7 @@ void G1ParScanThreadState::do_oop_evac(T* p) {
 
   markWord m = obj->mark();
   if (m.is_forwarded()) {
-    obj = m.forwardee();
+    obj = obj->forwardee(m);
   } else {
     obj = do_copy_to_survivor_space(region_attr, obj, m);
   }
@@ -232,7 +229,6 @@ void G1ParScanThreadState::do_partial_array(PartialArrayState* state) {
 #ifdef ASSERT
   oop from_obj = state->source();
   assert(_g1h->is_in_reserved(from_obj), "must be in heap.");
-  assert(from_obj->is_objArray(), "must be obj array");
   assert(from_obj->is_forwarded(), "must be forwarded");
   assert(from_obj != to_obj, "should not be chunking self-forwarded objects");
   assert(to_obj->is_objArray(), "must be obj array");
@@ -265,7 +261,6 @@ MAYBE_INLINE_EVACUATION
 void G1ParScanThreadState::start_partial_objarray(G1HeapRegionAttr dest_attr,
                                                   oop from_obj,
                                                   oop to_obj) {
-  assert(from_obj->is_objArray(), "precondition");
   assert(from_obj->is_forwarded(), "precondition");
   assert(from_obj->forwardee() == to_obj, "precondition");
   assert(to_obj->is_objArray(), "precondition");
@@ -401,22 +396,22 @@ G1HeapRegionAttr G1ParScanThreadState::next_region_attr(G1HeapRegionAttr const r
 }
 
 void G1ParScanThreadState::report_promotion_event(G1HeapRegionAttr const dest_attr,
-                                                  oop const old, size_t word_sz, uint age,
+                                                  Klass* klass, size_t word_sz, uint age,
                                                   HeapWord * const obj_ptr, uint node_index) const {
   PLAB* alloc_buf = _plab_allocator->alloc_buffer(dest_attr, node_index);
   if (alloc_buf->contains(obj_ptr)) {
-    _g1h->gc_tracer_stw()->report_promotion_in_new_plab_event(old->klass(), word_sz * HeapWordSize, age,
+    _g1h->gc_tracer_stw()->report_promotion_in_new_plab_event(klass, word_sz * HeapWordSize, age,
                                                               dest_attr.type() == G1HeapRegionAttr::Old,
                                                               alloc_buf->word_sz() * HeapWordSize);
   } else {
-    _g1h->gc_tracer_stw()->report_promotion_outside_plab_event(old->klass(), word_sz * HeapWordSize, age,
+    _g1h->gc_tracer_stw()->report_promotion_outside_plab_event(klass, word_sz * HeapWordSize, age,
                                                                dest_attr.type() == G1HeapRegionAttr::Old);
   }
 }
 
 NOINLINE
 HeapWord* G1ParScanThreadState::allocate_copy_slow(G1HeapRegionAttr* dest_attr,
-                                                   oop old,
+                                                   Klass* klass,
                                                    size_t word_sz,
                                                    uint age,
                                                    uint node_index) {
@@ -439,7 +434,7 @@ HeapWord* G1ParScanThreadState::allocate_copy_slow(G1HeapRegionAttr* dest_attr,
     update_numa_stats(node_index);
     if (_g1h->gc_tracer_stw()->should_report_promotion_events()) {
       // The events are checked individually as part of the actual commit
-      report_promotion_event(*dest_attr, old, word_sz, age, obj_ptr, node_index);
+      report_promotion_event(*dest_attr, klass, word_sz, age, obj_ptr, node_index);
     }
   }
   return obj_ptr;
@@ -474,9 +469,17 @@ oop G1ParScanThreadState::do_copy_to_survivor_space(G1HeapRegionAttr const regio
   assert(region_attr.is_in_cset(),
          "Unexpected region attr type: %s", region_attr.get_type_str());
 
-  // Get the klass once.  We'll need it again later, and this avoids
-  // re-decoding when it's compressed.
-  Klass* klass = old->klass();
+  // NOTE: With compact headers, it is not safe to load the Klass* from old, because
+  // that would access the mark-word, that might change at any time by concurrent
+  // workers.
+  // This mark word would refer to a forwardee, which may not yet have completed
+  // copying. Therefore we must load the Klass* from the mark-word that we already
+  // loaded. This is safe, because we only enter here if not yet forwarded.
+  assert(!old_mark.is_forwarded(), "precondition");
+  Klass* klass = UseCompactObjectHeaders
+      ? old_mark.klass()
+      : old->klass();
+
   const size_t word_sz = old->size_given_klass(klass);
 
   // JNI only allows pinning of typeArrays, so we only need to keep those in place.
@@ -494,7 +497,7 @@ oop G1ParScanThreadState::do_copy_to_survivor_space(G1HeapRegionAttr const regio
   // PLAB allocations should succeed most of the time, so we'll
   // normally check against null once and that's it.
   if (obj_ptr == nullptr) {
-    obj_ptr = allocate_copy_slow(&dest_attr, old, word_sz, age, node_index);
+    obj_ptr = allocate_copy_slow(&dest_attr, klass, word_sz, age, node_index);
     if (obj_ptr == nullptr) {
       // This will either forward-to-self, or detect that someone else has
       // installed a forwarding pointer.
@@ -595,7 +598,6 @@ G1ParScanThreadState* G1ParScanThreadStateSet::state_for_worker(uint worker_id)
   if (_states[worker_id] == nullptr) {
     _states[worker_id] =
       new G1ParScanThreadState(_g1h, rdcqs(),
-                               _preserved_marks_set.get(worker_id),
                                worker_id,
                                _num_workers,
                                _collection_set,
@@ -655,7 +657,7 @@ NOINLINE
 oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, size_t word_sz, bool cause_pinned) {
   assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
 
-  oop forward_ptr = old->forward_to_atomic(old, m, memory_order_relaxed);
+  oop forward_ptr = old->forward_to_self_atomic(m, memory_order_relaxed);
   if (forward_ptr == nullptr) {
     // Forward-to-self succeeded. We are the "owner" of the object.
     G1HeapRegion* r = _g1h->heap_region_containing(old);
@@ -668,8 +670,6 @@ oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, siz
     // evacuation failure recovery.
     _g1h->mark_evac_failure_object(_worker_id, old, word_sz);
 
-    _preserved_marks->push_if_necessary(old, m);
-
     ContinuationGCSupport::transform_stack_chunk(old);
 
     _evacuation_failed_info.register_copy_failure(word_sz);
@@ -727,7 +727,6 @@ G1ParScanThreadStateSet::G1ParScanThreadStateSet(G1CollectedHeap* g1h,
     _g1h(g1h),
     _collection_set(collection_set),
     _rdcqs(G1BarrierSet::dirty_card_queue_set().allocator()),
-    _preserved_marks_set(true /* in_c_heap */),
     _states(NEW_C_HEAP_ARRAY(G1ParScanThreadState*, num_workers, mtGC)),
     _rdc_buffers(NEW_C_HEAP_ARRAY(BufferNodeList, num_workers, mtGC)),
     _surviving_young_words_total(NEW_C_HEAP_ARRAY(size_t, collection_set->young_region_length() + 1, mtGC)),
@@ -736,7 +735,6 @@ G1ParScanThreadStateSet::G1ParScanThreadStateSet(G1CollectedHeap* g1h,
     _evac_failure_regions(evac_failure_regions),
     _partial_array_state_allocator(num_workers)
 {
-  _preserved_marks_set.init(num_workers);
   for (uint i = 0; i < num_workers; ++i) {
     _states[i] = nullptr;
     _rdc_buffers[i] = BufferNodeList();
@@ -749,5 +747,4 @@ G1ParScanThreadStateSet::~G1ParScanThreadStateSet() {
   FREE_C_HEAP_ARRAY(G1ParScanThreadState*, _states);
   FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_total);
   FREE_C_HEAP_ARRAY(BufferNodeList, _rdc_buffers);
-  _preserved_marks_set.reclaim();
 }
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index 3f7fefd8a07..f61f993f028 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -34,7 +34,6 @@
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
-#include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "memory/allocation.hpp"
@@ -48,8 +47,6 @@ class G1EvacuationRootClosures;
 class G1OopStarChunkedList;
 class G1PLABAllocator;
 class G1HeapRegion;
-class PreservedMarks;
-class PreservedMarksSet;
 class outputStream;
 
 class G1ParScanThreadState : public CHeapObj<mtGC> {
@@ -106,7 +103,6 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   // Per-thread evacuation failure data structures.
   ALLOCATION_FAILURE_INJECTOR_ONLY(size_t _allocation_failure_inject_counter;)
 
-  PreservedMarks* _preserved_marks;
   EvacuationFailedInfo _evacuation_failed_info;
   G1EvacFailureRegions* _evac_failure_regions;
   // Number of additional cards into evacuation failed regions enqueued into
@@ -125,7 +121,6 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
 public:
   G1ParScanThreadState(G1CollectedHeap* g1h,
                        G1RedirtyCardsQueueSet* rdcqs,
-                       PreservedMarks* preserved_marks,
                        uint worker_id,
                        uint num_workers,
                        G1CollectionSet* collection_set,
@@ -174,7 +169,7 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   void start_partial_objarray(G1HeapRegionAttr dest_dir, oop from, oop to);
 
   HeapWord* allocate_copy_slow(G1HeapRegionAttr* dest_attr,
-                               oop old,
+                               Klass* klass,
                                size_t word_sz,
                                uint age,
                                uint node_index);
@@ -209,7 +204,7 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   inline G1HeapRegionAttr next_region_attr(G1HeapRegionAttr const region_attr, markWord const m, uint& age);
 
   void report_promotion_event(G1HeapRegionAttr const dest_attr,
-                              oop const old, size_t word_sz, uint age,
+                              Klass* klass, size_t word_sz, uint age,
                               HeapWord * const obj_ptr, uint node_index) const;
 
   void trim_queue_to_threshold(uint threshold);
@@ -246,7 +241,6 @@ class G1ParScanThreadStateSet : public StackObj {
   G1CollectedHeap* _g1h;
   G1CollectionSet* _collection_set;
   G1RedirtyCardsQueueSet _rdcqs;
-  PreservedMarksSet _preserved_marks_set;
   G1ParScanThreadState** _states;
   BufferNodeList* _rdc_buffers;
   size_t* _surviving_young_words_total;
@@ -264,7 +258,6 @@ class G1ParScanThreadStateSet : public StackObj {
 
   G1RedirtyCardsQueueSet* rdcqs() { return &_rdcqs; }
   BufferNodeList* rdc_buffers() { return _rdc_buffers; }
-  PreservedMarksSet* preserved_marks_set() { return &_preserved_marks_set; }
 
   void flush_stats();
   void record_unused_optional_region(G1HeapRegion* hr);
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index f2fe93015c5..f3590aa2ff6 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -53,7 +53,6 @@
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gc_globals.hpp"
-#include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index a0e9a9b1569..1d76a44f8f8 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -42,7 +42,6 @@
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
 #include "gc/shared/bufferNode.hpp"
-#include "gc/shared/preservedMarks.inline.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
@@ -251,8 +250,8 @@ class G1PostEvacuateCollectionSetCleanupTask1::RestoreEvacFailureRegionsTask : p
 
       {
         // Process marked object.
-        assert(obj->is_forwarded() && obj->forwardee() == obj, "must be self-forwarded");
-        obj->init_mark();
+        assert(obj->is_self_forwarded(), "must be self-forwarded");
+        obj->unset_self_forwarded();
         hr->update_bot_for_block(obj_addr, obj_end_addr);
 
         // Statistics
@@ -477,27 +476,6 @@ class G1PostEvacuateCollectionSetCleanupTask2::EagerlyReclaimHumongousObjectsTas
   }
 };
 
-class G1PostEvacuateCollectionSetCleanupTask2::RestorePreservedMarksTask : public G1AbstractSubTask {
-  PreservedMarksSet* _preserved_marks;
-  WorkerTask* _task;
-
-public:
-  RestorePreservedMarksTask(PreservedMarksSet* preserved_marks) :
-    G1AbstractSubTask(G1GCPhaseTimes::RestorePreservedMarks),
-    _preserved_marks(preserved_marks),
-    _task(preserved_marks->create_task()) { }
-
-  virtual ~RestorePreservedMarksTask() {
-    delete _task;
-  }
-
-  double worker_cost() const override {
-    return _preserved_marks->num();
-  }
-
-  void do_work(uint worker_id) override { _task->work(worker_id); }
-};
-
 class RedirtyLoggedCardTableEntryClosure : public G1CardTableEntryClosure {
   size_t _num_dirtied;
   G1CollectedHeap* _g1h;
@@ -979,7 +957,6 @@ G1PostEvacuateCollectionSetCleanupTask2::G1PostEvacuateCollectionSetCleanupTask2
   }
 
   if (evac_failure_regions->has_regions_evac_failed()) {
-    add_parallel_task(new RestorePreservedMarksTask(per_thread_states->preserved_marks_set()));
     add_parallel_task(new ProcessEvacuationFailedRegionsTask(evac_failure_regions));
   }
   add_parallel_task(new RedirtyLoggedCardsTask(evac_failure_regions,
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.hpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.hpp
index 868ab788b53..96eeaf27de1 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,6 @@ class G1PostEvacuateCollectionSetCleanupTask1 : public G1BatchedTask {
 // - Update Derived Pointers (s)
 // - Clear Retained Region Data (on evacuation failure)
 // - Redirty Logged Cards
-// - Restore Preserved Marks (on evacuation failure)
 // - Free Collection Set
 // - Resize TLABs
 class G1PostEvacuateCollectionSetCleanupTask2 : public G1BatchedTask {
@@ -67,7 +66,6 @@ class G1PostEvacuateCollectionSetCleanupTask2 : public G1BatchedTask {
 
   class ProcessEvacuationFailedRegionsTask;
   class RedirtyLoggedCardsTask;
-  class RestorePreservedMarksTask;
   class FreeCollectionSetTask;
   class ResizeTLABsTask;
 
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 01d4e6bb04d..74801f4870b 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -218,15 +218,16 @@ void MutableSpace::object_iterate(ObjectClosure* cl) {
     // When promotion-failure occurs during Young GC, eden/from space is not cleared,
     // so we can encounter objects with "forwarded" markword.
     // They are essentially dead, so skipping them
-    if (!obj->is_forwarded()) {
+    if (obj->is_forwarded()) {
+      assert(!obj->is_self_forwarded(), "must not be self-forwarded");
+      // It is safe to use the forwardee here. Parallel GC only uses
+      // header-based forwarding during promotion. Full GC doesn't
+      // use the object header for forwarding at all.
+      p += obj->forwardee()->size();
+    } else {
       cl->do_object(obj);
+      p += obj->size();
     }
-#ifdef ASSERT
-    else {
-      assert(obj->forwardee() != obj, "must not be self-forwarded");
-    }
-#endif
-    p += obj->size();
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/parallelArguments.cpp b/src/hotspot/share/gc/parallel/parallelArguments.cpp
index 313716752d5..4035259e6d6 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.cpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +27,7 @@
 #include "gc/parallel/parallelArguments.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/genArguments.hpp"
 #include "gc/shared/workerPolicy.hpp"
@@ -127,6 +128,7 @@ void ParallelArguments::initialize_heap_flags_and_sizes() {
     // Redo everything from the start
     initialize_heap_flags_and_sizes_one_pass();
   }
+  FullGCForwarding::initialize_flags(heap_reserved_size_bytes());
 }
 
 size_t ParallelArguments::heap_reserved_size_bytes() {
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 5883b1cd607..52d031b6dd2 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -33,6 +33,7 @@
 #include "gc/parallel/psPromotionManager.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/psVMOperations.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/gcWhen.hpp"
@@ -129,6 +130,8 @@ jint ParallelScavengeHeap::initialize() {
 
   ParallelInitLogger::print();
 
+  FullGCForwarding::initialize(heap_rs.region());
+
   return JNI_OK;
 }
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index f6ef195abfc..e90404b6502 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -44,6 +44,7 @@
 #include "gc/parallel/psStringDedup.hpp"
 #include "gc/parallel/psYoungGen.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcId.hpp"
@@ -127,73 +128,84 @@ ParallelCompactData::RegionData::dc_claimed = 0x8U << dc_shift;
 const ParallelCompactData::RegionData::region_sz_t
 ParallelCompactData::RegionData::dc_completed = 0xcU << dc_shift;
 
+bool ParallelCompactData::RegionData::is_clear() {
+  return (_destination == nullptr) &&
+         (_source_region == 0) &&
+         (_partial_obj_addr == nullptr) &&
+         (_partial_obj_size == 0) &&
+         (_dc_and_los == 0) &&
+         (_shadow_state == 0);
+}
+
+#ifdef ASSERT
+void ParallelCompactData::RegionData::verify_clear() {
+  assert(_destination == nullptr, "inv");
+  assert(_source_region == 0, "inv");
+  assert(_partial_obj_addr == nullptr, "inv");
+  assert(_partial_obj_size == 0, "inv");
+  assert(_dc_and_los == 0, "inv");
+  assert(_shadow_state == 0, "inv");
+}
+#endif
+
 SpaceInfo PSParallelCompact::_space_info[PSParallelCompact::last_space_id];
 
 SpanSubjectToDiscoveryClosure PSParallelCompact::_span_based_discoverer;
 ReferenceProcessor* PSParallelCompact::_ref_processor = nullptr;
 
-void SplitInfo::record(size_t src_region_idx, size_t partial_obj_size,
-                       HeapWord* destination)
-{
-  assert(src_region_idx != 0, "invalid src_region_idx");
-  assert(partial_obj_size != 0, "invalid partial_obj_size argument");
-  assert(destination != nullptr, "invalid destination argument");
-
-  _src_region_idx = src_region_idx;
-  _partial_obj_size = partial_obj_size;
-  _destination = destination;
+void SplitInfo::record(size_t split_region_idx, HeapWord* split_point, size_t preceding_live_words) {
+  assert(split_region_idx != 0, "precondition");
 
-  // These fields may not be updated below, so make sure they're clear.
-  assert(_dest_region_addr == nullptr, "should have been cleared");
-  assert(_first_src_addr == nullptr, "should have been cleared");
+  // Obj denoted by split_point will be deferred to the next space.
+  assert(split_point != nullptr, "precondition");
 
-  // Determine the number of destination regions for the partial object.
-  HeapWord* const last_word = destination + partial_obj_size - 1;
   const ParallelCompactData& sd = PSParallelCompact::summary_data();
-  HeapWord* const beg_region_addr = sd.region_align_down(destination);
-  HeapWord* const end_region_addr = sd.region_align_down(last_word);
-
-  if (beg_region_addr == end_region_addr) {
-    // One destination region.
-    _destination_count = 1;
-    if (end_region_addr == destination) {
-      // The destination falls on a region boundary, thus the first word of the
-      // partial object will be the first word copied to the destination region.
-      _dest_region_addr = end_region_addr;
-      _first_src_addr = sd.region_to_addr(src_region_idx);
-    }
+
+  PSParallelCompact::RegionData* split_region_ptr = sd.region(split_region_idx);
+  assert(preceding_live_words < split_region_ptr->data_size(), "inv");
+
+  HeapWord* preceding_destination = split_region_ptr->destination();
+  assert(preceding_destination != nullptr, "inv");
+
+  // How many regions does the preceding part occupy
+  uint preceding_destination_count;
+  if (preceding_live_words == 0) {
+    preceding_destination_count = 0;
   } else {
-    // Two destination regions.  When copied, the partial object will cross a
-    // destination region boundary, so a word somewhere within the partial
-    // object will be the first word copied to the second destination region.
-    _destination_count = 2;
-    _dest_region_addr = end_region_addr;
-    const size_t ofs = pointer_delta(end_region_addr, destination);
-    assert(ofs < _partial_obj_size, "sanity");
-    _first_src_addr = sd.region_to_addr(src_region_idx) + ofs;
+    // -1 so that the ending address doesn't fall on the region-boundary
+    if (sd.region_align_down(preceding_destination) ==
+        sd.region_align_down(preceding_destination + preceding_live_words - 1)) {
+      preceding_destination_count = 1;
+    } else {
+      preceding_destination_count = 2;
+    }
   }
+
+  _split_region_idx = split_region_idx;
+  _split_point = split_point;
+  _preceding_live_words = preceding_live_words;
+  _preceding_destination = preceding_destination;
+  _preceding_destination_count = preceding_destination_count;
 }
 
 void SplitInfo::clear()
 {
-  _src_region_idx = 0;
-  _partial_obj_size = 0;
-  _destination = nullptr;
-  _destination_count = 0;
-  _dest_region_addr = nullptr;
-  _first_src_addr = nullptr;
+  _split_region_idx = 0;
+  _split_point = nullptr;
+  _preceding_live_words = 0;
+  _preceding_destination = nullptr;
+  _preceding_destination_count = 0;
   assert(!is_valid(), "sanity");
 }
 
 #ifdef  ASSERT
 void SplitInfo::verify_clear()
 {
-  assert(_src_region_idx == 0, "not clear");
-  assert(_partial_obj_size == 0, "not clear");
-  assert(_destination == nullptr, "not clear");
-  assert(_destination_count == 0, "not clear");
-  assert(_dest_region_addr == nullptr, "not clear");
-  assert(_first_src_addr == nullptr, "not clear");
+  assert(_split_region_idx == 0, "not clear");
+  assert(_split_point == nullptr, "not clear");
+  assert(_preceding_live_words == 0, "not clear");
+  assert(_preceding_destination == nullptr, "not clear");
+  assert(_preceding_destination_count == 0, "not clear");
 }
 #endif  // #ifdef ASSERT
 
@@ -296,110 +308,105 @@ ParallelCompactData::summarize_dense_prefix(HeapWord* beg, HeapWord* end)
   }
 }
 
-// Find the point at which a space can be split and, if necessary, record the
-// split point.
-//
-// If the current src region (which overflowed the destination space) doesn't
-// have a partial object, the split point is at the beginning of the current src
-// region (an "easy" split, no extra bookkeeping required).
-//
-// If the current src region has a partial object, the split point is in the
-// region where that partial object starts (call it the split_region).  If
-// split_region has a partial object, then the split point is just after that
-// partial object (a "hard" split where we have to record the split data and
-// zero the partial_obj_size field).  With a "hard" split, we know that the
-// partial_obj ends within split_region because the partial object that caused
-// the overflow starts in split_region.  If split_region doesn't have a partial
-// obj, then the split is at the beginning of split_region (another "easy"
-// split).
-HeapWord*
-ParallelCompactData::summarize_split_space(size_t src_region,
-                                           SplitInfo& split_info,
-                                           HeapWord* destination,
-                                           HeapWord* target_end,
-                                           HeapWord** target_next)
-{
+// The total live words on src_region would overflow the target space, so find
+// the overflowing object and record the split point. The invariant is that an
+// obj should not cross space boundary.
+HeapWord* ParallelCompactData::summarize_split_space(size_t src_region,
+                                                     SplitInfo& split_info,
+                                                     HeapWord* const destination,
+                                                     HeapWord* const target_end,
+                                                     HeapWord** target_next) {
   assert(destination <= target_end, "sanity");
   assert(destination + _region_data[src_region].data_size() > target_end,
     "region should not fit into target space");
   assert(is_region_aligned(target_end), "sanity");
 
-  size_t split_region = src_region;
-  HeapWord* split_destination = destination;
   size_t partial_obj_size = _region_data[src_region].partial_obj_size();
 
   if (destination + partial_obj_size > target_end) {
-    // The split point is just after the partial object (if any) in the
-    // src_region that contains the start of the object that overflowed the
-    // destination space.
+    assert(partial_obj_size > 0, "inv");
+    // The overflowing obj is from a previous region.
     //
-    // Find the start of the "overflow" object and set split_region to the
-    // region containing it.
-    HeapWord* const overflow_obj = _region_data[src_region].partial_obj_addr();
-    split_region = addr_to_region_idx(overflow_obj);
-
-    // Clear the source_region field of all destination regions whose first word
-    // came from data after the split point (a non-null source_region field
-    // implies a region must be filled).
+    // source-regions:
     //
-    // An alternative to the simple loop below:  clear during post_compact(),
-    // which uses memcpy instead of individual stores, and is easy to
-    // parallelize.  (The downside is that it clears the entire RegionData
-    // object as opposed to just one field.)
+    // ***************
+    // |     A|AA    |
+    // ***************
+    //       ^
+    //       | split-point
     //
-    // post_compact() would have to clear the summary data up to the highest
-    // address that was written during the summary phase, which would be
+    // dest-region:
     //
-    //         max(top, max(new_top, clear_top))
+    // ********
+    // |~~~~A |
+    // ********
+    //       ^^
+    //       || target-space-end
+    //       |
+    //       | destination
     //
-    // where clear_top is a new field in SpaceInfo.  Would have to set clear_top
-    // to target_end.
-    const RegionData* const sr = region(split_region);
-    const size_t beg_idx =
-      addr_to_region_idx(region_align_up(sr->destination() +
-                                         sr->partial_obj_size()));
-    const size_t end_idx = addr_to_region_idx(target_end);
+    // AAA would overflow target-space.
+    //
+    HeapWord* overflowing_obj = _region_data[src_region].partial_obj_addr();
+    size_t split_region = addr_to_region_idx(overflowing_obj);
 
-    log_develop_trace(gc, compaction)("split:  clearing source_region field in [" SIZE_FORMAT ", " SIZE_FORMAT ")", beg_idx, end_idx);
-    for (size_t idx = beg_idx; idx < end_idx; ++idx) {
-      _region_data[idx].set_source_region(0);
+    // The number of live words before the overflowing object on this split region
+    size_t preceding_live_words;
+    if (is_region_aligned(overflowing_obj)) {
+      preceding_live_words = 0;
+    } else {
+      // Words accounted by the overflowing object on the split region
+      size_t overflowing_size = pointer_delta(region_align_up(overflowing_obj), overflowing_obj);
+      preceding_live_words = region(split_region)->data_size() - overflowing_size;
     }
 
-    // Set split_destination and partial_obj_size to reflect the split region.
-    split_destination = sr->destination();
-    partial_obj_size = sr->partial_obj_size();
-  }
+    split_info.record(split_region, overflowing_obj, preceding_live_words);
+
+    HeapWord* src_region_start = region_to_addr(src_region);
+    HeapWord* new_top = destination - pointer_delta(src_region_start, overflowing_obj);
+
+    // If the overflowing obj was relocated to its original destination,
+    // those destination regions would have their source_region set. Now that
+    // this overflowing obj is relocated somewhere else, reset the
+    // source_region.
+    {
+      size_t range_start = addr_to_region_idx(region_align_up(new_top));
+      size_t range_end = addr_to_region_idx(region_align_up(destination));
+      for (size_t i = range_start; i < range_end; ++i) {
+        region(i)->set_source_region(0);
+      }
+    }
+
+    // Update new top of target space
+    *target_next = new_top;
 
-  // The split is recorded only if a partial object extends onto the region.
-  if (partial_obj_size != 0) {
-    _region_data[split_region].set_partial_obj_size(0);
-    split_info.record(split_region, partial_obj_size, split_destination);
+    return overflowing_obj;
   }
 
-  // Setup the continuation addresses.
-  *target_next = split_destination + partial_obj_size;
-  HeapWord* const source_next = region_to_addr(split_region) + partial_obj_size;
+  // Obj-iteration to locate the overflowing obj
+  HeapWord* region_start = region_to_addr(src_region);
+  HeapWord* region_end = region_start + RegionSize;
+  HeapWord* cur_addr = region_start + partial_obj_size;
+  size_t live_words = partial_obj_size;
 
-  if (log_develop_is_enabled(Trace, gc, compaction)) {
-    const char * split_type = partial_obj_size == 0 ? "easy" : "hard";
-    log_develop_trace(gc, compaction)("%s split:  src=" PTR_FORMAT " src_c=" SIZE_FORMAT " pos=" SIZE_FORMAT,
-                                      split_type, p2i(source_next), split_region, partial_obj_size);
-    log_develop_trace(gc, compaction)("%s split:  dst=" PTR_FORMAT " dst_c=" SIZE_FORMAT " tn=" PTR_FORMAT,
-                                      split_type, p2i(split_destination),
-                                      addr_to_region_idx(split_destination),
-                                      p2i(*target_next));
+  while (true) {
+    assert(cur_addr < region_end, "inv");
+    cur_addr = PSParallelCompact::mark_bitmap()->find_obj_beg(cur_addr, region_end);
+    // There must be an overflowing obj in this region
+    assert(cur_addr < region_end, "inv");
 
-    if (partial_obj_size != 0) {
-      HeapWord* const po_beg = split_info.destination();
-      HeapWord* const po_end = po_beg + split_info.partial_obj_size();
-      log_develop_trace(gc, compaction)("%s split:  po_beg=" PTR_FORMAT " " SIZE_FORMAT " po_end=" PTR_FORMAT " " SIZE_FORMAT,
-                                        split_type,
-                                        p2i(po_beg), addr_to_region_idx(po_beg),
-                                        p2i(po_end), addr_to_region_idx(po_end));
+    oop obj = cast_to_oop(cur_addr);
+    size_t obj_size = obj->size();
+    if (destination + live_words + obj_size > target_end) {
+      // Found the overflowing obj
+      split_info.record(src_region, cur_addr, live_words);
+      *target_next = destination + live_words;
+      return cur_addr;
     }
-  }
 
-  return source_next;
+    live_words += obj_size;
+    cur_addr += obj_size;
+  }
 }
 
 size_t ParallelCompactData::live_words_in_space(const MutableSpace* space,
@@ -451,70 +458,57 @@ bool ParallelCompactData::summarize(SplitInfo& split_info,
   const size_t end_region = addr_to_region_idx(region_align_up(source_end));
 
   HeapWord *dest_addr = target_beg;
-  while (cur_region < end_region) {
-    // The destination must be set even if the region has no data.
+  for (/* empty */; cur_region < end_region; cur_region++) {
+    size_t words = _region_data[cur_region].data_size();
+
+    // Skip empty ones
+    if (words == 0) {
+      continue;
+    }
+
+    if (split_info.is_split(cur_region)) {
+      assert(words > split_info.preceding_live_words(), "inv");
+      words -= split_info.preceding_live_words();
+    }
+
     _region_data[cur_region].set_destination(dest_addr);
 
-    size_t words = _region_data[cur_region].data_size();
-    if (words > 0) {
-      // If cur_region does not fit entirely into the target space, find a point
-      // at which the source space can be 'split' so that part is copied to the
-      // target space and the rest is copied elsewhere.
-      if (dest_addr + words > target_end) {
-        assert(source_next != nullptr, "source_next is null when splitting");
-        *source_next = summarize_split_space(cur_region, split_info, dest_addr,
-                                             target_end, target_next);
-        return false;
-      }
+    // If cur_region does not fit entirely into the target space, find a point
+    // at which the source space can be 'split' so that part is copied to the
+    // target space and the rest is copied elsewhere.
+    if (dest_addr + words > target_end) {
+      assert(source_next != nullptr, "source_next is null when splitting");
+      *source_next = summarize_split_space(cur_region, split_info, dest_addr,
+                                           target_end, target_next);
+      return false;
+    }
 
-      // Compute the destination_count for cur_region, and if necessary, update
-      // source_region for a destination region.  The source_region field is
-      // updated if cur_region is the first (left-most) region to be copied to a
-      // destination region.
-      //
-      // The destination_count calculation is a bit subtle.  A region that has
-      // data that compacts into itself does not count itself as a destination.
-      // This maintains the invariant that a zero count means the region is
-      // available and can be claimed and then filled.
-      uint destination_count = 0;
-      if (split_info.is_split(cur_region)) {
-        // The current region has been split:  the partial object will be copied
-        // to one destination space and the remaining data will be copied to
-        // another destination space.  Adjust the initial destination_count and,
-        // if necessary, set the source_region field if the partial object will
-        // cross a destination region boundary.
-        destination_count = split_info.destination_count();
-        if (destination_count == 2) {
-          size_t dest_idx = addr_to_region_idx(split_info.dest_region_addr());
-          _region_data[dest_idx].set_source_region(cur_region);
-        }
-      }
+    uint destination_count = split_info.is_split(cur_region)
+                             ? split_info.preceding_destination_count()
+                             : 0;
 
-      HeapWord* const last_addr = dest_addr + words - 1;
-      const size_t dest_region_1 = addr_to_region_idx(dest_addr);
-      const size_t dest_region_2 = addr_to_region_idx(last_addr);
-
-      // Initially assume that the destination regions will be the same and
-      // adjust the value below if necessary.  Under this assumption, if
-      // cur_region == dest_region_2, then cur_region will be compacted
-      // completely into itself.
-      destination_count += cur_region == dest_region_2 ? 0 : 1;
-      if (dest_region_1 != dest_region_2) {
-        // Destination regions differ; adjust destination_count.
-        destination_count += 1;
-        // Data from cur_region will be copied to the start of dest_region_2.
-        _region_data[dest_region_2].set_source_region(cur_region);
-      } else if (is_region_aligned(dest_addr)) {
-        // Data from cur_region will be copied to the start of the destination
-        // region.
-        _region_data[dest_region_1].set_source_region(cur_region);
-      }
+    HeapWord* const last_addr = dest_addr + words - 1;
+    const size_t dest_region_1 = addr_to_region_idx(dest_addr);
+    const size_t dest_region_2 = addr_to_region_idx(last_addr);
 
-      _region_data[cur_region].set_destination_count(destination_count);
-      dest_addr += words;
+    // Initially assume that the destination regions will be the same and
+    // adjust the value below if necessary.  Under this assumption, if
+    // cur_region == dest_region_2, then cur_region will be compacted
+    // completely into itself.
+    destination_count += cur_region == dest_region_2 ? 0 : 1;
+    if (dest_region_1 != dest_region_2) {
+      // Destination regions differ; adjust destination_count.
+      destination_count += 1;
+      // Data from cur_region will be copied to the start of dest_region_2.
+      _region_data[dest_region_2].set_source_region(cur_region);
+    } else if (is_region_aligned(dest_addr)) {
+      // Data from cur_region will be copied to the start of the destination
+      // region.
+      _region_data[dest_region_1].set_source_region(cur_region);
     }
 
-    ++cur_region;
+    _region_data[cur_region].set_destination_count(destination_count);
+    dest_addr += words;
   }
 
   *target_next = dest_addr;
@@ -522,12 +516,12 @@ bool ParallelCompactData::summarize(SplitInfo& split_info,
 }
 
 #ifdef ASSERT
-void ParallelCompactData::verify_clear()
-{
-  const size_t* const beg = (const size_t*) _region_vspace->committed_low_addr();
-  const size_t* const end = (const size_t*) _region_vspace->committed_high_addr();
-  for (const size_t* p = beg; p < end; ++p) {
-    assert(*p == 0, "not zero");
+void ParallelCompactData::verify_clear() {
+  for (uint cur_idx = 0; cur_idx < region_count(); ++cur_idx) {
+    if (!region(cur_idx)->is_clear()) {
+      log_warning(gc)("Uncleared Region: %u", cur_idx);
+      region(cur_idx)->verify_clear();
+    }
   }
 }
 #endif  // #ifdef ASSERT
@@ -694,6 +688,13 @@ void PSParallelCompact::post_compact()
     }
   }
 
+#ifdef ASSERT
+  {
+    mark_bitmap()->verify_clear();
+    summary_data().verify_clear();
+  }
+#endif
+
   ParCompactionManager::flush_all_string_dedup_requests();
 
   MutableSpace* const eden_space = _space_info[eden_space_id].space();
@@ -773,6 +774,8 @@ void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   //
   // The size of the filler (min-obj-size) is 2 heap words with the default
   // MinObjAlignment, since both markword and klass take 1 heap word.
+  // With +UseCompactObjectHeaders, the minimum filler size is only one word,
+  // because the Klass* gets encoded in the mark-word.
   //
   // The size of the gap (if any) right before dense-prefix-end is
   // MinObjAlignment.
@@ -780,16 +783,11 @@ void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   // Need to fill in the gap only if it's smaller than min-obj-size, and the
   // filler obj will extend to next region.
 
-  // Note: If min-fill-size decreases to 1, this whole method becomes redundant.
-  assert(CollectedHeap::min_fill_size() >= 2, "inv");
-#ifndef _LP64
-  // In 32-bit system, each heap word is 4 bytes, so MinObjAlignment == 2.
-  // The gap is always equal to min-fill-size, so nothing to do.
-  return;
-#endif
-  if (MinObjAlignment > 1) {
+  if (MinObjAlignment >= checked_cast<int>(CollectedHeap::min_fill_size())) {
     return;
   }
+
+  assert(!UseCompactObjectHeaders, "Compact headers can allocate small objects");
   assert(CollectedHeap::min_fill_size() == 2, "inv");
   HeapWord* const dense_prefix_end = dense_prefix(id);
   assert(_summary_data.is_region_aligned(dense_prefix_end), "precondition");
@@ -880,10 +878,10 @@ void PSParallelCompact::summary_phase()
     bool maximum_compaction = check_maximum_compaction(total_live_words,
                                                        old_space,
                                                        full_region_prefix_end);
-    HeapWord* dense_prefix_end =
-      maximum_compaction ? full_region_prefix_end
-                         : compute_dense_prefix_for_old_space(old_space,
-                                                              full_region_prefix_end);
+    HeapWord* dense_prefix_end = maximum_compaction
+                                 ? full_region_prefix_end
+                                 : compute_dense_prefix_for_old_space(old_space,
+                                                                      full_region_prefix_end);
     SpaceId id = old_space_id;
     _space_info[id].set_dense_prefix(dense_prefix_end);
 
@@ -891,6 +889,8 @@ void PSParallelCompact::summary_phase()
       fill_dense_prefix_end(id);
       _summary_data.summarize_dense_prefix(old_space->bottom(), dense_prefix_end);
     }
+
+    // Compacting objs inn [dense_prefix_end, old_space->top())
     _summary_data.summarize(_space_info[id].split_info(),
                             dense_prefix_end, old_space->top(), nullptr,
                             dense_prefix_end, old_space->end(),
@@ -1550,6 +1550,30 @@ void PSParallelCompact::forward_to_new_addr() {
       WorkerTask("PSForward task"),
       _num_workers(num_workers) {}
 
+    static void forward_objs_in_range(ParCompactionManager* cm,
+                                      HeapWord* start,
+                                      HeapWord* end,
+                                      HeapWord* destination) {
+      HeapWord* cur_addr = start;
+      HeapWord* new_addr = destination;
+
+      while (cur_addr < end) {
+        cur_addr = mark_bitmap()->find_obj_beg(cur_addr, end);
+        if (cur_addr >= end) {
+          return;
+        }
+        assert(mark_bitmap()->is_marked(cur_addr), "inv");
+        oop obj = cast_to_oop(cur_addr);
+        if (new_addr != cur_addr) {
+          cm->preserved_marks()->push_if_necessary(obj, obj->mark());
+          FullGCForwarding::forward_to(obj, cast_to_oop(new_addr));
+        }
+        size_t obj_size = obj->size();
+        new_addr += obj_size;
+        cur_addr += obj_size;
+      }
+    }
+
     void work(uint worker_id) override {
       ParCompactionManager* cm = ParCompactionManager::gc_thread_compaction_manager(worker_id);
       for (uint id = old_space_id; id < last_space_id; ++id) {
@@ -1561,6 +1585,8 @@ void PSParallelCompact::forward_to_new_addr() {
           continue;
         }
 
+        const SplitInfo& split_info = _space_info[SpaceId(id)].split_info();
+
         size_t dense_prefix_region = _summary_data.addr_to_region_idx(dense_prefix_addr);
         size_t top_region = _summary_data.addr_to_region_idx(_summary_data.region_align_up(top));
         size_t start_region;
@@ -1580,24 +1606,19 @@ void PSParallelCompact::forward_to_new_addr() {
           HeapWord* region_start = _summary_data.region_to_addr(cur_region);
           HeapWord* region_end = region_start + ParallelCompactData::RegionSize;
 
-          HeapWord* cur_addr = region_start + live_words;
-
-          HeapWord* destination = region_ptr->destination();
-          while (cur_addr < region_end) {
-            cur_addr = mark_bitmap()->find_obj_beg(cur_addr, region_end);
-            if (cur_addr >= region_end) {
-              break;
-            }
-            assert(mark_bitmap()->is_marked(cur_addr), "inv");
-            HeapWord* new_addr = destination + live_words;
-            oop obj = cast_to_oop(cur_addr);
-            if (new_addr != cur_addr) {
-              cm->preserved_marks()->push_if_necessary(obj, obj->mark());
-              obj->forward_to(cast_to_oop(new_addr));
-            }
-            size_t obj_size = obj->size();
-            live_words += obj_size;
-            cur_addr += obj_size;
+
+          if (split_info.is_split(cur_region)) {
+            // Part 1: will be relocated to space-1
+            HeapWord* preceding_destination = split_info.preceding_destination();
+            HeapWord* split_point = split_info.split_point();
+            forward_objs_in_range(cm, region_start + live_words, split_point, preceding_destination + live_words);
+
+            // Part 2: will be relocated to space-2
+            HeapWord* destination = region_ptr->destination();
+            forward_objs_in_range(cm, split_point, region_end, destination);
+          } else {
+            HeapWord* destination = region_ptr->destination();
+            forward_objs_in_range(cm, region_start + live_words, region_end, destination + live_words);
           }
         }
       }
@@ -1629,14 +1650,17 @@ void PSParallelCompact::verify_forward() {
         break;
       }
       assert(mark_bitmap()->is_marked(cur_addr), "inv");
+      assert(bump_ptr <= _space_info[bump_ptr_space].new_top(), "inv");
       // Move to the space containing cur_addr
       if (bump_ptr == _space_info[bump_ptr_space].new_top()) {
         bump_ptr = space(space_id(cur_addr))->bottom();
         bump_ptr_space = space_id(bump_ptr);
       }
       oop obj = cast_to_oop(cur_addr);
-      if (cur_addr != bump_ptr) {
-        assert(obj->forwardee() == cast_to_oop(bump_ptr), "inv");
+      if (cur_addr == bump_ptr) {
+        assert(!FullGCForwarding::is_forwarded(obj), "inv");
+      } else {
+        assert(FullGCForwarding::forwardee(obj) == cast_to_oop(bump_ptr), "inv");
       }
       bump_ptr += obj->size();
       cur_addr += obj->size();
@@ -1890,7 +1914,7 @@ void PSParallelCompact::verify_filler_in_dense_prefix() {
     oop obj = cast_to_oop(cur_addr);
     oopDesc::verify(obj);
     if (!mark_bitmap()->is_marked(cur_addr)) {
-      Klass* k = cast_to_oop(cur_addr)->klass_without_asserts();
+      Klass* k = cast_to_oop(cur_addr)->klass();
       assert(k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass(), "inv");
     }
     cur_addr += obj->size();
@@ -1941,15 +1965,10 @@ PSParallelCompact::SpaceId PSParallelCompact::space_id(HeapWord* addr) {
 }
 
 // Skip over count live words starting from beg, and return the address of the
-// next live word.  Unless marked, the word corresponding to beg is assumed to
-// be dead.  Callers must either ensure beg does not correspond to the middle of
-// an object, or account for those live words in some other way.  Callers must
-// also ensure that there are enough live words in the range [beg, end) to skip.
-HeapWord*
-PSParallelCompact::skip_live_words(HeapWord* beg, HeapWord* end, size_t count)
+// next live word. Callers must also ensure that there are enough live words in
+// the range [beg, end) to skip.
+HeapWord* PSParallelCompact::skip_live_words(HeapWord* beg, HeapWord* end, size_t count)
 {
-  assert(count > 0, "sanity");
-
   ParMarkBitMap* m = mark_bitmap();
   HeapWord* cur_addr = beg;
   while (true) {
@@ -1965,69 +1984,94 @@ PSParallelCompact::skip_live_words(HeapWord* beg, HeapWord* end, size_t count)
   }
 }
 
+// On filling a destination region (dest-region), we need to know the location
+// of the word that will be at the start of the dest-region after compaction.
+// A dest-region can have one or more source regions, but only the first
+// source-region contains this location. This location is retrieved by calling
+// `first_src_addr` on a dest-region.
+// Conversely, a source-region has a dest-region which holds the destination of
+// the first live word on this source-region, based on which the destination
+// for the rest of live words can be derived.
+//
+// Note:
+// There is some complication due to space-boundary-fragmentation (an obj can't
+// cross space-boundary) -- a source-region may be split and behave like two
+// distinct regions with their own dest-region, as depicted below.
+//
+// source-region: region-n
+//
+// **********************
+// |     A|A~~~~B|B     |
+// **********************
+//    n-1     n     n+1
+//
+// AA, BB denote two live objs. ~~~~ denotes unknown number of live objs.
+//
+// Assuming the dest-region for region-n is the final region before
+// old-space-end and its first-live-word is the middle of AA, the heap content
+// will look like the following after compaction:
+//
+// **************                  *************
+//      A|A~~~~ |                  |BB    |
+// **************                  *************
+//              ^                  ^
+//              | old-space-end    | eden-space-start
+//
+// Therefore, in this example, region-n will have two dest-regions, one for
+// the final region in old-space and the other for the first region in
+// eden-space.
+// To handle this special case, we introduce the concept of split-region, whose
+// contents are relocated to two spaces. `SplitInfo` captures all necessary
+// info about the split, the first part, spliting-point, and the second part.
 HeapWord* PSParallelCompact::first_src_addr(HeapWord* const dest_addr,
                                             SpaceId src_space_id,
                                             size_t src_region_idx)
 {
-  assert(summary_data().is_region_aligned(dest_addr), "not aligned");
-
-  const SplitInfo& split_info = _space_info[src_space_id].split_info();
-  if (split_info.dest_region_addr() == dest_addr) {
-    // The partial object ending at the split point contains the first word to
-    // be copied to dest_addr.
-    return split_info.first_src_addr();
-  }
-
-  const ParallelCompactData& sd = summary_data();
-  ParMarkBitMap* const bitmap = mark_bitmap();
   const size_t RegionSize = ParallelCompactData::RegionSize;
+  const ParallelCompactData& sd = summary_data();
+  assert(sd.is_region_aligned(dest_addr), "precondition");
 
-  assert(sd.is_region_aligned(dest_addr), "not aligned");
   const RegionData* const src_region_ptr = sd.region(src_region_idx);
+  assert(src_region_ptr->data_size() > 0, "src region cannot be empty");
+
   const size_t partial_obj_size = src_region_ptr->partial_obj_size();
   HeapWord* const src_region_destination = src_region_ptr->destination();
 
-  assert(dest_addr >= src_region_destination, "wrong src region");
-  assert(src_region_ptr->data_size() > 0, "src region cannot be empty");
-
-  HeapWord* const src_region_beg = sd.region_to_addr(src_region_idx);
-  HeapWord* const src_region_end = src_region_beg + RegionSize;
+  HeapWord* const region_start = sd.region_to_addr(src_region_idx);
+  HeapWord* const region_end = sd.region_to_addr(src_region_idx) + RegionSize;
 
-  HeapWord* addr = src_region_beg;
-  if (dest_addr == src_region_destination) {
-    // Return the first live word in the source region.
-    if (partial_obj_size == 0) {
-      addr = bitmap->find_obj_beg(addr, src_region_end);
-      assert(addr < src_region_end, "no objects start in src region");
+  // Identify the actual destination for the first live words on this region,
+  // taking split-region into account.
+  HeapWord* region_start_destination;
+  const SplitInfo& split_info = _space_info[src_space_id].split_info();
+  if (split_info.is_split(src_region_idx)) {
+    // The second part of this split region; use the recorded split point.
+    if (dest_addr == src_region_destination) {
+      return split_info.split_point();
     }
-    return addr;
+    region_start_destination = split_info.preceding_destination();
+  } else {
+    region_start_destination = src_region_destination;
   }
 
-  // Must skip some live data.
-  size_t words_to_skip = dest_addr - src_region_destination;
-  assert(src_region_ptr->data_size() > words_to_skip, "wrong src region");
+  // Calculate the offset to be skipped
+  size_t words_to_skip = pointer_delta(dest_addr, region_start_destination);
 
-  if (partial_obj_size >= words_to_skip) {
-    // All the live words to skip are part of the partial object.
-    addr += words_to_skip;
-    if (partial_obj_size == words_to_skip) {
-      // Find the first live word past the partial object.
-      addr = bitmap->find_obj_beg(addr, src_region_end);
-      assert(addr < src_region_end, "wrong src region");
-    }
-    return addr;
+  HeapWord* result;
+  if (partial_obj_size > words_to_skip) {
+    result = region_start + words_to_skip;
+  } else {
+    words_to_skip -= partial_obj_size;
+    result = skip_live_words(region_start + partial_obj_size, region_end, words_to_skip);
   }
 
-  // Skip over the partial object (if any).
-  if (partial_obj_size != 0) {
-    words_to_skip -= partial_obj_size;
-    addr += partial_obj_size;
+  if (split_info.is_split(src_region_idx)) {
+    assert(result < split_info.split_point(), "postcondition");
+  } else {
+    assert(result < region_end, "postcondition");
   }
 
-  // Skip over live words due to objects that start in the region.
-  addr = skip_live_words(addr, src_region_end, words_to_skip);
-  assert(addr < src_region_end, "wrong src region");
-  return addr;
+  return result;
 }
 
 void PSParallelCompact::decrement_destination_counts(ParCompactionManager* cm,
@@ -2078,10 +2122,7 @@ size_t PSParallelCompact::next_src_region(MoveAndUpdateClosure& closure,
                                           HeapWord*& src_space_top,
                                           HeapWord* end_addr)
 {
-  typedef ParallelCompactData::RegionData RegionData;
-
   ParallelCompactData& sd = PSParallelCompact::summary_data();
-  const size_t region_size = ParallelCompactData::RegionSize;
 
   size_t src_region_idx = 0;
 
@@ -2089,8 +2130,8 @@ size_t PSParallelCompact::next_src_region(MoveAndUpdateClosure& closure,
   HeapWord* const src_aligned_up = sd.region_align_up(end_addr);
   RegionData* src_region_ptr = sd.addr_to_region_ptr(src_aligned_up);
   HeapWord* const top_aligned_up = sd.region_align_up(src_space_top);
-  const RegionData* const top_region_ptr =
-    sd.addr_to_region_ptr(top_aligned_up);
+  const RegionData* const top_region_ptr = sd.addr_to_region_ptr(top_aligned_up);
+
   while (src_region_ptr < top_region_ptr && src_region_ptr->data_size() == 0) {
     ++src_region_ptr;
   }
@@ -2107,59 +2148,50 @@ size_t PSParallelCompact::next_src_region(MoveAndUpdateClosure& closure,
   }
 
   // Switch to a new source space and find the first non-empty region.
-  unsigned int space_id = src_space_id + 1;
+  uint space_id = src_space_id + 1;
   assert(space_id < last_space_id, "not enough spaces");
 
-  HeapWord* const destination = closure.destination();
-
-  do {
-    MutableSpace* space = _space_info[space_id].space();
-    HeapWord* const bottom = space->bottom();
-    const RegionData* const bottom_cp = sd.addr_to_region_ptr(bottom);
-
-    // Iterate over the spaces that do not compact into themselves.
-    if (bottom_cp->destination() != bottom) {
-      HeapWord* const top_aligned_up = sd.region_align_up(space->top());
-      const RegionData* const top_cp = sd.addr_to_region_ptr(top_aligned_up);
-
-      for (const RegionData* src_cp = bottom_cp; src_cp < top_cp; ++src_cp) {
-        if (src_cp->live_obj_size() > 0) {
-          // Found it.
-          assert(src_cp->destination() == destination,
-                 "first live obj in the space must match the destination");
-          assert(src_cp->partial_obj_size() == 0,
-                 "a space cannot begin with a partial obj");
-
-          src_space_id = SpaceId(space_id);
-          src_space_top = space->top();
-          const size_t src_region_idx = sd.region(src_cp);
-          closure.set_source(sd.region_to_addr(src_region_idx));
-          return src_region_idx;
-        } else {
-          assert(src_cp->data_size() == 0, "sanity");
-        }
+  for (/* empty */; space_id < last_space_id; ++space_id) {
+    HeapWord* bottom = _space_info[space_id].space()->bottom();
+    HeapWord* top = _space_info[space_id].space()->top();
+    // Skip empty space
+    if (bottom == top) {
+      continue;
+    }
+
+    // Identify the first region that contains live words in this space
+    size_t cur_region = sd.addr_to_region_idx(bottom);
+    size_t end_region = sd.addr_to_region_idx(sd.region_align_up(top));
+
+    for (/* empty */ ; cur_region < end_region; ++cur_region) {
+      RegionData* cur = sd.region(cur_region);
+      if (cur->live_obj_size() > 0) {
+        HeapWord* region_start_addr = sd.region_to_addr(cur_region);
+        HeapWord* region_end_addr = region_start_addr + ParallelCompactData::RegionSize;
+        HeapWord* first_live_word = mark_bitmap()->find_obj_beg(region_start_addr, region_end_addr);
+        assert(first_live_word < region_end_addr, "inv");
+
+        src_space_id = SpaceId(space_id);
+        src_space_top = top;
+        closure.set_source(first_live_word);
+        return cur_region;
       }
     }
-  } while (++space_id < last_space_id);
+  }
 
-  assert(false, "no source region was found");
-  return 0;
+  ShouldNotReachHere();
 }
 
 HeapWord* PSParallelCompact::partial_obj_end(HeapWord* region_start_addr) {
   ParallelCompactData& sd = summary_data();
   assert(sd.is_region_aligned(region_start_addr), "precondition");
 
-  // Use per-region partial_obj_size to locate the end of the obj, that extends to region_start_addr.
-  SplitInfo& split_info = _space_info[space_id(region_start_addr)].split_info();
+  // Use per-region partial_obj_size to locate the end of the obj, that extends
+  // to region_start_addr.
   size_t start_region_idx = sd.addr_to_region_idx(region_start_addr);
   size_t end_region_idx = sd.region_count();
   size_t accumulated_size = 0;
   for (size_t region_idx = start_region_idx; region_idx < end_region_idx; ++region_idx) {
-    if (split_info.is_split(region_idx)) {
-      accumulated_size += split_info.partial_obj_size();
-      break;
-    }
     size_t cur_partial_obj_size = sd.region(region_idx)->partial_obj_size();
     accumulated_size += cur_partial_obj_size;
     if (cur_partial_obj_size != ParallelCompactData::RegionSize) {
@@ -2169,6 +2201,8 @@ HeapWord* PSParallelCompact::partial_obj_end(HeapWord* region_start_addr) {
   return region_start_addr + accumulated_size;
 }
 
+// Use region_idx as the destination region, and evacuate all live objs on its
+// source regions to this destination region.
 void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosure& closure, size_t region_idx)
 {
   ParMarkBitMap* const bitmap = mark_bitmap();
@@ -2189,20 +2223,43 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
     src_region_idx += 1;
   }
 
+  // source-region:
+  //
+  // **********
+  // |   ~~~  |
+  // **********
+  //      ^
+  //      |-- closure.source() / first_src_addr
+  //
+  //
+  // ~~~ : live words
+  //
+  // destination-region:
+  //
+  // **********
+  // |        |
+  // **********
+  // ^
+  // |-- region-start
   if (bitmap->is_unmarked(closure.source())) {
-    // The first source word is in the middle of an object; copy the remainder
-    // of the object or as much as will fit.  The fact that pointer updates were
-    // deferred will be noted when the object header is processed.
+    // An object overflows the previous destination region, so this
+    // destination region should copy the remainder of the object or as much as
+    // will fit.
     HeapWord* const old_src_addr = closure.source();
     {
       HeapWord* region_start = sd.region_align_down(closure.source());
       HeapWord* obj_start = bitmap->find_obj_beg_reverse(region_start, closure.source());
       HeapWord* obj_end;
-      if (bitmap->is_marked(obj_start)) {
+      if (obj_start != closure.source()) {
+        assert(bitmap->is_marked(obj_start), "inv");
+        // Found the actual obj-start, try to find the obj-end using either
+        // size() if this obj is completely contained in the current region.
         HeapWord* next_region_start = region_start + ParallelCompactData::RegionSize;
         HeapWord* partial_obj_start = (next_region_start >= src_space_top)
                                       ? nullptr
                                       : sd.addr_to_region_ptr(next_region_start)->partial_obj_addr();
+        // This obj extends to next region iff partial_obj_addr of the *next*
+        // region is the same as obj-start.
         if (partial_obj_start == obj_start) {
           // This obj extends to next region.
           obj_end = partial_obj_end(next_region_start);
@@ -2219,39 +2276,41 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
     }
 
     if (closure.is_full()) {
-      decrement_destination_counts(cm, src_space_id, src_region_idx,
-                                   closure.source());
+      decrement_destination_counts(cm, src_space_id, src_region_idx, closure.source());
       closure.complete_region(dest_addr, region_ptr);
       return;
     }
 
+    // Finished copying without using up the current destination-region
     HeapWord* const end_addr = sd.region_align_down(closure.source());
     if (sd.region_align_down(old_src_addr) != end_addr) {
+      assert(sd.region_align_up(old_src_addr) == end_addr, "only one region");
       // The partial object was copied from more than one source region.
       decrement_destination_counts(cm, src_space_id, src_region_idx, end_addr);
 
       // Move to the next source region, possibly switching spaces as well.  All
       // args except end_addr may be modified.
-      src_region_idx = next_src_region(closure, src_space_id, src_space_top,
-                                       end_addr);
+      src_region_idx = next_src_region(closure, src_space_id, src_space_top, end_addr);
     }
   }
 
+  // Handle the rest obj-by-obj, where we know obj-start.
   do {
     HeapWord* cur_addr = closure.source();
     HeapWord* const end_addr = MIN2(sd.region_align_up(cur_addr + 1),
                                     src_space_top);
-    HeapWord* partial_obj_start = (end_addr == src_space_top)
+    // To handle the case where the final obj in source region extends to next region.
+    HeapWord* final_obj_start = (end_addr == src_space_top)
                                 ? nullptr
                                 : sd.addr_to_region_ptr(end_addr)->partial_obj_addr();
-    // apply closure on objs inside [cur_addr, end_addr)
+    // Apply closure on objs inside [cur_addr, end_addr)
     do {
       cur_addr = bitmap->find_obj_beg(cur_addr, end_addr);
       if (cur_addr == end_addr) {
         break;
       }
       size_t obj_size;
-      if (partial_obj_start == cur_addr) {
+      if (final_obj_start == cur_addr) {
         obj_size = pointer_delta(partial_obj_end(end_addr), cur_addr);
       } else {
         // This obj doesn't extend into next region; size() is safe to use.
@@ -2262,8 +2321,7 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
     } while (cur_addr < end_addr && !closure.is_full());
 
     if (closure.is_full()) {
-      decrement_destination_counts(cm, src_space_id, src_region_idx,
-                                   closure.source());
+      decrement_destination_counts(cm, src_space_id, src_region_idx, closure.source());
       closure.complete_region(dest_addr, region_ptr);
       return;
     }
@@ -2272,8 +2330,7 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
 
     // Move to the next source region, possibly switching spaces as well.  All
     // args except end_addr may be modified.
-    src_region_idx = next_src_region(closure, src_space_id, src_space_top,
-                                     end_addr);
+    src_region_idx = next_src_region(closure, src_space_id, src_space_top, end_addr);
   } while (true);
 }
 
@@ -2395,8 +2452,8 @@ void MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
   if (copy_destination() != source()) {
     DEBUG_ONLY(PSParallelCompact::check_new_location(source(), destination());)
     assert(source() != destination(), "inv");
-    assert(cast_to_oop(source())->is_forwarded(), "inv");
-    assert(cast_to_oop(source())->forwardee() == cast_to_oop(destination()), "inv");
+    assert(FullGCForwarding::is_forwarded(cast_to_oop(source())), "inv");
+    assert(FullGCForwarding::forwardee(cast_to_oop(source())) == cast_to_oop(destination()), "inv");
     Copy::aligned_conjoint_words(source(), copy_destination(), words);
     cast_to_oop(copy_destination())->init_mark();
   }
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 3f487ec3ef4..878a09e283b 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -116,51 +116,45 @@ class SplitInfo
   // Return true if this split info is valid (i.e., if a split has been
   // recorded).  The very first region cannot have a partial object and thus is
   // never split, so 0 is the 'invalid' value.
-  bool is_valid() const { return _src_region_idx > 0; }
+  bool is_valid() const { return _split_region_idx > 0; }
 
   // Return true if this split holds data for the specified source region.
-  inline bool is_split(size_t source_region) const;
+  inline bool is_split(size_t region_idx) const;
 
-  // The index of the split region, the size of the partial object on that
-  // region and the destination of the partial object.
-  size_t    partial_obj_size() const { return _partial_obj_size; }
-  HeapWord* destination() const      { return _destination; }
+  // Obj at the split point doesn't fit the previous space and will be relocated to the next space.
+  HeapWord* split_point() const { return _split_point; }
 
-  // The destination count of the partial object referenced by this split
-  // (either 1 or 2).  This must be added to the destination count of the
-  // remainder of the source region.
-  unsigned int destination_count() const { return _destination_count; }
+  // Number of live words before the split point on this region.
+  size_t preceding_live_words() const { return _preceding_live_words; }
 
-  // If a word within the partial object will be written to the first word of a
-  // destination region, this is the address of the destination region;
-  // otherwise this is null.
-  HeapWord* dest_region_addr() const     { return _dest_region_addr; }
+  // A split region has two "destinations", living in two spaces. This method
+  // returns the first one -- destination for the first live word on
+  // this split region.
+  HeapWord* preceding_destination() const {
+    assert(_preceding_destination != nullptr, "inv");
+    return _preceding_destination;
+  }
 
-  // If a word within the partial object will be written to the first word of a
-  // destination region, this is the address of that word within the partial
-  // object; otherwise this is null.
-  HeapWord* first_src_addr() const       { return _first_src_addr; }
+  // Number of regions the preceding live words are relocated into.
+  uint preceding_destination_count() const { return _preceding_destination_count; }
 
-  // Record the data necessary to split the region src_region_idx.
-  void record(size_t src_region_idx, size_t partial_obj_size,
-              HeapWord* destination);
+  void record(size_t split_region_idx, HeapWord* split_point, size_t preceding_live_words);
 
   void clear();
 
   DEBUG_ONLY(void verify_clear();)
 
 private:
-  size_t       _src_region_idx;
-  size_t       _partial_obj_size;
-  HeapWord*    _destination;
-  unsigned int _destination_count;
-  HeapWord*    _dest_region_addr;
-  HeapWord*    _first_src_addr;
+  size_t       _split_region_idx;
+  HeapWord*    _split_point;
+  size_t       _preceding_live_words;
+  HeapWord*    _preceding_destination;
+  uint         _preceding_destination_count;
 };
 
 inline bool SplitInfo::is_split(size_t region_idx) const
 {
-  return _src_region_idx == region_idx && is_valid();
+  return _split_region_idx == region_idx && is_valid();
 }
 
 class SpaceInfo
@@ -215,10 +209,18 @@ class ParallelCompactData
   class RegionData
   {
   public:
-    // Destination address of the region.
+    // Destination for the first live word in this region.
+    // Therefore, the new addr for every live obj on this region can be calculated as:
+    //
+    // new_addr := _destination + live_words_offset(old_addr);
+    //
+    // where, live_words_offset is the number of live words accumulated from
+    // region-start to old_addr.
     HeapWord* destination() const { return _destination; }
 
-    // The first region containing data destined for this region.
+    // A destination region can have multiple source regions; only the first
+    // one is recorded. Since all live objs are slided down, subsequent source
+    // regions can be found via plain heap-region iteration.
     size_t source_region() const { return _source_region; }
 
     // Reuse _source_region to store the corresponding shadow region index
@@ -313,9 +315,12 @@ class ParallelCompactData
     // Return to the normal path here
     inline void shadow_to_normal();
 
-
     int shadow_state() { return _shadow_state; }
 
+    bool is_clear();
+
+    void verify_clear() NOT_DEBUG_RETURN;
+
   private:
     // The type used to represent object sizes within a region.
     typedef uint region_sz_t;
@@ -873,7 +878,10 @@ class MoveAndUpdateClosure: public StackObj {
   size_t    words_remaining()    const { return _words_remaining; }
   bool      is_full()            const { return _words_remaining == 0; }
   HeapWord* source()             const { return _source; }
-  void      set_source(HeapWord* addr) { _source = addr; }
+  void      set_source(HeapWord* addr) {
+    assert(addr != nullptr, "precondition");
+    _source = addr;
+  }
 
   // If the object will fit (size <= words_remaining()), copy it to the current
   // destination, update the interior oops and the start array.
@@ -902,9 +910,8 @@ inline size_t MoveAndUpdateClosure::calculate_words_remaining(size_t region) {
   HeapWord* dest_addr = PSParallelCompact::summary_data().region_to_addr(region);
   PSParallelCompact::SpaceId dest_space_id = PSParallelCompact::space_id(dest_addr);
   HeapWord* new_top = PSParallelCompact::new_top(dest_space_id);
-  assert(dest_addr < new_top, "sanity");
-
-  return MIN2(pointer_delta(new_top, dest_addr), ParallelCompactData::RegionSize);
+  return MIN2(pointer_delta(new_top, dest_addr),
+              ParallelCompactData::RegionSize);
 }
 
 inline
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
index e5f1b9d30ae..aa62d474a55 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/parallel/parMarkBitMap.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.hpp"
@@ -79,7 +80,7 @@ inline void PSParallelCompact::adjust_pointer(T* p) {
     if (!obj->is_forwarded()) {
       return;
     }
-    oop new_obj = obj->forwardee();
+    oop new_obj = FullGCForwarding::forwardee(obj);
     assert(new_obj != nullptr, "non-null address for live objects");
     assert(new_obj != obj, "inv");
     assert(ParallelScavengeHeap::heap()->is_in_reserved(new_obj),
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index 5f6629e6cc2..c740b1488d7 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -321,7 +321,6 @@ void PSPromotionManager::process_array_chunk(PartialArrayState* state) {
 }
 
 void PSPromotionManager::push_objArray(oop old_obj, oop new_obj) {
-  assert(old_obj->is_objArray(), "precondition");
   assert(old_obj->is_forwarded(), "precondition");
   assert(old_obj->forwardee() == new_obj, "precondition");
   assert(new_obj->is_objArray(), "precondition");
@@ -357,7 +356,7 @@ oop PSPromotionManager::oop_promotion_failed(oop obj, markWord obj_mark) {
   // this started.  If it is the same (i.e., no forwarding
   // pointer has been installed), then this thread owns
   // it.
-  if (obj->forward_to_atomic(obj, obj_mark) == nullptr) {
+  if (obj->forward_to_self_atomic(obj_mark) == nullptr) {
     // We won any races, we "own" this object.
     assert(obj == obj->forwardee(), "Sanity");
 
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
index 8d412234614..a69d975956d 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
@@ -111,7 +111,7 @@ class PSPromotionManager {
 
   void push_depth(ScannerTask task);
 
-  inline void promotion_trace_event(oop new_obj, oop old_obj, size_t obj_size,
+  inline void promotion_trace_event(oop new_obj, Klass* klass, size_t obj_size,
                                     uint age, bool tenured,
                                     const PSPromotionLAB* lab);
 
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index f38cbaecf43..ed517c06a40 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -66,7 +66,7 @@ inline void PSPromotionManager::claim_or_forward_depth(T* p) {
   }
 }
 
-inline void PSPromotionManager::promotion_trace_event(oop new_obj, oop old_obj,
+inline void PSPromotionManager::promotion_trace_event(oop new_obj, Klass* klass,
                                                       size_t obj_size,
                                                       uint age, bool tenured,
                                                       const PSPromotionLAB* lab) {
@@ -79,14 +79,14 @@ inline void PSPromotionManager::promotion_trace_event(oop new_obj, oop old_obj,
       if (gc_tracer->should_report_promotion_in_new_plab_event()) {
         size_t obj_bytes = obj_size * HeapWordSize;
         size_t lab_size = lab->capacity();
-        gc_tracer->report_promotion_in_new_plab_event(old_obj->klass(), obj_bytes,
+        gc_tracer->report_promotion_in_new_plab_event(klass, obj_bytes,
                                                       age, tenured, lab_size);
       }
     } else {
       // Promotion of object directly to heap
       if (gc_tracer->should_report_promotion_outside_plab_event()) {
         size_t obj_bytes = obj_size * HeapWordSize;
-        gc_tracer->report_promotion_outside_plab_event(old_obj->klass(), obj_bytes,
+        gc_tracer->report_promotion_outside_plab_event(klass, obj_bytes,
                                                        age, tenured);
       }
     }
@@ -149,7 +149,7 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
     return copy_unmarked_to_survivor_space<promote_immediately>(o, m);
   } else {
     // Return the already installed forwardee.
-    return m.forwardee();
+    return o->forwardee(m);
   }
 }
 
@@ -165,7 +165,19 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
 
   oop new_obj = nullptr;
   bool new_obj_is_tenured = false;
-  size_t new_obj_size = o->size();
+
+  // NOTE: With compact headers, it is not safe to load the Klass* from old, because
+  // that would access the mark-word, that might change at any time by concurrent
+  // workers.
+  // This mark word would refer to a forwardee, which may not yet have completed
+  // copying. Therefore we must load the Klass* from the mark-word that we already
+  // loaded. This is safe, because we only enter here if not yet forwarded.
+  assert(!test_mark.is_forwarded(), "precondition");
+  Klass* klass = UseCompactObjectHeaders
+      ? test_mark.klass()
+      : o->klass();
+
+  size_t new_obj_size = o->size_given_klass(klass);
 
   // Find the objects age, MT safe.
   uint age = (test_mark.has_displaced_mark_helper() /* o->has_displaced_mark() */) ?
@@ -180,7 +192,7 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
         if (new_obj_size > (YoungPLABSize / 2)) {
           // Allocate this object directly
           new_obj = cast_to_oop(young_space()->cas_allocate(new_obj_size));
-          promotion_trace_event(new_obj, o, new_obj_size, age, false, nullptr);
+          promotion_trace_event(new_obj, klass, new_obj_size, age, false, nullptr);
         } else {
           // Flush and fill
           _young_lab.flush();
@@ -190,7 +202,7 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
             _young_lab.initialize(MemRegion(lab_base, YoungPLABSize));
             // Try the young lab allocation again.
             new_obj = cast_to_oop(_young_lab.allocate(new_obj_size));
-            promotion_trace_event(new_obj, o, new_obj_size, age, false, &_young_lab);
+            promotion_trace_event(new_obj, klass, new_obj_size, age, false, &_young_lab);
           } else {
             _young_gen_is_full = true;
           }
@@ -216,7 +228,7 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
         if (new_obj_size > (OldPLABSize / 2)) {
           // Allocate this object directly
           new_obj = cast_to_oop(old_gen()->allocate(new_obj_size));
-          promotion_trace_event(new_obj, o, new_obj_size, age, true, nullptr);
+          promotion_trace_event(new_obj, klass, new_obj_size, age, true, nullptr);
         } else {
           // Flush and fill
           _old_lab.flush();
@@ -226,7 +238,7 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
             _old_lab.initialize(MemRegion(lab_base, OldPLABSize));
             // Try the old lab allocation again.
             new_obj = cast_to_oop(_old_lab.allocate(new_obj_size));
-            promotion_trace_event(new_obj, o, new_obj_size, age, true, &_old_lab);
+            promotion_trace_event(new_obj, klass, new_obj_size, age, true, &_old_lab);
           }
         }
       }
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index f3b3c8952b9..3792bb5a721 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -39,7 +39,6 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
-#include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/space.hpp"
@@ -227,7 +226,6 @@ DefNewGeneration::DefNewGeneration(ReservedSpace rs,
                                    const char* policy)
   : Generation(rs, initial_size),
     _promotion_failed(false),
-    _preserved_marks_set(false /* in_c_heap */),
     _promo_failure_drain_in_progress(false),
     _string_dedup_requests()
 {
@@ -609,8 +607,6 @@ bool DefNewGeneration::collect(bool clear_all_soft_refs) {
 
   age_table()->clear();
   to()->clear(SpaceDecorator::Mangle);
-  // The preserved marks should be empty at the start of the GC.
-  _preserved_marks_set.init(1);
 
   YoungGenScanClosure young_gen_cl(this);
   OldGenScanClosure   old_gen_cl(this);
@@ -681,8 +677,6 @@ bool DefNewGeneration::collect(bool clear_all_soft_refs) {
     // Reset the PromotionFailureALot counters.
     NOT_PRODUCT(heap->reset_promotion_should_fail();)
   }
-  // We should have processed and cleared all the preserved marks.
-  _preserved_marks_set.reclaim();
 
   heap->trace_heap_after_gc(_gc_tracer);
 
@@ -706,19 +700,17 @@ void DefNewGeneration::remove_forwarding_pointers() {
   // starts. (The mark word is overloaded: `is_marked()` == `is_forwarded()`.)
   struct ResetForwardedMarkWord : ObjectClosure {
     void do_object(oop obj) override {
-      if (obj->is_forwarded()) {
-        obj->init_mark();
+      if (obj->is_self_forwarded()) {
+        obj->unset_self_forwarded();
+      } else if (obj->is_forwarded()) {
+        // To restore the klass-bits in the header.
+        // Needed for object iteration to work properly.
+        obj->set_mark(obj->forwardee()->prototype_mark());
       }
     }
   } cl;
   eden()->object_iterate(&cl);
   from()->object_iterate(&cl);
-
-  restore_preserved_marks();
-}
-
-void DefNewGeneration::restore_preserved_marks() {
-  _preserved_marks_set.restore(nullptr);
 }
 
 void DefNewGeneration::handle_promotion_failure(oop old) {
@@ -726,12 +718,11 @@ void DefNewGeneration::handle_promotion_failure(oop old) {
 
   _promotion_failed = true;
   _promotion_failed_info.register_copy_failure(old->size());
-  _preserved_marks_set.get()->push_if_necessary(old, old->mark());
 
   ContinuationGCSupport::transform_stack_chunk(old);
 
   // forward to self
-  old->forward_to(old);
+  old->forward_to_self();
 
   _promo_failure_scan_stack.push(old);
 
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index e86ea6b9747..c5e1c2b152e 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -32,7 +32,6 @@
 #include "gc/shared/copyFailedInfo.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/generationCounters.hpp"
-#include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "utilities/align.hpp"
@@ -99,11 +98,6 @@ class DefNewGeneration: public Generation {
   // therefore we must remove their forwarding pointers.
   void remove_forwarding_pointers();
 
-  virtual void restore_preserved_marks();
-
-  // Preserved marks
-  PreservedMarksSet _preserved_marks_set;
-
   Stack<oop, mtGC> _promo_failure_scan_stack;
   void drain_promo_failure_scan_stack(void);
   bool _promo_failure_drain_in_progress;
diff --git a/src/hotspot/share/gc/serial/serialArguments.cpp b/src/hotspot/share/gc/serial/serialArguments.cpp
index ac6dd24fdbf..f8efa192807 100644
--- a/src/hotspot/share/gc/serial/serialArguments.cpp
+++ b/src/hotspot/share/gc/serial/serialArguments.cpp
@@ -23,10 +23,16 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/genArguments.hpp"
 #include "gc/serial/serialArguments.hpp"
 #include "gc/serial/serialHeap.hpp"
 
+void SerialArguments::initialize_heap_flags_and_sizes() {
+  GenArguments::initialize_heap_flags_and_sizes();
+  FullGCForwarding::initialize_flags(MaxHeapSize);
+}
+
 CollectedHeap* SerialArguments::create_heap() {
   return new SerialHeap();
 }
diff --git a/src/hotspot/share/gc/serial/serialArguments.hpp b/src/hotspot/share/gc/serial/serialArguments.hpp
index 3ed4df5f41b..d12bd7d8e59 100644
--- a/src/hotspot/share/gc/serial/serialArguments.hpp
+++ b/src/hotspot/share/gc/serial/serialArguments.hpp
@@ -32,6 +32,7 @@ class CollectedHeap;
 class SerialArguments : public GenArguments {
 private:
   virtual CollectedHeap* create_heap();
+  virtual void initialize_heap_flags_and_sizes();
 };
 
 #endif // SHARE_GC_SERIAL_SERIALARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 897437e33c9..0df28fa7bd5 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -43,6 +43,7 @@
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
@@ -230,7 +231,7 @@ class Compacter {
   static void forward_obj(oop obj, HeapWord* new_addr) {
     prefetch_write_scan(obj);
     if (cast_from_oop<HeapWord*>(obj) != new_addr) {
-      obj->forward_to(cast_to_oop(new_addr));
+      FullGCForwarding::forward_to(obj, cast_to_oop(new_addr));
     } else {
       assert(obj->is_gc_marked(), "inv");
       // This obj will stay in-place. Fix the markword.
@@ -255,7 +256,7 @@ class Compacter {
     prefetch_read_scan(addr);
 
     oop obj = cast_to_oop(addr);
-    oop new_obj = obj->forwardee();
+    oop new_obj = FullGCForwarding::forwardee(obj);
     HeapWord* new_addr = cast_from_oop<HeapWord*>(new_obj);
     assert(addr != new_addr, "inv");
     prefetch_write_copy(new_addr);
@@ -352,13 +353,13 @@ class Compacter {
       HeapWord* top = space->top();
 
       // Check if the first obj inside this space is forwarded.
-      if (!cast_to_oop(cur_addr)->is_forwarded()) {
+      if (!FullGCForwarding::is_forwarded(cast_to_oop(cur_addr))) {
         // Jump over consecutive (in-place) live-objs-chunk
         cur_addr = get_first_dead(i);
       }
 
       while (cur_addr < top) {
-        if (!cast_to_oop(cur_addr)->is_forwarded()) {
+        if (!FullGCForwarding::is_forwarded(cast_to_oop(cur_addr))) {
           cur_addr = *(HeapWord**) cur_addr;
           continue;
         }
@@ -593,7 +594,7 @@ void SerialFullGC::mark_object(oop obj) {
   // some marks may contain information we need to preserve so we store them away
   // and overwrite the mark.  We'll restore it at the end of serial full GC.
   markWord mark = obj->mark();
-  obj->set_mark(markWord::prototype().set_marked());
+  obj->set_mark(obj->prototype_mark().set_marked());
 
   ContinuationGCSupport::transform_stack_chunk(obj);
 
@@ -624,8 +625,8 @@ template <class T> void SerialFullGC::adjust_pointer(T* p) {
     oop obj = CompressedOops::decode_not_null(heap_oop);
     assert(Universe::heap()->is_in(obj), "should be in heap");
 
-    if (obj->is_forwarded()) {
-      oop new_obj = obj->forwardee();
+    if (FullGCForwarding::is_forwarded(obj)) {
+      oop new_obj = FullGCForwarding::forwardee(obj);
       assert(is_object_aligned(new_obj), "oop must be aligned");
       RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
     }
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 9dcfb5b6092..f5e6a46df29 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -40,6 +40,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcId.hpp"
 #include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
@@ -200,6 +201,8 @@ jint SerialHeap::initialize() {
 
   GCInitLogger::print();
 
+  FullGCForwarding::initialize(_reserved);
+
   return JNI_OK;
 }
 
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 643a7936b9b..080af1c9693 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,8 +156,8 @@ Node* BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) cons
     }
 
     store = kit->store_to_memory(kit->control(), access.addr().node(), val.node(), bt,
-                                 access.addr().type(), mo, requires_atomic_access, unaligned,
-                                 mismatched, unsafe, access.barrier_data());
+                                 mo, requires_atomic_access, unaligned, mismatched,
+                                 unsafe, access.barrier_data());
   } else {
     assert(access.is_opt_access(), "either parse or opt access");
     C2OptAccess& opt_access = static_cast<C2OptAccess&>(access);
@@ -217,7 +217,7 @@ Node* BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) con
                             unaligned, mismatched, unsafe, access.barrier_data());
       load = kit->gvn().transform(load);
     } else {
-      load = kit->make_load(control, adr, val_type, access.type(), adr_type, mo,
+      load = kit->make_load(control, adr, val_type, access.type(), mo,
                             dep, requires_atomic_access, unaligned, mismatched, unsafe,
                             access.barrier_data());
     }
@@ -710,11 +710,12 @@ int BarrierSetC2::arraycopy_payload_base_offset(bool is_array) {
   int base_off = is_array ? arrayOopDesc::length_offset_in_bytes() :
                             instanceOopDesc::base_offset_in_bytes();
   // base_off:
-  // 8  - 32-bit VM
+  // 8  - 32-bit VM or 64-bit VM, compact headers
   // 12 - 64-bit VM, compressed klass
   // 16 - 64-bit VM, normal klass
   if (base_off % BytesPerLong != 0) {
     assert(UseCompressedClassPointers, "");
+    assert(!UseCompactObjectHeaders, "");
     if (is_array) {
       // Exclude length to copy by 8 bytes words.
       base_off += sizeof(int);
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
index 00fbf1f2c9f..a78fd434ad9 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,9 +92,9 @@ class C2AccessValuePtr: public C2AccessValue {
 
 public:
   C2AccessValuePtr(Node* node, const TypePtr* type) :
-    C2AccessValue(node, reinterpret_cast<const Type*>(type)) {}
+    C2AccessValue(node, type) {}
 
-  const TypePtr* type() const { return reinterpret_cast<const TypePtr*>(_type); }
+  const TypePtr* type() const { return _type->is_ptr(); }
 };
 
 // This class wraps a bunch of context parameters that are passed around in the
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 82eaaf9a396..3f0447b6558 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -220,6 +220,26 @@ bool CollectedHeap::supports_concurrent_gc_breakpoints() const {
   return false;
 }
 
+static bool klass_is_sane(oop object) {
+  if (UseCompactObjectHeaders) {
+    // With compact headers, we can't safely access the Klass* when
+    // the object has been forwarded, because non-full-GC-forwarding
+    // temporarily overwrites the mark-word, and thus the Klass*, with
+    // the forwarding pointer, and here we have no way to make a
+    // distinction between Full-GC and regular GC forwarding.
+    markWord mark = object->mark();
+    if (mark.is_forwarded()) {
+      // We can't access the Klass*. We optimistically assume that
+      // it is ok. This happens very rarely.
+      return true;
+    }
+
+    return Metaspace::contains(mark.klass_without_asserts());
+  }
+
+  return Metaspace::contains(object->klass_without_asserts());
+}
+
 bool CollectedHeap::is_oop(oop object) const {
   if (!is_object_aligned(object)) {
     return false;
@@ -229,7 +249,7 @@ bool CollectedHeap::is_oop(oop object) const {
     return false;
   }
 
-  if (!Metaspace::contains(object->klass_without_asserts())) {
+  if (!klass_is_sane(object)) {
     return false;
   }
 
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index b413e3dfb43..036bc0230c8 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -306,7 +306,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   }
 
   virtual void fill_with_dummy_object(HeapWord* start, HeapWord* end, bool zap);
-  static constexpr size_t min_dummy_object_size() {
+  static size_t min_dummy_object_size() {
     return oopDesc::header_size();
   }
 
diff --git a/src/hotspot/share/gc/shared/fullGCForwarding.cpp b/src/hotspot/share/gc/shared/fullGCForwarding.cpp
new file mode 100644
index 00000000000..4880b08887e
--- /dev/null
+++ b/src/hotspot/share/gc/shared/fullGCForwarding.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
+#include "memory/memRegion.hpp"
+#include "runtime/globals_extension.hpp"
+
+HeapWord* FullGCForwarding::_heap_base = nullptr;
+int FullGCForwarding::_num_low_bits = 0;
+
+void FullGCForwarding::initialize_flags(size_t max_heap_size) {
+#ifdef _LP64
+  size_t max_narrow_heap_size = right_n_bits(NumLowBitsNarrow - Shift);
+  if (UseCompactObjectHeaders && max_heap_size > max_narrow_heap_size * HeapWordSize) {
+    warning("Compact object headers require a java heap size smaller than " SIZE_FORMAT
+            "%s (given: " SIZE_FORMAT "%s). Disabling compact object headers.",
+            byte_size_in_proper_unit(max_narrow_heap_size * HeapWordSize),
+            proper_unit_for_byte_size(max_narrow_heap_size * HeapWordSize),
+            byte_size_in_proper_unit(max_heap_size),
+            proper_unit_for_byte_size(max_heap_size));
+    FLAG_SET_ERGO(UseCompactObjectHeaders, false);
+  }
+#endif
+}
+
+void FullGCForwarding::initialize(MemRegion heap) {
+#ifdef _LP64
+  _heap_base = heap.start();
+  if (UseCompactObjectHeaders) {
+    _num_low_bits = NumLowBitsNarrow;
+  } else {
+    _num_low_bits = NumLowBitsWide;
+  }
+#endif
+}
diff --git a/src/hotspot/share/gc/shared/fullGCForwarding.hpp b/src/hotspot/share/gc/shared/fullGCForwarding.hpp
new file mode 100644
index 00000000000..a6ca182428b
--- /dev/null
+++ b/src/hotspot/share/gc/shared/fullGCForwarding.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHARED_FULLGCFORWARDING_HPP
+#define SHARE_GC_SHARED_FULLGCFORWARDING_HPP
+
+#include "memory/allStatic.hpp"
+#include "memory/memRegion.hpp"
+#include "oops/markWord.hpp"
+#include "oops/oopsHierarchy.hpp"
+
+/*
+ * Implements forwarding for the Full GCs of Serial, Parallel, G1 and Shenandoah in
+ * a way that preserves upper N bits of object mark-words, which contain crucial
+ * Klass* information when running with compact headers. The encoding is similar to
+ * compressed-oops encoding: it basically subtracts the forwardee address from the
+ * heap-base, shifts that difference into the right place, and sets the lowest two
+ * bits (to indicate 'forwarded' state as usual).
+ * With compact-headers, we have 40 bits to encode forwarding pointers. This is
+ * enough to address 8TB of heap. If the heap size exceeds that limit, we turn off
+ * compact headers.
+ */
+class FullGCForwarding : public AllStatic {
+  static const int NumLowBitsNarrow = LP64_ONLY(markWord::klass_shift) NOT_LP64(0 /*unused*/);
+  static const int NumLowBitsWide   = BitsPerWord;
+  static const int Shift            = markWord::lock_bits + markWord::lock_shift;
+
+  static HeapWord* _heap_base;
+  static int _num_low_bits;
+public:
+  static void initialize_flags(size_t max_heap_size);
+  static void initialize(MemRegion heap);
+  static inline void forward_to(oop from, oop to);
+  static inline oop forwardee(oop from);
+  static inline bool is_forwarded(oop obj);
+};
+
+#endif // SHARE_GC_SHARED_FULLGCFORWARDING_HPP
diff --git a/src/hotspot/share/gc/shared/fullGCForwarding.inline.hpp b/src/hotspot/share/gc/shared/fullGCForwarding.inline.hpp
new file mode 100644
index 00000000000..ebd280a454f
--- /dev/null
+++ b/src/hotspot/share/gc/shared/fullGCForwarding.inline.hpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef GC_SHARED_FULLGCFORWARDING_INLINE_HPP
+#define GC_SHARED_FULLGCFORWARDING_INLINE_HPP
+
+#include "gc/shared/fullGCForwarding.hpp"
+
+#include "oops/oop.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+void FullGCForwarding::forward_to(oop from, oop to) {
+#ifdef _LP64
+  uintptr_t encoded = pointer_delta(cast_from_oop<HeapWord*>(to), _heap_base) << Shift;
+  assert(encoded <= static_cast<uintptr_t>(right_n_bits(_num_low_bits)), "encoded forwardee must fit");
+  uintptr_t mark = from->mark().value();
+  mark &= ~right_n_bits(_num_low_bits);
+  mark |= (encoded | markWord::marked_value);
+  from->set_mark(markWord(mark));
+#else
+  from->forward_to(to);
+#endif
+}
+
+oop FullGCForwarding::forwardee(oop from) {
+#ifdef _LP64
+  uintptr_t mark = from->mark().value();
+  HeapWord* decoded = _heap_base + ((mark & right_n_bits(_num_low_bits)) >> Shift);
+  return cast_to_oop(decoded);
+#else
+  return from->forwardee();
+#endif
+}
+
+bool FullGCForwarding::is_forwarded(oop obj) {
+  return obj->mark().is_forwarded();
+}
+
+#endif // GC_SHARED_FULLGCFORWARDING_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/locationPrinter.inline.hpp b/src/hotspot/share/gc/shared/locationPrinter.inline.hpp
index d368aa1c6c6..ae873d52cb5 100644
--- a/src/hotspot/share/gc/shared/locationPrinter.inline.hpp
+++ b/src/hotspot/share/gc/shared/locationPrinter.inline.hpp
@@ -37,7 +37,7 @@ oop BlockLocationPrinter<CollectedHeapT>::base_oop_or_null(void* addr) {
     return cast_to_oop(addr);
   }
 
-  // Try to find addr using block_start.
+  // Try to find addr using block_start (not implemented for all GCs/generations).
   HeapWord* p = CollectedHeapT::heap()->block_start(addr);
   if (p != nullptr && CollectedHeapT::heap()->block_is_obj(p)) {
     if (!is_valid_obj(p)) {
@@ -52,7 +52,9 @@ oop BlockLocationPrinter<CollectedHeapT>::base_oop_or_null(void* addr) {
 template <typename CollectedHeapT>
 bool BlockLocationPrinter<CollectedHeapT>::print_location(outputStream* st, void* addr) {
   // Check if addr points into Java heap.
-  if (CollectedHeapT::heap()->is_in(addr)) {
+  bool in_heap = CollectedHeapT::heap()->is_in(addr);
+  if (in_heap) {
+    // base_oop_or_null() might be unimplemented and return NULL for some GCs/generations
     oop o = base_oop_or_null(addr);
     if (o != nullptr) {
       if ((void*)o == addr) {
@@ -83,6 +85,10 @@ bool BlockLocationPrinter<CollectedHeapT>::print_location(outputStream* st, void
   }
 #endif
 
+  if (in_heap) {
+    st->print_cr(PTR_FORMAT " is an unknown heap location", p2i(addr));
+    return true;
+  }
   return false;
 }
 
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 318ab00188b..f96ec50e3b0 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -361,18 +361,23 @@ void MemAllocator::mem_clear(HeapWord* mem) const {
   assert(mem != nullptr, "cannot initialize null object");
   const size_t hs = oopDesc::header_size();
   assert(_word_size >= hs, "unexpected object size");
-  oopDesc::set_klass_gap(mem, 0);
+  if (oopDesc::has_klass_gap()) {
+    oopDesc::set_klass_gap(mem, 0);
+  }
   Copy::fill_to_aligned_words(mem + hs, _word_size - hs);
 }
 
 oop MemAllocator::finish(HeapWord* mem) const {
   assert(mem != nullptr, "null object pointer");
-  // May be bootstrapping
-  oopDesc::set_mark(mem, markWord::prototype());
   // Need a release store to ensure array/class length, mark word, and
   // object zeroing are visible before setting the klass non-null, for
   // concurrent collectors.
-  oopDesc::release_set_klass(mem, _klass);
+  if (UseCompactObjectHeaders) {
+    oopDesc::release_set_mark(mem, _klass->prototype_header());
+  } else {
+    oopDesc::set_mark(mem, markWord::prototype());
+    oopDesc::release_set_klass(mem, _klass);
+  }
   return cast_to_oop(mem);
 }
 
diff --git a/src/hotspot/share/gc/shared/preservedMarks.cpp b/src/hotspot/share/gc/shared/preservedMarks.cpp
index 9889dbc3690..bc241fb5daf 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.cpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/shared/workerUtils.hpp"
@@ -42,8 +43,8 @@ void PreservedMarks::restore() {
 
 void PreservedMarks::adjust_preserved_mark(PreservedMark* elem) {
   oop obj = elem->get_oop();
-  if (obj->is_forwarded()) {
-    elem->set_oop(obj->forwardee());
+  if (FullGCForwarding::is_forwarded(obj)) {
+    elem->set_oop(FullGCForwarding::forwardee(obj));
   }
 }
 
@@ -142,10 +143,6 @@ void PreservedMarksSet::restore(WorkerThreads* workers) {
   assert_empty();
 }
 
-WorkerTask* PreservedMarksSet::create_task() {
-  return new RestorePreservedMarksTask(this);
-}
-
 void PreservedMarksSet::reclaim() {
   assert_empty();
 
diff --git a/src/hotspot/share/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp
index 3fc8c62bff1..84bf18e41af 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.hpp
@@ -114,8 +114,6 @@ class PreservedMarksSet : public CHeapObj<mtGC> {
   // is null, perform the work serially in the current thread.
   void restore(WorkerThreads* workers);
 
-  WorkerTask* create_task();
-
   // Reclaim stack array.
   void reclaim();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index bcc370eeb31..ca95cde83b1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workerPolicy.hpp"
@@ -198,6 +199,11 @@ void ShenandoahArguments::initialize_alignments() {
   HeapAlignment = align;
 }
 
+void ShenandoahArguments::initialize_heap_flags_and_sizes() {
+  GCArguments::initialize_heap_flags_and_sizes();
+  FullGCForwarding::initialize_flags(MaxHeapSize);
+}
+
 CollectedHeap* ShenandoahArguments::create_heap() {
   return new ShenandoahHeap(new ShenandoahCollectorPolicy());
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp
index bc73d9a2d12..ad54b1d235c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp
@@ -35,6 +35,7 @@ class ShenandoahArguments : public GCArguments {
 
   virtual void initialize();
   virtual size_t conservative_max_heap_alignment();
+  virtual void initialize_heap_flags_and_sizes();
   virtual CollectedHeap* create_heap();
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
index 0bbced2e8d3..22822ad3fec 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
@@ -197,7 +197,7 @@ void ShenandoahAsserts::assert_correct(void* interior_loc, oop obj, const char*
                   file, line);
   }
 
-  Klass* obj_klass = obj->klass_or_null();
+  Klass* obj_klass = ShenandoahForwarding::klass(obj);
   if (obj_klass == nullptr) {
     print_failure(_safe_unknown, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",
                   "Object klass pointer should not be null",
@@ -235,7 +235,7 @@ void ShenandoahAsserts::assert_correct(void* interior_loc, oop obj, const char*
                     file, line);
     }
 
-    if (obj_klass != fwd->klass()) {
+    if (obj_klass != ShenandoahForwarding::klass(fwd)) {
       print_failure(_safe_oop, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",
                     "Forwardee klass disagrees with object class",
                     file, line);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.hpp b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.hpp
index 95152017a69..fb57c55e09a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.hpp
@@ -62,6 +62,8 @@ class ShenandoahForwarding {
    */
   static inline oop try_update_forwardee(oop obj, oop update);
 
+  static inline size_t size(oop obj);
+  static inline Klass* klass(oop obj);
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp
index 01294f9c890..ccdbb81f33b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp
@@ -90,4 +90,21 @@ inline oop ShenandoahForwarding::try_update_forwardee(oop obj, oop update) {
   }
 }
 
+inline Klass* ShenandoahForwarding::klass(oop obj) {
+  if (UseCompactObjectHeaders) {
+    markWord mark = obj->mark();
+    if (mark.is_marked()) {
+      oop fwd = cast_to_oop(mark.clear_lock_bits().to_pointer());
+      mark = fwd->mark();
+    }
+    return mark.klass();
+  } else {
+    return obj->klass();
+  }
+}
+
+inline size_t ShenandoahForwarding::size(oop obj) {
+  return obj->size_given_klass(klass(obj));
+}
+
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index c2d94353d54..53cb8e5d20f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -26,6 +26,7 @@
 
 #include "compiler/oopMap.hpp"
 #include "gc/shared/continuationGCSupport.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/tlab_globals.hpp"
@@ -369,7 +370,7 @@ class ShenandoahPrepareForCompactionObjectClosure : public ObjectClosure {
     shenandoah_assert_not_forwarded(nullptr, p);
     if (_compact_point != cast_from_oop<HeapWord*>(p)) {
       _preserved_marks->push_if_necessary(p, p->mark());
-      p->forward_to(cast_to_oop(_compact_point));
+      FullGCForwarding::forward_to(p, cast_to_oop(_compact_point));
     }
     _compact_point += obj_size;
   }
@@ -492,7 +493,7 @@ void ShenandoahFullGC::calculate_target_humongous_objects() {
       if (start >= to_begin && start != r->index()) {
         // Fits into current window, and the move is non-trivial. Record the move then, and continue scan.
         _preserved_marks->get(0)->push_if_necessary(old_obj, old_obj->mark());
-        old_obj->forward_to(cast_to_oop(heap->get_region(start)->bottom()));
+        FullGCForwarding::forward_to(old_obj, cast_to_oop(heap->get_region(start)->bottom()));
         to_end = start;
         continue;
       }
@@ -752,8 +753,8 @@ class ShenandoahAdjustPointersClosure : public MetadataVisitingOopIterateClosure
     if (!CompressedOops::is_null(o)) {
       oop obj = CompressedOops::decode_not_null(o);
       assert(_ctx->is_marked(obj), "must be marked");
-      if (obj->is_forwarded()) {
-        oop forw = obj->forwardee();
+      if (FullGCForwarding::is_forwarded(obj)) {
+        oop forw = FullGCForwarding::forwardee(obj);
         RawAccess<IS_NOT_NULL>::oop_store(p, forw);
       }
     }
@@ -863,9 +864,9 @@ class ShenandoahCompactObjectsClosure : public ObjectClosure {
   void do_object(oop p) {
     assert(_heap->complete_marking_context()->is_marked(p), "must be marked");
     size_t size = p->size();
-    if (p->is_forwarded()) {
+    if (FullGCForwarding::is_forwarded(p)) {
       HeapWord* compact_from = cast_from_oop<HeapWord*>(p);
-      HeapWord* compact_to = cast_from_oop<HeapWord*>(p->forwardee());
+      HeapWord* compact_to = cast_from_oop<HeapWord*>(FullGCForwarding::forwardee(p));
       assert(compact_from != compact_to, "Forwarded object should move");
       Copy::aligned_conjoint_words(compact_from, compact_to, size);
       oop new_obj = cast_to_oop(compact_to);
@@ -970,7 +971,7 @@ void ShenandoahFullGC::compact_humongous_objects() {
     ShenandoahHeapRegion* r = heap->get_region(c - 1);
     if (r->is_humongous_start()) {
       oop old_obj = cast_to_oop(r->bottom());
-      if (!old_obj->is_forwarded()) {
+      if (!FullGCForwarding::is_forwarded(old_obj)) {
         // No need to move the object, it stays at the same slot
         continue;
       }
@@ -979,7 +980,7 @@ void ShenandoahFullGC::compact_humongous_objects() {
 
       size_t old_start = r->index();
       size_t old_end   = old_start + num_regions - 1;
-      size_t new_start = heap->heap_region_index_containing(old_obj->forwardee());
+      size_t new_start = heap->heap_region_index_containing(FullGCForwarding::forwardee(old_obj));
       size_t new_end   = new_start + num_regions - 1;
       assert(old_start != new_start, "must be real move");
       assert(r->is_stw_move_allowed(), "Region " SIZE_FORMAT " should be movable", r->index());
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 07914947ead..0f7139691a3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -28,6 +28,7 @@
 #include "memory/universe.hpp"
 
 #include "gc/shared/classUnloadingContext.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
@@ -421,6 +422,8 @@ jint ShenandoahHeap::initialize() {
 
   ShenandoahInitLogger::print();
 
+  FullGCForwarding::initialize(_heap_region);
+
   return JNI_OK;
 }
 
@@ -1129,7 +1132,7 @@ oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
 
   assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
 
-  size_t size = p->size();
+  size_t size = ShenandoahForwarding::size(p);
 
   assert(!heap_region_containing(p)->is_humongous(), "never evacuate humongous objects");
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index cd2cc2eb209..6131d079590 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -434,7 +434,7 @@ inline void ShenandoahHeap::marked_object_iterate(ShenandoahHeapRegion* region,
     oop obj = cast_to_oop(cs);
     assert(oopDesc::is_oop(obj), "sanity");
     assert(ctx->is_marked(obj), "object expected to be marked");
-    size_t size = obj->size();
+    size_t size = ShenandoahForwarding::size(obj);
     cl->do_object(obj);
     cs += size;
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index 51878772889..b653a06b877 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -102,7 +102,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
     T o = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(o)) {
       oop obj = CompressedOops::decode_not_null(o);
-      if (is_instance_ref_klass(obj->klass())) {
+      if (is_instance_ref_klass(ShenandoahForwarding::klass(obj))) {
         obj = ShenandoahForwarding::get_forwardee(obj);
       }
       // Single threaded verification can use faster non-atomic stack and bitmap
@@ -129,7 +129,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
               "oop must be aligned");
 
     ShenandoahHeapRegion *obj_reg = _heap->heap_region_containing(obj);
-    Klass* obj_klass = obj->klass_or_null();
+    Klass* obj_klass = ShenandoahForwarding::klass(obj);
 
     // Verify that obj is not in dead space:
     {
@@ -144,11 +144,11 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
              "Object start should be within the region");
 
       if (!obj_reg->is_humongous()) {
-        check(ShenandoahAsserts::_safe_unknown, obj, (obj_addr + obj->size()) <= obj_reg->top(),
+        check(ShenandoahAsserts::_safe_unknown, obj, (obj_addr + ShenandoahForwarding::size(obj)) <= obj_reg->top(),
                "Object end should be within the region");
       } else {
         size_t humongous_start = obj_reg->index();
-        size_t humongous_end = humongous_start + (obj->size() >> ShenandoahHeapRegion::region_size_words_shift());
+        size_t humongous_end = humongous_start + (ShenandoahForwarding::size(obj) >> ShenandoahHeapRegion::region_size_words_shift());
         for (size_t idx = humongous_start + 1; idx < humongous_end; idx++) {
           check(ShenandoahAsserts::_safe_unknown, obj, _heap->get_region(idx)->is_humongous_continuation(),
                  "Humongous object is in continuation that fits it");
@@ -165,7 +165,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
           // skip
           break;
         case ShenandoahVerifier::_verify_liveness_complete:
-          Atomic::add(&_ld[obj_reg->index()], (uint) obj->size(), memory_order_relaxed);
+          Atomic::add(&_ld[obj_reg->index()], (uint) ShenandoahForwarding::size(obj), memory_order_relaxed);
           // fallthrough for fast failure for un-live regions:
         case ShenandoahVerifier::_verify_liveness_conservative:
           check(ShenandoahAsserts::_safe_oop, obj, obj_reg->has_live(),
@@ -209,7 +209,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
       HeapWord *fwd_addr = cast_from_oop<HeapWord *>(fwd);
       check(ShenandoahAsserts::_safe_oop, obj, fwd_addr < fwd_reg->top(),
              "Forwardee start should be within the region");
-      check(ShenandoahAsserts::_safe_oop, obj, (fwd_addr + fwd->size()) <= fwd_reg->top(),
+      check(ShenandoahAsserts::_safe_oop, obj, (fwd_addr + ShenandoahForwarding::size(fwd)) <= fwd_reg->top(),
              "Forwardee end should be within the region");
 
       oop fwd2 = ShenandoahForwarding::get_forwardee_raw_unchecked(fwd);
@@ -327,7 +327,11 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
    */
   void verify_oops_from(oop obj) {
     _loc = obj;
-    obj->oop_iterate(this);
+    // oop_iterate() can not deal with forwarded objects, because
+    // it needs to load klass(), which may be overridden by the
+    // forwarding pointer.
+    oop fwd = ShenandoahForwarding::get_forwardee_raw(obj);
+    fwd->oop_iterate(this);
     _loc = nullptr;
   }
 
@@ -591,7 +595,7 @@ class ShenandoahVerifierMarkedRegionTask : public WorkerTask {
 
       while (addr < limit) {
         verify_and_follow(addr, stack, cl, &processed);
-        addr += cast_to_oop(addr)->size();
+        addr += ShenandoahForwarding::size(cast_to_oop(addr));
       }
     }
 
@@ -607,7 +611,7 @@ class ShenandoahVerifierMarkedRegionTask : public WorkerTask {
 
     // Verify everything reachable from that object too, hopefully realizing
     // everything was already marked, and never touching further:
-    if (!is_instance_ref_klass(obj->klass())) {
+    if (!is_instance_ref_klass(ShenandoahForwarding::klass(obj))) {
       cl.verify_oops_from(obj);
       (*processed)++;
     }
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index 12ee400eb2d..3f9c09f1c8c 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -445,7 +445,7 @@ void ZBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCopyNode* a
       assert(src_offset == dest_offset, "should be equal");
       const jlong offset = src_offset->get_long();
       if (offset != arrayOopDesc::base_offset_in_bytes(T_OBJECT)) {
-        assert(!UseCompressedClassPointers, "should only happen without compressed class pointers");
+        assert(!UseCompressedClassPointers || UseCompactObjectHeaders, "should only happen without compressed class pointers");
         assert((arrayOopDesc::base_offset_in_bytes(T_OBJECT) - offset) == BytesPerLong, "unexpected offset");
         length = phase->transform_later(new SubLNode(length, phase->longcon(1))); // Size is in longs
         src_offset = phase->longcon(arrayOopDesc::base_offset_in_bytes(T_OBJECT));
diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index ada8351a9f6..c63b989dc4e 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -63,8 +63,12 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
 
   // Signal to the ZIterator that this is an invisible root, by setting
   // the mark word to "marked". Reset to prototype() after the clearing.
-  arrayOopDesc::set_mark(mem, markWord::prototype().set_marked());
-  arrayOopDesc::release_set_klass(mem, _klass);
+  if (UseCompactObjectHeaders) {
+    oopDesc::release_set_mark(mem, _klass->prototype_header().set_marked());
+  } else {
+    arrayOopDesc::set_mark(mem, markWord::prototype().set_marked());
+    arrayOopDesc::release_set_klass(mem, _klass);
+  }
   assert(_length >= 0, "length should be non-negative");
   arrayOopDesc::set_length(mem, _length);
 
@@ -152,7 +156,11 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   ZThreadLocalData::clear_invisible_root(_thread);
 
   // Signal to the ZIterator that this is no longer an invisible root
-  oopDesc::release_set_mark(mem, markWord::prototype());
+  if (UseCompactObjectHeaders) {
+    oopDesc::release_set_mark(mem, _klass->prototype_header());
+  } else {
+    oopDesc::release_set_mark(mem, markWord::prototype());
+  }
 
   return cast_to_oop(mem);
 }
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index af48c1a8c35..4cc309dd991 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -69,7 +69,7 @@ typedef struct CDSFileMapRegion {
   size_t  _ptrmap_offset;     // Bitmap for relocating native pointer fields in archived heap objects.
                               // (The base address is the bottom of the BM region).
   size_t  _ptrmap_size_in_bits;
-  char*   _mapped_base;       // Actually mapped address (NULL if this region is not mapped).
+  char*   _mapped_base;       // Actually mapped address (null if this region is not mapped).
 } CDSFileMapRegion;
 
 // This portion of the archive file header must remain unchanged for
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index 6634306636b..e50d758335c 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -419,7 +419,7 @@ JVM_FindPrimitiveClass(JNIEnv *env, const char *utf);
 
 
 /*
- * Find a class from a boot class loader. Returns NULL if class not found.
+ * Find a class from a boot class loader. Returns null if class not found.
  */
 JNIEXPORT jclass JNICALL
 JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
@@ -723,13 +723,6 @@ JNIEXPORT jbyte JNICALL JVM_ConstantPoolGetTagAt
 JNIEXPORT jobjectArray JNICALL
 JVM_GetMethodParameters(JNIEnv *env, jobject method);
 
-/*
- * java.security.*
- */
-
-JNIEXPORT jobject JNICALL
-JVM_GetInheritedAccessControlContext(JNIEnv *env, jclass cls);
-
 /*
  * Ensure that code doing a stackwalk and using javaVFrame::locals() to
  * get the value will see a materialized value and not a scalar-replaced
@@ -741,9 +734,6 @@ JVM_GetInheritedAccessControlContext(JNIEnv *env, jclass cls);
 JNIEXPORT void JNICALL
 JVM_EnsureMaterializedForStackWalk_func(JNIEnv* env, jobject vthread, jobject value);
 
-JNIEXPORT jobject JNICALL
-JVM_GetStackAccessControlContext(JNIEnv *env, jclass cls);
-
 /*
  * Signal support, used to implement the shutdown sequence.  Every VM must
  * support JVM_SIGINT and JVM_SIGTERM, raising the former for user interrupts
@@ -1145,6 +1135,12 @@ JVM_VirtualThreadUnmount(JNIEnv* env, jobject vthread, jboolean hide);
 JNIEXPORT void JNICALL
 JVM_VirtualThreadDisableSuspend(JNIEnv* env, jclass clazz, jboolean enter);
 
+JNIEXPORT void JNICALL
+JVM_VirtualThreadPinnedEvent(JNIEnv* env, jclass clazz, jstring op);
+
+JNIEXPORT jobject JNICALL
+JVM_TakeVirtualThreadListToUnblock(JNIEnv* env, jclass ignored);
+
 /*
  * Core reflection support.
  */
@@ -1157,6 +1153,13 @@ JVM_GetClassFileVersion(JNIEnv *env, jclass current);
 JNIEXPORT jboolean JNICALL
 JVM_PrintWarningAtDynamicAgentLoad(void);
 
+#define JNI_ONLOAD_SYMBOLS   {"JNI_OnLoad"}
+#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
+#define JVM_ONLOAD_SYMBOLS      {"JVM_OnLoad"}
+#define AGENT_ONLOAD_SYMBOLS    {"Agent_OnLoad"}
+#define AGENT_ONUNLOAD_SYMBOLS  {"Agent_OnUnload"}
+#define AGENT_ONATTACH_SYMBOLS  {"Agent_OnAttach"}
+
 /*
  * This structure is used by the launcher to get the default thread
  * stack size from the VM using JNI_GetDefaultJavaVMInitArgs() with a
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 525258b1ebd..1d8268dbda6 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -735,7 +735,7 @@ JRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorenter(JavaThread* current, B
   assert(Universe::heap()->is_in_or_null(elem->obj()),
          "must be null or an object");
 #ifdef ASSERT
-  current->last_frame().interpreter_frame_verify_monitor(elem);
+  if (!current->preempting()) current->last_frame().interpreter_frame_verify_monitor(elem);
 #endif
 JRT_END
 
diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index 87b124e9d79..3406c85df7f 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -234,8 +234,10 @@ class MaskFillerForNative: public NativeSignatureIterator {
  private:
   uintptr_t * _mask;                             // the bit mask to be filled
   int         _size;                             // the mask size in bits
+  int         _num_oops;
 
   void set_one(int i) {
+    _num_oops++;
     i *= InterpreterOopMap::bits_per_entry;
     assert(0 <= i && i < _size, "offset out of bounds");
     _mask[i / BitsPerWord] |= (((uintptr_t) 1 << InterpreterOopMap::oop_bit_number) << (i % BitsPerWord));
@@ -253,6 +255,7 @@ class MaskFillerForNative: public NativeSignatureIterator {
   MaskFillerForNative(const methodHandle& method, uintptr_t* mask, int size) : NativeSignatureIterator(method) {
     _mask   = mask;
     _size   = size;
+    _num_oops = 0;
     // initialize with 0
     int i = (size + BitsPerWord - 1) / BitsPerWord;
     while (i-- > 0) _mask[i] = 0;
@@ -261,6 +264,8 @@ class MaskFillerForNative: public NativeSignatureIterator {
   void generate() {
     iterate();
   }
+
+  int num_oops() { return _num_oops; }
 };
 
 bool OopMapCacheEntry::verify_mask(CellTypeState* vars, CellTypeState* stack, int max_locals, int stack_top) {
@@ -319,6 +324,7 @@ void OopMapCacheEntry::fill_for_native(const methodHandle& mh) {
   // fill mask for parameters
   MaskFillerForNative mf(mh, bit_mask(), mask_size());
   mf.generate();
+  _num_oops = mf.num_oops();
 }
 
 
diff --git a/src/hotspot/share/interpreter/templateInterpreter.cpp b/src/hotspot/share/interpreter/templateInterpreter.cpp
index 58559481e5d..dc3e4b67b33 100644
--- a/src/hotspot/share/interpreter/templateInterpreter.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,6 +212,7 @@ address    TemplateInterpreter::_throw_ClassCastException_entry             = nu
 address    TemplateInterpreter::_throw_NullPointerException_entry           = nullptr;
 address    TemplateInterpreter::_throw_StackOverflowError_entry             = nullptr;
 address    TemplateInterpreter::_throw_exception_entry                      = nullptr;
+address    TemplateInterpreter::_cont_resume_interpreter_adapter            = nullptr;
 
 #ifndef PRODUCT
 EntryPoint TemplateInterpreter::_trace_code;
diff --git a/src/hotspot/share/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp
index 9d3c5545fa0..224d9b973ed 100644
--- a/src/hotspot/share/interpreter/templateInterpreter.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,6 +111,8 @@ class TemplateInterpreter: public AbstractInterpreter {
 
   static address    _throw_StackOverflowError_entry;
 
+  static address    _cont_resume_interpreter_adapter;
+
   static address    _remove_activation_entry;                   // continuation address if an exception is not handled by current frame
   static address    _remove_activation_preserving_args_entry;   // continuation address when current frame is being popped
 
@@ -154,6 +156,8 @@ class TemplateInterpreter: public AbstractInterpreter {
   static address    throw_NullPointerException_entry()          { return _throw_NullPointerException_entry; }
   static address    throw_StackOverflowError_entry()            { return _throw_StackOverflowError_entry; }
 
+  static address    cont_resume_interpreter_adapter()           { return _cont_resume_interpreter_adapter; }
+
   // Code generation
 #ifndef PRODUCT
   static address    trace_code    (TosState state)              { return _trace_code.entry(state); }
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
index 3f497c3360b..91c30288843 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
@@ -175,7 +175,9 @@ void TemplateInterpreterGenerator::generate_all() {
     Interpreter::_throw_StackOverflowError_entry             = generate_StackOverflowError_handler();
   }
 
-
+  { CodeletMark cm(_masm, "preemption resume adapter");
+    Interpreter::_cont_resume_interpreter_adapter = generate_cont_resume_interpreter_adapter();
+  }
 
 #define method_entry(kind)                                                                          \
   { CodeletMark cm(_masm, "method entry point (kind = " #kind ")");                                 \
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
index b0afcb52795..d3ddf2a830f 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
@@ -56,6 +56,7 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator {
   address generate_earlyret_entry_for(TosState state);
   address generate_deopt_entry_for(TosState state, int step, address continuation = nullptr);
   address generate_safept_entry_for(TosState state, address runtime_entry);
+  address generate_cont_resume_interpreter_adapter();
   void    generate_throw_exception();
 
   void lock_method();
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
index fbdf8f9ca71..fa572537c2f 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -641,9 +641,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
               success = false;
             }
           }
-          if (success) {
-            THREAD->inc_held_monitor_count();
-          }
         }
         if (!success) {
             CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
@@ -745,9 +742,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
             success = false;
           }
         }
-        if (success) {
-          THREAD->inc_held_monitor_count();
-        }
       }
       if (!success) {
         CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
@@ -1680,9 +1674,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
                 success = false;
               }
             }
-            if (success) {
-              THREAD->inc_held_monitor_count();
-            }
           }
           if (!success) {
             CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
@@ -1720,9 +1711,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
                   success = false;
                 }
               }
-              if (success) {
-                THREAD->dec_held_monitor_count();
-              }
             }
             if (!success) {
               InterpreterRuntime::monitorexit(most_recent);
@@ -2021,10 +2009,13 @@ void BytecodeInterpreter::run(interpreterState istate) {
               }
 
               // Initialize header, mirrors MemAllocator.
-              oopDesc::set_mark(result, markWord::prototype());
-              oopDesc::set_klass_gap(result, 0);
-              oopDesc::release_set_klass(result, ik);
-
+              if (UseCompactObjectHeaders) {
+                oopDesc::release_set_mark(result, ik->prototype_header());
+              } else {
+                oopDesc::set_mark(result, markWord::prototype());
+                oopDesc::set_klass_gap(result, 0);
+                oopDesc::release_set_klass(result, ik);
+              }
               oop obj = cast_to_oop(result);
 
               // Must prevent reordering of stores for object initialization
@@ -3163,9 +3154,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
                 success = false;
               }
             }
-            if (success) {
-              THREAD->dec_held_monitor_count();
-            }
           }
           if (!success) {
             InterpreterRuntime::monitorexit(end);
@@ -3242,9 +3230,6 @@ void BytecodeInterpreter::run(interpreterState istate) {
                 }
               }
             }
-            if (dec_monitor_count) {
-              THREAD->dec_held_monitor_count();
-            }
           }
         }
       }
diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
index 04df0012d67..699d50e778f 100644
--- a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
+++ b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
@@ -71,6 +71,7 @@ class ZeroInterpreter: public AbstractInterpreter {
   static address throw_NullPointerException_entry() { return nullptr; }
   static address throw_ArithmeticException_entry()  { return nullptr; }
   static address throw_StackOverflowError_entry()   { return nullptr; }
+  static address cont_resume_interpreter_adapter()  { return nullptr; }
 
 # include "zeroInterpreter_zero.hpp"
 };
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
index 4e2493fc251..777c4ced8a3 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -299,6 +299,24 @@ void JfrJavaSupport::set_array_element(jobjectArray arr, jobject element, int in
 /*
  *  Field access
  */
+static void write_bool_field(const Handle& h_oop, fieldDescriptor* fd, jboolean value) {
+  assert(h_oop.not_null(), "invariant");
+  assert(fd != nullptr, "invariant");
+  h_oop->bool_field_put(fd->offset(), value);
+}
+
+static void write_char_field(const Handle& h_oop, fieldDescriptor* fd, jchar value) {
+  assert(h_oop.not_null(), "invariant");
+  assert(fd != nullptr, "invariant");
+  h_oop->char_field_put(fd->offset(), value);
+}
+
+static void write_short_field(const Handle& h_oop, fieldDescriptor* fd, jshort value) {
+  assert(h_oop.not_null(), "invariant");
+  assert(fd != nullptr, "invariant");
+  h_oop->short_field_put(fd->offset(), value);
+}
+
 static void write_int_field(const Handle& h_oop, fieldDescriptor* fd, jint value) {
   assert(h_oop.not_null(), "invariant");
   assert(fd != nullptr, "invariant");
@@ -341,8 +359,14 @@ static void write_specialized_field(JfrJavaArguments* args, const Handle& h_oop,
 
   switch(fd->field_type()) {
     case T_BOOLEAN:
+      write_bool_field(h_oop, fd, args->param(1).get_jboolean());
+      break;
     case T_CHAR:
+      write_char_field(h_oop, fd, args->param(1).get_jchar());
+      break;
     case T_SHORT:
+      write_short_field(h_oop, fd, args->param(1).get_jshort());
+      break;
     case T_INT:
       write_int_field(h_oop, fd, args->param(1).get_jint());
       break;
@@ -374,8 +398,14 @@ static void read_specialized_field(JavaValue* result, const Handle& h_oop, field
 
   switch(fd->field_type()) {
     case T_BOOLEAN:
+      result->set_jint(h_oop->bool_field(fd->offset()));
+      break;
     case T_CHAR:
+      result->set_jint(h_oop->char_field(fd->offset()));
+      break;
     case T_SHORT:
+      result->set_jint(h_oop->short_field(fd->offset()));
+      break;
     case T_INT:
       result->set_jint(h_oop->int_field(fd->offset()));
       break;
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 680e6bee1ee..ece4425782d 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -163,7 +163,7 @@ void JNICALL jfr_emit_data_loss(JNIEnv* env, jclass jvm, jlong bytes);
 
 jlong JNICALL jfr_register_stack_filter(JNIEnv* env, jclass jvm, jobjectArray classes, jobjectArray methods);
 
-jlong JNICALL jfr_unregister_stack_filter(JNIEnv* env, jclass jvm, jlong id);
+void JNICALL jfr_unregister_stack_filter(JNIEnv* env, jclass jvm, jlong id);
 
 jlong JNICALL jfr_nanos_now(JNIEnv* env, jclass jvm);
 
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
index 13b55c34e23..2eca6b5eb71 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ class ObjectSampleMarker : public StackObj {
     // now we will set the mark word to "marked" in order to quickly
     // identify sample objects during the reachability search from gc roots.
     assert(!obj->mark().is_marked(), "should only mark an object once");
-    obj->set_mark(markWord::prototype().set_marked());
+    obj->set_mark(obj->prototype_mark().set_marked());
     assert(obj->mark().is_marked(), "invariant");
   }
 };
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index babb24f28ea..f8b792f3094 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -156,6 +156,12 @@
     <Field type="ulong" name="id" label="Continuation ID" />
   </Event>
 
+  <Event name="VirtualThreadPinned" category="Java Application" label="Virtual Thread Pinned" thread="true" stackTrace="true">
+    <Field type="string" name="blockingOperation" label="Blocking Operation" />
+    <Field type="string" name="pinnedReason" label="Pinned Reason" />
+    <Field type="Thread" name="carrierThread" label="Carrier Thread" />
+  </Event>
+
   <Event name="ReservedStackActivation" category="Java Virtual Machine, Runtime" label="Reserved Stack Activation"
     description="Activation of Reserved Stack Area caused by stack overflow with ReservedStackAccess annotated method in call stack" thread="true" stackTrace="true"
     startTime="false">
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
index 0759d02cb7c..eaee79497bb 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
@@ -109,8 +109,6 @@ static void close_emergency_dump_file() {
 }
 
 static const char* create_emergency_dump_path() {
-  assert(is_path_empty(), "invariant");
-
   const size_t path_len = get_dump_directory();
   if (path_len == 0) {
     return nullptr;
diff --git a/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp b/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
index 8969b787a1c..79bcb37e5c0 100644
--- a/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
+++ b/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "interpreter/bytecodes.hpp"
 #include "jfrfiles/jfrEventIds.hpp"
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -216,6 +217,25 @@ static bool should_record(const Method* method, const Method* sender, JavaThread
   return is_not_jdk_module(sender_module, jt) && max_limit_not_reached();
 }
 
+static inline bool is_invoke_bytecode(const Method* sender, int bci) {
+  assert(sender != nullptr, "invariant");
+  assert(sender->validate_bci(bci) >= 0, "invariant");
+  const Bytecodes::Code bc = (Bytecodes::Code)*sender->bcp_from(bci);
+  switch (bc) {
+    case Bytecodes::_invokevirtual:
+    case Bytecodes::_invokestatic:
+    case Bytecodes::_invokeinterface:
+    case Bytecodes::_invokespecial:
+    case Bytecodes::_invokedynamic: {
+      return true;
+    }
+    default: {
+      return false;
+    }
+  }
+  return false;
+}
+
 // This is the entry point for newly discovered edges in JfrResolution.cpp.
 void JfrDeprecationManager::on_link(const Method* method, Method* sender, int bci, u1 frame_type, JavaThread* jt) {
   assert(method != nullptr, "invariant");
@@ -224,10 +244,13 @@ void JfrDeprecationManager::on_link(const Method* method, Method* sender, int bc
   assert(!sender->is_native(), "invariant");
   assert(jt != nullptr, "invariant");
   assert(JfrRecorder::is_started_on_commandline(), "invariant");
-  if (JfrMethodData::mark_deprecated_call_site(sender, bci, jt)) {
-    if (should_record(method, sender, jt)) {
-      create_edge(method, sender, bci, frame_type, jt);
+  if (should_record(method, sender, jt)) {
+    if (is_invoke_bytecode(sender, bci)) {
+      if (!JfrMethodData::mark_deprecated_call_site(sender, bci, jt)) {
+        return;
+      }
     }
+    create_edge(method, sender, bci, frame_type, jt);
   }
 }
 
diff --git a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
index 0c2fb0206ec..a6cff1609a4 100644
--- a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
+++ b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
@@ -35,6 +35,7 @@
 #include "oops/klass.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/safepointVerifiers.hpp"
 #include "utilities/stack.inline.hpp"
 
 static jobject empty_java_util_arraylist = nullptr;
@@ -80,30 +81,25 @@ static bool is_allowed(const Klass* k) {
   return !(k->is_abstract() || k->should_be_initialized());
 }
 
-static void fill_klasses(GrowableArray<const void*>& event_subklasses, const InstanceKlass* event_klass, JavaThread* thread) {
+static void fill_klasses(GrowableArray<jclass>& event_subklasses, const InstanceKlass* event_klass, JavaThread* thread) {
   assert(event_subklasses.length() == 0, "invariant");
   assert(event_klass != nullptr, "invariant");
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(thread));
+  // Do not safepoint while walking the ClassHierarchy, keeping klasses alive and storing their mirrors in JNI handles.
+  NoSafepointVerifier nsv;
 
   for (ClassHierarchyIterator iter(const_cast<InstanceKlass*>(event_klass)); !iter.done(); iter.next()) {
     Klass* subk = iter.klass();
     if (is_allowed(subk)) {
-      event_subklasses.append(subk);
+      // We are walking the class hierarchy and saving the relevant klasses in JNI handles.
+      // To be allowed to store the java mirror, we must ensure that the klass and its oops are kept alive,
+      // and perform the store before the next safepoint.
+      subk->keep_alive();
+      event_subklasses.append((jclass)JfrJavaSupport::local_jni_handle(subk->java_mirror(), thread));
     }
   }
 }
 
-static void transform_klasses_to_local_jni_handles(GrowableArray<const void*>& event_subklasses, JavaThread* thread) {
-  assert(event_subklasses.is_nonempty(), "invariant");
-  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(thread));
-
-  for (int i = 0; i < event_subklasses.length(); ++i) {
-    const InstanceKlass* k = static_cast<const InstanceKlass*>(event_subklasses.at(i));
-    assert(is_allowed(k), "invariant");
-    event_subklasses.at_put(i, JfrJavaSupport::local_jni_handle(k->java_mirror(), thread));
-  }
-}
-
 jobject JdkJfrEvent::get_all_klasses(TRAPS) {
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
   initialize(THREAD);
@@ -126,15 +122,13 @@ jobject JdkJfrEvent::get_all_klasses(TRAPS) {
   }
 
   ResourceMark rm(THREAD);
-  GrowableArray<const void*> event_subklasses(initial_array_size);
+  GrowableArray<jclass> event_subklasses(initial_array_size);
   fill_klasses(event_subklasses, InstanceKlass::cast(klass), THREAD);
 
   if (event_subklasses.is_empty()) {
     return empty_java_util_arraylist;
   }
 
-  transform_klasses_to_local_jni_handles(event_subklasses, THREAD);
-
   Handle h_array_list(THREAD, new_java_util_arraylist(THREAD));
   if (h_array_list.is_null()) {
     return empty_java_util_arraylist;
@@ -152,7 +146,7 @@ jobject JdkJfrEvent::get_all_klasses(TRAPS) {
 
   JavaValue result(T_BOOLEAN);
   for (int i = 0; i < event_subklasses.length(); ++i) {
-    const jclass clazz = (jclass)event_subklasses.at(i);
+    const jclass clazz = event_subklasses.at(i);
     assert(JdkJfrEvent::is_subklass(clazz), "invariant");
     JfrJavaArguments args(&result, array_list_klass, add_method_sym, add_method_sig_sym);
     args.set_receiver(h_array_list());
diff --git a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
index e31a96153a4..55ea5225e24 100644
--- a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
+++ b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ inline bool send_allocation_sample(const Klass* klass, int64_t allocated_bytes,
 inline int64_t estimate_tlab_size_bytes(Thread* thread) {
   const size_t desired_tlab_size_bytes = thread->tlab().desired_size() * HeapWordSize;
   const size_t alignment_reserve_bytes = thread->tlab().alignment_reserve_in_bytes();
-  assert(desired_tlab_size_bytes > alignment_reserve_bytes, "invariant");
+  assert(desired_tlab_size_bytes >= alignment_reserve_bytes, "invariant");
   return static_cast<int64_t>(desired_tlab_size_bytes - alignment_reserve_bytes);
 }
 
@@ -66,6 +66,10 @@ static void normalize_as_tlab_and_send_allocation_samples(const Klass* klass, in
     return;
   }
   const int64_t tlab_size_bytes = estimate_tlab_size_bytes(thread);
+  if (tlab_size_bytes <= 0) {
+    // We don't get a TLAB, avoid endless loop below.
+    return;
+  }
   if (allocated_bytes - tl->last_allocated_bytes() < tlab_size_bytes) {
     return;
   }
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 35e50bd6318..9fc6be3d4c8 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -104,7 +104,7 @@ void JfrThreadLocal::initialize_main_thread(JavaThread* jt) {
   assert(Thread::is_starting_thread(jt), "invariant");
   assert(jt->threadObj() == nullptr, "invariant");
   assert(jt->jfr_thread_local()->_jvm_thread_id == 0, "invariant");
-  jt->jfr_thread_local()->_jvm_thread_id = 1;
+  jt->jfr_thread_local()->_jvm_thread_id = ThreadIdentifier::initial();
 }
 
 static void send_java_thread_start_event(JavaThread* jt) {
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 7922a681639..3599df18544 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -1382,7 +1382,8 @@ C2V_VMENTRY(void, reprofile, (JNIEnv* env, jobject, ARGUMENT_PAIR(method)))
   if (method_data == nullptr) {
     method_data = get_profiling_method_data(method, CHECK);
   } else {
-    method_data->initialize();
+    CompilerThreadCanCallJava canCallJava(THREAD, true);
+    method_data->reinitialize();
   }
 C2V_END
 
@@ -2577,9 +2578,7 @@ C2V_VMENTRY_NULL(jlongArray, registerNativeMethods, (JNIEnv* env, jobject, jclas
       stringStream st;
       char* pure_name = NativeLookup::pure_jni_name(method);
       guarantee(pure_name != nullptr, "Illegal native method name encountered");
-      os::print_jni_name_prefix_on(&st, args_size);
       st.print_raw(pure_name);
-      os::print_jni_name_suffix_on(&st, args_size);
       char* jni_name = st.as_string();
 
       address entry = (address) os::dll_lookup(sl_handle, jni_name);
@@ -2588,10 +2587,8 @@ C2V_VMENTRY_NULL(jlongArray, registerNativeMethods, (JNIEnv* env, jobject, jclas
         st.reset();
         char* long_name = NativeLookup::long_jni_name(method);
         guarantee(long_name != nullptr, "Illegal native method name encountered");
-        os::print_jni_name_prefix_on(&st, args_size);
         st.print_raw(pure_name);
         st.print_raw(long_name);
-        os::print_jni_name_suffix_on(&st, args_size);
         char* jni_long_name = st.as_string();
         entry = (address) os::dll_lookup(sl_handle, jni_long_name);
         if (entry == nullptr) {
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index 0773de6ddba..b44b4bb9116 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
@@ -39,6 +39,9 @@ class CompilerToVM {
     friend class JVMCIVMStructs;
 
    private:
+    static int oopDesc_klass_offset_in_bytes;
+    static int arrayOopDesc_length_offset_in_bytes;
+
     static int Klass_vtable_start_offset;
     static int Klass_vtable_length_offset;
 
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index ab536a81e6e..faa23a84178 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -54,6 +54,8 @@
 #include "runtime/stubRoutines.hpp"
 #include "utilities/resourceHash.hpp"
 
+int CompilerToVM::Data::oopDesc_klass_offset_in_bytes;
+int CompilerToVM::Data::arrayOopDesc_length_offset_in_bytes;
 
 int CompilerToVM::Data::Klass_vtable_start_offset;
 int CompilerToVM::Data::Klass_vtable_length_offset;
@@ -147,6 +149,9 @@ int CompilerToVM::Data::data_section_item_alignment;
 JVMTI_ONLY( int* CompilerToVM::Data::_should_notify_object_alloc; )
 
 void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
+  oopDesc_klass_offset_in_bytes = oopDesc::klass_offset_in_bytes();
+  arrayOopDesc_length_offset_in_bytes = arrayOopDesc::length_offset_in_bytes();
+
   Klass_vtable_start_offset = in_bytes(Klass::vtable_start_offset());
   Klass_vtable_length_offset = in_bytes(Klass::vtable_length_offset());
 
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index da50a524243..bde157a34e1 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -56,6 +56,9 @@
 #endif
 
 #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
+  static_field(CompilerToVM::Data,             oopDesc_klass_offset_in_bytes,          int)                                          \
+  static_field(CompilerToVM::Data,             arrayOopDesc_length_offset_in_bytes,    int)                                          \
+                                                                                                                                     \
   static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \
   static_field(CompilerToVM::Data,             Klass_vtable_length_offset,             int)                                          \
                                                                                                                                      \
@@ -224,6 +227,7 @@
   nonstatic_field(JavaThread,                  _vthread,                                      OopHandle)                             \
   nonstatic_field(JavaThread,                  _scopedValueCache,                             OopHandle)                             \
   nonstatic_field(JavaThread,                  _anchor,                                       JavaFrameAnchor)                       \
+  nonstatic_field(JavaThread,                  _lock_id,                                      int64_t)                               \
   nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \
   nonstatic_field(JavaThread,                  _stack_overflow_state._stack_overflow_limit,   address)                               \
   volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
@@ -275,6 +279,7 @@
   nonstatic_field(Klass,                       _secondary_supers_bitmap,                      uintx)                                 \
   nonstatic_field(Klass,                       _hash_slot,                                    uint8_t)                               \
   nonstatic_field(Klass,                       _misc_flags._flags,                            u1)                                    \
+  nonstatic_field(Klass,                       _prototype_header,                             markWord)                              \
                                                                                                                                      \
   nonstatic_field(LocalVariableTableElement,   start_bci,                                     u2)                                    \
   nonstatic_field(LocalVariableTableElement,   length,                                        u2)                                    \
@@ -323,11 +328,12 @@
                                                                                                                                      \
   nonstatic_field(ObjArrayKlass,               _element_klass,                                Klass*)                                \
                                                                                                                                      \
-  unchecked_nonstatic_field(ObjectMonitor,     _owner,                                        sizeof(void *)) /* NOTE: no type */    \
+  volatile_nonstatic_field(ObjectMonitor,      _owner,                                        int64_t)                               \
   volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intptr_t)                              \
   volatile_nonstatic_field(ObjectMonitor,      _cxq,                                          ObjectWaiter*)                         \
   volatile_nonstatic_field(ObjectMonitor,      _EntryList,                                    ObjectWaiter*)                         \
-  volatile_nonstatic_field(ObjectMonitor,      _succ,                                         JavaThread*)                           \
+  volatile_nonstatic_field(ObjectMonitor,      _succ,                                         int64_t)                               \
+  volatile_nonstatic_field(ObjectMonitor,      _stack_locker,                                 BasicLock*)                            \
                                                                                                                                      \
   volatile_nonstatic_field(oopDesc,            _mark,                                         markWord)                              \
   volatile_nonstatic_field(oopDesc,            _metadata._klass,                              Klass*)                                \
@@ -480,7 +486,6 @@
   declare_constant(CompLevel_full_optimization)                           \
   declare_constant(HeapWordSize)                                          \
   declare_constant(InvocationEntryBci)                                    \
-  declare_constant(LogKlassAlignmentInBytes)                              \
   declare_constant(JVMCINMethodData::SPECULATION_LENGTH_BITS)             \
                                                                           \
   declare_constant(JVM_ACC_WRITTEN_FLAGS)                                 \
@@ -776,7 +781,9 @@
   AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_instruction_and_data_patch)) \
   AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_data_patch))                 \
                                                                           \
+  declare_constant(ObjectMonitor::NO_OWNER)                               \
   declare_constant(ObjectMonitor::ANONYMOUS_OWNER)                        \
+  declare_constant(ObjectMonitor::DEFLATER_MARKER)                        \
                                                                           \
   declare_constant(ReceiverTypeData::receiver_type_row_cell_count)        \
   declare_constant(ReceiverTypeData::receiver0_offset)                    \
@@ -796,6 +803,7 @@
   declare_constant(InvocationCounter::count_increment)                    \
   declare_constant(InvocationCounter::count_shift)                        \
                                                                           \
+  declare_constant(markWord::klass_shift)                                 \
   declare_constant(markWord::hash_shift)                                  \
   declare_constant(markWord::monitor_value)                               \
                                                                           \
@@ -805,6 +813,7 @@
   declare_constant(markWord::hash_mask_in_place)                          \
                                                                           \
   declare_constant(markWord::unlocked_value)                              \
+  declare_constant(markWord::marked_value)                                \
                                                                           \
   declare_constant(markWord::no_hash_in_place)                            \
   declare_constant(markWord::no_lock_in_place)                            \
diff --git a/src/hotspot/share/memory/classLoaderMetaspace.cpp b/src/hotspot/share/memory/classLoaderMetaspace.cpp
index 08bf42da8e3..4bcbb862a5a 100644
--- a/src/hotspot/share/memory/classLoaderMetaspace.cpp
+++ b/src/hotspot/share/memory/classLoaderMetaspace.cpp
@@ -30,17 +30,23 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/internalStats.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "memory/metaspace/metaspaceArena.hpp"
 #include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp"
+#include "memory/metaspace/metaspaceCommon.hpp"
+#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceSettings.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspaceTracer.hpp"
+#include "oops/klass.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"
 
 using metaspace::ChunkManager;
+using metaspace::MetaBlock;
 using metaspace::MetaspaceArena;
+using metaspace::MetaspaceContext;
 using metaspace::ArenaGrowthPolicy;
 using metaspace::RunningCounters;
 using metaspace::InternalStats;
@@ -49,30 +55,35 @@ using metaspace::InternalStats;
 #define LOGFMT_ARGS    p2i(this)
 
 ClassLoaderMetaspace::ClassLoaderMetaspace(Mutex* lock, Metaspace::MetaspaceType space_type) :
+    ClassLoaderMetaspace(lock, space_type,
+                         MetaspaceContext::context_nonclass(),
+                         MetaspaceContext::context_class(),
+                         CompressedKlassPointers::klass_alignment_in_words())
+{}
+
+ClassLoaderMetaspace::ClassLoaderMetaspace(Mutex* lock, Metaspace::MetaspaceType space_type,
+                                           MetaspaceContext* non_class_context,
+                                           MetaspaceContext* class_context,
+                                           size_t klass_alignment_words) :
   _lock(lock),
   _space_type(space_type),
   _non_class_space_arena(nullptr),
   _class_space_arena(nullptr)
 {
-  ChunkManager* const non_class_cm =
-          ChunkManager::chunkmanager_nonclass();
-
   // Initialize non-class Arena
   _non_class_space_arena = new MetaspaceArena(
-      non_class_cm,
+      non_class_context,
       ArenaGrowthPolicy::policy_for_space_type(space_type, false),
-      RunningCounters::used_nonclass_counter(),
-      "non-class sm");
+      Metaspace::min_allocation_alignment_words,
+      "non-class arena");
 
   // If needed, initialize class arena
-  if (Metaspace::using_class_space()) {
-    ChunkManager* const class_cm =
-            ChunkManager::chunkmanager_class();
+  if (class_context != nullptr) {
     _class_space_arena = new MetaspaceArena(
-        class_cm,
+        class_context,
         ArenaGrowthPolicy::policy_for_space_type(space_type, true),
-        RunningCounters::used_class_counter(),
-        "class sm");
+        klass_alignment_words,
+        "class arena");
   }
 
   UL2(debug, "born (nonclass arena: " PTR_FORMAT ", class arena: " PTR_FORMAT ".",
@@ -89,12 +100,28 @@ ClassLoaderMetaspace::~ClassLoaderMetaspace() {
 
 // Allocate word_size words from Metaspace.
 MetaWord* ClassLoaderMetaspace::allocate(size_t word_size, Metaspace::MetadataType mdType) {
+  word_size = align_up(word_size, Metaspace::min_allocation_word_size);
   MutexLocker fcl(lock(), Mutex::_no_safepoint_check_flag);
-  if (Metaspace::is_class_space_allocation(mdType)) {
-    return class_space_arena()->allocate(word_size);
+  MetaBlock result, wastage;
+  const bool is_class = have_class_space_arena() && mdType == Metaspace::ClassType;
+  if (is_class) {
+    assert(word_size >= (sizeof(Klass)/BytesPerWord), "weird size for klass: %zu", word_size);
+    result = class_space_arena()->allocate(word_size, wastage);
   } else {
-    return non_class_space_arena()->allocate(word_size);
+    result = non_class_space_arena()->allocate(word_size, wastage);
   }
+  if (wastage.is_nonempty()) {
+    non_class_space_arena()->deallocate(wastage);
+  }
+#ifdef ASSERT
+  if (result.is_nonempty()) {
+    const bool in_class_arena = class_space_arena() != nullptr ? class_space_arena()->contains(result) : false;
+    const bool in_nonclass_arena = non_class_space_arena()->contains(result);
+    assert((is_class && in_class_arena) || (!is_class && in_class_arena != in_nonclass_arena),
+           "block from neither arena " METABLOCKFORMAT "?", METABLOCKFORMATARGS(result));
+  }
+#endif
+  return result.base();
 }
 
 // Attempt to expand the GC threshold to be good for at least another word_size words
@@ -132,12 +159,15 @@ MetaWord* ClassLoaderMetaspace::expand_and_allocate(size_t word_size, Metaspace:
 // because it is not needed anymore.
 void ClassLoaderMetaspace::deallocate(MetaWord* ptr, size_t word_size) {
   MutexLocker fcl(lock(), Mutex::_no_safepoint_check_flag);
-  const bool is_class = Metaspace::using_class_space() && Metaspace::is_in_class_space(ptr);
-  if (is_class) {
-    class_space_arena()->deallocate(ptr, word_size);
-  } else {
-    non_class_space_arena()->deallocate(ptr, word_size);
+  NOT_LP64(word_size = align_down(word_size, Metaspace::min_allocation_word_size);)
+  MetaBlock bl(ptr, word_size);
+  // Add to class arena only if block is usable for encodable Klass storage.
+  MetaspaceArena* receiving_arena = non_class_space_arena();
+  if (Metaspace::using_class_space() && Metaspace::is_in_class_space(ptr) &&
+      is_aligned(ptr, class_space_arena()->allocation_alignment_bytes())) {
+    receiving_arena = class_space_arena();
   }
+  receiving_arena->deallocate(bl);
   DEBUG_ONLY(InternalStats::inc_num_deallocs();)
 }
 
@@ -180,7 +210,7 @@ void ClassLoaderMetaspace::usage_numbers(size_t* p_used_words, size_t* p_committ
   {
     MutexLocker fcl(lock(), Mutex::_no_safepoint_check_flag);
     usage_numbers(Metaspace::MetadataType::NonClassType, &used_nc, &comm_nc, &cap_nc);
-    if (Metaspace::using_class_space()) {
+    if (have_class_space_arena()) {
       usage_numbers(Metaspace::MetadataType::ClassType, &used_c, &comm_c, &cap_c);
     }
   }
diff --git a/src/hotspot/share/memory/classLoaderMetaspace.hpp b/src/hotspot/share/memory/classLoaderMetaspace.hpp
index 176b8c5082a..aa43e171708 100644
--- a/src/hotspot/share/memory/classLoaderMetaspace.hpp
+++ b/src/hotspot/share/memory/classLoaderMetaspace.hpp
@@ -33,7 +33,9 @@ class outputStream;
 
 namespace metaspace {
   struct ClmsStats;
+  class ClmsTester;
   class MetaspaceArena;
+  class MetaspaceContext;
 }
 
 // A ClassLoaderMetaspace manages MetaspaceArena(s) for a CLD.
@@ -57,6 +59,7 @@ namespace metaspace {
 //                                                               alloc top
 //
 class ClassLoaderMetaspace : public CHeapObj<mtClass> {
+  friend class metaspace::ClmsTester; // for gtests
 
   // A reference to an outside lock, held by the CLD.
   Mutex* const _lock;
@@ -75,8 +78,14 @@ class ClassLoaderMetaspace : public CHeapObj<mtClass> {
   metaspace::MetaspaceArena* non_class_space_arena() const   { return _non_class_space_arena; }
   metaspace::MetaspaceArena* class_space_arena() const       { return _class_space_arena; }
 
-public:
+  bool have_class_space_arena() const { return _class_space_arena != nullptr; }
+
+  ClassLoaderMetaspace(Mutex* lock, Metaspace::MetaspaceType space_type,
+                       metaspace::MetaspaceContext* non_class_context,
+                       metaspace::MetaspaceContext* class_context,
+                       size_t klass_alignment_words);
 
+public:
   ClassLoaderMetaspace(Mutex* lock, Metaspace::MetaspaceType space_type);
 
   ~ClassLoaderMetaspace();
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index f86be4774d5..aa592a3a6aa 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -651,23 +651,41 @@ void Metaspace::ergo_initialize() {
   MaxMetaspaceSize = MAX2(MaxMetaspaceSize, commit_alignment());
 
   if (UseCompressedClassPointers) {
-    // Let CCS size not be larger than 80% of MaxMetaspaceSize. Note that is
+    // Let Class Space not be larger than 80% of MaxMetaspaceSize. Note that is
     // grossly over-dimensioned for most usage scenarios; typical ratio of
     // class space : non class space usage is about 1:6. With many small classes,
     // it can get as low as 1:2. It is not a big deal though since ccs is only
     // reserved and will be committed on demand only.
-    size_t max_ccs_size = 8 * (MaxMetaspaceSize / 10);
-    size_t adjusted_ccs_size = MIN2(CompressedClassSpaceSize, max_ccs_size);
+    const size_t max_ccs_size = 8 * (MaxMetaspaceSize / 10);
+
+    // Sanity check.
+    const size_t max_klass_range = CompressedKlassPointers::max_klass_range_size();
+    assert(max_klass_range >= reserve_alignment(),
+           "Klass range (%zu) must cover at least a full root chunk (%zu)",
+           max_klass_range, reserve_alignment());
+
+    size_t adjusted_ccs_size = MIN3(CompressedClassSpaceSize, max_ccs_size, max_klass_range);
 
     // CCS must be aligned to root chunk size, and be at least the size of one
     //  root chunk.
     adjusted_ccs_size = align_up(adjusted_ccs_size, reserve_alignment());
     adjusted_ccs_size = MAX2(adjusted_ccs_size, reserve_alignment());
 
+    // Print a warning if the adjusted size differs from the users input
+    if (CompressedClassSpaceSize != adjusted_ccs_size) {
+      #define X "CompressedClassSpaceSize adjusted from user input " \
+                "%zu bytes to %zu bytes", CompressedClassSpaceSize, adjusted_ccs_size
+      if (FLAG_IS_CMDLINE(CompressedClassSpaceSize)) {
+        log_warning(metaspace)(X);
+      } else {
+        log_info(metaspace)(X);
+      }
+      #undef X
+    }
+
     // Note: re-adjusting may have us left with a CompressedClassSpaceSize
     //  larger than MaxMetaspaceSize for very small values of MaxMetaspaceSize.
     //  Lets just live with that, its not a big deal.
-
     if (adjusted_ccs_size != CompressedClassSpaceSize) {
       FLAG_SET_ERGO(CompressedClassSpaceSize, adjusted_ccs_size);
       log_info(metaspace)("Setting CompressedClassSpaceSize to " SIZE_FORMAT ".",
@@ -778,6 +796,7 @@ void Metaspace::global_initialize() {
     Metaspace::initialize_class_space(rs);
 
     // Set up compressed class pointer encoding.
+    // In CDS=off mode, we give the JVM some leeway to choose a favorable base/shift combination.
     CompressedKlassPointers::initialize((address)rs.base(), rs.size());
   }
 
@@ -846,9 +865,17 @@ MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
   MetaWord* result = loader_data->metaspace_non_null()->allocate(word_size, mdtype);
 
   if (result != nullptr) {
+#ifdef ASSERT
+    if (using_class_space() && mdtype == ClassType) {
+      assert(is_in_class_space(result) &&
+             is_aligned(result, CompressedKlassPointers::klass_alignment_in_bytes()), "Sanity");
+    } else {
+      assert((is_in_class_space(result) || is_in_nonclass_metaspace(result)) &&
+             is_aligned(result, Metaspace::min_allocation_alignment_bytes), "Sanity");
+    }
+#endif
     // Zero initialize.
     Copy::fill_to_words((HeapWord*)result, word_size, 0);
-
     log_trace(metaspace)("Metaspace::allocate: type %d return " PTR_FORMAT ".", (int)type, p2i(result));
   }
 
diff --git a/src/hotspot/share/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp
index 7076a6a09bb..7adebfd826b 100644
--- a/src/hotspot/share/memory/metaspace.hpp
+++ b/src/hotspot/share/memory/metaspace.hpp
@@ -26,6 +26,7 @@
 #define SHARE_MEMORY_METASPACE_HPP
 
 #include "memory/allocation.hpp"
+#include "memory/virtualspace.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -35,7 +36,6 @@ class MetaspaceShared;
 class MetaspaceTracer;
 class Mutex;
 class outputStream;
-class ReservedSpace;
 
 ////////////////// Metaspace ///////////////////////
 
@@ -108,6 +108,17 @@ class Metaspace : public AllStatic {
   // The largest possible single allocation
   static size_t max_allocation_word_size();
 
+  // Minimum allocation alignment, in bytes. All MetaData shall be aligned correctly
+  // to be able to hold 64-bit data types. Unlike malloc, we don't care for larger
+  // data types.
+  static constexpr size_t min_allocation_alignment_bytes = sizeof(uint64_t);
+
+  // Minimum allocation alignment, in words, Metaspace observes.
+  static constexpr size_t min_allocation_alignment_words = min_allocation_alignment_bytes / BytesPerWord;
+
+  // Every allocation will get rounded up to the minimum word size.
+  static constexpr size_t min_allocation_word_size = min_allocation_alignment_words;
+
   static MetaWord* allocate(ClassLoaderData* loader_data, size_t word_size,
                             MetaspaceObj::Type type, bool use_class_space, TRAPS);
 
diff --git a/src/hotspot/share/memory/metaspace/binList.hpp b/src/hotspot/share/memory/metaspace/binList.hpp
index 76cd9e155aa..9442ea3cd52 100644
--- a/src/hotspot/share/memory/metaspace/binList.hpp
+++ b/src/hotspot/share/memory/metaspace/binList.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +28,7 @@
 #define SHARE_MEMORY_METASPACE_BINLIST_HPP
 
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
@@ -36,8 +37,7 @@
 namespace metaspace {
 
 // BinList is a data structure to manage small to very small memory blocks
-// (only a few words). It is used to manage deallocated blocks - see
-// class FreeBlocks.
+// (only a few words). It is used to manage deallocated small blocks.
 
 // Memory blocks are kept in a vector of linked lists of equi-sized blocks:
 //
@@ -143,7 +143,10 @@ class BinListImpl {
     }
   }
 
-  void add_block(MetaWord* p, size_t word_size) {
+  void add_block(MetaBlock mb) {
+    assert(!mb.is_empty(), "Don't add empty blocks");
+    const size_t word_size = mb.word_size();
+    MetaWord* const p = mb.base();
     assert(word_size >= MinWordSize &&
            word_size <= MaxWordSize, "bad block size");
     DEBUG_ONLY(write_canary(p, word_size);)
@@ -155,10 +158,11 @@ class BinListImpl {
   }
 
   // Given a word_size, searches and returns a block of at least that size.
-  // Block may be larger. Real block size is returned in *p_real_word_size.
-  MetaWord* remove_block(size_t word_size, size_t* p_real_word_size) {
+  // Block may be larger.
+  MetaBlock remove_block(size_t word_size) {
     assert(word_size >= MinWordSize &&
            word_size <= MaxWordSize, "bad block size " SIZE_FORMAT ".", word_size);
+    MetaBlock result;
     int index = index_for_word_size(word_size);
     index = index_for_next_non_empty_list(index);
     if (index != -1) {
@@ -169,12 +173,9 @@ class BinListImpl {
              "bad block in list[%d] (" BLOCK_FORMAT ")", index, BLOCK_FORMAT_ARGS(b, real_word_size));
       _blocks[index] = b->_next;
       _counter.sub(real_word_size);
-      *p_real_word_size = real_word_size;
-      return (MetaWord*)b;
-    } else {
-      *p_real_word_size = 0;
-      return nullptr;
+      result = MetaBlock((MetaWord*)b, real_word_size);
     }
+    return result;
   }
 
   // Returns number of blocks in this structure
@@ -191,9 +192,12 @@ class BinListImpl {
     for (int i = 0; i < num_lists; i++) {
       const size_t s = word_size_for_index(i);
       int pos = 0;
+      Block* b_last = nullptr; // catch simple circularities
       for (Block* b = _blocks[i]; b != nullptr; b = b->_next, pos++) {
         assert(check_canary(b, s), "");
+        assert(b != b_last, "Circle");
         local_counter.add(s);
+        b_last = b;
       }
     }
     local_counter.check(_counter);
diff --git a/src/hotspot/share/memory/metaspace/blockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp
index 1f1e54f4a46..85e77508836 100644
--- a/src/hotspot/share/memory/metaspace/blockTree.cpp
+++ b/src/hotspot/share/memory/metaspace/blockTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -180,8 +180,8 @@ void BlockTree::verify() const {
   _counter.check(counter);
 }
 
-void BlockTree::zap_range(MetaWord* p, size_t word_size) {
-  memset(p, 0xF3, word_size * sizeof(MetaWord));
+void BlockTree::zap_block(MetaBlock bl) {
+  memset(bl.base(), 0xF3, bl.word_size() * sizeof(MetaWord));
 }
 
 void BlockTree::print_tree(outputStream* st) const {
@@ -224,6 +224,12 @@ void BlockTree::print_tree(outputStream* st) const {
         }
       }
 
+      // Handle simple circularities
+      if (n == n->_right || n == n->_left || n == n->_next) {
+        st->print_cr("@" PTR_FORMAT ": circularity detected.", p2i(n));
+        return; // stop printing
+      }
+
       // Handle children.
       if (n->_right != nullptr) {
         walkinfo info2;
diff --git a/src/hotspot/share/memory/metaspace/blockTree.hpp b/src/hotspot/share/memory/metaspace/blockTree.hpp
index c5dd48926ac..8bcdd30919a 100644
--- a/src/hotspot/share/memory/metaspace/blockTree.hpp
+++ b/src/hotspot/share/memory/metaspace/blockTree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,13 +29,14 @@
 #include "memory/allocation.hpp"
 #include "memory/metaspace/chunklevel.hpp"
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 namespace metaspace {
 
 // BlockTree is a rather simple binary search tree. It is used to
-//  manage small to medium free memory blocks (see class FreeBlocks).
+//  manage medium to large free memory blocks.
 //
 // There is no separation between payload (managed blocks) and nodes: the
 //  memory blocks themselves are the nodes, with the block size being the key.
@@ -80,8 +81,7 @@ class BlockTree: public CHeapObj<mtMetaspace> {
         NOT_LP64(0x4e4f4445) LP64_ONLY(0x4e4f44454e4f4445ULL); // "NODE" resp "NODENODE"
 
     // Note: we afford us the luxury of an always-there canary value.
-    //  The space for that is there (these nodes are only used to manage larger blocks,
-    //  see FreeBlocks::MaxSmallBlocksWordSize).
+    //  The space for that is there (these nodes are only used to manage larger blocks).
     //  It is initialized in debug and release, but only automatically tested
     //  in debug.
     const intptr_t _canary;
@@ -335,7 +335,7 @@ class BlockTree: public CHeapObj<mtMetaspace> {
   }
 
 #ifdef ASSERT
-  void zap_range(MetaWord* p, size_t word_size);
+  void zap_block(MetaBlock block);
   // Helper for verify()
   void verify_node_pointer(const Node* n) const;
 #endif // ASSERT
@@ -345,10 +345,11 @@ class BlockTree: public CHeapObj<mtMetaspace> {
   BlockTree() : _root(nullptr) {}
 
   // Add a memory block to the tree. Its content will be overwritten.
-  void add_block(MetaWord* p, size_t word_size) {
-    DEBUG_ONLY(zap_range(p, word_size));
+  void add_block(MetaBlock block) {
+    DEBUG_ONLY(zap_block(block);)
+    const size_t word_size = block.word_size();
     assert(word_size >= MinWordSize, "invalid block size " SIZE_FORMAT, word_size);
-    Node* n = new(p) Node(word_size);
+    Node* n = new(block.base()) Node(word_size);
     if (_root == nullptr) {
       _root = n;
     } else {
@@ -358,11 +359,11 @@ class BlockTree: public CHeapObj<mtMetaspace> {
   }
 
   // Given a word_size, search and return the smallest block that is equal or
-  //  larger than that size. Upon return, *p_real_word_size contains the actual
-  //  block size.
-  MetaWord* remove_block(size_t word_size, size_t* p_real_word_size) {
+  //  larger than that size.
+  MetaBlock remove_block(size_t word_size) {
     assert(word_size >= MinWordSize, "invalid block size " SIZE_FORMAT, word_size);
 
+    MetaBlock result;
     Node* n = find_closest_fit(word_size);
 
     if (n != nullptr) {
@@ -379,15 +380,13 @@ class BlockTree: public CHeapObj<mtMetaspace> {
         remove_node_from_tree(n);
       }
 
-      MetaWord* p = (MetaWord*)n;
-      *p_real_word_size = n->_word_size;
+      result = MetaBlock((MetaWord*)n, n->_word_size);
 
       _counter.sub(n->_word_size);
 
-      DEBUG_ONLY(zap_range(p, n->_word_size));
-      return p;
+      DEBUG_ONLY(zap_block(result);)
     }
-    return nullptr;
+    return result;
   }
 
   // Returns number of blocks in this structure
diff --git a/src/hotspot/share/memory/metaspace/freeBlocks.cpp b/src/hotspot/share/memory/metaspace/freeBlocks.cpp
index b6a281f0db7..ab65387043a 100644
--- a/src/hotspot/share/memory/metaspace/freeBlocks.cpp
+++ b/src/hotspot/share/memory/metaspace/freeBlocks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,32 +30,23 @@
 
 namespace metaspace {
 
-void FreeBlocks::add_block(MetaWord* p, size_t word_size) {
-  if (word_size > MaxSmallBlocksWordSize) {
-    _tree.add_block(p, word_size);
+void FreeBlocks::add_block(MetaBlock bl) {
+  if (bl.word_size() > _small_blocks.MaxWordSize) {
+    _tree.add_block(bl);
   } else {
-    _small_blocks.add_block(p, word_size);
+    _small_blocks.add_block(bl);
   }
 }
 
-MetaWord* FreeBlocks::remove_block(size_t requested_word_size) {
+MetaBlock FreeBlocks::remove_block(size_t requested_word_size) {
   size_t real_size = 0;
-  MetaWord* p = nullptr;
-  if (requested_word_size > MaxSmallBlocksWordSize) {
-    p = _tree.remove_block(requested_word_size, &real_size);
+  MetaBlock bl;
+  if (requested_word_size > _small_blocks.MaxWordSize) {
+    bl = _tree.remove_block(requested_word_size);
   } else {
-    p = _small_blocks.remove_block(requested_word_size, &real_size);
+    bl = _small_blocks.remove_block(requested_word_size);
   }
-  if (p != nullptr) {
-    // Blocks which are larger than a certain threshold are split and
-    //  the remainder is handed back to the manager.
-    const size_t waste = real_size - requested_word_size;
-    if (waste >= MinWordSize) {
-      add_block(p + requested_word_size, waste);
-    }
-  }
-  return p;
+  return bl;
 }
 
 } // namespace metaspace
-
diff --git a/src/hotspot/share/memory/metaspace/freeBlocks.hpp b/src/hotspot/share/memory/metaspace/freeBlocks.hpp
index d5a3c29a9d7..77ab48e17ea 100644
--- a/src/hotspot/share/memory/metaspace/freeBlocks.hpp
+++ b/src/hotspot/share/memory/metaspace/freeBlocks.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -73,20 +73,16 @@ class FreeBlocks : public CHeapObj<mtMetaspace> {
   // kept in the blocktree.
   STATIC_ASSERT(BinList32::MaxWordSize >= BlockTree::MinWordSize);
 
-  // Cutoff point: blocks larger than this size are kept in the
-  // tree, blocks smaller than or equal to this size in the bin list.
-  const size_t MaxSmallBlocksWordSize = BinList32::MaxWordSize;
-
 public:
 
   // Smallest blocks we can keep in this structure.
   const static size_t MinWordSize = BinList32::MinWordSize;
 
   // Add a block to the deallocation management.
-  void add_block(MetaWord* p, size_t word_size);
+  void add_block(MetaBlock bl);
 
-  // Retrieve a block of at least requested_word_size.
-  MetaWord* remove_block(size_t requested_word_size);
+  // Retrieve a block of at least requested_word_size. May be larger.
+  MetaBlock remove_block(size_t requested_word_size);
 
 #ifdef ASSERT
   void verify() const {
diff --git a/src/hotspot/share/memory/metaspace/metablock.hpp b/src/hotspot/share/memory/metaspace/metablock.hpp
new file mode 100644
index 00000000000..96e27ff8702
--- /dev/null
+++ b/src/hotspot/share/memory/metaspace/metablock.hpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_MEMORY_METASPACE_METABLOCK_HPP
+#define SHARE_MEMORY_METASPACE_METABLOCK_HPP
+
+#include "utilities/globalDefinitions.hpp"
+
+class outputStream;
+
+namespace metaspace {
+
+// Tiny structure to be passed by value
+class MetaBlock {
+
+  MetaWord* _base;
+  size_t _word_size;
+
+public:
+
+  MetaBlock(MetaWord* p, size_t word_size) :
+    _base(word_size == 0 ? nullptr : p), _word_size(word_size) {}
+  MetaBlock() : MetaBlock(nullptr, 0) {}
+
+  MetaWord* base() const { return _base; }
+  const MetaWord* end() const { return _base + _word_size; }
+  size_t word_size() const { return _word_size; }
+  bool is_empty() const { return _base == nullptr; }
+  bool is_nonempty() const { return _base != nullptr; }
+  void reset() { _base = nullptr; _word_size = 0; }
+
+  bool operator==(const MetaBlock& rhs) const {
+    return base() == rhs.base() &&
+           word_size() == rhs.word_size();
+  }
+
+  // Split off tail block.
+  inline MetaBlock split_off_tail(size_t tailsize);
+
+  DEBUG_ONLY(inline void verify() const;)
+
+  // Convenience functions
+  inline bool is_aligned_base(size_t alignment_words) const;
+  inline bool is_aligned_size(size_t alignment_words) const;
+
+  void print_on(outputStream* st) const;
+};
+
+#define METABLOCKFORMAT                 "block (@" PTR_FORMAT " word size " SIZE_FORMAT ")"
+#define METABLOCKFORMATARGS(__block__)  p2i((__block__).base()), (__block__).word_size()
+
+} // namespace metaspace
+
+#endif // SHARE_MEMORY_METASPACE_METABLOCK_HPP
diff --git a/src/hotspot/share/memory/metaspace/metablock.inline.hpp b/src/hotspot/share/memory/metaspace/metablock.inline.hpp
new file mode 100644
index 00000000000..04eb6c22277
--- /dev/null
+++ b/src/hotspot/share/memory/metaspace/metablock.inline.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_MEMORY_METASPACE_METABLOCK_INLINE_HPP
+#define SHARE_MEMORY_METASPACE_METABLOCK_INLINE_HPP
+
+#include "memory/metaspace/metablock.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/align.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/debug.hpp"
+
+class outputStream;
+
+namespace metaspace {
+
+inline MetaBlock MetaBlock::split_off_tail(size_t tailsize) {
+  if (is_empty() || tailsize == 0) {
+    return MetaBlock();
+  }
+  assert(tailsize <= _word_size, "invalid split point for block "
+         METABLOCKFORMAT ": %zu", METABLOCKFORMATARGS(*this), tailsize);
+  const size_t new_size = _word_size - tailsize;
+  MetaBlock tail(_base + new_size, tailsize);
+  _word_size = new_size;
+  if (_word_size == 0) {
+    _base = nullptr;
+  }
+  return tail;
+}
+
+inline void MetaBlock::print_on(outputStream* st) const {
+  st->print(METABLOCKFORMAT, METABLOCKFORMATARGS(*this));
+}
+
+// Convenience functions
+inline bool MetaBlock::is_aligned_base(size_t alignment_words) const {
+  return is_aligned(_base, alignment_words * BytesPerWord);
+}
+
+inline bool MetaBlock::is_aligned_size(size_t alignment_words) const {
+  return is_aligned(_word_size, alignment_words);
+}
+
+// some convenience asserts
+#define assert_block_base_aligned(block, alignment_words) \
+  assert(block.is_aligned_base(alignment_words), "Block wrong base alignment " METABLOCKFORMAT, METABLOCKFORMATARGS(block));
+
+#define assert_block_size_aligned(block, alignment_words) \
+  assert(block.is_aligned_size(alignment_words), "Block wrong size alignment " METABLOCKFORMAT, METABLOCKFORMATARGS(block));
+
+#define assert_block_larger_or_equal(block, x) \
+  assert(block.word_size() >= x, "Block too small " METABLOCKFORMAT, METABLOCKFORMATARGS(block));
+
+#ifdef ASSERT
+inline void MetaBlock::verify() const {
+  assert( (_base == nullptr && _word_size == 0) ||
+          (_base != nullptr && _word_size > 0),
+          "block invalid " METABLOCKFORMAT, METABLOCKFORMATARGS(*this));
+}
+#endif
+
+} // namespace metaspace
+
+#endif // SHARE_MEMORY_METASPACE_METABLOCK_INLINE_HPP
diff --git a/src/hotspot/share/memory/metaspace/metaspaceArena.cpp b/src/hotspot/share/memory/metaspace/metaspaceArena.cpp
index 92d7d0ea7eb..33f1bfc46a3 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceArena.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceArena.cpp
@@ -30,10 +30,12 @@
 #include "memory/metaspace/counters.hpp"
 #include "memory/metaspace/freeBlocks.hpp"
 #include "memory/metaspace/internalStats.hpp"
+#include "memory/metaspace/metablock.inline.hpp"
 #include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceArena.hpp"
 #include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
+#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceSettings.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
@@ -56,24 +58,25 @@ chunklevel_t MetaspaceArena::next_chunk_level() const {
   return _growth_policy->get_level_at_step(growth_step);
 }
 
-// Given a chunk, add its remaining free committed space to the free block list.
-void MetaspaceArena::salvage_chunk(Metachunk* c) {
-  size_t remaining_words = c->free_below_committed_words();
+// Given a chunk, return the committed remainder of this chunk.
+MetaBlock MetaspaceArena::salvage_chunk(Metachunk* c) {
+  MetaBlock result;
+  const size_t remaining_words = c->free_below_committed_words();
   if (remaining_words >= FreeBlocks::MinWordSize) {
 
     UL2(trace, "salvaging chunk " METACHUNK_FULL_FORMAT ".", METACHUNK_FULL_FORMAT_ARGS(c));
 
     MetaWord* ptr = c->allocate(remaining_words);
     assert(ptr != nullptr, "Should have worked");
-    _total_used_words_counter->increment_by(remaining_words);
 
-    add_allocation_to_fbl(ptr, remaining_words);
+    result = MetaBlock(ptr, remaining_words);
 
     // After this operation: the chunk should have no free committed space left.
     assert(c->free_below_committed_words() == 0,
            "Salvaging chunk failed (chunk " METACHUNK_FULL_FORMAT ").",
            METACHUNK_FULL_FORMAT_ARGS(c));
   }
+  return result;
 }
 
 // Allocate a new chunk from the underlying chunk manager able to hold at least
@@ -97,28 +100,35 @@ Metachunk* MetaspaceArena::allocate_new_chunk(size_t requested_word_size) {
   return c;
 }
 
-void MetaspaceArena::add_allocation_to_fbl(MetaWord* p, size_t word_size) {
-  assert(p != nullptr, "p is null");
-  assert_is_aligned_metaspace_pointer(p);
-  assert(word_size > 0, "zero sized");
-
+void MetaspaceArena::add_allocation_to_fbl(MetaBlock bl) {
+  assert(bl.is_nonempty(), "Sanity");
+  assert_block_base_aligned(bl, allocation_alignment_words());
+  assert_block_size_aligned(bl, Metaspace::min_allocation_alignment_words);
   if (_fbl == nullptr) {
     _fbl = new FreeBlocks(); // Create only on demand
   }
-  _fbl->add_block(p, word_size);
+  _fbl->add_block(bl);
 }
 
-MetaspaceArena::MetaspaceArena(ChunkManager* chunk_manager, const ArenaGrowthPolicy* growth_policy,
-                               SizeAtomicCounter* total_used_words_counter,
-                               const char* name) :
-  _chunk_manager(chunk_manager),
+MetaspaceArena::MetaspaceArena(MetaspaceContext* context,
+               const ArenaGrowthPolicy* growth_policy,
+               size_t allocation_alignment_words,
+               const char* name) :
+  _allocation_alignment_words(allocation_alignment_words),
+  _chunk_manager(context->cm()),
   _growth_policy(growth_policy),
   _chunks(),
   _fbl(nullptr),
-  _total_used_words_counter(total_used_words_counter),
+  _total_used_words_counter(context->used_words_counter()),
   _name(name)
 {
-  UL(debug, ": born.");
+  // Check arena allocation alignment
+  assert(is_power_of_2(_allocation_alignment_words) &&
+         _allocation_alignment_words >= Metaspace::min_allocation_alignment_words &&
+         _allocation_alignment_words <= chunklevel::MIN_CHUNK_WORD_SIZE,
+         "Invalid alignment: %zu", _allocation_alignment_words);
+
+  UL(debug, "born.");
 
   // Update statistics
   InternalStats::inc_num_arena_births();
@@ -140,7 +150,7 @@ MetaspaceArena::~MetaspaceArena() {
     c = c2;
   }
 
-  UL2(info, "returned %d chunks, total capacity " SIZE_FORMAT " words.",
+  UL2(debug, "returned %d chunks, total capacity " SIZE_FORMAT " words.",
       return_counter.count(), return_counter.total_size());
 
   _total_used_words_counter->decrement_by(return_counter.total_size());
@@ -205,49 +215,93 @@ bool MetaspaceArena::attempt_enlarge_current_chunk(size_t requested_word_size) {
 // 3) Attempt to enlarge the current chunk in place if it is too small.
 // 4) Attempt to get a new chunk and allocate from that chunk.
 // At any point, if we hit a commit limit, we return null.
-MetaWord* MetaspaceArena::allocate(size_t requested_word_size) {
+MetaBlock MetaspaceArena::allocate(size_t requested_word_size, MetaBlock& wastage) {
   UL2(trace, "requested " SIZE_FORMAT " words.", requested_word_size);
 
-  MetaWord* p = nullptr;
   const size_t aligned_word_size = get_raw_word_size_for_requested_word_size(requested_word_size);
 
+  MetaBlock result;
+  bool taken_from_fbl = false;
+
   // Before bothering the arena proper, attempt to re-use a block from the free blocks list
   if (_fbl != nullptr && !_fbl->is_empty()) {
-    p = _fbl->remove_block(aligned_word_size);
-    if (p != nullptr) {
+    result = _fbl->remove_block(aligned_word_size);
+    if (result.is_nonempty()) {
+      assert_block_larger_or_equal(result, aligned_word_size);
+      assert_block_base_aligned(result, allocation_alignment_words());
+      assert_block_size_aligned(result, Metaspace::min_allocation_alignment_words);
+      // Split off wastage
+      wastage = result.split_off_tail(result.word_size() - aligned_word_size);
+      // Stats, logging
       DEBUG_ONLY(InternalStats::inc_num_allocs_from_deallocated_blocks();)
-      UL2(trace, "returning " PTR_FORMAT " - taken from fbl (now: %d, " SIZE_FORMAT ").",
-          p2i(p), _fbl->count(), _fbl->total_size());
-      assert_is_aligned_metaspace_pointer(p);
+      UL2(trace, "returning " METABLOCKFORMAT " with wastage " METABLOCKFORMAT " - taken from fbl (now: %d, " SIZE_FORMAT ").",
+          METABLOCKFORMATARGS(result), METABLOCKFORMATARGS(wastage), _fbl->count(), _fbl->total_size());
       // Note: free blocks in freeblock dictionary still count as "used" as far as statistics go;
-      // therefore we have no need to adjust any usage counters (see epilogue of allocate_inner())
-      // and can just return here.
-      return p;
+      // therefore we don't need to adjust any usage counters (see epilogue of allocate_inner()).
+      taken_from_fbl = true;
     }
   }
 
-  // Primary allocation
-  p = allocate_inner(aligned_word_size);
+  if (result.is_empty()) {
+    // Free-block allocation failed; we allocate from the arena.
+    result = allocate_inner(aligned_word_size, wastage);
+  }
 
-  return p;
+  // Logging
+  if (result.is_nonempty()) {
+    LogTarget(Trace, metaspace) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      ls.print(LOGFMT ": returning " METABLOCKFORMAT " taken from %s, ", LOGFMT_ARGS,
+               METABLOCKFORMATARGS(result), (taken_from_fbl ? "fbl" : "arena"));
+      if (wastage.is_empty()) {
+        ls.print("no wastage");
+      } else {
+        ls.print("wastage " METABLOCKFORMAT, METABLOCKFORMATARGS(wastage));
+      }
+    }
+  } else {
+    UL(info, "allocation failed, returned null.");
+  }
+
+  // Final sanity checks
+#ifdef ASSERT
+   result.verify();
+   wastage.verify();
+   if (result.is_nonempty()) {
+     assert(result.word_size() == aligned_word_size &&
+            is_aligned(result.base(), _allocation_alignment_words * BytesPerWord),
+            "result bad or unaligned: " METABLOCKFORMAT ".", METABLOCKFORMATARGS(result));
+   }
+   if (wastage.is_nonempty()) {
+     assert(wastage.is_empty() ||
+            (wastage.is_aligned_base(Metaspace::min_allocation_alignment_words) &&
+             wastage.is_aligned_size(Metaspace::min_allocation_alignment_words)),
+            "Misaligned wastage: " METABLOCKFORMAT".", METABLOCKFORMATARGS(wastage));
+   }
+#endif // ASSERT
+   return result;
 }
 
 // Allocate from the arena proper, once dictionary allocations and fencing are sorted out.
-MetaWord* MetaspaceArena::allocate_inner(size_t word_size) {
-  assert_is_aligned(word_size, metaspace::AllocationAlignmentWordSize);
+MetaBlock MetaspaceArena::allocate_inner(size_t word_size, MetaBlock& wastage) {
 
-  MetaWord* p = nullptr;
+  MetaBlock result;
   bool current_chunk_too_small = false;
   bool commit_failure = false;
+  size_t alignment_gap_size = 0;
 
   if (current_chunk() != nullptr) {
-
     // Attempt to satisfy the allocation from the current chunk.
 
+    const MetaWord* const chunk_top = current_chunk()->top();
+    alignment_gap_size = align_up(chunk_top, _allocation_alignment_words * BytesPerWord) - chunk_top;
+    const size_t word_size_plus_alignment = word_size + alignment_gap_size;
+
     // If the current chunk is too small to hold the requested size, attempt to enlarge it.
     // If that fails, retire the chunk.
-    if (current_chunk()->free_words() < word_size) {
-      if (!attempt_enlarge_current_chunk(word_size)) {
+    if (current_chunk()->free_words() < word_size_plus_alignment) {
+      if (!attempt_enlarge_current_chunk(word_size_plus_alignment)) {
         current_chunk_too_small = true;
       } else {
         DEBUG_ONLY(InternalStats::inc_num_chunks_enlarged();)
@@ -259,20 +313,26 @@ MetaWord* MetaspaceArena::allocate_inner(size_t word_size) {
     // hit a limit (either GC threshold or MaxMetaspaceSize). In that case retire the
     // chunk.
     if (!current_chunk_too_small) {
-      if (!current_chunk()->ensure_committed_additional(word_size)) {
-        UL2(info, "commit failure (requested size: " SIZE_FORMAT ")", word_size);
+      if (!current_chunk()->ensure_committed_additional(word_size_plus_alignment)) {
+        UL2(info, "commit failure (requested size: " SIZE_FORMAT ")", word_size_plus_alignment);
         commit_failure = true;
       }
     }
 
     // Allocate from the current chunk. This should work now.
     if (!current_chunk_too_small && !commit_failure) {
-      p = current_chunk()->allocate(word_size);
-      assert(p != nullptr, "Allocation from chunk failed.");
+      MetaWord* const p_gap = current_chunk()->allocate(word_size_plus_alignment);
+      assert(p_gap != nullptr, "Allocation from chunk failed.");
+      MetaWord* const p_user_allocation = p_gap + alignment_gap_size;
+      result = MetaBlock(p_user_allocation, word_size);
+      if (alignment_gap_size > 0) {
+        NOT_LP64(assert(alignment_gap_size >= AllocationAlignmentWordSize, "Sanity"));
+        wastage = MetaBlock(p_gap, alignment_gap_size);
+      }
     }
   }
 
-  if (p == nullptr) {
+  if (result.is_empty()) {
     // If we are here, we either had no current chunk to begin with or it was deemed insufficient.
     assert(current_chunk() == nullptr ||
            current_chunk_too_small || commit_failure, "Sanity");
@@ -286,63 +346,69 @@ MetaWord* MetaspaceArena::allocate_inner(size_t word_size) {
 
       // We have a new chunk. Before making it the current chunk, retire the old one.
       if (current_chunk() != nullptr) {
-        salvage_chunk(current_chunk());
+        wastage = salvage_chunk(current_chunk());
         DEBUG_ONLY(InternalStats::inc_num_chunks_retired();)
       }
 
       _chunks.add(new_chunk);
 
-      // Now, allocate from that chunk. That should work.
-      p = current_chunk()->allocate(word_size);
+      // Now, allocate from that chunk. That should work. Note that the resulting allocation
+      // is guaranteed to be aligned to arena alignment, since arena alignment cannot be larger
+      // than smallest chunk size, and chunk starts are aligned by their size (buddy allocation).
+      MetaWord* const p = current_chunk()->allocate(word_size);
       assert(p != nullptr, "Allocation from chunk failed.");
+      result = MetaBlock(p, word_size);
     } else {
       UL2(info, "failed to allocate new chunk for requested word size " SIZE_FORMAT ".", word_size);
     }
   }
 
-  if (p == nullptr) {
+  if (result.is_empty()) {
     InternalStats::inc_num_allocs_failed_limit();
   } else {
     DEBUG_ONLY(InternalStats::inc_num_allocs();)
-    _total_used_words_counter->increment_by(word_size);
+    _total_used_words_counter->increment_by(word_size + wastage.word_size());
   }
 
   SOMETIMES(verify();)
 
-  if (p == nullptr) {
-    UL(info, "allocation failed, returned null.");
-  } else {
+  if (result.is_nonempty()) {
     UL2(trace, "after allocation: %u chunk(s), current:" METACHUNK_FULL_FORMAT,
         _chunks.count(), METACHUNK_FULL_FORMAT_ARGS(current_chunk()));
-    UL2(trace, "returning " PTR_FORMAT ".", p2i(p));
   }
 
-  assert_is_aligned_metaspace_pointer(p);
+#ifdef ASSERT
+  if (wastage.is_nonempty()) {
+    // Wastage from arena allocations only occurs if either or both are true:
+    // - it is too small to hold the requested allocation words
+    // - it is misaligned
+    assert(!wastage.is_aligned_base(allocation_alignment_words()) ||
+           wastage.word_size() < word_size,
+           "Unexpected wastage: " METABLOCKFORMAT ", arena alignment: %zu, allocation word size: %zu",
+           METABLOCKFORMATARGS(wastage), allocation_alignment_words(), word_size);
+    wastage.verify();
+  }
+#endif // ASSERT
 
-  return p;
+  return result;
 }
 
 // Prematurely returns a metaspace allocation to the _block_freelists
 // because it is not needed anymore (requires CLD lock to be active).
-void MetaspaceArena::deallocate(MetaWord* p, size_t word_size) {
-  // At this point a current chunk must exist since we only deallocate if we did allocate before.
-  assert(current_chunk() != nullptr, "stray deallocation?");
-  assert(is_valid_area(p, word_size),
-         "Pointer range not part of this Arena and cannot be deallocated: (" PTR_FORMAT ".." PTR_FORMAT ").",
-         p2i(p), p2i(p + word_size));
-
-  UL2(trace, "deallocating " PTR_FORMAT ", word size: " SIZE_FORMAT ".",
-      p2i(p), word_size);
-
-  // Only blocks that had been allocated via MetaspaceArena::allocate(size) must be handed in
-  // to MetaspaceArena::deallocate(), and only with the same size that had been original used for allocation.
-  // Therefore the pointer must be aligned correctly, and size can be alignment-adjusted (the latter
-  // only matters on 32-bit):
-  assert_is_aligned_metaspace_pointer(p);
-  size_t raw_word_size = get_raw_word_size_for_requested_word_size(word_size);
-
-  add_allocation_to_fbl(p, raw_word_size);
-
+void MetaspaceArena::deallocate(MetaBlock block) {
+  // Note that we may receive blocks that don't originate from this
+  // arena, and that is okay.
+  DEBUG_ONLY(block.verify();)
+  // This only matters on 32-bit:
+  // Since we always align up allocations from arena, we align up here, too.
+#ifndef _LP64
+  MetaBlock raw_block(block.base(), get_raw_word_size_for_requested_word_size(block.word_size()));
+  add_allocation_to_fbl(raw_block);
+#else
+  add_allocation_to_fbl(block);
+#endif
+  UL2(trace, "added to fbl: " METABLOCKFORMAT ", (now: %d, " SIZE_FORMAT ").",
+      METABLOCKFORMATARGS(block), _fbl->count(), _fbl->total_size());
   SOMETIMES(verify();)
 }
 
@@ -400,15 +466,15 @@ void MetaspaceArena::verify() const {
   }
 }
 
-// Returns true if the area indicated by pointer and size have actually been allocated
-// from this arena.
-bool MetaspaceArena::is_valid_area(MetaWord* p, size_t word_size) const {
-  assert(p != nullptr && word_size > 0, "Sanity");
+// Returns true if the given block is contained in this arena
+bool MetaspaceArena::contains(MetaBlock bl) const {
+  DEBUG_ONLY(bl.verify();)
+  assert(bl.is_nonempty(), "Sanity");
   bool found = false;
   for (const Metachunk* c = _chunks.first(); c != nullptr && !found; c = c->next()) {
-    assert(c->is_valid_committed_pointer(p) ==
-           c->is_valid_committed_pointer(p + word_size - 1), "range intersects");
-    found = c->is_valid_committed_pointer(p);
+    assert(c->is_valid_committed_pointer(bl.base()) ==
+           c->is_valid_committed_pointer(bl.end() - 1), "range intersects");
+    found = c->is_valid_committed_pointer(bl.base());
   }
   return found;
 }
diff --git a/src/hotspot/share/memory/metaspace/metaspaceArena.hpp b/src/hotspot/share/memory/metaspace/metaspaceArena.hpp
index 77eb939c6b4..75d1ec5318c 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceArena.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceArena.hpp
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "memory/metaspace/metachunkList.hpp"
 
 class outputStream;
@@ -37,11 +38,12 @@ class Mutex;
 namespace metaspace {
 
 class ArenaGrowthPolicy;
+struct ArenaStats;
 class ChunkManager;
-class Metachunk;
 class FreeBlocks;
+class Metachunk;
+class MetaspaceContext;
 
-struct ArenaStats;
 
 // The MetaspaceArena is a growable metaspace memory pool belonging to a CLD;
 //  internally it consists of a list of metaspace chunks, of which the head chunk
@@ -74,10 +76,14 @@ struct ArenaStats;
 //
 
 class MetaspaceArena : public CHeapObj<mtClass> {
+  friend class MetaspaceArenaTestFriend;
 
   // Please note that access to a metaspace arena may be shared
   // between threads and needs to be synchronized in CLMS.
 
+  // Allocation alignment specific to this arena
+  const size_t _allocation_alignment_words;
+
   // Reference to the chunk manager to allocate chunks from.
   ChunkManager* const _chunk_manager;
 
@@ -104,10 +110,10 @@ class MetaspaceArena : public CHeapObj<mtClass> {
 
   // free block list
   FreeBlocks* fbl() const                       { return _fbl; }
-  void add_allocation_to_fbl(MetaWord* p, size_t word_size);
+  void add_allocation_to_fbl(MetaBlock bl);
 
-  // Given a chunk, add its remaining free committed space to the free block list.
-  void salvage_chunk(Metachunk* c);
+  // Given a chunk, return the committed remainder of this chunk.
+  MetaBlock salvage_chunk(Metachunk* c);
 
   // Allocate a new chunk from the underlying chunk manager able to hold at least
   // requested word size.
@@ -122,32 +128,31 @@ class MetaspaceArena : public CHeapObj<mtClass> {
   // On success, true is returned, false otherwise.
   bool attempt_enlarge_current_chunk(size_t requested_word_size);
 
-  // Returns true if the area indicated by pointer and size have actually been allocated
-  // from this arena.
-  DEBUG_ONLY(bool is_valid_area(MetaWord* p, size_t word_size) const;)
-
   // Allocate from the arena proper, once dictionary allocations and fencing are sorted out.
-  MetaWord* allocate_inner(size_t word_size);
+  MetaBlock allocate_inner(size_t word_size, MetaBlock& wastage);
 
 public:
 
-  MetaspaceArena(ChunkManager* chunk_manager, const ArenaGrowthPolicy* growth_policy,
-                 SizeAtomicCounter* total_used_words_counter,
+  MetaspaceArena(MetaspaceContext* context,
+                 const ArenaGrowthPolicy* growth_policy,
+                 size_t allocation_alignment_words,
                  const char* name);
 
   ~MetaspaceArena();
 
+  size_t allocation_alignment_words() const { return _allocation_alignment_words; }
+  size_t allocation_alignment_bytes() const { return allocation_alignment_words() * BytesPerWord; }
+
   // Allocate memory from Metaspace.
-  // 1) Attempt to allocate from the dictionary of deallocated blocks.
-  // 2) Attempt to allocate from the current chunk.
-  // 3) Attempt to enlarge the current chunk in place if it is too small.
-  // 4) Attempt to get a new chunk and allocate from that chunk.
-  // At any point, if we hit a commit limit, we return null.
-  MetaWord* allocate(size_t word_size);
+  // On success, returns non-empty block of the specified word size, and
+  // possibly a wastage block that is the result of alignment operations.
+  // On failure, returns an empty block. Failure may happen if we hit a
+  // commit limit.
+  MetaBlock allocate(size_t word_size, MetaBlock& wastage);
 
   // Prematurely returns a metaspace allocation to the _block_freelists because it is not
   // needed anymore.
-  void deallocate(MetaWord* p, size_t word_size);
+  void deallocate(MetaBlock bl);
 
   // Update statistics. This walks all in-use chunks.
   void add_to_statistics(ArenaStats* out) const;
@@ -161,6 +166,8 @@ class MetaspaceArena : public CHeapObj<mtClass> {
 
   void print_on(outputStream* st) const;
 
+  // Returns true if the given block is contained in this arena
+  DEBUG_ONLY(bool contains(MetaBlock bl) const;)
 };
 
 } // namespace metaspace
diff --git a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
index 511f4e6e092..d296ffd6cd7 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -42,13 +42,11 @@ namespace metaspace {
 //  correctly. We currently don't hold members with a larger alignment requirement
 //  than 64-bit inside MetaData, so 8-byte alignment is enough.
 //
-// Klass* structures need to be aligned to KlassAlignmentInBytes, but since that is
-// 64-bit, we don't need special handling for allocating Klass*.
+// Klass* structures need to be aligned to Klass* alignment,
 //
 // On 64-bit platforms, we align to word size; on 32-bit, we align to two words.
 
 static const size_t AllocationAlignmentByteSize = 8;
-STATIC_ASSERT(AllocationAlignmentByteSize == (size_t)KlassAlignmentInBytes);
 
 static const size_t AllocationAlignmentWordSize = AllocationAlignmentByteSize / BytesPerWord;
 
diff --git a/src/hotspot/share/memory/metaspace/metaspaceContext.cpp b/src/hotspot/share/memory/metaspace/metaspaceContext.cpp
index e2a2d752d64..b43f4cd3b15 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceContext.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -75,6 +75,18 @@ void MetaspaceContext::print_on(outputStream* st) const {
   _cm->print_on(st);
 }
 
+size_t MetaspaceContext::used_words() const {
+  return _used_words_counter.get();
+}
+
+size_t MetaspaceContext::committed_words() const {
+  return _vslist->committed_words();
+}
+
+size_t MetaspaceContext::reserved_words() const {
+  return _vslist->reserved_words();
+}
+
 #ifdef ASSERT
 void MetaspaceContext::verify() const {
   _vslist->verify();
diff --git a/src/hotspot/share/memory/metaspace/metaspaceContext.hpp b/src/hotspot/share/memory/metaspace/metaspaceContext.hpp
index be1d6f356ae..c773c6385b3 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceContext.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceContext.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +27,7 @@
 #define SHARE_MEMORY_METASPACE_METASPACECONTEXT_HPP
 
 #include "memory/allocation.hpp"
+#include "memory/metaspace/counters.hpp"
 #include "memory/virtualspace.hpp"
 #include "utilities/debug.hpp"
 
@@ -61,6 +62,7 @@ class MetaspaceContext : public CHeapObj<mtMetaspace> {
   const char* const _name;
   VirtualSpaceList* const _vslist;
   ChunkManager* const _cm;
+  SizeAtomicCounter _used_words_counter;
 
   MetaspaceContext(const char* name, VirtualSpaceList* vslist, ChunkManager* cm) :
     _name(name),
@@ -78,8 +80,9 @@ class MetaspaceContext : public CHeapObj<mtMetaspace> {
   // untouched, otherwise all memory is unmapped.
   ~MetaspaceContext();
 
-  VirtualSpaceList* vslist() { return _vslist; }
-  ChunkManager* cm() { return _cm; }
+  VirtualSpaceList* vslist()                    { return _vslist; }
+  ChunkManager* cm()                            { return _cm; }
+  SizeAtomicCounter* used_words_counter()       { return &_used_words_counter; }
 
   // Create a new, empty, expandable metaspace context.
   static MetaspaceContext* create_expandable_context(const char* name, CommitLimiter* commit_limiter);
@@ -103,6 +106,9 @@ class MetaspaceContext : public CHeapObj<mtMetaspace> {
   // null otherwise.
   static MetaspaceContext* context_class()        { return _class_space_context; }
 
+  size_t used_words() const;
+  size_t committed_words() const;
+  size_t reserved_words() const;
 };
 
 } // end namespace
diff --git a/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp b/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp
index 3cd9ba5ab87..cbd2400444f 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp
@@ -39,6 +39,7 @@
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspaceUtils.hpp"
+#include "oops/compressedKlass.hpp"
 #include "runtime/os.hpp"
 
 namespace metaspace {
@@ -117,6 +118,9 @@ static void print_settings(outputStream* out, size_t scale) {
   out->cr();
   out->print_cr("CDS: %s", (CDSConfig::is_using_archive() ? "on" : (CDSConfig::is_dumping_static_archive() ? "dump" : "off")));
   Settings::print_on(out);
+#ifdef _LP64
+  CompressedKlassPointers::print_mode(out);
+#endif
 }
 
 // This will print out a basic metaspace usage report but
@@ -324,7 +328,7 @@ void MetaspaceReporter::print_report(outputStream* out, size_t scale, int flags)
   // For all wastages, print percentages from total. As total use the total size of memory committed for metaspace.
   const size_t committed_words = RunningCounters::committed_words();
 
-  out->print("(percentages refer to total committed size ");
+  out->print(" (percentages refer to total committed size ");
   print_scaled_words(out, committed_words, scale);
   out->print_cr("):");
 
diff --git a/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
index 2c32cbe38b1..32329831e7c 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -186,16 +186,12 @@ void ArenaStats::print_on(outputStream* st, size_t scale,  bool detailed) const
 }
 
 #ifdef ASSERT
-
 void ArenaStats::verify() const {
   size_t total_used = 0;
   for (chunklevel_t l = chunklevel::LOWEST_CHUNK_LEVEL; l <= chunklevel::HIGHEST_CHUNK_LEVEL; l++) {
     _stats[l].verify();
     total_used += _stats[l]._used_words;
   }
-  // Deallocated allocations still count as used
-  assert(total_used >= _free_blocks_word_size,
-         "Sanity");
 }
 #endif
 
diff --git a/src/hotspot/share/memory/metaspace/runningCounters.cpp b/src/hotspot/share/memory/metaspace/runningCounters.cpp
index 323862ac02f..75fc4b9792c 100644
--- a/src/hotspot/share/memory/metaspace/runningCounters.cpp
+++ b/src/hotspot/share/memory/metaspace/runningCounters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,15 +25,12 @@
 
 #include "precompiled.hpp"
 #include "memory/metaspace/chunkManager.hpp"
-#include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
 
 namespace metaspace {
 
-SizeAtomicCounter RunningCounters::_used_class_counter;
-SizeAtomicCounter RunningCounters::_used_nonclass_counter;
-
 // Return reserved size, in words, for Metaspace
 size_t RunningCounters::reserved_words() {
   return reserved_words_class() + reserved_words_nonclass();
@@ -72,11 +69,12 @@ size_t RunningCounters::used_words() {
 }
 
 size_t RunningCounters::used_words_class() {
-  return _used_class_counter.get();
+  const MetaspaceContext* context = MetaspaceContext::context_class();
+  return context != nullptr ? context->used_words() : 0;
 }
 
 size_t RunningCounters::used_words_nonclass() {
-  return _used_nonclass_counter.get();
+  return MetaspaceContext::context_nonclass()->used_words();
 }
 
 // ---- free chunks -----
diff --git a/src/hotspot/share/memory/metaspace/runningCounters.hpp b/src/hotspot/share/memory/metaspace/runningCounters.hpp
index ff24ead7ebd..e898a099818 100644
--- a/src/hotspot/share/memory/metaspace/runningCounters.hpp
+++ b/src/hotspot/share/memory/metaspace/runningCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,17 +27,11 @@
 #define SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP
 
 #include "memory/allStatic.hpp"
-#include "memory/metaspace/counters.hpp"
 
 namespace metaspace {
 
 // This class is a convenience interface for accessing global metaspace counters.
-class RunningCounters : public AllStatic {
-
-  static SizeAtomicCounter _used_class_counter;
-  static SizeAtomicCounter _used_nonclass_counter;
-
-public:
+struct RunningCounters : public AllStatic {
 
   // ---- virtual memory -----
 
@@ -65,10 +59,6 @@ class RunningCounters : public AllStatic {
   static size_t free_chunks_words_class();
   static size_t free_chunks_words_nonclass();
 
-  // Direct access to the counters.
-  static SizeAtomicCounter* used_nonclass_counter()     { return &_used_nonclass_counter; }
-  static SizeAtomicCounter* used_class_counter()        { return &_used_class_counter; }
-
 };
 
 } // namespace metaspace
diff --git a/src/hotspot/share/memory/metaspace/testHelpers.cpp b/src/hotspot/share/memory/metaspace/testHelpers.cpp
index 2d1071d77dd..b974f06f243 100644
--- a/src/hotspot/share/memory/metaspace/testHelpers.cpp
+++ b/src/hotspot/share/memory/metaspace/testHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -54,12 +54,17 @@ MetaspaceTestArena::~MetaspaceTestArena() {
 
 MetaWord* MetaspaceTestArena::allocate(size_t word_size) {
   MutexLocker fcl(_lock, Mutex::_no_safepoint_check_flag);
-  return _arena->allocate(word_size);
+  MetaBlock result, wastage;
+  result = _arena->allocate(word_size, wastage);
+  if (wastage.is_nonempty()) {
+    _arena->deallocate(wastage);
+  }
+  return result.base();
 }
 
 void MetaspaceTestArena::deallocate(MetaWord* p, size_t word_size) {
   MutexLocker fcl(_lock, Mutex::_no_safepoint_check_flag);
-  return _arena->deallocate(p, word_size);
+  _arena->deallocate(MetaBlock(p, word_size));
 }
 
 ///// MetaspaceTestArea //////
@@ -70,7 +75,6 @@ MetaspaceTestContext::MetaspaceTestContext(const char* name, size_t commit_limit
   _commit_limit(commit_limit),
   _context(nullptr),
   _commit_limiter(commit_limit == 0 ? max_uintx : commit_limit), // commit_limit == 0 -> no limit
-  _used_words_counter(),
   _rs()
 {
   assert(is_aligned(reserve_limit, Metaspace::reserve_alignment_words()), "reserve_limit (" SIZE_FORMAT ") "
@@ -103,7 +107,7 @@ MetaspaceTestArena* MetaspaceTestContext::create_arena(Metaspace::MetaspaceType
   MetaspaceArena* arena = nullptr;
   {
     MutexLocker ml(lock,  Mutex::_no_safepoint_check_flag);
-    arena = new MetaspaceArena(_context->cm(), growth_policy, &_used_words_counter, _name);
+    arena = new MetaspaceArena(_context, growth_policy, Metaspace::min_allocation_alignment_words, _name);
   }
   return new MetaspaceTestArena(lock, arena);
 }
@@ -124,5 +128,18 @@ void MetaspaceTestContext::print_on(outputStream* st) const {
   _context->print_on(st);
 }
 
+size_t MetaspaceTestContext::used_words() const {
+  return _context->used_words_counter()->get();
+}
+
+size_t MetaspaceTestContext::committed_words() const {
+  assert(_commit_limiter.committed_words() == _context->committed_words(), "Sanity");
+  return _context->committed_words();
+}
+
+size_t MetaspaceTestContext::reserved_words() const {
+  return _context->reserved_words();
+}
+
 } // namespace metaspace
 
diff --git a/src/hotspot/share/memory/metaspace/testHelpers.hpp b/src/hotspot/share/memory/metaspace/testHelpers.hpp
index 669a3f61226..65d5ee47512 100644
--- a/src/hotspot/share/memory/metaspace/testHelpers.hpp
+++ b/src/hotspot/share/memory/metaspace/testHelpers.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -75,7 +75,6 @@ class MetaspaceTestContext : public CHeapObj<mtInternal> {
 
   MetaspaceContext* _context;
   CommitLimiter _commit_limiter;
-  SizeAtomicCounter _used_words_counter;
 
   // For non-expandable contexts we keep track of the space
   // and delete it at destruction time.
@@ -98,15 +97,16 @@ class MetaspaceTestContext : public CHeapObj<mtInternal> {
   const CommitLimiter& commit_limiter() const { return _commit_limiter; }
   const VirtualSpaceList& vslist() const      { return *(_context->vslist()); }
   ChunkManager& cm()                          { return *(_context->cm()); }
+  MetaspaceContext* context() const           { return _context; }
 
   // Returns reserve- and commit limit we run the test with (in the real world,
   // these would be equivalent to CompressedClassSpaceSize resp MaxMetaspaceSize)
   size_t reserve_limit() const    { return _reserve_limit == 0 ? max_uintx : 0; }
   size_t commit_limit() const     { return _commit_limit == 0 ? max_uintx : 0; }
 
-  // Convenience function to retrieve total committed/used words
-  size_t used_words() const       { return _used_words_counter.get(); }
-  size_t committed_words() const  { return _commit_limiter.committed_words(); }
+  size_t used_words() const;
+  size_t committed_words() const;
+  size_t reserved_words() const;
 
   DEBUG_ONLY(void verify() const;)
 
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 4af9c8b2ef2..6daeb2f1045 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -397,8 +397,13 @@ void Universe::genesis(TRAPS) {
   HandleMark   hm(THREAD);
 
   // Explicit null checks are needed if these offsets are not smaller than the page size
-  assert(oopDesc::klass_offset_in_bytes() < static_cast<intptr_t>(os::vm_page_size()),
-         "Klass offset is expected to be less than the page size");
+  if (UseCompactObjectHeaders) {
+    assert(oopDesc::mark_offset_in_bytes() < static_cast<intptr_t>(os::vm_page_size()),
+           "Mark offset is expected to be less than the page size");
+  } else {
+    assert(oopDesc::klass_offset_in_bytes() < static_cast<intptr_t>(os::vm_page_size()),
+           "Klass offset is expected to be less than the page size");
+  }
   assert(arrayOopDesc::length_offset_in_bytes() < static_cast<intptr_t>(os::vm_page_size()),
          "Array length offset is expected to be less than the page size");
 
diff --git a/src/hotspot/share/nmt/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
index 270601e9c05..6f82b2de9f1 100644
--- a/src/hotspot/share/nmt/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -141,7 +141,7 @@ void MemBaseline::baseline_summary() {
   MallocMemorySummary::snapshot(&_malloc_memory_snapshot);
   VirtualMemorySummary::snapshot(&_virtual_memory_snapshot);
   {
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     MemoryFileTracker::Instance::summary_snapshot(&_virtual_memory_snapshot);
   }
 
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index 15767da276c..6ce6206ebcc 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -465,7 +465,7 @@ void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion*
 void MemDetailReporter::report_memory_file_allocations() {
   stringStream st;
   {
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     MemoryFileTracker::Instance::print_all_reports_on(&st, scale());
   }
   output()->print_raw(st.freeze());
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 92640430e1c..6ba1db2e7ff 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -31,6 +31,7 @@
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/threadCritical.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/nativeCallStack.hpp"
 
@@ -124,7 +125,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      NmtVirtualMemoryLocker ml;
+      ThreadCritical tc;
       VirtualMemoryTracker::add_reserved_region((address)addr, size, stack, mem_tag);
     }
   }
@@ -150,7 +151,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      NmtVirtualMemoryLocker ml;
+      ThreadCritical tc;
       VirtualMemoryTracker::add_reserved_region((address)addr, size, stack, mem_tag);
       VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
     }
@@ -161,7 +162,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      NmtVirtualMemoryLocker ml;
+      ThreadCritical tc;
       VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
     }
   }
@@ -169,7 +170,7 @@ class MemTracker : AllStatic {
   static inline MemoryFileTracker::MemoryFile* register_file(const char* descriptive_name) {
     assert_post_init();
     if (!enabled()) return nullptr;
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     return MemoryFileTracker::Instance::make_file(descriptive_name);
   }
 
@@ -177,7 +178,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     assert(file != nullptr, "must be");
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     MemoryFileTracker::Instance::free_file(file);
   }
 
@@ -186,7 +187,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     assert(file != nullptr, "must be");
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     MemoryFileTracker::Instance::allocate_memory(file, offset, size, stack, mem_tag);
   }
 
@@ -195,7 +196,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     assert(file != nullptr, "must be");
-    NmtVirtualMemoryLocker ml;
+    MemoryFileTracker::Instance::Locker lock;
     MemoryFileTracker::Instance::free_memory(file, offset, size);
   }
 
@@ -209,7 +210,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      NmtVirtualMemoryLocker ml;
+      ThreadCritical tc;
       VirtualMemoryTracker::split_reserved_region((address)addr, size, split, mem_tag, split_tag);
     }
   }
@@ -218,7 +219,7 @@ class MemTracker : AllStatic {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      NmtVirtualMemoryLocker ml;
+      ThreadCritical tc;
       VirtualMemoryTracker::set_reserved_region_type((address)addr, mem_tag);
     }
   }
diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp
index ab4f8b6d1f3..ede483ed337 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.cpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.cpp
@@ -29,11 +29,13 @@
 #include "nmt/nmtCommon.hpp"
 #include "nmt/nmtNativeCallStackStorage.hpp"
 #include "nmt/vmatree.hpp"
+#include "runtime/mutex.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
 MemoryFileTracker* MemoryFileTracker::Instance::_tracker = nullptr;
+PlatformMutex* MemoryFileTracker::Instance::_mutex = nullptr;
 
 MemoryFileTracker::MemoryFileTracker(bool is_detailed_mode)
   : _stack_storage(is_detailed_mode), _files() {}
@@ -130,6 +132,7 @@ bool MemoryFileTracker::Instance::initialize(NMT_TrackingLevel tracking_level) {
   _tracker = static_cast<MemoryFileTracker*>(os::malloc(sizeof(MemoryFileTracker), mtNMT));
   if (_tracker == nullptr) return false;
   new (_tracker) MemoryFileTracker(tracking_level == NMT_TrackingLevel::NMT_detail);
+  _mutex = new PlatformMutex();
   return true;
 }
 
@@ -190,3 +193,11 @@ void MemoryFileTracker::summary_snapshot(VirtualMemorySnapshot* snapshot) const
 void MemoryFileTracker::Instance::summary_snapshot(VirtualMemorySnapshot* snapshot) {
   _tracker->summary_snapshot(snapshot);
 }
+
+MemoryFileTracker::Instance::Locker::Locker() {
+  MemoryFileTracker::Instance::_mutex->lock();
+}
+
+MemoryFileTracker::Instance::Locker::~Locker() {
+  MemoryFileTracker::Instance::_mutex->unlock();
+}
diff --git a/src/hotspot/share/nmt/memoryFileTracker.hpp b/src/hotspot/share/nmt/memoryFileTracker.hpp
index 911f10baf98..42902701a16 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.hpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.hpp
@@ -30,6 +30,7 @@
 #include "nmt/nmtNativeCallStackStorage.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
 #include "nmt/vmatree.hpp"
+#include "runtime/mutex.hpp"
 #include "runtime/os.inline.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/nativeCallStack.hpp"
@@ -80,8 +81,14 @@ class MemoryFileTracker {
 
   class Instance : public AllStatic {
     static MemoryFileTracker* _tracker;
+    static PlatformMutex* _mutex;
 
   public:
+    class Locker : public StackObj {
+    public:
+      Locker();
+      ~Locker();
+    };
 
     static bool initialize(NMT_TrackingLevel tracking_level);
 
diff --git a/src/hotspot/share/nmt/nmtCommon.hpp b/src/hotspot/share/nmt/nmtCommon.hpp
index a6fd29e83f2..3f72960f21f 100644
--- a/src/hotspot/share/nmt/nmtCommon.hpp
+++ b/src/hotspot/share/nmt/nmtCommon.hpp
@@ -29,8 +29,6 @@
 
 #include "memory/allStatic.hpp"
 #include "nmt/memTag.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "runtime/thread.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -139,13 +137,5 @@ class NMTUtil : AllStatic {
   static S _strings[mt_number_of_tags];
 };
 
-// Same as MutexLocker but can be used during VM init.
-// Performs no action if given a null mutex or with detached threads.
-class NmtVirtualMemoryLocker: public ConditionalMutexLocker {
-public:
-    NmtVirtualMemoryLocker() :
-            ConditionalMutexLocker(NmtVirtualMemory_lock, Thread::current_or_null_safe() != nullptr, Mutex::_no_safepoint_check_flag) {
-    }
-};
 
 #endif // SHARE_NMT_NMTCOMMON_HPP
diff --git a/src/hotspot/share/nmt/threadStackTracker.cpp b/src/hotspot/share/nmt/threadStackTracker.cpp
index 42af67d6464..6f112fa8fc5 100644
--- a/src/hotspot/share/nmt/threadStackTracker.cpp
+++ b/src/hotspot/share/nmt/threadStackTracker.cpp
@@ -29,6 +29,7 @@
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/os.hpp"
+#include "runtime/threadCritical.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -52,7 +53,7 @@ void ThreadStackTracker::new_thread_stack(void* base, size_t size, const NativeC
   assert(base != nullptr, "Should have been filtered");
   align_thread_stack_boundaries_inward(base, size);
 
-  NmtVirtualMemoryLocker ml;
+  ThreadCritical tc;
   VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
   _thread_count++;
 }
@@ -62,7 +63,7 @@ void ThreadStackTracker::delete_thread_stack(void* base, size_t size) {
   assert(base != nullptr, "Should have been filtered");
   align_thread_stack_boundaries_inward(base, size);
 
-  NmtVirtualMemoryLocker ml;
+  ThreadCritical tc;
   VirtualMemoryTracker::remove_released_region((address)base, size);
   _thread_count--;
 }
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 8b0f2f4d7a4..d298381f103 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -30,6 +30,7 @@
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/os.hpp"
+#include "runtime/threadCritical.hpp"
 #include "utilities/ostream.hpp"
 
 VirtualMemorySnapshot VirtualMemorySummary::_snapshot;
@@ -620,7 +621,6 @@ class SnapshotThreadStackWalker : public VirtualMemoryWalker {
   SnapshotThreadStackWalker() {}
 
   bool do_allocation_site(const ReservedMemoryRegion* rgn) {
-    assert_lock_strong(NmtVirtualMemory_lock);
     if (rgn->mem_tag() == mtThreadStack) {
       address stack_bottom = rgn->thread_stack_uncommitted_bottom();
       address committed_start;
@@ -661,7 +661,7 @@ void VirtualMemoryTracker::snapshot_thread_stacks() {
 
 bool VirtualMemoryTracker::walk_virtual_memory(VirtualMemoryWalker* walker) {
   assert(_reserved_regions != nullptr, "Sanity check");
-  NmtVirtualMemoryLocker ml;
+  ThreadCritical tc;
   // Check that the _reserved_regions haven't been deleted.
   if (_reserved_regions != nullptr) {
     LinkedListNode<ReservedMemoryRegion>* head = _reserved_regions->head();
diff --git a/src/hotspot/share/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp
index 1ca8a9530a4..f0c476a2486 100644
--- a/src/hotspot/share/oops/arrayOop.hpp
+++ b/src/hotspot/share/oops/arrayOop.hpp
@@ -79,11 +79,11 @@ class arrayOopDesc : public oopDesc {
   }
 
   // The _length field is not declared in C++.  It is allocated after the
-  // declared nonstatic fields in arrayOopDesc if not compressed, otherwise
-  // it occupies the second half of the _klass field in oopDesc.
+  // mark-word when using compact headers (+UseCompactObjectHeaders), otherwise
+  // after the compressed Klass* when running with compressed class-pointers
+  // (+UseCompressedClassPointers), or else after the full Klass*.
   static int length_offset_in_bytes() {
-    return UseCompressedClassPointers ? klass_gap_offset_in_bytes() :
-                               (int)sizeof(arrayOopDesc);
+    return oopDesc::base_offset_in_bytes();
   }
 
   // Returns the offset of the first element.
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index 02483d25a9a..f3c6fe92897 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,39 +27,145 @@
 #include "memory/metaspace.hpp"
 #include "oops/compressedKlass.inline.hpp"
 #include "runtime/globals.hpp"
+#include "runtime/java.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
 
-address CompressedKlassPointers::_base = nullptr;
-int CompressedKlassPointers::_shift = 0;
+int CompressedKlassPointers::_narrow_klass_pointer_bits = -1;
+int CompressedKlassPointers::_max_shift = -1;
+
+address CompressedKlassPointers::_base = (address)-1;
+int CompressedKlassPointers::_shift = -1;
 address CompressedKlassPointers::_klass_range_start = nullptr;
 address CompressedKlassPointers::_klass_range_end = nullptr;
+narrowKlass CompressedKlassPointers::_lowest_valid_narrow_klass_id = (narrowKlass)-1;
+narrowKlass CompressedKlassPointers::_highest_valid_narrow_klass_id = (narrowKlass)-1;
 
 #ifdef _LP64
 
-#ifdef ASSERT
-void CompressedKlassPointers::assert_is_valid_encoding(address addr, size_t len, address base, int shift) {
-  assert(base + nth_bit(32 + shift) >= addr + len, "Encoding (base=" PTR_FORMAT ", shift=%d) does not "
-         "fully cover the class range " PTR_FORMAT "-" PTR_FORMAT, p2i(base), shift, p2i(addr), p2i(addr + len));
+size_t CompressedKlassPointers::max_klass_range_size() {
+  // We disallow klass range sizes larger than 4GB even if the encoding
+  // range would allow for a larger Klass range (e.g. Base=zero, shift=3 -> 32GB).
+  // That is because many CPU-specific compiler decodings do not want the
+  // shifted narrow Klass to spill over into the third quadrant of the 64-bit target
+  // address, e.g. to use a 16-bit move for a simplified base addition.
+  return MIN2(4 * G, max_encoding_range_size());
+}
+
+void CompressedKlassPointers::pre_initialize() {
+  if (UseCompactObjectHeaders) {
+    _narrow_klass_pointer_bits = narrow_klass_pointer_bits_coh;
+    _max_shift = max_shift_coh;
+  } else {
+    _narrow_klass_pointer_bits = narrow_klass_pointer_bits_noncoh;
+    _max_shift = max_shift_noncoh;
+  }
 }
+
+#ifdef ASSERT
+void CompressedKlassPointers::sanity_check_after_initialization() {
+  // In expectation of an assert, prepare condensed info to be printed with the assert.
+  char tmp[256];
+  os::snprintf(tmp, sizeof(tmp), "klass range: " RANGE2FMT ","
+      " base " PTR_FORMAT ", shift %d, lowest/highest valid narrowKlass %u/%u",
+      RANGE2FMTARGS(_klass_range_start, _klass_range_end),
+      p2i(_base), _shift, _lowest_valid_narrow_klass_id, _highest_valid_narrow_klass_id);
+#define ASSERT_HERE(cond) assert(cond, " (%s)", tmp);
+#define ASSERT_HERE_2(cond, msg) assert(cond, msg " (%s)", tmp);
+
+  // All values must be inited
+  ASSERT_HERE(_max_shift != -1);
+  ASSERT_HERE(_klass_range_start != (address)-1);
+  ASSERT_HERE(_klass_range_end != (address)-1);
+  ASSERT_HERE(_lowest_valid_narrow_klass_id != (narrowKlass)-1);
+  ASSERT_HERE(_base != (address)-1);
+  ASSERT_HERE(_shift != -1);
+
+  const size_t klass_align = klass_alignment_in_bytes();
+
+  // must be aligned enough hold 64-bit data
+  ASSERT_HERE(is_aligned(klass_align, sizeof(uint64_t)));
+
+  // should be smaller than the minimum metaspace chunk size (soft requirement)
+  ASSERT_HERE(klass_align <= K);
+
+  ASSERT_HERE(_klass_range_end > _klass_range_start);
+
+  // Check that Klass range is fully engulfed in the encoding range
+  const address encoding_start = _base;
+  const address encoding_end = _base + nth_bit(narrow_klass_pointer_bits() + _shift);
+  ASSERT_HERE_2(_klass_range_start >= _base && _klass_range_end <= encoding_end,
+                "Resulting encoding range does not fully cover the class range");
+
+  // Check that Klass range is aligned to Klass alignment. Note that this should never be
+  // an issue since the Klass range is handed in by either CDS- or Metaspace-initialization, and
+  // it should be the result of an mmap operation that operates on page sizes. So as long as
+  // the Klass alignment is <= page size, we are fine.
+  ASSERT_HERE_2(is_aligned(_klass_range_start, klass_align) &&
+                is_aligned(_klass_range_end, klass_align),
+                "Klass range must start and end at a properly aligned address");
+
+  // Check _lowest_valid_narrow_klass_id and _highest_valid_narrow_klass_id
+  ASSERT_HERE_2(_lowest_valid_narrow_klass_id > 0, "Null is not a valid narrowKlass");
+  ASSERT_HERE(_highest_valid_narrow_klass_id > _lowest_valid_narrow_klass_id);
+
+  Klass* const k1 = decode_not_null_without_asserts(_lowest_valid_narrow_klass_id, _base, _shift);
+  if (encoding_start == _klass_range_start) {
+    ASSERT_HERE_2((address)k1 == _klass_range_start + klass_align, "Not lowest");
+  } else {
+    ASSERT_HERE_2((address)k1 == _klass_range_start, "Not lowest");
+  }
+  narrowKlass nk1 = encode_not_null_without_asserts(k1, _base, _shift);
+  ASSERT_HERE_2(nk1 == _lowest_valid_narrow_klass_id, "not reversible");
+
+  Klass* const k2 = decode_not_null_without_asserts(_highest_valid_narrow_klass_id, _base, _shift);
+  ASSERT_HERE((address)k2 == _klass_range_end - klass_align);
+  narrowKlass nk2 = encode_not_null_without_asserts(k2, _base, _shift);
+  ASSERT_HERE_2(nk2 == _highest_valid_narrow_klass_id, "not reversible");
+
+#ifdef AARCH64
+  // On aarch64, we never expect a shift value > 0 in standard (non-coh) mode
+  ASSERT_HERE_2(UseCompactObjectHeaders || _shift == 0, "Shift > 0 in non-coh mode?");
 #endif
+#undef ASSERT_HERE
+#undef ASSERT_HERE_2
+}
+#endif // ASSERT
+
+// Helper function: given current Klass Range, Base and Shift, calculate the lowest and highest values
+// of narrowKlass we can expect.
+void CompressedKlassPointers::calc_lowest_highest_narrow_klass_id() {
+  address lowest_possible_klass_location = _klass_range_start;
+
+  // A Klass will never be placed at the Encoding range start, since that would translate to a narrowKlass=0, which
+  // is disallowed. Note that both Metaspace and CDS prvent allocation at the first address for this reason.
+  if (lowest_possible_klass_location == _base) {
+    lowest_possible_klass_location += klass_alignment_in_bytes();
+  }
+  _lowest_valid_narrow_klass_id = (narrowKlass) ((uintptr_t)(lowest_possible_klass_location - _base) >> _shift);
+
+  address highest_possible_klass_location = _klass_range_end - klass_alignment_in_bytes();
+  _highest_valid_narrow_klass_id = (narrowKlass) ((uintptr_t)(highest_possible_klass_location - _base) >> _shift);
+}
 
 // Given a klass range [addr, addr+len) and a given encoding scheme, assert that this scheme covers the range, then
 // set this encoding scheme. Used by CDS at runtime to re-instate the scheme used to pre-compute klass ids for
 // archived heap objects.
 void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t len, address requested_base, int requested_shift) {
-  address const end = addr + len;
-
-  const int narrow_klasspointer_bits = sizeof(narrowKlass) * 8;
-  const size_t encoding_range_size = nth_bit(narrow_klasspointer_bits + requested_shift);
-  address encoding_range_end = requested_base + encoding_range_size;
+  if (len > max_klass_range_size()) {
+    stringStream ss;
+    ss.print("Class space size and CDS archive size combined (%zu) "
+             "exceed the maximum possible size (%zu)",
+             len, max_klass_range_size());
+    vm_exit_during_initialization(ss.base());
+  }
 
-  // Note: it would be technically valid for the encoding base to precede the start of the Klass range. But we only call
-  // this function from CDS, and therefore know this to be true.
+  // Note: While it would be technically valid for the encoding base to precede the start of the Klass range,
+  // we never do this here. This is used at CDS runtime to re-instate the scheme used to precompute the
+  // narrow Klass IDs in the archive, and the requested base should point to the start of the Klass range.
   assert(requested_base == addr, "Invalid requested base");
-  assert(encoding_range_end >= end, "Encoding does not cover the full Klass range");
 
   // Remember Klass range:
   _klass_range_start = addr;
@@ -68,7 +174,9 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
   _base = requested_base;
   _shift = requested_shift;
 
-  DEBUG_ONLY(assert_is_valid_encoding(addr, len, _base, _shift);)
+  calc_lowest_highest_narrow_klass_id();
+
+  DEBUG_ONLY(sanity_check_after_initialization();)
 }
 
 char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t to, size_t size, size_t alignment, bool aslr) {
@@ -77,60 +185,105 @@ char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_unscaled_encoding(size_t size, bool aslr) {
-  return reserve_address_space_X(0, nth_bit(32), size, Metaspace::reserve_alignment(), aslr);
+  const size_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
+  return reserve_address_space_X(0, unscaled_max, size, Metaspace::reserve_alignment(), aslr);
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_zerobased_encoding(size_t size, bool aslr) {
-  return reserve_address_space_X(nth_bit(32), nth_bit(32 + LogKlassAlignmentInBytes), size, Metaspace::reserve_alignment(), aslr);
+  const size_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
+  const size_t zerobased_max = nth_bit(narrow_klass_pointer_bits() + max_shift());
+  return reserve_address_space_X(unscaled_max, zerobased_max, size, Metaspace::reserve_alignment(), aslr);
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_16bit_move(size_t size, bool aslr) {
   return reserve_address_space_X(nth_bit(32), nth_bit(48), size, nth_bit(32), aslr);
 }
 
-#if !defined(AARCH64) || defined(ZERO)
-// On aarch64 we have an own version; all other platforms use the default version
 void CompressedKlassPointers::initialize(address addr, size_t len) {
 
+  if (len > max_klass_range_size()) {
+    stringStream ss;
+    ss.print("Class space size (%zu) exceeds the maximum possible size (%zu)",
+              len, max_klass_range_size());
+    vm_exit_during_initialization(ss.base());
+  }
+
   // Remember the Klass range:
   _klass_range_start = addr;
   _klass_range_end = addr + len;
 
-  // The default version of this code tries, in order of preference:
-  // -unscaled    (base=0 shift=0)
-  // -zero-based  (base=0 shift>0)
-  // -nonzero-base (base>0 shift=0)
-  // Note that base>0 shift>0 should never be needed, since the klass range will
-  // never exceed 4GB.
-  constexpr uintptr_t unscaled_max = nth_bit(32);
-  assert(len <= unscaled_max, "Klass range larger than 32 bits?");
+  // Calculate Base and Shift:
 
-  constexpr uintptr_t zerobased_max = nth_bit(32 + LogKlassAlignmentInBytes);
+  if (UseCompactObjectHeaders) {
+
+    // In compact object header mode, with 22-bit narrowKlass, we don't attempt for
+    // zero-based mode. Instead, we set the base to the start of the klass range and
+    // then try for the smallest shift possible that still covers the whole range.
+    // The reason is that we want to avoid, if possible, shifts larger than
+    // a cacheline size.
+    _base = addr;
+
+    const int log_cacheline = exact_log2(DEFAULT_CACHE_LINE_SIZE);
+    int s = max_shift();
+    while (s > log_cacheline && ((size_t)nth_bit(narrow_klass_pointer_bits() + s - 1) > len)) {
+      s--;
+    }
+    _shift = s;
 
-  address const end = addr + len;
-  if (end <= (address)unscaled_max) {
-    _base = nullptr;
-    _shift = 0;
   } else {
-    if (end <= (address)zerobased_max) {
+
+    // Traditional (non-compact) header mode
+    const uintptr_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
+    const uintptr_t zerobased_max = nth_bit(narrow_klass_pointer_bits() + max_shift());
+
+#ifdef AARCH64
+    // Aarch64 avoids zero-base shifted mode (_base=0 _shift>0), instead prefers
+    // non-zero-based mode with a zero shift.
+    _shift = 0;
+    address const end = addr + len;
+    _base = (end <= (address)unscaled_max) ? nullptr : addr;
+#else
+    // We try, in order of preference:
+    // -unscaled    (base=0 shift=0)
+    // -zero-based  (base=0 shift>0)
+    // -nonzero-base (base>0 shift=0)
+    // Note that base>0 shift>0 should never be needed, since the klass range will
+    // never exceed 4GB.
+    address const end = addr + len;
+    if (end <= (address)unscaled_max) {
       _base = nullptr;
-      _shift = LogKlassAlignmentInBytes;
-    } else {
-      _base = addr;
       _shift = 0;
+    } else {
+      if (end <= (address)zerobased_max) {
+        _base = nullptr;
+        _shift = max_shift();
+      } else {
+        _base = addr;
+        _shift = 0;
+      }
     }
+#endif // AARCH64
   }
 
-  DEBUG_ONLY(assert_is_valid_encoding(addr, len, _base, _shift);)
+  calc_lowest_highest_narrow_klass_id();
+
+#ifdef ASSERT
+  sanity_check_after_initialization();
+#endif
 }
-#endif // !AARCH64 || ZERO
 
 void CompressedKlassPointers::print_mode(outputStream* st) {
+  st->print_cr("UseCompressedClassPointers %d, UseCompactObjectHeaders %d",
+               UseCompressedClassPointers, UseCompactObjectHeaders);
   if (UseCompressedClassPointers) {
+    st->print_cr("Narrow klass pointer bits %d, Max shift %d",
+                 _narrow_klass_pointer_bits, _max_shift);
     st->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: %d",
                   p2i(base()), shift());
     st->print_cr("Encoding Range: " RANGE2FMT, RANGE2FMTARGS(_base, encoding_range_end()));
     st->print_cr("Klass Range:    " RANGE2FMT, RANGE2FMTARGS(_klass_range_start, _klass_range_end));
+    st->print_cr("Klass ID Range:  [%u - %u) (%u)", _lowest_valid_narrow_klass_id, _highest_valid_narrow_klass_id + 1,
+                 _highest_valid_narrow_klass_id + 1 - _lowest_valid_narrow_klass_id);
   } else {
     st->print_cr("UseCompressedClassPointers off");
   }
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index 8f89b0550ff..9e3a09d73b9 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -26,6 +26,7 @@
 #define SHARE_OOPS_COMPRESSEDKLASS_HPP
 
 #include "memory/allStatic.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class outputStream;
@@ -97,42 +98,98 @@ class Klass;
 // If compressed klass pointers then use narrowKlass.
 typedef juint  narrowKlass;
 
-const int LogKlassAlignmentInBytes = 3;
-const int KlassAlignmentInBytes    = 1 << LogKlassAlignmentInBytes;
-
-// Maximal size of compressed class space. Above this limit compression is not possible.
-// Also upper bound for placement of zero based class space. (Class space is further limited
-// to be < 3G, see arguments.cpp.)
-const  uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
-
 // For UseCompressedClassPointers.
 class CompressedKlassPointers : public AllStatic {
   friend class VMStructs;
   friend class ArchiveBuilder;
 
+  // We use a different narrow Klass pointer geometry depending on
+  // whether we run in standard mode or in compact-object-header-mode.
+
+  // Narrow klass pointer bits for an unshifted narrow Klass pointer.
+  static constexpr int narrow_klass_pointer_bits_noncoh = 32;
+  static constexpr int narrow_klass_pointer_bits_coh = 22;
+
+  // Bit size of a narrowKlass
+  static int _narrow_klass_pointer_bits;
+
+  // The maximum shift values we can use depending on UseCompactObjectHeaders
+  static constexpr int max_shift_noncoh = 3;
+  static constexpr int max_shift_coh = 10;
+
+  // Maximum shift usable
+  static int _max_shift;
+
+  // Encoding Base, Encoding Shift
   static address _base;
   static int _shift;
 
   // Start and end of the Klass Range.
-  // Note: guaranteed to be aligned to KlassAlignmentInBytes
+  // Note: guaranteed to be aligned to 1<<shift (klass_alignment_in_bytes)
   static address _klass_range_start;
   static address _klass_range_end;
 
+  // Values for the lowest (inclusive) and highest (inclusive) narrow Klass ID, given the
+  // current Klass Range and encoding settings.
+  static narrowKlass _lowest_valid_narrow_klass_id;
+  static narrowKlass _highest_valid_narrow_klass_id;
+
+
   // Helper function for common cases.
   static char* reserve_address_space_X(uintptr_t from, uintptr_t to, size_t size, size_t alignment, bool aslr);
   static char* reserve_address_space_for_unscaled_encoding(size_t size, bool aslr);
   static char* reserve_address_space_for_zerobased_encoding(size_t size, bool aslr);
   static char* reserve_address_space_for_16bit_move(size_t size, bool aslr);
+  static void calc_lowest_highest_narrow_klass_id();
 
-  DEBUG_ONLY(static void assert_is_valid_encoding(address addr, size_t len, address base, int shift);)
+#ifdef ASSERT
+  static void sanity_check_after_initialization();
+#endif // ASSERT
 
-  static inline Klass* decode_not_null_without_asserts(narrowKlass v, address base, int shift);
-  static inline Klass* decode_not_null(narrowKlass v, address base, int shift);
+  template <typename T>
+  static inline void check_init(T var) {
+    assert(var != (T)-1, "Not yet initialized");
+  }
 
-  static inline narrowKlass encode_not_null(Klass* v, address base, int shift);
+  static inline Klass* decode_not_null_without_asserts(narrowKlass v, address base, int shift);
 
 public:
 
+  // Initialization sequence:
+  // 1) Parse arguments. The following arguments take a role:
+  //      - UseCompressedClassPointers
+  //      - UseCompactObjectHeaders
+  //      - Xshare on off dump
+  //      - CompressedClassSpaceSize
+  // 2) call pre_initialize(): depending on UseCompactObjectHeaders, defines the limits of narrow Klass pointer
+  //    geometry (how many bits, the max. possible shift)
+  // 3) .. from here on, narrow_klass_pointer_bits() and max_shift() can be used
+  // 4) call reserve_address_space_for_compressed_classes() either from CDS initialization or, if CDS is off,
+  //    from metaspace initialization. Reserves space for class space + CDS, attempts to reserve such that
+  //    we later can use a "good" encoding scheme. Reservation is highly CPU-specific.
+  // 5) Initialize the narrow Klass encoding scheme by determining encoding base and shift:
+  //   5a) if CDS=on: Calls initialize_for_given_encoding() with the reservation base from step (4) and the
+  //       CDS-intrinsic setting for shift; here, we don't have any freedom to deviate from the base.
+  //   5b) if CDS=off: Calls initialize() - here, we have more freedom and, if we want, can choose an encoding
+  //       base that differs from the reservation base from step (4). That allows us, e.g., to later use
+  //       zero-based encoding.
+  // 6) ... from now on, we can use base() and shift().
+
+  // Called right after argument parsing; defines narrow klass pointer geometry limits
+  static void pre_initialize();
+
+  // The number of bits a narrow Klass pointer has;
+  static int narrow_klass_pointer_bits() { check_init(_narrow_klass_pointer_bits); return _narrow_klass_pointer_bits; }
+
+  // The maximum possible shift; the actual shift employed later can be smaller (see initialize())
+  static int max_shift()                 { check_init(_max_shift); return _max_shift; }
+
+  // Returns the maximum encoding range, given the current geometry (narrow klass bit size and shift)
+  static size_t max_encoding_range_size() { return nth_bit(narrow_klass_pointer_bits() + max_shift()); }
+
+  // Returns the maximum allowed klass range size.
+  static size_t max_klass_range_size();
+
   // Reserve a range of memory that is to contain Klass strucutures which are referenced by narrow Klass IDs.
   // If optimize_for_zero_base is true, the implementation will attempt to reserve optimized for zero-based encoding.
   static char* reserve_address_space_for_compressed_classes(size_t size, bool aslr, bool optimize_for_zero_base);
@@ -152,33 +209,55 @@ class CompressedKlassPointers : public AllStatic {
 
   static void     print_mode(outputStream* st);
 
-  static address  base()               { return  _base; }
-  static int      shift()              { return  _shift; }
+  // Can only be used after initialization
+  static address  base()             { check_init(_base); return  _base; }
+  static int      shift()            { check_init(_shift); return  _shift; }
 
   static address  klass_range_start()  { return  _klass_range_start; }
   static address  klass_range_end()    { return  _klass_range_end; }
 
   static inline address encoding_range_end();
 
+  // Returns the alignment a Klass* is guaranteed to have.
+  // Note: *Not* the same as 1 << shift ! Klass are always guaranteed to be at least 64-bit aligned,
+  // so this will return 8 even if shift is 0.
+  static int klass_alignment_in_bytes() { return nth_bit(MAX2(3, _shift)); }
+  static int klass_alignment_in_words() { return klass_alignment_in_bytes() / BytesPerWord; }
+
+  // Returns the highest possible narrowKlass value given the current Klass range
+  static narrowKlass highest_valid_narrow_klass_id() { return _highest_valid_narrow_klass_id; }
+
   static bool is_null(Klass* v)      { return v == nullptr; }
   static bool is_null(narrowKlass v) { return v == 0; }
 
   // Versions without asserts
-  static inline Klass* decode_not_null_without_asserts(narrowKlass v);
   static inline Klass* decode_without_asserts(narrowKlass v);
-
   static inline Klass* decode_not_null(narrowKlass v);
   static inline Klass* decode(narrowKlass v);
 
+  static inline narrowKlass encode_not_null_without_asserts(Klass* k, address narrow_base, int shift);
   static inline narrowKlass encode_not_null(Klass* v);
   static inline narrowKlass encode(Klass* v);
 
+#ifdef ASSERT
+  // Given an address, check that it can be encoded with the current encoding
+  inline static void check_encodable(const void* addr);
+  // Given a narrow Klass ID, check that it is valid according to current encoding
+  inline static void check_valid_narrow_klass_id(narrowKlass nk);
+#endif
+
   // Returns whether the pointer is in the memory region used for encoding compressed
   // class pointers.  This includes CDS.
-  static inline bool is_encodable(const void* p) {
-    return (address) p >= _klass_range_start &&
-           (address) p < _klass_range_end;
+  static inline bool is_encodable(const void* addr) {
+    // An address can only be encoded if:
+    //
+    // 1) the address lies within the klass range.
+    // 2) It is suitably aligned to 2^encoding_shift. This only really matters for
+    //    +UseCompactObjectHeaders, since the encoding shift can be large (max 10 bits -> 1KB).
+    return (address)addr >= _klass_range_start && (address)addr < _klass_range_end &&
+        is_aligned(addr, klass_alignment_in_bytes());
   }
+
 };
 
 #endif // SHARE_OOPS_COMPRESSEDKLASS_HPP
diff --git a/src/hotspot/share/oops/compressedKlass.inline.hpp b/src/hotspot/share/oops/compressedKlass.inline.hpp
index c9c9af24ad8..7c5da48a494 100644
--- a/src/hotspot/share/oops/compressedKlass.inline.hpp
+++ b/src/hotspot/share/oops/compressedKlass.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,42 +32,24 @@
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-static inline bool check_alignment(Klass* v) {
-  return (intptr_t)v % KlassAlignmentInBytes == 0;
+inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v, address narrow_base_base, int shift) {
+  return (Klass*)((uintptr_t)narrow_base_base +((uintptr_t)v << shift));
 }
 
-inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v, address narrow_base, int shift) {
-  return (Klass*)((uintptr_t)narrow_base +((uintptr_t)v << shift));
-}
-
-inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v, address narrow_base, int shift) {
-  assert(!is_null(v), "narrow klass value can never be zero");
-  Klass* result = decode_not_null_without_asserts(v, narrow_base, shift);
-  assert(check_alignment(result), "address not aligned: " PTR_FORMAT, p2i(result));
-  return result;
-}
-
-inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v, address narrow_base, int shift) {
-  assert(!is_null(v), "klass value can never be zero");
-  assert(check_alignment(v), "Address not aligned");
-  uint64_t pd = (uint64_t)(pointer_delta(v, narrow_base, 1));
-  assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding (Klass " PTR_FORMAT ", Base " PTR_FORMAT ")", p2i(v), p2i(narrow_base));
-  uint64_t result = pd >> shift;
-  assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
-  assert(decode_not_null((narrowKlass)result, narrow_base, shift) == v, "reversibility");
-  return (narrowKlass)result;
-}
-
-inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v) {
-  return decode_not_null_without_asserts(v, base(), shift());
+inline narrowKlass CompressedKlassPointers::encode_not_null_without_asserts(Klass* k, address narrow_base, int shift) {
+  return (narrowKlass)(pointer_delta(k, narrow_base, 1) >> shift);
 }
 
 inline Klass* CompressedKlassPointers::decode_without_asserts(narrowKlass v) {
-  return is_null(v) ? nullptr : decode_not_null_without_asserts(v);
+  return is_null(v) ? nullptr : decode_not_null_without_asserts(v, base(), shift());
 }
 
 inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v) {
-  return decode_not_null(v, base(), shift());
+  assert(!is_null(v), "narrow klass value can never be zero");
+  DEBUG_ONLY(check_valid_narrow_klass_id(v);)
+  Klass* const k = decode_not_null_without_asserts(v, base(), shift());
+  DEBUG_ONLY(check_encodable(k));
+  return k;
 }
 
 inline Klass* CompressedKlassPointers::decode(narrowKlass v) {
@@ -75,15 +57,40 @@ inline Klass* CompressedKlassPointers::decode(narrowKlass v) {
 }
 
 inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v) {
-  return encode_not_null(v, base(), shift());
+  assert(!is_null(v), "klass value can never be zero");
+  DEBUG_ONLY(check_encodable(v);)
+  const narrowKlass nk = encode_not_null_without_asserts(v, base(), shift());
+  assert(decode_not_null_without_asserts(nk, base(), shift()) == v, "reversibility");
+  DEBUG_ONLY(check_valid_narrow_klass_id(nk);)
+  return nk;
 }
 
 inline narrowKlass CompressedKlassPointers::encode(Klass* v) {
   return is_null(v) ? (narrowKlass)0 : encode_not_null(v);
 }
 
+#ifdef ASSERT
+inline void CompressedKlassPointers::check_encodable(const void* addr) {
+  assert(UseCompressedClassPointers, "Only call for +UseCCP");
+  assert(addr != nullptr, "Null Klass?");
+  assert(is_encodable(addr),
+         "Address " PTR_FORMAT " is not encodable (Klass range: " RANGEFMT ", klass alignment: %d)",
+         p2i(addr), RANGE2FMTARGS(_klass_range_start, _klass_range_end), klass_alignment_in_bytes());
+}
+
+inline void CompressedKlassPointers::check_valid_narrow_klass_id(narrowKlass nk) {
+  check_init(_base);
+  assert(UseCompressedClassPointers, "Only call for +UseCCP");
+  assert(nk > 0, "narrow Klass ID is 0");
+  const uint64_t nk_mask = ~right_n_bits(narrow_klass_pointer_bits());
+  assert(((uint64_t)nk & nk_mask) == 0, "narrow klass id bit spillover (%u)", nk);
+  assert(nk >= _lowest_valid_narrow_klass_id &&
+         nk <= _highest_valid_narrow_klass_id, "narrowKlass ID out of range (%u)", nk);
+}
+#endif // ASSERT
+
 inline address CompressedKlassPointers::encoding_range_end() {
-  const int max_bits = (sizeof(narrowKlass) * BitsPerByte) + _shift; // narrowKlass are 32 bit
+  const int max_bits = narrow_klass_pointer_bits() + _shift;
   return _base + nth_bit(max_bits);
 }
 
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 1c295e10b21..7147e2588c9 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -477,7 +477,7 @@ void ConstantPool::remove_resolved_klass_if_non_deterministic(int cp_index) {
   if (k == nullptr) {
     // We'd come here if the referenced class has been excluded via
     // SystemDictionaryShared::is_excluded_class(). As a result, ArchiveBuilder
-    // has cleared the resolved_klasses()->at(...) pointer to NULL. Thus, we
+    // has cleared the resolved_klasses()->at(...) pointer to null. Thus, we
     // need to revert the tag to JVM_CONSTANT_UnresolvedClass.
     can_archive = false;
   } else {
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index e7cc0a00766..a9024bf4a9f 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -455,7 +455,7 @@ InstanceKlass* InstanceKlass::allocate_instance_klass(const ClassFileParser& par
   assert(loader_data != nullptr, "invariant");
 
   InstanceKlass* ik;
-  const bool use_class_space = !parser.is_interface() && !parser.is_abstract();
+  const bool use_class_space = parser.klass_needs_narrow_id();
 
   // Allocation
   if (parser.is_instance_ref_klass()) {
@@ -475,6 +475,11 @@ InstanceKlass* InstanceKlass::allocate_instance_klass(const ClassFileParser& par
     ik = new (loader_data, size, use_class_space, THREAD) InstanceKlass(parser);
   }
 
+  if (ik != nullptr && UseCompressedClassPointers && use_class_space) {
+    assert(CompressedKlassPointers::is_encodable(ik),
+           "Klass " PTR_FORMAT "needs a narrow Klass ID, but is not encodable", p2i(ik));
+  }
+
   // Check for pending exception before adding to the loader data and incrementing
   // class count.  Can get OOM here.
   if (HAS_PENDING_EXCEPTION) {
@@ -1595,6 +1600,7 @@ void InstanceKlass::call_class_initializer(TRAPS) {
                 THREAD->name());
   }
   if (h_method() != nullptr) {
+    ThreadInClassInitializer ticl(THREAD, this); // Track class being initialized
     JavaCallArguments args; // No arguments
     JavaValue result(T_VOID);
     JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args)
@@ -2639,10 +2645,15 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
     // have been redefined.
     bool trace_name_printed = false;
     adjust_default_methods(&trace_name_printed);
-    vtable().initialize_vtable();
-    itable().initialize_itable();
+    if (verified_at_dump_time()) {
+      // Initialize vtable and itable for classes which can be verified at dump time.
+      // Unlinked classes such as old classes with major version < 50 cannot be verified
+      // at dump time.
+      vtable().initialize_vtable();
+      itable().initialize_itable();
+    }
   }
-#endif
+#endif // INCLUDE_JVMTI
 
   // restore constant pool resolved references
   constants()->restore_unshareable_info(CHECK);
diff --git a/src/hotspot/share/oops/instanceOop.hpp b/src/hotspot/share/oops/instanceOop.hpp
index 8de3b1a742c..e97cd00f79f 100644
--- a/src/hotspot/share/oops/instanceOop.hpp
+++ b/src/hotspot/share/oops/instanceOop.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,6 @@
 // Evaluating "new HashTable()" will create an instanceOop.
 
 class instanceOopDesc : public oopDesc {
- public:
-  // aligned header size.
-  static int header_size() { return sizeof(instanceOopDesc)/HeapWordSize; }
-
-  // If compressed, the offset of the fields of the instance may not be aligned.
-  static int base_offset_in_bytes() {
-    return (UseCompressedClassPointers) ?
-            klass_gap_offset_in_bytes() :
-            sizeof(instanceOopDesc);
-
-  }
 };
 
 // See similar requirement for oopDesc.
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.cpp b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
index a2227b0a76a..2b819b27f64 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.cpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
@@ -163,6 +163,23 @@ void InstanceStackChunkKlass::oop_oop_iterate_stack_slow(stackChunkOop chunk, Oo
   chunk->iterate_stack(&frame_closure);
 }
 
+template <typename OopT>
+void InstanceStackChunkKlass::oop_oop_iterate_lockstack(stackChunkOop chunk, OopIterateClosure* closure, MemRegion mr) {
+  if (LockingMode != LM_LIGHTWEIGHT) {
+    return;
+  }
+
+  StackChunkOopIterateFilterClosure<OopIterateClosure> cl(closure, mr);
+  if (chunk->has_bitmap()) {
+    chunk->iterate_lockstack<OopT>(&cl);
+  } else {
+    chunk->iterate_lockstack<oop>(&cl);
+  }
+}
+
+template void InstanceStackChunkKlass::oop_oop_iterate_lockstack<oop>(stackChunkOop chunk, OopIterateClosure* closure, MemRegion mr);
+template void InstanceStackChunkKlass::oop_oop_iterate_lockstack<narrowOop>(stackChunkOop chunk, OopIterateClosure* closure, MemRegion mr);
+
 #ifdef ASSERT
 
 class DescribeStackChunkClosure {
@@ -224,7 +241,7 @@ class PrintStackChunkClosure {
     frame f = fs.to_frame();
     _st->print_cr("-- frame sp: " PTR_FORMAT " interpreted: %d size: %d argsize: %d",
                   p2i(fs.sp()), fs.is_interpreted(), f.frame_size(),
-                  fs.is_interpreted() ? 0 : f.compiled_frame_stack_argsize());
+                  fs.is_interpreted() || fs.is_stub() ? 0 : f.compiled_frame_stack_argsize());
   #ifdef ASSERT
     f.print_value_on(_st);
   #else
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.hpp b/src/hotspot/share/oops/instanceStackChunkKlass.hpp
index aa59b46f42c..19ce37c4ddd 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.hpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,6 +177,9 @@ class InstanceStackChunkKlass: public InstanceKlass {
   template <typename T, class OopClosureType>
   inline void oop_oop_iterate_stack_with_bitmap(stackChunkOop chunk, OopClosureType* closure, intptr_t* start, intptr_t* end);
 
+  template <typename OopT>
+  void oop_oop_iterate_lockstack(stackChunkOop chunk, OopIterateClosure* closure, MemRegion mr);
+
   void do_methods(stackChunkOop chunk, OopIterateClosure* cl);
 
   void oop_oop_iterate_stack_slow(stackChunkOop chunk, OopIterateClosure* closure, MemRegion mr);
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp b/src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp
index 38aab2c78a7..3374895c6a1 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@ void InstanceStackChunkKlass::oop_oop_iterate(oop obj, OopClosureType* closure)
   }
   oop_oop_iterate_stack<T>(chunk, closure);
   oop_oop_iterate_header<T>(chunk, closure);
+  oop_oop_iterate_lockstack<T>(chunk, closure, chunk->range());
 }
 
 template <typename T, class OopClosureType>
@@ -73,6 +74,7 @@ void InstanceStackChunkKlass::oop_oop_iterate_reverse(oop obj, OopClosureType* c
   stackChunkOop chunk = stackChunkOopDesc::cast(obj);
   oop_oop_iterate_stack<T>(chunk, closure);
   oop_oop_iterate_header<T>(chunk, closure);
+  oop_oop_iterate_lockstack<T>(chunk, closure, chunk->range());
 }
 
 template <typename T, class OopClosureType>
@@ -85,6 +87,7 @@ void InstanceStackChunkKlass::oop_oop_iterate_bounded(oop obj, OopClosureType* c
   }
   oop_oop_iterate_stack_bounded<T>(chunk, closure, mr);
   oop_oop_iterate_header_bounded<T>(chunk, closure, mr);
+  oop_oop_iterate_lockstack<T>(chunk, closure, mr);
 }
 
 template <typename T, class OopClosureType>
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index b87f341ce48..884816764a0 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -43,6 +43,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
@@ -274,6 +275,23 @@ Method* Klass::uncached_lookup_method(const Symbol* name, const Symbol* signatur
   return nullptr;
 }
 
+static markWord make_prototype(const Klass* kls) {
+  markWord prototype = markWord::prototype();
+#ifdef _LP64
+  if (UseCompactObjectHeaders) {
+    // With compact object headers, the narrow Klass ID is part of the mark word.
+    // We therfore seed the mark word with the narrow Klass ID.
+    // Note that only those Klass that can be instantiated have a narrow Klass ID.
+    // For those who don't, we leave the klass bits empty and assert if someone
+    // tries to use those.
+    const narrowKlass nk = CompressedKlassPointers::is_encodable(kls) ?
+        CompressedKlassPointers::encode(const_cast<Klass*>(kls)) : 0;
+    prototype = prototype.set_narrow_klass(nk);
+  }
+#endif
+  return prototype;
+}
+
 Klass::Klass() : _kind(UnknownKlassKind) {
   assert(CDSConfig::is_dumping_static_archive() || CDSConfig::is_using_archive(), "only for cds");
 }
@@ -283,6 +301,7 @@ Klass::Klass() : _kind(UnknownKlassKind) {
 // The constructor is also used from CppVtableCloner,
 // which doesn't zero out the memory before calling the constructor.
 Klass::Klass(KlassKind kind) : _kind(kind),
+                               _prototype_header(make_prototype(this)),
                                _shared_class_path_index(-1) {
   CDS_ONLY(_shared_class_flags = 0;)
   CDS_JAVA_HEAP_ONLY(_archived_mirror_index = -1;)
@@ -985,6 +1004,10 @@ void Klass::oop_print_on(oop obj, outputStream* st) {
      // print header
      obj->mark().print_on(st);
      st->cr();
+     if (UseCompactObjectHeaders) {
+       st->print(BULLET"prototype_header: " INTPTR_FORMAT, _prototype_header.value());
+       st->cr();
+     }
   }
 
   // print class
@@ -1007,7 +1030,14 @@ void Klass::verify_on(outputStream* st) {
 
   // This can be expensive, but it is worth checking that this klass is actually
   // in the CLD graph but not in production.
-  assert(Metaspace::contains((address)this), "Should be");
+#ifdef ASSERT
+  if (UseCompressedClassPointers && needs_narrow_id()) {
+    // Stricter checks for both correct alignment and placement
+    CompressedKlassPointers::check_encodable(this);
+  } else {
+    assert(Metaspace::contains((address)this), "Should be");
+  }
+#endif // ASSERT
 
   guarantee(this->is_klass(),"should be klass");
 
@@ -1035,6 +1065,8 @@ void Klass::oop_verify_on(oop obj, outputStream* st) {
   guarantee(obj->klass()->is_klass(), "klass field is not a klass");
 }
 
+// Note: this function is called with an address that may or may not be a Klass.
+// The point is not to assert it is but to check if it could be.
 bool Klass::is_valid(Klass* k) {
   if (!is_aligned(k, sizeof(MetaWord))) return false;
   if ((size_t)k < os::min_page_size()) return false;
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 4fc670d85f1..2629be64bea 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -165,6 +165,8 @@ class Klass : public Metadata {
   uintx    _secondary_supers_bitmap;
   uint8_t  _hash_slot;
 
+  markWord _prototype_header;   // Used to initialize objects' header
+
   int _vtable_len;              // vtable length. This field may be read very often when we
                                 // have lots of itable dispatches (e.g., lambdas and streams).
                                 // Keep it away from the beginning of a Klass to avoid cacheline
@@ -581,6 +583,8 @@ class Klass : public Metadata {
 
   inline oop klass_holder() const;
 
+  inline void keep_alive() const;
+
  protected:
 
   // Error handling when length > max_length or length < 0
@@ -705,6 +709,10 @@ class Klass : public Metadata {
   bool is_cloneable() const;
   void set_is_cloneable();
 
+  inline markWord prototype_header() const;
+  inline void set_prototype_header(markWord header);
+  static ByteSize prototype_header_offset() { return in_ByteSize(offset_of(Klass, _prototype_header)); }
+
   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
 
   virtual void metaspace_pointers_do(MetaspaceClosure* iter);
@@ -759,6 +767,10 @@ class Klass : public Metadata {
   static bool is_valid(Klass* k);
 
   static void on_secondary_supers_verification_failure(Klass* super, Klass* sub, bool linear_result, bool table_result, const char* msg);
+
+  // Returns true if this Klass needs to be addressable via narrow Klass ID.
+  inline bool needs_narrow_id() const;
+
 };
 
 #endif // SHARE_OOPS_KLASS_HPP
diff --git a/src/hotspot/share/oops/klass.inline.hpp b/src/hotspot/share/oops/klass.inline.hpp
index ea9af6d6928..4f9401f1709 100644
--- a/src/hotspot/share/oops/klass.inline.hpp
+++ b/src/hotspot/share/oops/klass.inline.hpp
@@ -37,6 +37,13 @@ inline oop Klass::klass_holder() const {
   return class_loader_data()->holder();
 }
 
+inline void Klass::keep_alive() const {
+  // Resolving the holder (a WeakHandle) will keep the klass alive until the next safepoint.
+  // Making the klass's CLD handle oops (e.g. the java_mirror), safe to store in the object
+  // graph and its roots (e.g. Handles).
+  static_cast<void>(klass_holder());
+}
+
 inline bool Klass::is_non_strong_hidden() const {
   return is_hidden() && class_loader_data()->has_class_mirror_holder();
 }
@@ -52,6 +59,25 @@ inline bool Klass::is_loader_alive() const {
   return class_loader_data()->is_alive();
 }
 
+inline markWord Klass::prototype_header() const {
+  assert(UseCompactObjectHeaders, "only use with compact object headers");
+#ifdef _LP64
+  // You only need prototypes for allocating objects. If the class is not instantiable, it won't live in
+  // class space and have no narrow Klass ID. But in that case we should not need the prototype.
+  assert(_prototype_header.narrow_klass() > 0, "Klass " PTR_FORMAT ": invalid prototype (" PTR_FORMAT ")",
+         p2i(this), _prototype_header.value());
+#endif
+  return _prototype_header;
+}
+
+// This is only used when dumping the archive. In other cases,
+// the _prototype_header is already initialized to the right thing.
+inline void Klass::set_prototype_header(markWord header) {
+  assert(UseCompactObjectHeaders, "only with compact headers");
+  _prototype_header = header;
+}
+
+// Loading the java_mirror does not keep its holder alive. See Klass::keep_alive().
 inline oop Klass::java_mirror() const {
   return _java_mirror.resolve();
 }
@@ -144,4 +170,13 @@ inline bool Klass::search_secondary_supers(Klass *k) const {
   return result;
 }
 
+// Returns true if this Klass needs to be addressable via narrow Klass ID.
+inline bool Klass::needs_narrow_id() const {
+  // Classes that are never instantiated need no narrow Klass Id, since the
+  // only point of having a narrow id is to put it into an object header. Keeping
+  // never instantiated classes out of class space lessens the class space pressure.
+  // For more details, see JDK-8338526.
+  // Note: don't call this function before access flags are initialized.
+  return !is_abstract() && !is_interface();
+}
 #endif // SHARE_OOPS_KLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/markWord.cpp b/src/hotspot/share/oops/markWord.cpp
index 2bbec570fa8..a9b1a7b026a 100644
--- a/src/hotspot/share/oops/markWord.cpp
+++ b/src/hotspot/share/oops/markWord.cpp
@@ -29,6 +29,12 @@
 #include "runtime/objectMonitor.inline.hpp"
 #include "utilities/ostream.hpp"
 
+#ifdef _LP64
+STATIC_ASSERT(markWord::klass_shift + markWord::klass_bits == 64);
+// The hash (preceding klass bits) shall be a direct neighbor but not interleave
+STATIC_ASSERT(markWord::klass_shift == markWord::hash_bits + markWord::hash_shift);
+#endif
+
 markWord markWord::displaced_mark_helper() const {
   assert(has_displaced_mark_helper(), "check");
   if (has_monitor()) {
diff --git a/src/hotspot/share/oops/markWord.hpp b/src/hotspot/share/oops/markWord.hpp
index bbd80d02cbd..7d2bff1efc0 100644
--- a/src/hotspot/share/oops/markWord.hpp
+++ b/src/hotspot/share/oops/markWord.hpp
@@ -26,6 +26,7 @@
 #define SHARE_OOPS_MARKWORD_HPP
 
 #include "metaprogramming/primitiveConversions.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/globals.hpp"
 
@@ -37,11 +38,15 @@
 //
 //  32 bits:
 //  --------
-//             hash:25 ------------>| age:4  unused_gap:1  lock:2 (normal object)
+//             hash:25 ------------>| age:4  self-fwd:1  lock:2 (normal object)
 //
 //  64 bits:
 //  --------
-//  unused:25 hash:31 -->| unused_gap:1  age:4  unused_gap:1  lock:2 (normal object)
+//  unused:22 hash:31 -->| unused_gap:4  age:4  self-fwd:1  lock:2 (normal object)
+//
+//  64 bits (with compact headers):
+//  -------------------------------
+//  klass:22  hash:31 -->| unused_gap:4  age:4  self-fwd:1  lock:2 (normal object)
 //
 //  - hash contains the identity hash value: largest value is
 //    31 bits, see os::random().  Also, 64-bit vm's require
@@ -104,22 +109,37 @@ class markWord {
   // Constants
   static const int age_bits                       = 4;
   static const int lock_bits                      = 2;
-  static const int first_unused_gap_bits          = 1;
-  static const int max_hash_bits                  = BitsPerWord - age_bits - lock_bits - first_unused_gap_bits;
+  static const int self_fwd_bits                  = 1;
+  static const int max_hash_bits                  = BitsPerWord - age_bits - lock_bits - self_fwd_bits;
   static const int hash_bits                      = max_hash_bits > 31 ? 31 : max_hash_bits;
-  static const int second_unused_gap_bits         = LP64_ONLY(1) NOT_LP64(0);
+  static const int unused_gap_bits                = LP64_ONLY(4) NOT_LP64(0); // Reserved for Valhalla.
 
   static const int lock_shift                     = 0;
-  static const int age_shift                      = lock_bits + first_unused_gap_bits;
-  static const int hash_shift                     = age_shift + age_bits + second_unused_gap_bits;
+  static const int self_fwd_shift                 = lock_shift + lock_bits;
+  static const int age_shift                      = self_fwd_shift + self_fwd_bits;
+  static const int hash_shift                     = age_shift + age_bits + unused_gap_bits;
 
   static const uintptr_t lock_mask                = right_n_bits(lock_bits);
   static const uintptr_t lock_mask_in_place       = lock_mask << lock_shift;
+  static const uintptr_t self_fwd_mask            = right_n_bits(self_fwd_bits);
+  static const uintptr_t self_fwd_mask_in_place   = self_fwd_mask << self_fwd_shift;
   static const uintptr_t age_mask                 = right_n_bits(age_bits);
   static const uintptr_t age_mask_in_place        = age_mask << age_shift;
   static const uintptr_t hash_mask                = right_n_bits(hash_bits);
   static const uintptr_t hash_mask_in_place       = hash_mask << hash_shift;
 
+#ifdef _LP64
+  // Used only with compact headers:
+  // We store the (narrow) Klass* in the bits 43 to 64.
+
+  // These are for bit-precise extraction of the narrow Klass* from the 64-bit Markword
+  static constexpr int klass_shift                = hash_shift + hash_bits;
+  static constexpr int klass_bits                 = 22;
+  static constexpr uintptr_t klass_mask           = right_n_bits(klass_bits);
+  static constexpr uintptr_t klass_mask_in_place  = klass_mask << klass_shift;
+#endif
+
+
   static const uintptr_t locked_value             = 0;
   static const uintptr_t unlocked_value           = 1;
   static const uintptr_t monitor_value            = 2;
@@ -144,8 +164,9 @@ class markWord {
   bool is_marked()   const {
     return (mask_bits(value(), lock_mask_in_place) == marked_value);
   }
-  bool is_forwarded()   const {
-    return (mask_bits(value(), lock_mask_in_place) == marked_value);
+  bool is_forwarded() const {
+    // Returns true for normal forwarded (0b011) and self-forwarded (0b1xx).
+    return mask_bits(value(), lock_mask_in_place | self_fwd_mask_in_place) >= static_cast<intptr_t>(marked_value);
   }
   bool is_neutral()  const {  // Not locked, or marked - a "clean" neutral state
     return (mask_bits(value(), lock_mask_in_place) == unlocked_value);
@@ -260,6 +281,12 @@ class markWord {
     return hash() == no_hash;
   }
 
+  inline Klass* klass() const;
+  inline Klass* klass_or_null() const;
+  inline Klass* klass_without_asserts() const;
+  inline narrowKlass narrow_klass() const;
+  inline markWord set_narrow_klass(narrowKlass narrow_klass) const;
+
   // Prototype mark for initialization
   static markWord prototype() {
     return markWord( no_hash_in_place | no_lock_in_place );
@@ -274,6 +301,21 @@ class markWord {
   // Recover address of oop from encoded form used in mark
   inline void* decode_pointer() const { return (void*)clear_lock_bits().value(); }
 
+  inline bool is_self_forwarded() const {
+    NOT_LP64(assert(LockingMode != LM_LEGACY, "incorrect with LM_LEGACY on 32 bit");)
+    return mask_bits(value(), self_fwd_mask_in_place) != 0;
+  }
+
+  inline markWord set_self_forwarded() const {
+    NOT_LP64(assert(LockingMode != LM_LEGACY, "incorrect with LM_LEGACY on 32 bit");)
+    return markWord(value() | self_fwd_mask_in_place);
+  }
+
+  inline markWord unset_self_forwarded() const {
+    NOT_LP64(assert(LockingMode != LM_LEGACY, "incorrect with LM_LEGACY on 32 bit");)
+    return markWord(value() & ~self_fwd_mask_in_place);
+  }
+
   inline oop forwardee() const {
     return cast_to_oop(decode_pointer());
   }
diff --git a/src/hotspot/share/oops/markWord.inline.hpp b/src/hotspot/share/oops/markWord.inline.hpp
new file mode 100644
index 00000000000..27c8cfdeaef
--- /dev/null
+++ b/src/hotspot/share/oops/markWord.inline.hpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_OOPS_MARKWORD_INLINE_HPP
+#define SHARE_OOPS_MARKWORD_INLINE_HPP
+
+#include "oops/compressedOops.inline.hpp"
+#include "oops/markWord.hpp"
+
+narrowKlass markWord::narrow_klass() const {
+#ifdef _LP64
+  assert(UseCompactObjectHeaders, "only used with compact object headers");
+  return narrowKlass(value() >> klass_shift);
+#else
+  ShouldNotReachHere();
+  return 0;
+#endif
+}
+
+markWord markWord::set_narrow_klass(narrowKlass narrow_klass) const {
+#ifdef _LP64
+  assert(UseCompactObjectHeaders, "only used with compact object headers");
+  return markWord((value() & ~klass_mask_in_place) | ((uintptr_t) narrow_klass << klass_shift));
+#else
+  ShouldNotReachHere();
+  return markWord(0);
+#endif
+}
+
+Klass* markWord::klass() const {
+#ifdef _LP64
+  assert(UseCompactObjectHeaders, "only used with compact object headers");
+  return CompressedKlassPointers::decode_not_null(narrow_klass());
+#else
+  ShouldNotReachHere();
+  return nullptr;
+#endif
+}
+
+Klass* markWord::klass_or_null() const {
+#ifdef _LP64
+  assert(UseCompactObjectHeaders, "only used with compact object headers");
+  return CompressedKlassPointers::decode(narrow_klass());
+#else
+  ShouldNotReachHere();
+  return nullptr;
+#endif
+}
+
+Klass* markWord::klass_without_asserts() const {
+#ifdef _LP64
+  assert(UseCompactObjectHeaders, "only used with compact object headers");
+  return CompressedKlassPointers::decode_without_asserts(narrow_klass());
+#else
+  ShouldNotReachHere();
+  return nullptr;
+#endif
+}
+
+#endif // SHARE_OOPS_MARKWORD_INLINE_HPP
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index a1b380d3646..26a047449ed 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -867,6 +867,11 @@ bool Method::needs_clinit_barrier() const {
   return is_static() && !method_holder()->is_initialized();
 }
 
+bool Method::is_object_wait0() const {
+  return klass_name() == vmSymbols::java_lang_Object()
+         && name() == vmSymbols::wait_name();
+}
+
 objArrayHandle Method::resolved_checked_exceptions_impl(Method* method, TRAPS) {
   int length = method->checked_exceptions_length();
   if (length == 0) {  // common case
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index d42089d3a5c..232e5fb577e 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -586,6 +586,9 @@ class Method : public Metadata {
   // returns true if the method name is <init>
   bool is_object_initializer() const;
 
+  // returns true if the method name is wait0
+  bool is_object_wait0() const;
+
   // compiled code support
   // NOTE: code() is inherently racy as deopt can be clearing code
   // simultaneously. Use with caution.
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index af19d59f281..bc2649ba0ed 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -59,9 +59,14 @@ bool DataLayout::needs_array_len(u1 tag) {
 // Perform generic initialization of the data.  More specific
 // initialization occurs in overrides of ProfileData::post_initialize.
 void DataLayout::initialize(u1 tag, u2 bci, int cell_count) {
-  _header._bits = (intptr_t)0;
-  _header._struct._tag = tag;
-  _header._struct._bci = bci;
+  DataLayout temp;
+  temp._header._bits = (intptr_t)0;
+  temp._header._struct._tag = tag;
+  temp._header._struct._bci = bci;
+  // Write the header using a single intptr_t write.  This ensures that if the layout is
+  // reinitialized readers will never see the transient state where the header is 0.
+  _header = temp._header;
+
   for (int i = 0; i < cell_count; i++) {
     set_cell_at(i, (intptr_t)0);
   }
@@ -1224,6 +1229,28 @@ MethodData::MethodData(const methodHandle& method)
   initialize();
 }
 
+// Reinitialize the storage of an existing MDO at a safepoint.  Doing it this way will ensure it's
+// not being accessed while the contents are being rewritten.
+class VM_ReinitializeMDO: public VM_Operation {
+ private:
+  MethodData* _mdo;
+ public:
+  VM_ReinitializeMDO(MethodData* mdo): _mdo(mdo) {}
+  VMOp_Type type() const                         { return VMOp_ReinitializeMDO; }
+  void doit() {
+    // The extra data is being zero'd, we'd like to acquire the extra_data_lock but it can't be held
+    // over a safepoint.  This means that we don't actually need to acquire the lock.
+    _mdo->initialize();
+  }
+  bool allow_nested_vm_operations() const        { return true; }
+};
+
+void MethodData::reinitialize() {
+  VM_ReinitializeMDO op(this);
+  VMThread::execute(&op);
+}
+
+
 void MethodData::initialize() {
   Thread* thread = Thread::current();
   NoSafepointVerifier no_safepoint;  // init function atomic wrt GC
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index 5071c29f1d7..36fcf8ce5fd 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -1949,6 +1949,7 @@ class MethodData : public Metadata {
   friend class ProfileData;
   friend class TypeEntriesAtCall;
   friend class ciMethodData;
+  friend class VM_ReinitializeMDO;
 
   // If you add a new field that points to any metaspace object, you
   // must add this field to MethodData::metaspace_pointers_do().
@@ -1965,11 +1966,18 @@ class MethodData : public Metadata {
   Mutex _extra_data_lock;
 
   MethodData(const methodHandle& method);
+
+  void initialize();
+
 public:
   static MethodData* allocate(ClassLoaderData* loader_data, const methodHandle& method, TRAPS);
 
   virtual bool is_methodData() const { return true; }
-  void initialize();
+
+  // Safely reinitialize the data in the MDO.  This is intended as a testing facility as the
+  // reinitialization is performed at a safepoint so it's isn't cheap and it doesn't ensure that all
+  // readers will see consistent profile data.
+  void reinitialize();
 
   // Whole-method sticky bits and flags
   enum {
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index bee010b6d72..0697901d174 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -143,7 +143,10 @@ ObjArrayKlass::ObjArrayKlass(int n, Klass* element_klass, Symbol* name) : ArrayK
 }
 
 size_t ObjArrayKlass::oop_size(oop obj) const {
-  assert(obj->is_objArray(), "must be object array");
+  // In this assert, we cannot safely access the Klass* with compact headers,
+  // because size_given_klass() calls oop_size() on objects that might be
+  // concurrently forwarded, which would overwrite the Klass*.
+  assert(UseCompactObjectHeaders || obj->is_objArray(), "must be object array");
   return objArrayOop(obj)->object_size();
 }
 
diff --git a/src/hotspot/share/oops/objArrayKlass.inline.hpp b/src/hotspot/share/oops/objArrayKlass.inline.hpp
index 6c9165509c7..a92c42d21a8 100644
--- a/src/hotspot/share/oops/objArrayKlass.inline.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ void ObjArrayKlass::oop_oop_iterate_elements_bounded(
 
 template <typename T, typename OopClosureType>
 void ObjArrayKlass::oop_oop_iterate(oop obj, OopClosureType* closure) {
-  assert (obj->is_array(), "obj must be array");
+  assert(obj->is_array(), "obj must be array");
   objArrayOop a = objArrayOop(obj);
 
   if (Devirtualizer::do_metadata(closure)) {
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index acb47d4c7cf..9385379a617 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,8 +153,7 @@ bool oopDesc::is_objArray_noinline()    const { return is_objArray();    }
 bool oopDesc::is_typeArray_noinline()   const { return is_typeArray();   }
 
 bool oopDesc::has_klass_gap() {
-  // Only has a klass gap when compressed class pointers are used.
-  return UseCompressedClassPointers;
+  return UseCompressedClassPointers && !UseCompactObjectHeaders;
 }
 
 #if INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index a330b3df529..dcf42c7343b 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,8 @@ class oopDesc {
   // make use of the C++ copy/assign incorrect.
   NONCOPYABLE(oopDesc);
 
+  inline oop cas_set_forwardee(markWord new_mark, markWord old_mark, atomic_memory_order order);
+
  public:
   // Must be trivial; see verifying static assert after the class.
   oopDesc() = default;
@@ -78,6 +80,9 @@ class oopDesc {
   inline markWord cas_set_mark(markWord new_mark, markWord old_mark);
   inline markWord cas_set_mark(markWord new_mark, markWord old_mark, atomic_memory_order order);
 
+  // Returns the prototype mark that should be used for this object.
+  inline markWord prototype_mark() const;
+
   // Used only to re-initialize the mark word (e.g., of promoted
   // objects during a GC) -- requires a valid klass pointer
   inline void init_mark();
@@ -95,8 +100,14 @@ class oopDesc {
   // For klass field compression
   static inline void set_klass_gap(HeapWord* mem, int z);
 
-  // size of object header, aligned to platform wordSize
-  static constexpr int header_size() { return sizeof(oopDesc)/HeapWordSize; }
+  // Size of object header, aligned to platform wordSize
+  static int header_size() {
+    if (UseCompactObjectHeaders) {
+      return sizeof(markWord) / HeapWordSize;
+    } else {
+      return sizeof(oopDesc)  / HeapWordSize;
+    }
+  }
 
   // Returns whether this is an instance of k or an instance of a subclass of k
   inline bool is_a(Klass* k) const;
@@ -258,16 +269,22 @@ class oopDesc {
 
   // Forward pointer operations for scavenge
   inline bool is_forwarded() const;
+  inline bool is_self_forwarded() const;
 
   inline void forward_to(oop p);
+  inline void forward_to_self();
 
   // Like "forward_to", but inserts the forwarding pointer atomically.
   // Exactly one thread succeeds in inserting the forwarding pointer, and
   // this call returns null for that thread; any other thread has the
   // value of the forwarding pointer returned and does not modify "this".
   inline oop forward_to_atomic(oop p, markWord compare, atomic_memory_order order = memory_order_conservative);
+  inline oop forward_to_self_atomic(markWord compare, atomic_memory_order order = memory_order_conservative);
 
   inline oop forwardee() const;
+  inline oop forwardee(markWord header) const;
+
+  inline void unset_self_forwarded();
 
   // Age of object during scavenge
   inline uint age() const;
@@ -311,12 +328,39 @@ class oopDesc {
 
   // for code generation
   static int mark_offset_in_bytes()      { return (int)offset_of(oopDesc, _mark); }
-  static int klass_offset_in_bytes()     { return (int)offset_of(oopDesc, _metadata._klass); }
+  static int klass_offset_in_bytes()     {
+#ifdef _LP64
+    if (UseCompactObjectHeaders) {
+      // NOTE: The only places where this is used with compact headers are the C2
+      // compiler and JVMCI, and even there we don't use it to access the (narrow)Klass*
+      // directly. It is used only as a placeholder to identify the special memory slice
+      // containing Klass* info. This value could be any value that is not a valid
+      // field offset. Use an offset halfway into the markWord, as the markWord is never
+      // partially loaded from C2 and JVMCI.
+      return mark_offset_in_bytes() + 4;
+    } else
+#endif
+    {
+      return (int)offset_of(oopDesc, _metadata._klass);
+    }
+  }
   static int klass_gap_offset_in_bytes() {
     assert(has_klass_gap(), "only applicable to compressed klass pointers");
     return klass_offset_in_bytes() + sizeof(narrowKlass);
   }
 
+  static int base_offset_in_bytes() {
+    if (UseCompactObjectHeaders) {
+      // With compact headers, the Klass* field is not used for the Klass*
+      // and is used for the object fields instead.
+      return sizeof(markWord);
+    } else if (UseCompressedClassPointers) {
+      return sizeof(markWord) + sizeof(narrowKlass);
+    } else {
+      return sizeof(markWord) + sizeof(Klass*);
+    }
+  }
+
   // for error reporting
   static void* load_oop_raw(oop obj, int offset);
 };
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index 95b99b215fa..098e6bfa90f 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -34,7 +34,7 @@
 #include "oops/arrayOop.hpp"
 #include "oops/compressedKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/markWord.hpp"
+#include "oops/markWord.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
@@ -82,20 +82,32 @@ markWord oopDesc::cas_set_mark(markWord new_mark, markWord old_mark, atomic_memo
   return Atomic::cmpxchg(&_mark, old_mark, new_mark, order);
 }
 
+markWord oopDesc::prototype_mark() const {
+  if (UseCompactObjectHeaders) {
+    return klass()->prototype_header();
+  } else {
+    return markWord::prototype();
+  }
+}
+
 void oopDesc::init_mark() {
-  set_mark(markWord::prototype());
+  set_mark(prototype_mark());
 }
 
 Klass* oopDesc::klass() const {
-  if (UseCompressedClassPointers) {
-    return CompressedKlassPointers::decode_not_null(_metadata._compressed_klass);
+  if (UseCompactObjectHeaders) {
+    return mark().klass();
+  } else if (UseCompressedClassPointers) {
+     return CompressedKlassPointers::decode_not_null(_metadata._compressed_klass);
   } else {
     return _metadata._klass;
   }
 }
 
 Klass* oopDesc::klass_or_null() const {
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    return mark().klass_or_null();
+  } else if (UseCompressedClassPointers) {
     return CompressedKlassPointers::decode(_metadata._compressed_klass);
   } else {
     return _metadata._klass;
@@ -103,16 +115,20 @@ Klass* oopDesc::klass_or_null() const {
 }
 
 Klass* oopDesc::klass_or_null_acquire() const {
-  if (UseCompressedClassPointers) {
-    narrowKlass nklass = Atomic::load_acquire(&_metadata._compressed_klass);
-    return CompressedKlassPointers::decode(nklass);
+  if (UseCompactObjectHeaders) {
+    return mark_acquire().klass();
+  } else if (UseCompressedClassPointers) {
+    narrowKlass narrow_klass = Atomic::load_acquire(&_metadata._compressed_klass);
+    return CompressedKlassPointers::decode(narrow_klass);
   } else {
     return Atomic::load_acquire(&_metadata._klass);
   }
 }
 
 Klass* oopDesc::klass_without_asserts() const {
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    return mark().klass_without_asserts();
+  } else if (UseCompressedClassPointers) {
     return CompressedKlassPointers::decode_without_asserts(_metadata._compressed_klass);
   } else {
     return _metadata._klass;
@@ -121,6 +137,7 @@ Klass* oopDesc::klass_without_asserts() const {
 
 void oopDesc::set_klass(Klass* k) {
   assert(Universe::is_bootstrapping() || (k != nullptr && k->is_klass()), "incorrect Klass");
+  assert(!UseCompactObjectHeaders, "don't set Klass* with compact headers");
   if (UseCompressedClassPointers) {
     _metadata._compressed_klass = CompressedKlassPointers::encode_not_null(k);
   } else {
@@ -130,6 +147,7 @@ void oopDesc::set_klass(Klass* k) {
 
 void oopDesc::release_set_klass(HeapWord* mem, Klass* k) {
   assert(Universe::is_bootstrapping() || (k != nullptr && k->is_klass()), "incorrect Klass");
+  assert(!UseCompactObjectHeaders, "don't set Klass* with compact headers");
   char* raw_mem = ((char*)mem + klass_offset_in_bytes());
   if (UseCompressedClassPointers) {
     Atomic::release_store((narrowKlass*)raw_mem,
@@ -140,9 +158,8 @@ void oopDesc::release_set_klass(HeapWord* mem, Klass* k) {
 }
 
 void oopDesc::set_klass_gap(HeapWord* mem, int v) {
-  if (UseCompressedClassPointers) {
-    *(int*)(((char*)mem) + klass_gap_offset_in_bytes()) = v;
-  }
+  assert(has_klass_gap(), "precondition");
+  *(int*)(((char*)mem) + klass_gap_offset_in_bytes()) = v;
 }
 
 bool oopDesc::is_a(Klass* k) const {
@@ -267,21 +284,53 @@ bool oopDesc::is_forwarded() const {
   return mark().is_forwarded();
 }
 
+bool oopDesc::is_self_forwarded() const {
+  return mark().is_self_forwarded();
+}
+
 // Used by scavengers
 void oopDesc::forward_to(oop p) {
+  assert(cast_from_oop<oopDesc*>(p) != this,
+         "must not be used for self-forwarding, use forward_to_self() instead");
   markWord m = markWord::encode_pointer_as_mark(p);
   assert(m.decode_pointer() == p, "encoding must be reversible");
   set_mark(m);
 }
 
-oop oopDesc::forward_to_atomic(oop p, markWord compare, atomic_memory_order order) {
-  markWord m = markWord::encode_pointer_as_mark(p);
-  assert(m.decode_pointer() == p, "encoding must be reversible");
-  markWord old_mark = cas_set_mark(m, compare, order);
+void oopDesc::forward_to_self() {
+  set_mark(mark().set_self_forwarded());
+}
+
+oop oopDesc::cas_set_forwardee(markWord new_mark, markWord compare, atomic_memory_order order) {
+  markWord old_mark = cas_set_mark(new_mark, compare, order);
   if (old_mark == compare) {
     return nullptr;
   } else {
-    return cast_to_oop(old_mark.decode_pointer());
+    assert(old_mark.is_forwarded(), "must be forwarded here");
+    return forwardee(old_mark);
+  }
+}
+
+oop oopDesc::forward_to_atomic(oop p, markWord compare, atomic_memory_order order) {
+  assert(cast_from_oop<oopDesc*>(p) != this,
+         "must not be used for self-forwarding, use forward_to_self_atomic() instead");
+  markWord m = markWord::encode_pointer_as_mark(p);
+  assert(forwardee(m) == p, "encoding must be reversible");
+  return cas_set_forwardee(m, compare, order);
+}
+
+oop oopDesc::forward_to_self_atomic(markWord old_mark, atomic_memory_order order) {
+  markWord new_mark = old_mark.set_self_forwarded();
+  assert(forwardee(new_mark) == cast_to_oop(this), "encoding must be reversible");
+  return cas_set_forwardee(new_mark, old_mark, order);
+}
+
+oop oopDesc::forwardee(markWord mark) const {
+  assert(mark.is_forwarded(), "only decode when actually forwarded");
+  if (mark.is_self_forwarded()) {
+    return cast_to_oop(this);
+  } else {
+    return mark.forwardee();
   }
 }
 
@@ -289,7 +338,11 @@ oop oopDesc::forward_to_atomic(oop p, markWord compare, atomic_memory_order orde
 // The forwardee is used when copying during scavenge and mark-sweep.
 // It does need to clear the low two locking- and GC-related bits.
 oop oopDesc::forwardee() const {
-  return mark().forwardee();
+  return forwardee(mark());
+}
+
+void oopDesc::unset_self_forwarded() {
+  set_mark(mark().unset_self_forwarded());
 }
 
 // The following method needs to be MT safe.
@@ -346,6 +399,7 @@ void oopDesc::oop_iterate_backwards(OopClosureType* cl) {
 
 template <typename OopClosureType>
 void oopDesc::oop_iterate_backwards(OopClosureType* cl, Klass* k) {
+  // In this assert, we cannot safely access the Klass* with compact headers.
   assert(k == klass(), "wrong klass");
   OopIteratorClosureDispatch::oop_oop_iterate_backwards(cl, this, k);
 }
diff --git a/src/hotspot/share/oops/oopHandle.hpp b/src/hotspot/share/oops/oopHandle.hpp
index 983ddf9ae5c..4f0532534a8 100644
--- a/src/hotspot/share/oops/oopHandle.hpp
+++ b/src/hotspot/share/oops/oopHandle.hpp
@@ -71,6 +71,7 @@ class OopHandle {
   inline void replace(oop obj);
 
   inline oop xchg(oop new_value);
+  inline oop cmpxchg(oop old_value, oop new_value);
 
   oop* ptr_raw() const { return _obj; }
 };
diff --git a/src/hotspot/share/oops/oopHandle.inline.hpp b/src/hotspot/share/oops/oopHandle.inline.hpp
index 23a13cb35e3..06acd291274 100644
--- a/src/hotspot/share/oops/oopHandle.inline.hpp
+++ b/src/hotspot/share/oops/oopHandle.inline.hpp
@@ -65,4 +65,8 @@ inline oop OopHandle::xchg(oop new_value) {
   return NativeAccess<MO_SEQ_CST>::oop_atomic_xchg(_obj, new_value);
 }
 
+inline oop OopHandle::cmpxchg(oop old_value, oop new_value) {
+  return NativeAccess<MO_SEQ_CST>::oop_atomic_cmpxchg(_obj, old_value, new_value);
+}
+
 #endif // SHARE_OOPS_OOPHANDLE_INLINE_HPP
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index 344fef15308..7319e93b667 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -65,6 +65,21 @@ class FrameOopIterator : public OopIterator {
   }
 };
 
+class LockStackOopIterator : public OopIterator {
+private:
+  const stackChunkOop _chunk;
+public:
+  LockStackOopIterator(const stackChunkOop chunk) : _chunk(chunk) {}
+
+  virtual void oops_do(OopClosure* cl) override {
+    int cnt = _chunk->lockstack_size();
+    oop* lockstack_start = (oop*)_chunk->start_address();
+    for (int i = 0; i < cnt; i++) {
+      cl->do_oop(&lockstack_start[i]);
+    }
+  }
+};
+
 frame stackChunkOopDesc::top_frame(RegisterMap* map) {
   assert(!is_empty(), "");
   StackChunkFrameStream<ChunkFrames::Mixed> fs(this);
@@ -224,6 +239,14 @@ class EncodeGCModeConcurrentFrameClosure {
 
     return true;
   }
+
+  bool do_lockstack() {
+    BarrierSetStackChunk* bs_chunk = BarrierSet::barrier_set()->barrier_set_stack_chunk();
+    LockStackOopIterator iterator(_chunk);
+    bs_chunk->encode_gc_mode(_chunk, &iterator);
+
+    return true;
+  }
 };
 
 bool stackChunkOopDesc::try_acquire_relativization() {
@@ -298,6 +321,7 @@ void stackChunkOopDesc::relativize_derived_pointers_concurrently() {
   DerivedPointersSupport::RelativizeClosure derived_cl;
   EncodeGCModeConcurrentFrameClosure<decltype(derived_cl)> frame_cl(this, &derived_cl);
   iterate_stack(&frame_cl);
+  frame_cl.do_lockstack();
 
   release_relativization();
 }
@@ -320,6 +344,14 @@ class TransformStackChunkClosure {
 
     return true;
   }
+
+  bool do_lockstack() {
+    BarrierSetStackChunk* bs_chunk = BarrierSet::barrier_set()->barrier_set_stack_chunk();
+    LockStackOopIterator iterator(_chunk);
+    bs_chunk->encode_gc_mode(_chunk, &iterator);
+
+    return true;
+  }
 };
 
 void stackChunkOopDesc::transform() {
@@ -332,6 +364,7 @@ void stackChunkOopDesc::transform() {
 
   TransformStackChunkClosure closure(this);
   iterate_stack(&closure);
+  closure.do_lockstack();
 }
 
 template <stackChunkOopDesc::BarrierType barrier, bool compressedOopsWithBitmap>
@@ -408,6 +441,35 @@ void stackChunkOopDesc::fix_thawed_frame(const frame& f, const RegisterMapT* map
 template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const RegisterMap* map);
 template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const SmallRegisterMap* map);
 
+void stackChunkOopDesc::transfer_lockstack(oop* dst, bool requires_barriers) {
+  const bool requires_gc_barriers = is_gc_mode() || requires_barriers;
+  const bool requires_uncompress = has_bitmap() && UseCompressedOops;
+  const auto load_and_clear_obj = [&](intptr_t* at) -> oop {
+    if (requires_gc_barriers) {
+      if (requires_uncompress) {
+        oop value = HeapAccess<>::oop_load(reinterpret_cast<narrowOop*>(at));
+        HeapAccess<>::oop_store(reinterpret_cast<narrowOop*>(at), nullptr);
+        return value;
+      } else {
+        oop value = HeapAccess<>::oop_load(reinterpret_cast<oop*>(at));
+        HeapAccess<>::oop_store(reinterpret_cast<oop*>(at), nullptr);
+        return value;
+      }
+    } else {
+      oop value = *reinterpret_cast<oop*>(at);
+      return value;
+    }
+  };
+
+  const int cnt = lockstack_size();
+  intptr_t* lockstack_start = start_address();
+  for (int i = 0; i < cnt; i++) {
+    oop mon_owner = load_and_clear_obj(&lockstack_start[i]);
+    assert(oopDesc::is_oop(mon_owner), "not an oop");
+    dst[i] = mon_owner;
+  }
+}
+
 void stackChunkOopDesc::print_on(bool verbose, outputStream* st) const {
   if (*((juint*)this) == badHeapWordVal) {
     st->print_cr("BAD WORD");
@@ -456,9 +518,9 @@ class VerifyStackChunkFrameClosure {
   int _num_interpreted_frames;
   int _num_i2c;
 
-  VerifyStackChunkFrameClosure(stackChunkOop chunk, int num_frames, int size)
+  VerifyStackChunkFrameClosure(stackChunkOop chunk)
     : _chunk(chunk), _sp(nullptr), _cb(nullptr), _callee_interpreted(false),
-      _size(size), _argsize(0), _num_oops(0), _num_frames(num_frames), _num_interpreted_frames(0), _num_i2c(0) {}
+      _size(0), _argsize(0), _num_oops(0), _num_frames(0), _num_interpreted_frames(0), _num_i2c(0) {}
 
   template <ChunkFrames frame_kind, typename RegisterMapT>
   bool do_frame(const StackChunkFrameStream<frame_kind>& f, const RegisterMapT* map) {
@@ -552,11 +614,8 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
   assert((size == 0) == is_empty(), "");
 
   const StackChunkFrameStream<ChunkFrames::Mixed> first(this);
-  const bool has_safepoint_stub_frame = first.is_stub();
 
-  VerifyStackChunkFrameClosure closure(this,
-                                       has_safepoint_stub_frame ? 1 : 0, // Iterate_stack skips the safepoint stub
-                                       has_safepoint_stub_frame ? first.frame_size() : 0);
+  VerifyStackChunkFrameClosure closure(this);
   iterate_stack(&closure);
 
   assert(!is_empty() || closure._cb == nullptr, "");
diff --git a/src/hotspot/share/oops/stackChunkOop.hpp b/src/hotspot/share/oops/stackChunkOop.hpp
index 250acc8d165..38f26d091f0 100644
--- a/src/hotspot/share/oops/stackChunkOop.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@ class frame;
 class MemRegion;
 class RegisterMap;
 class VMRegImpl;
+class ObjectMonitor;
+class ObjectWaiter;
 typedef VMRegImpl* VMReg;
 
 // A continuation stack-chunk oop.
@@ -58,6 +60,8 @@ class stackChunkOopDesc : public instanceOopDesc {
   static const uint8_t FLAG_NOTIFY_RELATIVIZE = 1 << 2; // Someone is waiting for relativization to complete
   static const uint8_t FLAG_GC_MODE = 1 << 3; // Once true it and FLAG_HAS_INTERPRETED_FRAMES can't change
   static const uint8_t FLAG_HAS_BITMAP = 1 << 4; // Can only be true if FLAG_GC_MODE is true
+  static const uint8_t FLAG_HAS_LOCKSTACK = 1 << 5; // LockStack was copied into stackChunk
+  static const uint8_t FLAG_PREEMPTED = 1 << 6; // Continuation was unmounted from inside VM
 
   bool try_acquire_relativization();
   void release_relativization();
@@ -91,6 +95,15 @@ class stackChunkOopDesc : public instanceOopDesc {
   inline int max_thawing_size() const;
   inline void set_max_thawing_size(int value);
 
+  inline uint8_t lockstack_size() const;
+  inline void set_lockstack_size(uint8_t value);
+
+  inline ObjectWaiter* object_waiter() const;
+  inline void set_object_waiter(ObjectWaiter* obj_waiter);
+
+  inline ObjectMonitor* current_pending_monitor() const;
+  inline ObjectMonitor* current_waiting_monitor() const;
+
   inline oop cont() const;
   template<typename P>
   inline oop cont() const;
@@ -127,6 +140,12 @@ class stackChunkOopDesc : public instanceOopDesc {
   inline bool has_mixed_frames() const;
   inline void set_has_mixed_frames(bool value);
 
+  inline bool preempted() const;
+  inline void set_preempted(bool value);
+
+  inline bool has_lockstack() const;
+  inline void set_has_lockstack(bool value);
+
   inline bool is_gc_mode() const;
   inline bool is_gc_mode_acquire() const;
   inline void set_gc_mode(bool value);
@@ -147,6 +166,11 @@ class stackChunkOopDesc : public instanceOopDesc {
   template <typename RegisterMapT>
   void fix_thawed_frame(const frame& f, const RegisterMapT* map);
 
+  void transfer_lockstack(oop* start, bool requires_barriers);
+
+  template <typename OopT, class StackChunkLockStackClosureType>
+  inline void iterate_lockstack(StackChunkLockStackClosureType* closure);
+
   template <class StackChunkFrameClosureType>
   inline void iterate_stack(StackChunkFrameClosureType* closure);
 
diff --git a/src/hotspot/share/oops/stackChunkOop.inline.hpp b/src/hotspot/share/oops/stackChunkOop.inline.hpp
index 7b955d551d7..d647904bf5b 100644
--- a/src/hotspot/share/oops/stackChunkOop.inline.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,10 @@
 #include "oops/access.inline.hpp"
 #include "oops/instanceStackChunkKlass.inline.hpp"
 #include "runtime/continuationJavaClasses.inline.hpp"
-#include "runtime/frame.inline.hpp"
+#include "runtime/frame.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/objectMonitor.hpp"
 #include "runtime/registerMap.hpp"
 #include "runtime/smallRegisterMap.inline.hpp"
 #include "utilities/macros.hpp"
@@ -88,6 +89,12 @@ inline void stackChunkOopDesc::set_max_thawing_size(int value)  {
   jdk_internal_vm_StackChunk::set_maxThawingSize(this, (jint)value);
 }
 
+inline uint8_t stackChunkOopDesc::lockstack_size() const         { return jdk_internal_vm_StackChunk::lockStackSize(as_oop()); }
+inline void stackChunkOopDesc::set_lockstack_size(uint8_t value) { jdk_internal_vm_StackChunk::set_lockStackSize(this, value); }
+
+inline ObjectWaiter* stackChunkOopDesc::object_waiter() const       { return (ObjectWaiter*)jdk_internal_vm_StackChunk::objectWaiter(as_oop()); }
+inline void stackChunkOopDesc::set_object_waiter(ObjectWaiter* obj) { jdk_internal_vm_StackChunk::set_objectWaiter(this, (address)obj); }
+
 inline oop stackChunkOopDesc::cont() const                { return jdk_internal_vm_StackChunk::cont(as_oop()); }
 inline void stackChunkOopDesc::set_cont(oop value)        { jdk_internal_vm_StackChunk::set_cont(this, value); }
 template<typename P>
@@ -154,10 +161,35 @@ inline void stackChunkOopDesc::clear_flags() {
 
 inline bool stackChunkOopDesc::has_mixed_frames() const { return is_flag(FLAG_HAS_INTERPRETED_FRAMES); }
 inline void stackChunkOopDesc::set_has_mixed_frames(bool value) {
-  assert((flags() & ~FLAG_HAS_INTERPRETED_FRAMES) == 0, "other flags should not be set");
+  assert((flags() & ~(FLAG_HAS_INTERPRETED_FRAMES | FLAG_PREEMPTED)) == 0, "other flags should not be set");
   set_flag(FLAG_HAS_INTERPRETED_FRAMES, value);
 }
 
+inline bool stackChunkOopDesc::preempted() const { return is_flag(FLAG_PREEMPTED); }
+inline void stackChunkOopDesc::set_preempted(bool value) {
+  assert(preempted() != value, "");
+  set_flag(FLAG_PREEMPTED, value);
+}
+
+inline ObjectMonitor* stackChunkOopDesc::current_pending_monitor() const {
+  ObjectWaiter* waiter = object_waiter();
+  if (waiter != nullptr && waiter->at_monitorenter()) {
+    return waiter->monitor();
+  }
+  return nullptr;
+}
+
+inline ObjectMonitor* stackChunkOopDesc::current_waiting_monitor() const {
+  ObjectWaiter* waiter = object_waiter();
+  if (waiter != nullptr && waiter->is_wait()) {
+    return waiter->monitor();
+  }
+  return nullptr;
+}
+
+inline bool stackChunkOopDesc::has_lockstack() const         { return is_flag(FLAG_HAS_LOCKSTACK); }
+inline void stackChunkOopDesc::set_has_lockstack(bool value) { set_flag(FLAG_HAS_LOCKSTACK, value); }
+
 inline bool stackChunkOopDesc::is_gc_mode() const                  { return is_flag(FLAG_GC_MODE); }
 inline bool stackChunkOopDesc::is_gc_mode_acquire() const          { return is_flag_acquire(FLAG_GC_MODE); }
 inline void stackChunkOopDesc::set_gc_mode(bool value)             { set_flag(FLAG_GC_MODE, value); }
@@ -180,6 +212,16 @@ void stackChunkOopDesc::do_barriers(const StackChunkFrameStream<frame_kind>& f,
   do_barriers0<barrier>(f, map);
 }
 
+template <typename OopT, class StackChunkLockStackClosureType>
+inline void stackChunkOopDesc::iterate_lockstack(StackChunkLockStackClosureType* closure) {
+  assert(LockingMode == LM_LIGHTWEIGHT, "");
+  int cnt = lockstack_size();
+  intptr_t* lockstart_addr = start_address();
+  for (int i = 0; i < cnt; i++) {
+    closure->do_oop((OopT*)&lockstart_addr[i]);
+  }
+}
+
 template <class StackChunkFrameClosureType>
 inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure) {
   has_mixed_frames() ? iterate_stack<ChunkFrames::Mixed>(closure)
@@ -200,15 +242,14 @@ inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure
                          RegisterMap::ProcessFrames::skip,
                          RegisterMap::WalkContinuation::include);
     full_map.set_include_argument_oops(false);
+    closure->do_frame(f, map);
 
     f.next(&full_map);
-
     assert(!f.is_done(), "");
     assert(f.is_compiled(), "");
 
     should_continue = closure->do_frame(f, &full_map);
     f.next(map);
-    f.handle_deopted(); // the stub caller might be deoptimized (as it's not at a call)
   }
   assert(!f.is_stub(), "");
 
@@ -269,7 +310,7 @@ inline MemRegion stackChunkOopDesc::range() {
 }
 
 inline int stackChunkOopDesc::relativize_usp_offset(const frame& fr, const int usp_offset_in_bytes) const {
-  assert(fr.is_compiled_frame() || fr.cb()->is_safepoint_stub(), "");
+  assert(fr.is_compiled_frame() || fr.cb()->is_runtime_stub(), "");
   assert(is_in_chunk(fr.unextended_sp()), "");
 
   intptr_t* base = fr.real_fp(); // equal to the caller's sp
diff --git a/src/hotspot/share/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp
index 38e28edd157..ddf60d4382e 100644
--- a/src/hotspot/share/oops/typeArrayKlass.cpp
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,8 @@ void TypeArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos
 }
 
 size_t TypeArrayKlass::oop_size(oop obj) const {
-  assert(obj->is_typeArray(),"must be a type array");
+  // In this assert, we cannot safely access the Klass* with compact headers.
+  assert(UseCompactObjectHeaders || obj->is_typeArray(),"must be a type array");
   typeArrayOop t = typeArrayOop(obj);
   return t->object_size(this);
 }
diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index 802af20adae..4215124b0d4 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -1546,7 +1546,7 @@ const Type* MinLNode::add_ring(const Type* t0, const Type* t1) const {
   const TypeLong* r0 = t0->is_long();
   const TypeLong* r1 = t1->is_long();
 
-  return TypeLong::make(MIN2(r0->_lo, r1->_lo), MIN2(r0->_hi, r1->_hi), MIN2(r0->_widen, r1->_widen));
+  return TypeLong::make(MIN2(r0->_lo, r1->_lo), MIN2(r0->_hi, r1->_hi), MAX2(r0->_widen, r1->_widen));
 }
 
 Node* MinLNode::Identity(PhaseGVN* phase) {
diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp
index 4e2b159bf8e..0b4c88f0b5c 100644
--- a/src/hotspot/share/opto/arraycopynode.cpp
+++ b/src/hotspot/share/opto/arraycopynode.cpp
@@ -220,6 +220,10 @@ Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int c
     Node* off = phase->MakeConX(field->offset_in_bytes());
     Node* next_src = phase->transform(new AddPNode(base_src,base_src,off));
     Node* next_dest = phase->transform(new AddPNode(base_dest,base_dest,off));
+    assert(phase->C->get_alias_index(adr_type) == phase->C->get_alias_index(phase->type(next_src)->isa_ptr()),
+      "slice of address and input slice don't match");
+    assert(phase->C->get_alias_index(adr_type) == phase->C->get_alias_index(phase->type(next_dest)->isa_ptr()),
+      "slice of address and input slice don't match");
     BasicType bt = field->layout_type();
 
     const Type *type;
diff --git a/src/hotspot/share/opto/buildOopMap.cpp b/src/hotspot/share/opto/buildOopMap.cpp
index b553cc6ea69..c2f771bedb7 100644
--- a/src/hotspot/share/opto/buildOopMap.cpp
+++ b/src/hotspot/share/opto/buildOopMap.cpp
@@ -601,7 +601,7 @@ static void do_liveness(PhaseRegAlloc* regalloc, PhaseCFG* cfg, Block_List* work
 
 // Collect GC mask info - where are all the OOPs?
 void PhaseOutput::BuildOopMaps() {
-  Compile::TracePhase tp("bldOopMaps", &timers[_t_buildOopMaps]);
+  Compile::TracePhase tp(_t_buildOopMaps);
   // Can't resource-mark because I need to leave all those OopMaps around,
   // or else I need to resource-mark some arena other than the default.
   // ResourceMark rm;              // Reclaim all OopFlows when done
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 7f6b7c2dceb..45a067a830b 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -419,7 +419,7 @@
                                                                             \
   product(intx, LoopOptsCount, 43,                                          \
           "Set level of loop optimization for tier 1 compiles")             \
-          range(5, 43)                                                      \
+          range(5, max_jint)                                                \
                                                                             \
   product(bool, OptimizeUnstableIf, true, DIAGNOSTIC,                       \
           "Optimize UnstableIf traps")                                      \
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index e800b3c736b..83ea2eea1a8 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -1615,8 +1615,14 @@ void AllocateNode::compute_MemBar_redundancy(ciMethod* initializer)
 }
 Node *AllocateNode::make_ideal_mark(PhaseGVN *phase, Node* obj, Node* control, Node* mem) {
   Node* mark_node = nullptr;
-  // For now only enable fast locking for non-array types
-  mark_node = phase->MakeConX(markWord::prototype().value());
+  if (UseCompactObjectHeaders) {
+    Node* klass_node = in(AllocateNode::KlassNode);
+    Node* proto_adr = phase->transform(new AddPNode(klass_node, klass_node, phase->MakeConX(in_bytes(Klass::prototype_header_offset()))));
+    mark_node = LoadNode::make(*phase, control, mem, proto_adr, TypeRawPtr::BOTTOM, TypeX_X, TypeX_X->basic_type(), MemNode::unordered);
+  } else {
+    // For now only enable fast locking for non-array types
+    mark_node = phase->MakeConX(markWord::prototype().value());
+  }
   return mark_node;
 }
 
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index ac8896705de..1d287c2f43d 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -324,7 +324,7 @@ class IfNode : public MultiBranchNode {
   float _fcnt;                           // Frequency counter
 
  private:
-  NOT_PRODUCT(AssertionPredicateType _assertion_predicate_type;)
+  AssertionPredicateType _assertion_predicate_type;
 
   void init_node(Node* control, Node* bol) {
     init_class_id(Class_If);
@@ -426,7 +426,7 @@ class IfNode : public MultiBranchNode {
   // gen_subtype_check() and catch_inline_exceptions().
 
   IfNode(Node* control, Node* bol, float p, float fcnt);
-  NOT_PRODUCT(IfNode(Node* control, Node* bol, float p, float fcnt, AssertionPredicateType assertion_predicate_type);)
+  IfNode(Node* control, Node* bol, float p, float fcnt, AssertionPredicateType assertion_predicate_type);
 
   static IfNode* make_with_same_profile(IfNode* if_node_profile, Node* ctrl, BoolNode* bol);
 
@@ -448,11 +448,11 @@ class IfNode : public MultiBranchNode {
   // Returns null is it couldn't improve the type.
   static const TypeInt* filtered_int_type(PhaseGVN* phase, Node* val, Node* if_proj);
 
-#ifndef PRODUCT
   AssertionPredicateType assertion_predicate_type() const {
     return _assertion_predicate_type;
   }
 
+#ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
 
@@ -468,12 +468,10 @@ class RangeCheckNode : public IfNode {
     init_class_id(Class_RangeCheck);
   }
 
-#ifndef PRODUCT
   RangeCheckNode(Node* control, Node* bol, float p, float fcnt, AssertionPredicateType assertion_predicate_type)
       : IfNode(control, bol, p, fcnt, assertion_predicate_type) {
     init_class_id(Class_RangeCheck);
   }
-#endif // NOT PRODUCT
 
   virtual int Opcode() const;
   virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index be0aadacbc2..bef4cfce4d5 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -216,7 +216,7 @@ PhaseChaitin::PhaseChaitin(uint unique, PhaseCFG &cfg, Matcher &matcher, bool sc
   , _scratch_int_pressure(0, Matcher::int_pressure_limit())
   , _scratch_float_pressure(0, Matcher::float_pressure_limit())
 {
-  Compile::TracePhase tp("ctorChaitin", &timers[_t_ctorChaitin]);
+  Compile::TracePhase tp(_t_ctorChaitin);
 
   _high_frequency_lrg = MIN2(double(OPTO_LRG_HIGH_FREQ), _cfg.get_outer_loop_frequency());
 
@@ -321,7 +321,7 @@ int PhaseChaitin::clone_projs(Block* b, uint idx, Node* orig, Node* copy, uint&
 
 // Renumber the live ranges to compact them.  Makes the IFG smaller.
 void PhaseChaitin::compact() {
-  Compile::TracePhase tp("chaitinCompact", &timers[_t_chaitinCompact]);
+  Compile::TracePhase tp(_t_chaitinCompact);
 
   // Current the _uf_map contains a series of short chains which are headed
   // by a self-cycle.  All the chains run from big numbers to little numbers.
@@ -397,7 +397,7 @@ void PhaseChaitin::Register_Allocate() {
 #endif
 
   {
-    Compile::TracePhase tp("computeLive", &timers[_t_computeLive]);
+    Compile::TracePhase tp(_t_computeLive);
     _live = nullptr;              // Mark live as being not available
     rm.reset_to_mark();           // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
@@ -414,7 +414,7 @@ void PhaseChaitin::Register_Allocate() {
   // at all the GC points, and "stretches" the live range of any base pointer
   // to the GC point.
   if (stretch_base_pointer_live_ranges(&live_arena)) {
-    Compile::TracePhase tp("computeLive (sbplr)", &timers[_t_computeLive]);
+    Compile::TracePhase tp("computeLive (sbplr)", _t_computeLive);
     // Since some live range stretched, I need to recompute live
     _live = nullptr;
     rm.reset_to_mark();         // Reclaim working storage
@@ -439,7 +439,7 @@ void PhaseChaitin::Register_Allocate() {
   // This pass works on virtual copies.  Any virtual copies which are not
   // coalesced get manifested as actual copies
   {
-    Compile::TracePhase tp("chaitinCoalesce1", &timers[_t_chaitinCoalesce1]);
+    Compile::TracePhase tp(_t_chaitinCoalesce1);
 
     PhaseAggressiveCoalesce coalesce(*this);
     coalesce.coalesce_driver();
@@ -454,7 +454,7 @@ void PhaseChaitin::Register_Allocate() {
   // After aggressive coalesce, attempt a first cut at coloring.
   // To color, we need the IFG and for that we need LIVE.
   {
-    Compile::TracePhase tp("computeLive", &timers[_t_computeLive]);
+    Compile::TracePhase tp(_t_computeLive);
     _live = nullptr;
     rm.reset_to_mark();           // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
@@ -495,7 +495,7 @@ void PhaseChaitin::Register_Allocate() {
     compact();                  // Compact LRGs; return new lower max lrg
 
     {
-      Compile::TracePhase tp("computeLive", &timers[_t_computeLive]);
+      Compile::TracePhase tp(_t_computeLive);
       _live = nullptr;
       rm.reset_to_mark();         // Reclaim working storage
       IndexSet::reset_memory(C, &live_arena);
@@ -509,7 +509,7 @@ void PhaseChaitin::Register_Allocate() {
     _ifg->Compute_Effective_Degree();
     // Only do conservative coalescing if requested
     if (OptoCoalesce) {
-      Compile::TracePhase tp("chaitinCoalesce2", &timers[_t_chaitinCoalesce2]);
+      Compile::TracePhase tp(_t_chaitinCoalesce2);
       // Conservative (and pessimistic) copy coalescing of those spills
       PhaseConservativeCoalesce coalesce(*this);
       // If max live ranges greater than cutoff, don't color the stack.
@@ -568,7 +568,7 @@ void PhaseChaitin::Register_Allocate() {
 
     // Nuke the live-ness and interference graph and LiveRanGe info
     {
-      Compile::TracePhase tp("computeLive", &timers[_t_computeLive]);
+      Compile::TracePhase tp(_t_computeLive);
       _live = nullptr;
       rm.reset_to_mark();         // Reclaim working storage
       IndexSet::reset_memory(C, &live_arena);
@@ -586,7 +586,7 @@ void PhaseChaitin::Register_Allocate() {
 
     // Only do conservative coalescing if requested
     if (OptoCoalesce) {
-      Compile::TracePhase tp("chaitinCoalesce3", &timers[_t_chaitinCoalesce3]);
+      Compile::TracePhase tp(_t_chaitinCoalesce3);
       // Conservative (and pessimistic) copy coalescing
       PhaseConservativeCoalesce coalesce(*this);
       // Check for few live ranges determines how aggressive coalesce is.
@@ -1183,7 +1183,7 @@ void PhaseChaitin::set_was_low() {
 
 // Compute cost/area ratio, in case we spill.  Build the lo-degree list.
 void PhaseChaitin::cache_lrg_info( ) {
-  Compile::TracePhase tp("chaitinCacheLRG", &timers[_t_chaitinCacheLRG]);
+  Compile::TracePhase tp(_t_chaitinCacheLRG);
 
   for (uint i = 1; i < _lrg_map.max_lrg_id(); i++) {
     LRG &lrg = lrgs(i);
@@ -1217,7 +1217,7 @@ void PhaseChaitin::cache_lrg_info( ) {
 
 // Simplify the IFG by removing LRGs of low degree.
 void PhaseChaitin::Simplify( ) {
-  Compile::TracePhase tp("chaitinSimplify", &timers[_t_chaitinSimplify]);
+  Compile::TracePhase tp(_t_chaitinSimplify);
 
   while( 1 ) {                  // Repeat till simplified it all
     // May want to explore simplifying lo_degree before _lo_stk_degree.
@@ -1516,7 +1516,7 @@ OptoReg::Name PhaseChaitin::choose_color( LRG &lrg, int chunk ) {
 // everything going back is guaranteed a color.  Select that color.  If some
 // hi-degree LRG cannot get a color then we record that we must spill.
 uint PhaseChaitin::Select( ) {
-  Compile::TracePhase tp("chaitinSelect", &timers[_t_chaitinSelect]);
+  Compile::TracePhase tp(_t_chaitinSelect);
 
   uint spill_reg = LRG::SPILL_REG;
   _max_reg = OptoReg::Name(0);  // Past max register used
@@ -1704,7 +1704,7 @@ void PhaseChaitin::fixup_spills() {
   // This function does only cisc spill work.
   if( !UseCISCSpill ) return;
 
-  Compile::TracePhase tp("fixupSpills", &timers[_t_fixupSpills]);
+  Compile::TracePhase tp(_t_fixupSpills);
 
   // Grab the Frame Pointer
   Node *fp = _cfg.get_root_block()->head()->in(1)->in(TypeFunc::FramePtr);
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index a2428625d4d..1b148db20e0 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -746,7 +746,7 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
 
   print_inlining_init();
   { // Scope for timing the parser
-    TracePhase tp("parse", &timers[_t_parser]);
+    TracePhase tp(_t_parser);
 
     // Put top into the hash table ASAP.
     initial_gvn()->transform(top());
@@ -1701,6 +1701,10 @@ Compile::AliasType* Compile::find_alias_type(const TypePtr* adr_type, bool no_cr
       }
     }
     if (flat->isa_klassptr()) {
+      if (UseCompactObjectHeaders) {
+        if (flat->offset() == in_bytes(Klass::prototype_header_offset()))
+          alias_type(idx)->set_rewritable(false);
+      }
       if (flat->offset() == in_bytes(Klass::super_check_offset_offset()))
         alias_type(idx)->set_rewritable(false);
       if (flat->offset() == in_bytes(Klass::modifier_flags_offset()))
@@ -2027,7 +2031,7 @@ void Compile::inline_boxing_calls(PhaseIterGVN& igvn) {
 bool Compile::inline_incrementally_one() {
   assert(IncrementalInline, "incremental inlining should be on");
 
-  TracePhase tp("incrementalInline_inline", &timers[_t_incrInline_inline]);
+  TracePhase tp(_t_incrInline_inline);
 
   set_inlining_progress(false);
   set_do_cleanup(false);
@@ -2068,12 +2072,12 @@ bool Compile::inline_incrementally_one() {
 
 void Compile::inline_incrementally_cleanup(PhaseIterGVN& igvn) {
   {
-    TracePhase tp("incrementalInline_pru", &timers[_t_incrInline_pru]);
+    TracePhase tp(_t_incrInline_pru);
     ResourceMark rm;
     PhaseRemoveUseless pru(initial_gvn(), *igvn_worklist());
   }
   {
-    TracePhase tp("incrementalInline_igvn", &timers[_t_incrInline_igvn]);
+    TracePhase tp(_t_incrInline_igvn);
     igvn.reset_from_gvn(initial_gvn());
     igvn.optimize();
     if (failing()) return;
@@ -2083,7 +2087,7 @@ void Compile::inline_incrementally_cleanup(PhaseIterGVN& igvn) {
 
 // Perform incremental inlining until bound on number of live nodes is reached
 void Compile::inline_incrementally(PhaseIterGVN& igvn) {
-  TracePhase tp("incrementalInline", &timers[_t_incrInline]);
+  TracePhase tp(_t_incrInline);
 
   set_inlining_incrementally(true);
   uint low_live_nodes = 0;
@@ -2091,7 +2095,7 @@ void Compile::inline_incrementally(PhaseIterGVN& igvn) {
   while (_late_inlines.length() > 0) {
     if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
       if (low_live_nodes < (uint)LiveNodeCountInliningCutoff * 8 / 10) {
-        TracePhase tp("incrementalInline_ideal", &timers[_t_incrInline_ideal]);
+        TracePhase tp(_t_incrInline_ideal);
         // PhaseIdealLoop is expensive so we only try it once we are
         // out of live nodes and we only try it again if the previous
         // helped got the number of nodes down significantly
@@ -2175,7 +2179,7 @@ void Compile::process_late_inline_calls_no_inline(PhaseIterGVN& igvn) {
 bool Compile::optimize_loops(PhaseIterGVN& igvn, LoopOptsMode mode) {
   if (_loop_opts_cnt > 0) {
     while (major_progress() && (_loop_opts_cnt > 0)) {
-      TracePhase tp("idealLoop", &timers[_t_idealLoop]);
+      TracePhase tp(_t_idealLoop);
       PhaseIdealLoop::optimize(igvn, mode);
       _loop_opts_cnt--;
       if (failing())  return false;
@@ -2213,7 +2217,7 @@ void Compile::remove_root_to_sfpts_edges(PhaseIterGVN& igvn) {
 //------------------------------Optimize---------------------------------------
 // Given a graph, optimize it.
 void Compile::Optimize() {
-  TracePhase tp("optimizer", &timers[_t_optimizer]);
+  TracePhase tp(_t_optimizer);
 
 #ifndef PRODUCT
   if (env()->break_at_compile()) {
@@ -2243,7 +2247,7 @@ void Compile::Optimize() {
   _modified_nodes = new (comp_arena()) Unique_Node_List(comp_arena());
 #endif
   {
-    TracePhase tp("iterGVN", &timers[_t_iterGVN]);
+    TracePhase tp(_t_iterGVN);
     igvn.optimize();
   }
 
@@ -2292,7 +2296,7 @@ void Compile::Optimize() {
 
   assert(EnableVectorSupport || !has_vbox_nodes(), "sanity");
   if (EnableVectorSupport && has_vbox_nodes()) {
-    TracePhase tp("", &timers[_t_vector]);
+    TracePhase tp(_t_vector);
     PhaseVector pv(igvn);
     pv.optimize_vector_boxes();
     if (failing())  return;
@@ -2301,7 +2305,7 @@ void Compile::Optimize() {
   assert(!has_vbox_nodes(), "sanity");
 
   if (!failing() && RenumberLiveNodes && live_nodes() + NodeLimitFudgeFactor < unique()) {
-    Compile::TracePhase tp("", &timers[_t_renumberLive]);
+    Compile::TracePhase tp(_t_renumberLive);
     igvn_worklist()->ensure_empty(); // should be done with igvn
     {
       ResourceMark rm;
@@ -2322,7 +2326,7 @@ void Compile::Optimize() {
   if (do_escape_analysis() && ConnectionGraph::has_candidates(this)) {
     if (has_loops()) {
       // Cleanup graph (remove dead nodes).
-      TracePhase tp("idealLoop", &timers[_t_idealLoop]);
+      TracePhase tp(_t_idealLoop);
       PhaseIdealLoop::optimize(igvn, LoopOptsMaxUnroll);
       if (failing())  return;
     }
@@ -2342,7 +2346,7 @@ void Compile::Optimize() {
       if (failing()) return;
 
       if (congraph() != nullptr && macro_count() > 0) {
-        TracePhase tp("macroEliminate", &timers[_t_macroEliminate]);
+        TracePhase tp(_t_macroEliminate);
         PhaseMacroExpand mexp(igvn);
         mexp.eliminate_macro_nodes();
         if (failing()) return;
@@ -2371,7 +2375,7 @@ void Compile::Optimize() {
   // Set loop opts counter
   if((_loop_opts_cnt > 0) && (has_loops() || has_split_ifs())) {
     {
-      TracePhase tp("idealLoop", &timers[_t_idealLoop]);
+      TracePhase tp(_t_idealLoop);
       PhaseIdealLoop::optimize(igvn, LoopOptsDefault);
       _loop_opts_cnt--;
       if (major_progress()) print_method(PHASE_PHASEIDEALLOOP1, 2);
@@ -2379,7 +2383,7 @@ void Compile::Optimize() {
     }
     // Loop opts pass if partial peeling occurred in previous pass
     if(PartialPeelLoop && major_progress() && (_loop_opts_cnt > 0)) {
-      TracePhase tp("idealLoop", &timers[_t_idealLoop]);
+      TracePhase tp(_t_idealLoop);
       PhaseIdealLoop::optimize(igvn, LoopOptsSkipSplitIf);
       _loop_opts_cnt--;
       if (major_progress()) print_method(PHASE_PHASEIDEALLOOP2, 2);
@@ -2387,7 +2391,7 @@ void Compile::Optimize() {
     }
     // Loop opts pass for loop-unrolling before CCP
     if(major_progress() && (_loop_opts_cnt > 0)) {
-      TracePhase tp("idealLoop", &timers[_t_idealLoop]);
+      TracePhase tp(_t_idealLoop);
       PhaseIdealLoop::optimize(igvn, LoopOptsSkipSplitIf);
       _loop_opts_cnt--;
       if (major_progress()) print_method(PHASE_PHASEIDEALLOOP3, 2);
@@ -2404,7 +2408,7 @@ void Compile::Optimize() {
   PhaseCCP ccp( &igvn );
   assert( true, "Break here to ccp.dump_nodes_and_types(_root,999,1)");
   {
-    TracePhase tp("ccp", &timers[_t_ccp]);
+    TracePhase tp(_t_ccp);
     ccp.do_transform();
   }
   print_method(PHASE_CCP1, 2);
@@ -2413,7 +2417,7 @@ void Compile::Optimize() {
 
   // Iterative Global Value Numbering, including ideal transforms
   {
-    TracePhase tp("iterGVN2", &timers[_t_iterGVN2]);
+    TracePhase tp(_t_iterGVN2);
     igvn.reset_from_igvn(&ccp);
     igvn.optimize();
   }
@@ -2440,7 +2444,7 @@ void Compile::Optimize() {
 #endif
 
   {
-    TracePhase tp("macroExpand", &timers[_t_macroExpand]);
+    TracePhase tp(_t_macroExpand);
     print_method(PHASE_BEFORE_MACRO_EXPANSION, 3);
     PhaseMacroExpand  mex(igvn);
     if (mex.expand_macro_nodes()) {
@@ -2451,7 +2455,7 @@ void Compile::Optimize() {
   }
 
   {
-    TracePhase tp("barrierExpand", &timers[_t_barrierExpand]);
+    TracePhase tp(_t_barrierExpand);
     if (bs->expand_barriers(this, igvn)) {
       assert(failing(), "must bail out w/ explicit message");
       return;
@@ -2489,7 +2493,7 @@ void Compile::Optimize() {
 
  // A method with only infinite loops has no edges entering loops from root
  {
-   TracePhase tp("graphReshape", &timers[_t_graphReshaping]);
+   TracePhase tp(_t_graphReshaping);
    if (final_graph_reshaping()) {
      assert(failing(), "must bail out w/ explicit message");
      return;
@@ -2931,7 +2935,7 @@ void Compile::Code_Gen() {
   Matcher matcher;
   _matcher = &matcher;
   {
-    TracePhase tp("matcher", &timers[_t_matcher]);
+    TracePhase tp(_t_matcher);
     matcher.match();
     if (failing()) {
       return;
@@ -2956,7 +2960,7 @@ void Compile::Code_Gen() {
   }
   _cfg = &cfg;
   {
-    TracePhase tp("scheduler", &timers[_t_scheduler]);
+    TracePhase tp(_t_scheduler);
     bool success = cfg.do_global_code_motion();
     if (!success) {
       return;
@@ -2970,7 +2974,7 @@ void Compile::Code_Gen() {
   PhaseChaitin regalloc(unique(), cfg, matcher, false);
   _regalloc = &regalloc;
   {
-    TracePhase tp("regalloc", &timers[_t_registerAllocation]);
+    TracePhase tp(_t_registerAllocation);
     // Perform register allocation.  After Chaitin, use-def chains are
     // no longer accurate (at spill code) and so must be ignored.
     // Node->LRG->reg mappings are still accurate.
@@ -2989,7 +2993,7 @@ void Compile::Code_Gen() {
   // are not adding any new instructions.  If any basic block is empty, we
   // can now safely remove it.
   {
-    TracePhase tp("blockOrdering", &timers[_t_blockOrdering]);
+    TracePhase tp(_t_blockOrdering);
     cfg.remove_empty_blocks();
     if (do_freq_based_layout()) {
       PhaseBlockLayout layout(cfg);
@@ -3004,7 +3008,7 @@ void Compile::Code_Gen() {
 
   // Apply peephole optimizations
   if( OptoPeephole ) {
-    TracePhase tp("peephole", &timers[_t_peephole]);
+    TracePhase tp(_t_peephole);
     PhasePeephole peep( _regalloc, cfg);
     peep.do_transform();
     print_method(PHASE_PEEPHOLE, 3);
@@ -3012,14 +3016,14 @@ void Compile::Code_Gen() {
 
   // Do late expand if CPU requires this.
   if (Matcher::require_postalloc_expand) {
-    TracePhase tp("postalloc_expand", &timers[_t_postalloc_expand]);
+    TracePhase tp(_t_postalloc_expand);
     cfg.postalloc_expand(_regalloc);
     print_method(PHASE_POSTALLOC_EXPAND, 3);
   }
 
   // Convert Nodes to instruction bits in a buffer
   {
-    TracePhase tp("output", &timers[_t_output]);
+    TracePhase tp(_t_output);
     PhaseOutput output;
     output.Output();
     if (failing())  return;
@@ -4309,11 +4313,10 @@ void Compile::record_failure(const char* reason DEBUG_ONLY(COMMA bool allow_mult
   _root = nullptr;  // flush the graph, too
 }
 
-Compile::TracePhase::TracePhase(const char* name, elapsedTimer* accumulator)
-  : TraceTime(name, accumulator, CITime, CITimeVerbose),
+Compile::TracePhase::TracePhase(const char* name, PhaseTraceId id)
+  : TraceTime(name, &Phase::timers[id], CITime, CITimeVerbose),
     _compile(Compile::current()),
     _log(nullptr),
-    _phase_name(name),
     _dolog(CITimeVerbose)
 {
   assert(_compile != nullptr, "sanity check");
@@ -4321,12 +4324,15 @@ Compile::TracePhase::TracePhase(const char* name, elapsedTimer* accumulator)
     _log = _compile->log();
   }
   if (_log != nullptr) {
-    _log->begin_head("phase name='%s' nodes='%d' live='%d'", _phase_name, _compile->unique(), _compile->live_nodes());
+    _log->begin_head("phase name='%s' nodes='%d' live='%d'", phase_name(), _compile->unique(), _compile->live_nodes());
     _log->stamp();
     _log->end_head();
   }
 }
 
+Compile::TracePhase::TracePhase(PhaseTraceId id)
+  : TracePhase(Phase::get_phase_trace_id_text(id), id) {}
+
 Compile::TracePhase::~TracePhase() {
   if (_compile->failing_internal()) {
     return; // timing code, not stressing bailouts.
@@ -4334,7 +4340,7 @@ Compile::TracePhase::~TracePhase() {
 #ifdef ASSERT
   if (PrintIdealNodeCount) {
     tty->print_cr("phase name='%s' nodes='%d' live='%d' live_graph_walk='%d'",
-                  _phase_name, _compile->unique(), _compile->live_nodes(), _compile->count_live_nodes_by_graph_walk());
+                  phase_name(), _compile->unique(), _compile->live_nodes(), _compile->count_live_nodes_by_graph_walk());
   }
 
   if (VerifyIdealNodeCount) {
@@ -4343,7 +4349,7 @@ Compile::TracePhase::~TracePhase() {
 #endif
 
   if (_log != nullptr) {
-    _log->done("phase name='%s' nodes='%d' live='%d'", _phase_name, _compile->unique(), _compile->live_nodes());
+    _log->done("phase name='%s' nodes='%d' live='%d'", phase_name(), _compile->unique(), _compile->live_nodes());
   }
 }
 
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 05e24bf3f6e..6285d4a5548 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -239,11 +239,12 @@ class Compile : public Phase {
    private:
     Compile*    _compile;
     CompileLog* _log;
-    const char* _phase_name;
     bool _dolog;
    public:
-    TracePhase(const char* name, elapsedTimer* accumulator);
+    TracePhase(PhaseTraceId phaseTraceId);
+    TracePhase(const char* name, PhaseTraceId phaseTraceId);
     ~TracePhase();
+    const char* phase_name() const { return title(); }
   };
 
   // Information per category of alias (memory slice)
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index f8a0209d9ad..6d845c86a5f 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -103,7 +103,7 @@ bool ConnectionGraph::has_candidates(Compile *C) {
 }
 
 void ConnectionGraph::do_analysis(Compile *C, PhaseIterGVN *igvn) {
-  Compile::TracePhase tp("escapeAnalysis", &Phase::timers[Phase::_t_escapeAnalysis]);
+  Compile::TracePhase tp(Phase::_t_escapeAnalysis);
   ResourceMark rm;
 
   // Add ConP and ConN null oop nodes before ConnectionGraph construction
@@ -148,7 +148,7 @@ bool ConnectionGraph::compute_escape() {
   GrowableArray<MergeMemNode*>   mergemem_worklist;
   DEBUG_ONLY( GrowableArray<Node*> addp_worklist; )
 
-  { Compile::TracePhase tp("connectionGraph", &Phase::timers[Phase::_t_connectionGraph]);
+  { Compile::TracePhase tp(Phase::_t_connectionGraph);
 
   // 1. Populate Connection Graph (CG) with PointsTo nodes.
   ideal_nodes.map(C->live_nodes(), nullptr);  // preallocate space
@@ -644,7 +644,7 @@ bool ConnectionGraph::can_reduce_phi(PhiNode* ophi) const {
 //
 // 'curr_ctrl' is the control of the CastPP that we want to split through phi.
 // If the CastPP currently doesn't have a control then the CmpP/N will be
-// against the NULL constant, otherwise it will be against the constant input of
+// against the null constant, otherwise it will be against the constant input of
 // the existing CmpP/N. It's guaranteed that there will be a CmpP/N in the later
 // case because we have constraints on it and because the CastPP has a control
 // input.
@@ -672,7 +672,7 @@ Node* ConnectionGraph::specialize_cmp(Node* base, Node* curr_ctrl) {
 // means that the CastPP now will be specific for a given base instead of a Phi.
 // An If-Then-Else-Region block is inserted to control the CastPP. The control
 // of the CastPP is a copy of the current one (if there is one) or a check
-// against NULL.
+// against null.
 //
 // Before:
 //
@@ -806,10 +806,10 @@ Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr
 // After splitting the CastPP we'll put it under an If-Then-Else-Region control
 // flow. If the CastPP originally had an IfTrue/False control input then we'll
 // use a similar CmpP/N to control the new If-Then-Else-Region. Otherwise, we'll
-// juse use a CmpP/N against the NULL constant.
+// juse use a CmpP/N against the null constant.
 //
 // The If-Then-Else-Region isn't always needed. For instance, if input to
-// splitted cast was not nullable (or if it was the NULL constant) then we don't
+// splitted cast was not nullable (or if it was the null constant) then we don't
 // need (shouldn't) use a CastPP at all.
 //
 // After the casts are splitted we'll split the AddP->Loads through the Phi and
@@ -837,7 +837,7 @@ Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr
 //
 // After (Very much simplified):
 //
-//                         Call  NULL
+//                         Call  Null
 //                            \  /
 //                            CmpP
 //                             |
@@ -873,7 +873,7 @@ void ConnectionGraph::reduce_phi_on_castpp_field_load(Node* curr_castpp, Growabl
   // array, depending on the nullability status of the corresponding input in
   // ophi.
   //
-  //  - nullptr:    Meaning that the base is actually the NULL constant and therefore
+  //  - nullptr:    Meaning that the base is actually the null constant and therefore
   //                we won't try to load from it.
   //
   //  - CFG Node:   Meaning that the base is a CastPP that was specialized for
@@ -890,7 +890,7 @@ void ConnectionGraph::reduce_phi_on_castpp_field_load(Node* curr_castpp, Growabl
 
     if (base_t->maybe_null()) {
       if (base->is_Con()) {
-        // Nothing todo as bases_for_loads[i] is already nullptr
+        // Nothing todo as bases_for_loads[i] is already null
       } else {
         Node* new_castpp = specialize_castpp(curr_castpp, base, ophi->in(0)->in(i));
         bases_for_loads.at_put(i, new_castpp->in(0)); // Use the ctrl of the new node just as a flag
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index c46d69058e9..c9eb418b4f0 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -1681,7 +1681,7 @@ void PhaseCFG::global_code_motion() {
   PhaseIFG ifg(&live_arena);
   if (OptoRegScheduling && block_size_threshold_ok) {
     regalloc.mark_ssa();
-    Compile::TracePhase tp("computeLive", &timers[_t_computeLive]);
+    Compile::TracePhase tp(_t_computeLive);
     rm_live.reset_to_mark();           // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
     uint node_size = regalloc._lrg_map.max_lrg_id();
diff --git a/src/hotspot/share/opto/generateOptoStub.cpp b/src/hotspot/share/opto/generateOptoStub.cpp
index 2f940439045..2e3dc878c84 100644
--- a/src/hotspot/share/opto/generateOptoStub.cpp
+++ b/src/hotspot/share/opto/generateOptoStub.cpp
@@ -101,7 +101,7 @@ void GraphKit::gen_stub(address C_function,
   //
   Node *adr_sp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_sp_offset()));
   Node *last_sp = frameptr();
-  store_to_memory(control(), adr_sp, last_sp, T_ADDRESS, NoAlias, MemNode::unordered);
+  store_to_memory(control(), adr_sp, last_sp, T_ADDRESS, MemNode::unordered);
 
   // Set _thread_in_native
   // The order of stores into TLS is critical!  Setting _thread_in_native MUST
@@ -221,12 +221,12 @@ void GraphKit::gen_stub(address C_function,
   //-----------------------------
 
   // Clear last_Java_sp
-  store_to_memory(control(), adr_sp, null(), T_ADDRESS, NoAlias, MemNode::unordered);
+  store_to_memory(control(), adr_sp, null(), T_ADDRESS, MemNode::unordered);
   // Clear last_Java_pc
-  store_to_memory(control(), adr_last_Java_pc, null(), T_ADDRESS, NoAlias, MemNode::unordered);
+  store_to_memory(control(), adr_last_Java_pc, null(), T_ADDRESS, MemNode::unordered);
 #if (defined(IA64) && !defined(AIX))
   Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset()));
-  store_to_memory(control(), adr_last_Java_fp, null(), T_ADDRESS, NoAlias, MemNode::unordered);
+  store_to_memory(control(), adr_last_Java_fp, null(), T_ADDRESS, MemNode::unordered);
 #endif
 
   // For is-fancy-jump, the C-return value is also the branch target
@@ -234,16 +234,16 @@ void GraphKit::gen_stub(address C_function,
   // Runtime call returning oop in TLS?  Fetch it out
   if( pass_tls ) {
     Node* adr = basic_plus_adr(top(), thread, in_bytes(JavaThread::vm_result_offset()));
-    Node* vm_result = make_load(nullptr, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, MemNode::unordered);
+    Node* vm_result = make_load(nullptr, adr, TypeOopPtr::BOTTOM, T_OBJECT, MemNode::unordered);
     map()->set_req(TypeFunc::Parms, vm_result); // vm_result passed as result
     // clear thread-local-storage(tls)
-    store_to_memory(control(), adr, null(), T_ADDRESS, NoAlias, MemNode::unordered);
+    store_to_memory(control(), adr, null(), T_ADDRESS, MemNode::unordered);
   }
 
   //-----------------------------
   // check exception
   Node* adr = basic_plus_adr(top(), thread, in_bytes(Thread::pending_exception_offset()));
-  Node* pending = make_load(nullptr, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, MemNode::unordered);
+  Node* pending = make_load(nullptr, adr, TypeOopPtr::BOTTOM, T_OBJECT, MemNode::unordered);
 
   Node* exit_memory = reset_memory();
 
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index ac74abd7e55..0cc68c42639 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -510,7 +510,7 @@ void GraphKit::uncommon_trap_if_should_post_on_exceptions(Deoptimization::DeoptR
     // first must access the should_post_on_exceptions_flag in this thread's JavaThread
     Node* jthread = _gvn.transform(new ThreadLocalNode());
     Node* adr = basic_plus_adr(top(), jthread, in_bytes(JavaThread::should_post_on_exceptions_flag_offset()));
-    Node* should_post_flag = make_load(control(), adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw, MemNode::unordered);
+    Node* should_post_flag = make_load(control(), adr, TypeInt::INT, T_INT, MemNode::unordered);
 
     // Test the should_post_on_exceptions_flag vs. 0
     Node* chk = _gvn.transform( new CmpINode(should_post_flag, intcon(0)) );
@@ -1550,7 +1550,6 @@ void GraphKit::set_all_memory_call(Node* call, bool separate_io_proj) {
 
 // factory methods in "int adr_idx"
 Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
-                          int adr_idx,
                           MemNode::MemOrd mo,
                           LoadNode::ControlDependency control_dependency,
                           bool require_atomic_access,
@@ -1558,7 +1557,7 @@ Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
                           bool mismatched,
                           bool unsafe,
                           uint8_t barrier_data) {
-  assert(adr_idx == C->get_alias_index(_gvn.type(adr)->isa_ptr()), "slice of address and input slice don't match");
+  int adr_idx = C->get_alias_index(_gvn.type(adr)->isa_ptr());
   assert(adr_idx != Compile::AliasIdxTop, "use other make_load factory" );
   const TypePtr* adr_type = nullptr; // debug-mode-only argument
   debug_only(adr_type = C->get_adr_type(adr_idx));
@@ -1580,15 +1579,14 @@ Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
 }
 
 Node* GraphKit::store_to_memory(Node* ctl, Node* adr, Node *val, BasicType bt,
-                                int adr_idx,
                                 MemNode::MemOrd mo,
                                 bool require_atomic_access,
                                 bool unaligned,
                                 bool mismatched,
                                 bool unsafe,
                                 int barrier_data) {
+  int adr_idx = C->get_alias_index(_gvn.type(adr)->isa_ptr());
   assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
-  assert(adr_idx == C->get_alias_index(_gvn.type(adr)->isa_ptr()), "slice of address and input slice don't match");
   const TypePtr* adr_type = nullptr;
   debug_only(adr_type = C->get_adr_type(adr_idx));
   Node *mem = memory(adr_idx);
@@ -2044,11 +2042,10 @@ void GraphKit::increment_counter(address counter_addr) {
 }
 
 void GraphKit::increment_counter(Node* counter_addr) {
-  int adr_type = Compile::AliasIdxRaw;
   Node* ctrl = control();
-  Node* cnt  = make_load(ctrl, counter_addr, TypeLong::LONG, T_LONG, adr_type, MemNode::unordered);
+  Node* cnt  = make_load(ctrl, counter_addr, TypeLong::LONG, T_LONG, MemNode::unordered);
   Node* incr = _gvn.transform(new AddLNode(cnt, _gvn.longcon(1)));
-  store_to_memory(ctrl, counter_addr, incr, T_LONG, adr_type, MemNode::unordered);
+  store_to_memory(ctrl, counter_addr, incr, T_LONG, MemNode::unordered);
 }
 
 
@@ -4240,8 +4237,8 @@ void GraphKit::inflate_string_slow(Node* src, Node* dst, Node* start, Node* coun
   set_memory(mem, TypeAryPtr::BYTES);
   Node* ch = load_array_element(src, i_byte, TypeAryPtr::BYTES, /* set_ctrl */ true);
   Node* st = store_to_memory(control(), array_element_address(dst, i_char, T_BYTE),
-                             AndI(ch, intcon(0xff)), T_CHAR, TypeAryPtr::BYTES, MemNode::unordered,
-                             false, false, true /* mismatched */);
+                             AndI(ch, intcon(0xff)), T_CHAR, MemNode::unordered, false,
+                             false, true /* mismatched */);
 
   IfNode* iff = create_and_map_if(head, Bool(CmpI(i_byte, count), BoolTest::lt), PROB_FAIR, COUNT_UNKNOWN);
   head->init_req(2, IfTrue(iff));
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 3333b7d1bd9..e91ae769895 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -540,26 +540,6 @@ class GraphKit : public Phase {
   // adapted the `do_put_xxx' and `do_get_xxx' procedures for the case
   // of volatile fields.
   Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
-                  MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
-                  bool require_atomic_access = false, bool unaligned = false,
-                  bool mismatched = false, bool unsafe = false, uint8_t barrier_data = 0) {
-    // This version computes alias_index from bottom_type
-    return make_load(ctl, adr, t, bt, adr->bottom_type()->is_ptr(),
-                     mo, control_dependency, require_atomic_access,
-                     unaligned, mismatched, unsafe, barrier_data);
-  }
-  Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt, const TypePtr* adr_type,
-                  MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
-                  bool require_atomic_access = false, bool unaligned = false,
-                  bool mismatched = false, bool unsafe = false, uint8_t barrier_data = 0) {
-    // This version computes alias_index from an address type
-    assert(adr_type != nullptr, "use other make_load factory");
-    return make_load(ctl, adr, t, bt, C->get_alias_index(adr_type),
-                     mo, control_dependency, require_atomic_access,
-                     unaligned, mismatched, unsafe, barrier_data);
-  }
-  // This is the base version which is given an alias index.
-  Node* make_load(Node* ctl, Node* adr, const Type* t, BasicType bt, int adr_idx,
                   MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest,
                   bool require_atomic_access = false, bool unaligned = false,
                   bool mismatched = false, bool unsafe = false, uint8_t barrier_data = 0);
@@ -572,26 +552,8 @@ class GraphKit : public Phase {
   // procedure must indicate that the store requires `release'
   // semantics, if the stored value is an object reference that might
   // point to a new object and may become externally visible.
-  Node* store_to_memory(Node* ctl, Node* adr, Node* val, BasicType bt,
-                        const TypePtr* adr_type,
-                        MemNode::MemOrd mo,
-                        bool require_atomic_access = false,
-                        bool unaligned = false,
-                        bool mismatched = false,
-                        bool unsafe = false,
-                        int barrier_data = 0) {
-    // This version computes alias_index from an address type
-    assert(adr_type != nullptr, "use other store_to_memory factory");
-    return store_to_memory(ctl, adr, val, bt,
-                           C->get_alias_index(adr_type),
-                           mo, require_atomic_access,
-                           unaligned, mismatched, unsafe,
-                           barrier_data);
-  }
-  // This is the base version which is given alias index
   // Return the new StoreXNode
   Node* store_to_memory(Node* ctl, Node* adr, Node* val, BasicType bt,
-                        int adr_idx,
                         MemNode::MemOrd,
                         bool require_atomic_access = false,
                         bool unaligned = false,
diff --git a/src/hotspot/share/opto/ifg.cpp b/src/hotspot/share/opto/ifg.cpp
index b11fb3deb44..d12698121b9 100644
--- a/src/hotspot/share/opto/ifg.cpp
+++ b/src/hotspot/share/opto/ifg.cpp
@@ -313,7 +313,7 @@ void PhaseChaitin::interfere_with_live(uint lid, IndexSet* liveout) {
 // at this point can end up in bad places).  Copies I re-insert later I have
 // more opportunity to insert them in low-frequency locations.
 void PhaseChaitin::build_ifg_virtual( ) {
-  Compile::TracePhase tp("buildIFG_virt", &timers[_t_buildIFGvirtual]);
+  Compile::TracePhase tp(_t_buildIFGvirtual);
 
   // For all blocks (in any order) do...
   for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
@@ -843,7 +843,7 @@ void PhaseChaitin::print_pressure_info(Pressure& pressure, const char *str) {
  *   low to high register pressure transition within the block (if any).
  */
 uint PhaseChaitin::build_ifg_physical( ResourceArea *a ) {
-  Compile::TracePhase tp("buildIFG", &timers[_t_buildIFGphysical]);
+  Compile::TracePhase tp(_t_buildIFGphysical);
 
   uint must_spill = 0;
   for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 093cafd1574..c0ed3f7e5d4 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -50,12 +50,11 @@ extern uint explicit_null_checks_elided;
 IfNode::IfNode(Node* control, Node* bol, float p, float fcnt)
     : MultiBranchNode(2),
       _prob(p),
-      _fcnt(fcnt)
-      NOT_PRODUCT(COMMA _assertion_predicate_type(AssertionPredicateType::None)) {
+      _fcnt(fcnt),
+      _assertion_predicate_type(AssertionPredicateType::None) {
   init_node(control, bol);
 }
 
-#ifndef PRODUCT
 IfNode::IfNode(Node* control, Node* bol, float p, float fcnt, AssertionPredicateType assertion_predicate_type)
     : MultiBranchNode(2),
       _prob(p),
@@ -63,7 +62,6 @@ IfNode::IfNode(Node* control, Node* bol, float p, float fcnt, AssertionPredicate
       _assertion_predicate_type(assertion_predicate_type) {
   init_node(control, bol);
 }
-#endif // NOT_PRODUCT
 
 //=============================================================================
 //------------------------------Value------------------------------------------
@@ -1524,6 +1522,14 @@ Node* IfNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   Node* prev_dom = search_identical(dist, igvn);
 
   if (prev_dom != nullptr) {
+    // Dominating CountedLoopEnd (left over from some now dead loop) will become the new loop exit. Outer strip mined
+    // loop will go away. Mark this loop as no longer strip mined.
+    if (is_CountedLoopEnd()) {
+      CountedLoopNode* counted_loop_node = as_CountedLoopEnd()->loopnode();
+      if (counted_loop_node != nullptr) {
+        counted_loop_node->clear_strip_mined();
+      }
+    }
     // Replace dominated IfNode
     return dominated_by(prev_dom, igvn, false);
   }
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 2a40cf000d8..88dc00ab463 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -275,8 +275,8 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
         // cannot reason about it; is probably not implicit null exception
       } else {
         const TypePtr* tptr;
-        if ((UseCompressedOops || UseCompressedClassPointers) &&
-            (CompressedOops::shift() == 0 || CompressedKlassPointers::shift() == 0)) {
+        if ((UseCompressedOops && CompressedOops::shift() == 0) ||
+            (UseCompressedClassPointers && CompressedKlassPointers::shift() == 0)) {
           // 32-bits narrow oop can be the base of address expressions
           tptr = base->get_ptr_type();
         } else {
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 523b1efd0c2..226fddce29b 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1288,7 +1288,6 @@ bool LibraryCallKit::inline_string_indexOfI(StrIntrinsicNode::ArgEnc ae) {
   bool call_opt_stub = (StubRoutines::_string_indexof_array[ae] != nullptr);
 
   if (call_opt_stub) {
-    assert(arrayOopDesc::base_offset_in_bytes(T_BYTE) >= 16, "Needed for indexOf");
     Node* call = make_runtime_call(RC_LEAF, OptoRuntime::string_IndexOf_Type(),
                                    StubRoutines::_string_indexof_array[ae],
                                    "stringIndexOf", TypePtr::BOTTOM, src_start,
@@ -3110,7 +3109,7 @@ bool LibraryCallKit::inline_native_jvm_commit() {
   set_control(is_notified);
 
   // Reset notified state.
-  Node* notified_reset_memory = store_to_memory(control(), notified_offset, _gvn.intcon(0), T_BOOLEAN, Compile::AliasIdxRaw, MemNode::unordered);
+  Node* notified_reset_memory = store_to_memory(control(), notified_offset, _gvn.intcon(0), T_BOOLEAN, MemNode::unordered);
 
   // Iff notified, the return address of the commit method is the current position of the backing java buffer. This is used to reset the event writer.
   Node* current_pos_X = _gvn.transform(new LoadXNode(control(), input_memory_state, java_buffer_pos_offset, TypeRawPtr::NOTNULL, TypeX_X, MemNode::unordered));
@@ -3130,9 +3129,9 @@ bool LibraryCallKit::inline_native_jvm_commit() {
   // Store the next_position to the underlying jfr java buffer.
   Node* commit_memory;
 #ifdef _LP64
-  commit_memory = store_to_memory(control(), java_buffer_pos_offset, next_pos_X, T_LONG, Compile::AliasIdxRaw, MemNode::release);
+  commit_memory = store_to_memory(control(), java_buffer_pos_offset, next_pos_X, T_LONG, MemNode::release);
 #else
-  commit_memory = store_to_memory(control(), java_buffer_pos_offset, next_pos_X, T_INT, Compile::AliasIdxRaw, MemNode::release);
+  commit_memory = store_to_memory(control(), java_buffer_pos_offset, next_pos_X, T_INT, MemNode::release);
 #endif
 
   // Now load the flags from off the java buffer and decide if the buffer is a lease. If so, it needs to be returned post-commit.
@@ -3449,13 +3448,10 @@ bool LibraryCallKit::inline_native_getEventWriter() {
   Node* const event_writer_tid = load_field_from_object(event_writer, "threadID", "J");
   // Get the field offset to, conditionally, store an updated tid value later.
   Node* const event_writer_tid_field = field_address_from_object(event_writer, "threadID", "J", false);
-  const TypePtr* event_writer_tid_field_type = _gvn.type(event_writer_tid_field)->isa_ptr();
   // Get the field offset to, conditionally, store an updated exclusion value later.
   Node* const event_writer_excluded_field = field_address_from_object(event_writer, "excluded", "Z", false);
-  const TypePtr* event_writer_excluded_field_type = _gvn.type(event_writer_excluded_field)->isa_ptr();
   // Get the field offset to, conditionally, store an updated pinVirtualThread value later.
   Node* const event_writer_pin_field = field_address_from_object(event_writer, "pinVirtualThread", "Z", false);
-  const TypePtr* event_writer_pin_field_type = _gvn.type(event_writer_pin_field)->isa_ptr();
 
   RegionNode* event_writer_tid_compare_rgn = new RegionNode(PATH_LIMIT);
   record_for_igvn(event_writer_tid_compare_rgn);
@@ -3477,13 +3473,13 @@ bool LibraryCallKit::inline_native_getEventWriter() {
   record_for_igvn(tid_is_not_equal);
 
   // Store the pin state to the event writer.
-  store_to_memory(tid_is_not_equal, event_writer_pin_field, _gvn.transform(pinVirtualThread), T_BOOLEAN, event_writer_pin_field_type, MemNode::unordered);
+  store_to_memory(tid_is_not_equal, event_writer_pin_field, _gvn.transform(pinVirtualThread), T_BOOLEAN, MemNode::unordered);
 
   // Store the exclusion state to the event writer.
-  store_to_memory(tid_is_not_equal, event_writer_excluded_field, _gvn.transform(exclusion), T_BOOLEAN, event_writer_excluded_field_type, MemNode::unordered);
+  store_to_memory(tid_is_not_equal, event_writer_excluded_field, _gvn.transform(exclusion), T_BOOLEAN, MemNode::unordered);
 
   // Store the tid to the event writer.
-  store_to_memory(tid_is_not_equal, event_writer_tid_field, tid, T_LONG, event_writer_tid_field_type, MemNode::unordered);
+  store_to_memory(tid_is_not_equal, event_writer_tid_field, tid, T_LONG, MemNode::unordered);
 
   // Update control and phi nodes.
   event_writer_tid_compare_rgn->init_req(_true_path, tid_is_not_equal);
@@ -3562,7 +3558,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
   // False branch, is carrierThread.
   Node* thread_equal_carrierThread = _gvn.transform(new IfFalseNode(iff_thread_not_equal_carrierThread));
   // Store release
-  Node* vthread_false_memory = store_to_memory(thread_equal_carrierThread, vthread_offset, _gvn.intcon(0), T_BOOLEAN, Compile::AliasIdxRaw, MemNode::release, true);
+  Node* vthread_false_memory = store_to_memory(thread_equal_carrierThread, vthread_offset, _gvn.intcon(0), T_BOOLEAN, MemNode::release, true);
 
   set_all_memory(input_memory_state);
 
@@ -3583,7 +3579,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
 
   // Store the vthread tid to the jfr thread local.
   Node* thread_id_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_ID_OFFSET_JFR));
-  Node* tid_memory = store_to_memory(control(), thread_id_offset, tid, T_LONG, Compile::AliasIdxRaw, MemNode::unordered, true);
+  Node* tid_memory = store_to_memory(control(), thread_id_offset, tid, T_LONG, MemNode::unordered, true);
 
   // Branch is_excluded to conditionalize updating the epoch .
   Node* excluded_cmp = _gvn.transform(new CmpINode(is_excluded, _gvn.transform(excluded_mask)));
@@ -3605,7 +3601,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
 
   // Store the vthread epoch to the jfr thread local.
   Node* vthread_epoch_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EPOCH_OFFSET_JFR));
-  Node* included_memory = store_to_memory(control(), vthread_epoch_offset, epoch, T_CHAR, Compile::AliasIdxRaw, MemNode::unordered, true);
+  Node* included_memory = store_to_memory(control(), vthread_epoch_offset, epoch, T_CHAR, MemNode::unordered, true);
 
   RegionNode* excluded_rgn = new RegionNode(PATH_LIMIT);
   record_for_igvn(excluded_rgn);
@@ -3628,10 +3624,10 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
 
   // Store the vthread exclusion state to the jfr thread local.
   Node* thread_local_excluded_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EXCLUDED_OFFSET_JFR));
-  store_to_memory(control(), thread_local_excluded_offset, _gvn.transform(exclusion), T_BOOLEAN, Compile::AliasIdxRaw, MemNode::unordered, true);
+  store_to_memory(control(), thread_local_excluded_offset, _gvn.transform(exclusion), T_BOOLEAN, MemNode::unordered, true);
 
   // Store release
-  Node * vthread_true_memory = store_to_memory(control(), vthread_offset, _gvn.intcon(1), T_BOOLEAN, Compile::AliasIdxRaw, MemNode::release, true);
+  Node * vthread_true_memory = store_to_memory(control(), vthread_offset, _gvn.intcon(1), T_BOOLEAN, MemNode::release, true);
 
   RegionNode* thread_compare_rgn = new RegionNode(PATH_LIMIT);
   record_for_igvn(thread_compare_rgn);
@@ -3679,6 +3675,12 @@ bool LibraryCallKit::inline_native_setCurrentThread() {
   thread_obj_handle = _gvn.transform(thread_obj_handle);
   const TypePtr *adr_type = _gvn.type(thread_obj_handle)->isa_ptr();
   access_store_at(nullptr, thread_obj_handle, adr_type, arr, _gvn.type(arr), T_OBJECT, IN_NATIVE | MO_UNORDERED);
+
+  // Change the lock_id of the JavaThread
+  Node* tid = load_field_from_object(arr, "tid", "J");
+  Node* thread_id_offset = basic_plus_adr(thread, in_bytes(JavaThread::lock_id_offset()));
+  Node* tid_memory = store_to_memory(control(), thread_id_offset, tid, T_LONG, MemNode::unordered, true);
+
   JFR_ONLY(extend_setCurrentThread(thread, arr);)
   return true;
 }
@@ -3781,7 +3783,7 @@ bool LibraryCallKit::inline_native_Continuation_pinning(bool unpin) {
     next_pin_count = _gvn.transform(new AddINode(pin_count, _gvn.intcon(1)));
   }
 
-  Node* updated_pin_count_memory = store_to_memory(control(), pin_count_offset, next_pin_count, T_INT, Compile::AliasIdxRaw, MemNode::unordered);
+  Node* updated_pin_count_memory = store_to_memory(control(), pin_count_offset, next_pin_count, T_INT, MemNode::unordered);
 
   // True branch, pin count over/underflow.
   Node* pin_count_over_underflow = _gvn.transform(new IfTrueNode(iff_pin_count_over_underflow));
@@ -5058,7 +5060,7 @@ bool LibraryCallKit::inline_unsafe_copyMemory() {
   assert((sizeof(bool) * CHAR_BIT) == 8, "not implemented");
 
   // update volatile field
-  store_to_memory(control(), doing_unsafe_access_addr, intcon(1), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(1), doing_unsafe_access_bt, MemNode::unordered);
 
   int flags = RC_LEAF | RC_NO_FP;
 
@@ -5083,7 +5085,7 @@ bool LibraryCallKit::inline_unsafe_copyMemory() {
                     dst_type,
                     src_addr, dst_addr, size XTOP);
 
-  store_to_memory(control(), doing_unsafe_access_addr, intcon(0), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(0), doing_unsafe_access_bt, MemNode::unordered);
 
   return true;
 }
@@ -5113,7 +5115,7 @@ bool LibraryCallKit::inline_unsafe_setMemory() {
   assert((sizeof(bool) * CHAR_BIT) == 8, "not implemented");
 
   // update volatile field
-  store_to_memory(control(), doing_unsafe_access_addr, intcon(1), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(1), doing_unsafe_access_bt, MemNode::unordered);
 
   int flags = RC_LEAF | RC_NO_FP;
 
@@ -5134,7 +5136,7 @@ bool LibraryCallKit::inline_unsafe_setMemory() {
                     dst_type,
                     dst_addr, size XTOP, byte);
 
-  store_to_memory(control(), doing_unsafe_access_addr, intcon(0), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(0), doing_unsafe_access_bt, MemNode::unordered);
 
   return true;
 }
@@ -7017,6 +7019,8 @@ Node* LibraryCallKit::load_field_from_object(Node* fromObj, const char* fieldNam
   assert(field_klass->is_loaded(), "should be loaded");
   const TypePtr* adr_type = C->alias_type(field)->adr_type();
   Node *adr = basic_plus_adr(fromObj, fromObj, offset);
+  assert(C->get_alias_index(adr_type) == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
+    "slice of address and input slice don't match");
   BasicType bt = field->layout_type();
 
   // Build the resultant type of the load
@@ -7750,11 +7754,11 @@ bool LibraryCallKit::inline_intpoly_montgomeryMult_P256() {
   r = must_be_not_null(r, true);
 
   Node* a_start = array_element_address(a, intcon(0), T_LONG);
-  assert(a_start, "a array is NULL");
+  assert(a_start, "a array is null");
   Node* b_start = array_element_address(b, intcon(0), T_LONG);
-  assert(b_start, "b array is NULL");
+  assert(b_start, "b array is null");
   Node* r_start = array_element_address(r, intcon(0), T_LONG);
-  assert(r_start, "r array is NULL");
+  assert(r_start, "r array is null");
 
   Node* call = make_runtime_call(RC_LEAF | RC_NO_FP,
                                  OptoRuntime::intpoly_montgomeryMult_P256_Type(),
@@ -7779,9 +7783,9 @@ bool LibraryCallKit::inline_intpoly_assign() {
   b = must_be_not_null(b, true);
 
   Node* a_start = array_element_address(a, intcon(0), T_LONG);
-  assert(a_start, "a array is NULL");
+  assert(a_start, "a array is null");
   Node* b_start = array_element_address(b, intcon(0), T_LONG);
-  assert(b_start, "b array is NULL");
+  assert(b_start, "b array is null");
 
   Node* call = make_runtime_call(RC_LEAF | RC_NO_FP,
                                  OptoRuntime::intpoly_assign_Type(),
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 9a639b1f9a1..a4bec870b18 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -100,8 +100,8 @@ void PhaseIdealLoop::register_control(Node* n, IdealLoopTree *loop, Node* pred,
 // is an IfTrue projection. This code is also used to clone predicates to cloned loops.
 IfTrueNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_success_proj,
                                                         Node* new_entry, const Deoptimization::DeoptReason reason,
-                                                        const int opcode, const bool rewire_uncommon_proj_phi_inputs
-                                                        NOT_PRODUCT (COMMA AssertionPredicateType assertion_predicate_type)) {
+                                                        const int opcode, const bool rewire_uncommon_proj_phi_inputs,
+                                                        AssertionPredicateType assertion_predicate_type) {
   assert(parse_predicate_success_proj->is_uncommon_trap_if_pattern(reason), "must be a uct if pattern!");
   ParsePredicateNode* parse_predicate = parse_predicate_success_proj->in(0)->as_ParsePredicate();
   ParsePredicateUncommonProj* uncommon_proj = parse_predicate->uncommon_proj();
@@ -288,7 +288,7 @@ IfProjNode* PhaseIdealLoop::clone_parse_predicate_to_unswitched_loop(ParsePredic
 // cloned predicates.
 void PhaseIdealLoop::clone_assertion_predicates_to_unswitched_loop(IdealLoopTree* loop, const Node_List& old_new,
                                                                    Deoptimization::DeoptReason reason,
-                                                                   IfProjNode* old_predicate_proj,
+                                                                   ParsePredicateSuccessProj* old_parse_predicate_proj,
                                                                    ParsePredicateSuccessProj* fast_loop_parse_predicate_proj,
                                                                    ParsePredicateSuccessProj* slow_loop_parse_predicate_proj) {
   assert(fast_loop_parse_predicate_proj->in(0)->is_ParsePredicate() &&
@@ -297,17 +297,15 @@ void PhaseIdealLoop::clone_assertion_predicates_to_unswitched_loop(IdealLoopTree
   // and doing loop unrolling. Push the original predicates on a list to later process them in reverse order to keep the
   // original predicate order.
   Unique_Node_List list;
-  get_assertion_predicates(old_predicate_proj, list);
+  get_assertion_predicates(old_parse_predicate_proj, list);
 
   Node_List to_process;
-  IfNode* iff = old_predicate_proj->in(0)->as_If();
-  IfProjNode* uncommon_proj = iff->proj_out(1 - old_predicate_proj->as_Proj()->_con)->as_IfProj();
   // Process in reverse order such that 'create_new_if_for_predicate' can be used in
   // 'clone_assertion_predicate_for_unswitched_loops' and the original order is maintained.
   for (int i = list.size() - 1; i >= 0; i--) {
     Node* predicate = list.at(i);
     assert(predicate->in(0)->is_If(), "must be If node");
-    iff = predicate->in(0)->as_If();
+    IfNode* iff = predicate->in(0)->as_If();
     assert(predicate->is_Proj() && predicate->as_Proj()->is_IfProj(), "predicate must be a projection of an if node");
     IfProjNode* predicate_proj = predicate->as_IfProj();
 
@@ -337,34 +335,14 @@ void PhaseIdealLoop::clone_assertion_predicates_to_unswitched_loop(IdealLoopTree
 }
 
 // Put all Assertion Predicate projections on a list, starting at 'predicate' and going up in the tree. If 'get_opaque'
-// is set, then the OpaqueTemplateAssertionPredicate nodes of the Assertion Predicates are put on the list instead of
-// the projections.
-void PhaseIdealLoop::get_assertion_predicates(Node* predicate, Unique_Node_List& list, bool get_opaque) {
-  ParsePredicateNode* parse_predicate = predicate->in(0)->as_ParsePredicate();
-  ProjNode* uncommon_proj = parse_predicate->proj_out(1 - predicate->as_Proj()->_con);
-  Node* rgn = uncommon_proj->unique_ctrl_out();
-  assert(rgn->is_Region() || rgn->is_Call(), "must be a region or call uct");
-  predicate = parse_predicate->in(0);
-  while (predicate != nullptr && predicate->is_Proj() && predicate->in(0)->is_If()) {
-    IfNode* iff = predicate->in(0)->as_If();
-    uncommon_proj = iff->proj_out(1 - predicate->as_Proj()->_con);
-    if (uncommon_proj->unique_ctrl_out() != rgn) {
-      break;
-    }
-    Node* bol = iff->in(1);
-    assert(!bol->is_OpaqueInitializedAssertionPredicate(), "should not find an Initialized Assertion Predicate");
-    if (bol->is_OpaqueTemplateAssertionPredicate()) {
-      assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes");
-      if (get_opaque) {
-        // Collect the OpaqueTemplateAssertionPredicateNode.
-        list.push(bol);
-      } else {
-        // Collect the predicate projection.
-        list.push(predicate);
-      }
-    }
-    predicate = predicate->in(0)->in(0);
-  }
+// is set, then the OpaqueTemplateAssertionPredicateNode nodes of the Assertion Predicates are put on the list instead
+// of the projections.
+void PhaseIdealLoop::get_assertion_predicates(ParsePredicateSuccessProj* parse_predicate_proj, Unique_Node_List& list,
+                                              const bool get_opaque) {
+  Deoptimization::DeoptReason deopt_reason = parse_predicate_proj->in(0)->as_ParsePredicate()->deopt_reason();
+  PredicateBlockIterator predicate_iterator(parse_predicate_proj, deopt_reason);
+  TemplateAssertionPredicateCollector template_assertion_predicate_collector(list, get_opaque);
+  predicate_iterator.for_each(template_assertion_predicate_collector);
 }
 
 // Clone an Assertion Predicate for an unswitched loop. OpaqueLoopInit and OpaqueLoopStride nodes are cloned and uncommon
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 0ad60c80c2d..9175d79e6dd 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -758,7 +758,6 @@ void PhaseIdealLoop::do_peeling(IdealLoopTree *loop, Node_List &old_new) {
 #endif
     }
   }
-  Node* entry = head->in(LoopNode::EntryControl);
 
   // Step 1: Clone the loop body.  The clone becomes the peeled iteration.
   //         The pre-loop illegally has 2 control users (old & new loops).
@@ -1109,7 +1108,7 @@ void IdealLoopTree::policy_unroll_slp_analysis(CountedLoopNode *cl, PhaseIdealLo
   // Enable this functionality target by target as needed
   if (SuperWordLoopUnrollAnalysis) {
     if (!cl->was_slp_analyzed()) {
-      Compile::TracePhase tp("autoVectorize", &Phase::timers[Phase::_t_autoVectorize]);
+      Compile::TracePhase tp(Phase::_t_autoVectorize);
 
       VLoop vloop(this, true);
       if (vloop.check_preconditions()) {
@@ -1780,47 +1779,19 @@ bool IdealLoopTree::is_invariant(Node* n) const {
 
 // Search the Assertion Predicates added by loop predication and/or range check elimination and update them according
 // to the new stride.
-void PhaseIdealLoop::update_main_loop_assertion_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init,
-                                                           const int stride_con) {
-  Node* entry = ctrl;
-  Node* prev_proj = ctrl;
-  LoopNode* outer_loop_head = loop_head->skip_strip_mined();
-  IdealLoopTree* outer_loop = get_loop(outer_loop_head);
+void PhaseIdealLoop::update_main_loop_assertion_predicates(CountedLoopNode* main_loop_head) {
+  Node* init = main_loop_head->init_trip();
 
   // Compute the value of the loop induction variable at the end of the
   // first iteration of the unrolled loop: init + new_stride_con - init_inc
-  int new_stride_con = stride_con * 2;
-  Node* max_value = _igvn.intcon(new_stride_con);
-  set_ctrl(max_value, C->root());
-
-  while (entry != nullptr && entry->is_Proj() && entry->in(0)->is_If()) {
-    IfNode* iff = entry->in(0)->as_If();
-    ProjNode* proj = iff->proj_out(1 - entry->as_Proj()->_con);
-    if (!proj->unique_ctrl_out()->is_Halt()) {
-      break;
-    }
-    Node* bol = iff->in(1);
-    if (bol->is_OpaqueTemplateAssertionPredicate()) {
-      assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes");
-      // This is a Template Assertion Predicate for the initial or last access.
-      // Create an Initialized Assertion Predicates for it accordingly:
-      // - For the initial access a[init] (same as before)
-      // - For the last access a[init+new_stride-orig_stride] (with the new unroll stride)
-      prev_proj = create_initialized_assertion_predicate(iff, init, max_value, prev_proj);
-    } else if (bol->is_OpaqueInitializedAssertionPredicate()) {
-      // This is one of the two Initialized Assertion Predicates:
-      // - For the initial access a[init]
-      // - For the last access a[init+old_stride-orig_stride]
-      // We could keep the one for the initial access but we do not know which one we currently have here. Just kill both.
-      _igvn.replace_input_of(iff, 1, _igvn.intcon(1));
-    }
-    assert(!bol->is_OpaqueNotNull() || !loop_head->is_main_loop(), "OpaqueNotNull should not be at main loop");
-    entry = entry->in(0)->in(0);
-  }
-  if (prev_proj != ctrl) {
-    _igvn.replace_input_of(outer_loop_head, LoopNode::EntryControl, prev_proj);
-    set_idom(outer_loop_head, prev_proj, dom_depth(outer_loop_head));
-  }
+  int unrolled_stride_con = main_loop_head->stride_con() * 2;
+  Node* unrolled_stride = _igvn.intcon(unrolled_stride_con);
+  set_ctrl(unrolled_stride, C->root());
+
+  Node* loop_entry = main_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
+  PredicateIterator predicate_iterator(loop_entry);
+  UpdateStrideForAssertionPredicates update_stride_for_assertion_predicates(unrolled_stride, this);
+  predicate_iterator.for_each(update_stride_for_assertion_predicates);
 }
 
 // Source Loop: Cloned   - peeled_loop_head
@@ -1937,7 +1908,7 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
   assert(old_trip_count > 1 && (!adjust_min_trip || stride_p <=
     MIN2<int>(max_jint / 2 - 2, MAX2(1<<3, Matcher::max_vector_size(T_BYTE)) * loop_head->unrolled_count())), "sanity");
 
-  update_main_loop_assertion_predicates(ctrl, loop_head, init, stride_con);
+  update_main_loop_assertion_predicates(loop_head);
 
   // Adjust loop limit to keep valid iterations number after unroll.
   // Use (limit - stride) instead of (((limit - init)/stride) & (-2))*stride
@@ -2788,8 +2759,8 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
             // cannot remove an empty loop with a constant limit when init is not a constant as well. We will use
             // a LoopLimitCheck node that can only be folded if the zero grip guard is also foldable.
             loop_entry = initialized_assertion_predicate_creator.create(final_iv_placeholder, loop_entry, stride_con,
-                                                                        scale_con, int_offset, int_limit NOT_PRODUCT(
-                                                                        COMMA AssertionPredicateType::FinalIv));
+                                                                        scale_con, int_offset, int_limit,
+                                                                        AssertionPredicateType::FinalIv);
             assert(!assertion_predicate_has_loop_opaque_node(loop_entry->in(0)->as_If()), "unexpected");
           }
 
@@ -2802,8 +2773,8 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
 
           // Initialized Assertion Predicate for the value of the initial main-loop.
           loop_entry = initialized_assertion_predicate_creator.create(init, loop_entry, stride_con, scale_con,
-                                                                      int_offset, int_limit NOT_PRODUCT(COMMA
-                                                                      AssertionPredicateType::InitValue));
+                                                                      int_offset, int_limit,
+                                                                      AssertionPredicateType::InitValue);
           assert(!assertion_predicate_has_loop_opaque_node(loop_entry->in(0)->as_If()), "unexpected");
 
         } else {
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index e2db179676d..44a72fda644 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4469,7 +4469,7 @@ void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(Ideal
   if (UseProfiledLoopPredicate) {
     const PredicateBlock* profiled_loop_predicate_block = predicates.profiled_loop_predicate_block();
     if (profiled_loop_predicate_block->has_parse_predicate()) {
-      IfProjNode* parse_predicate_proj = profiled_loop_predicate_block->parse_predicate_success_proj();
+      ParsePredicateSuccessProj* parse_predicate_proj = profiled_loop_predicate_block->parse_predicate_success_proj();
       get_assertion_predicates(parse_predicate_proj, useful_predicates, true);
     }
   }
@@ -4477,7 +4477,7 @@ void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(Ideal
   if (UseLoopPredicate) {
     const PredicateBlock* loop_predicate_block = predicates.loop_predicate_block();
     if (loop_predicate_block->has_parse_predicate()) {
-      IfProjNode* parse_predicate_proj = loop_predicate_block->parse_predicate_success_proj();
+      ParsePredicateSuccessProj* parse_predicate_proj = loop_predicate_block->parse_predicate_success_proj();
       get_assertion_predicates(parse_predicate_proj, useful_predicates, true);
     }
   }
@@ -4971,7 +4971,7 @@ void PhaseIdealLoop::build_and_optimize() {
 
   // Auto-vectorize main-loop
   if (C->do_superword() && C->has_loops() && !C->major_progress()) {
-    Compile::TracePhase tp("autoVectorize", &timers[_t_autoVectorize]);
+    Compile::TracePhase tp(_t_autoVectorize);
 
     // Shared data structures for all AutoVectorizations, to reduce allocations
     // of large arrays.
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 487c4473280..cc67240975d 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -947,8 +947,8 @@ class PhaseIdealLoop : public PhaseTransform {
   DEBUG_ONLY(static bool assertion_predicate_has_loop_opaque_node(IfNode* iff);)
  private:
   DEBUG_ONLY(static void count_opaque_loop_nodes(Node* n, uint& init, uint& stride);)
-  static void get_assertion_predicates(Node* predicate, Unique_Node_List& list, bool get_opaque = false);
-  void update_main_loop_assertion_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init, int stride_con);
+  static void get_assertion_predicates(ParsePredicateSuccessProj* parse_predicate_proj, Unique_Node_List& list, bool get_opaque = false);
+  void update_main_loop_assertion_predicates(CountedLoopNode* main_loop_head);
   void initialize_assertion_predicates_for_peeled_loop(CountedLoopNode* peeled_loop_head,
                                                        CountedLoopNode* remaining_loop_head,
                                                        uint first_node_index_in_cloned_loop_body,
@@ -1196,7 +1196,7 @@ class PhaseIdealLoop : public PhaseTransform {
   static void verify(PhaseIterGVN& igvn) {
 #ifdef ASSERT
     ResourceMark rm;
-    Compile::TracePhase tp("idealLoopVerify", &timers[_t_idealLoopVerify]);
+    Compile::TracePhase tp(_t_idealLoopVerify);
     PhaseIdealLoop v(igvn);
 #endif
   }
@@ -1352,8 +1352,8 @@ class PhaseIdealLoop : public PhaseTransform {
   // Create a new if above the uncommon_trap_if_pattern for the predicate to be promoted
   IfTrueNode* create_new_if_for_predicate(
       ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry, Deoptimization::DeoptReason reason, int opcode,
-      bool rewire_uncommon_proj_phi_inputs = false
-      NOT_PRODUCT (COMMA AssertionPredicateType assertion_predicate_type = AssertionPredicateType::None));
+      bool rewire_uncommon_proj_phi_inputs = false,
+      AssertionPredicateType assertion_predicate_type = AssertionPredicateType::None);
 
  private:
   // Helper functions for create_new_if_for_predicate()
@@ -1672,7 +1672,7 @@ class PhaseIdealLoop : public PhaseTransform {
   IfProjNode* clone_parse_predicate_to_unswitched_loop(ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry,
                                                        Deoptimization::DeoptReason reason, bool slow_loop);
   void clone_assertion_predicates_to_unswitched_loop(IdealLoopTree* loop, const Node_List& old_new,
-                                                     Deoptimization::DeoptReason reason, IfProjNode* old_predicate_proj,
+                                                     Deoptimization::DeoptReason reason, ParsePredicateSuccessProj* old_parse_predicate_proj,
                                                      ParsePredicateSuccessProj* fast_loop_parse_predicate_proj,
                                                      ParsePredicateSuccessProj* slow_loop_parse_predicate_proj);
   IfProjNode* clone_assertion_predicate_for_unswitched_loops(IfNode* template_assertion_predicate, IfProjNode* predicate,
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 31a453c9093..289ea30a633 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -1706,7 +1706,9 @@ PhaseMacroExpand::initialize_object(AllocateNode* alloc,
   }
   rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, TypeX_X->basic_type());
 
-  rawmem = make_store(control, rawmem, object, oopDesc::klass_offset_in_bytes(), klass_node, T_METADATA);
+  if (!UseCompactObjectHeaders) {
+    rawmem = make_store(control, rawmem, object, oopDesc::klass_offset_in_bytes(), klass_node, T_METADATA);
+  }
   int header_size = alloc->minimum_header_size();  // conservatively small
 
   // Array length
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 0d29412dc29..abfbddee21a 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -434,7 +434,7 @@ void Matcher::match( ) {
   Fixup_Save_On_Entry( );
 
   { // Cleanup mach IR after selection phase is over.
-    Compile::TracePhase tp("postselect_cleanup", &timers[_t_postselect_cleanup]);
+    Compile::TracePhase tp(_t_postselect_cleanup);
     do_postselect_cleanup();
     if (C->failing())  return;
     assert(verify_after_postselect_cleanup(), "");
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 919d23fea8d..ad351fb81ad 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -1971,6 +1971,8 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 const Type*
 LoadNode::load_array_final_field(const TypeKlassPtr *tkls,
                                  ciKlass* klass) const {
+  assert(!UseCompactObjectHeaders || tkls->offset() != in_bytes(Klass::prototype_header_offset()),
+         "must not happen");
   if (tkls->offset() == in_bytes(Klass::modifier_flags_offset())) {
     // The field is Klass::_modifier_flags.  Return its (constant) value.
     // (Folds up the 2nd indirection in aClassConstant.getModifiers().)
@@ -2149,6 +2151,13 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
         assert(Opcode() == Op_LoadI, "must load an int from _super_check_offset");
         return TypeInt::make(klass->super_check_offset());
       }
+      if (UseCompactObjectHeaders) {
+        if (tkls->offset() == in_bytes(Klass::prototype_header_offset())) {
+          // The field is Klass::_prototype_header. Return its (constant) value.
+          assert(this->Opcode() == Op_LoadX, "must load a proper type from _prototype_header");
+          return TypeX::make(klass->prototype_header());
+        }
+      }
       // Compute index into primary_supers array
       juint depth = (tkls->offset() - in_bytes(Klass::primary_supers_offset())) / sizeof(Klass*);
       // Check for overflowing; use unsigned compare to handle the negative case.
@@ -2238,9 +2247,11 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
     }
   }
 
-  Node* alloc = is_new_object_mark_load();
-  if (alloc != nullptr) {
-    return TypeX::make(markWord::prototype().value());
+  if (!UseCompactObjectHeaders) {
+    Node* alloc = is_new_object_mark_load();
+    if (alloc != nullptr) {
+      return TypeX::make(markWord::prototype().value());
+    }
   }
 
   return _type;
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index ea1175bce14..fa781bf23a6 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -437,7 +437,7 @@ void PhaseOutput::compute_loop_first_inst_sizes() {
 // branch instructions. Replace eligible long branches with short branches.
 void PhaseOutput::shorten_branches(uint* blk_starts) {
 
-  Compile::TracePhase tp("shorten branches", &timers[_t_shortenBranches]);
+  Compile::TracePhase tp(_t_shortenBranches);
 
   // Compute size of each block, method size, and relocation information size
   uint nblocks  = C->cfg()->number_of_blocks();
@@ -1418,7 +1418,7 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) {
 
   // Compute the size of first NumberOfLoopInstrToAlign instructions at head
   // of a loop. It is used to determine the padding for loop alignment.
-  Compile::TracePhase tp("fill buffer", &timers[_t_fillBuffer]);
+  Compile::TracePhase tp(_t_fillBuffer);
 
   compute_loop_first_inst_sizes();
 
@@ -2162,7 +2162,7 @@ void PhaseOutput::ScheduleAndBundle() {
     return;
   }
 
-  Compile::TracePhase tp("isched", &timers[_t_instrSched]);
+  Compile::TracePhase tp(_t_instrSched);
 
   // Create a data structure for all the scheduling information
   Scheduling scheduling(Thread::current()->resource_area(), *C);
@@ -3428,7 +3428,7 @@ void PhaseOutput::install_code(ciMethod*         target,
       return;
     }
 #endif
-    Compile::TracePhase tp("install_code", &timers[_t_registerMethod]);
+    Compile::TracePhase tp(_t_registerMethod);
 
     if (C->is_osr_compilation()) {
       _code_offsets.set_value(CodeOffsets::Verified_Entry, 0);
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index d4a6a9ce5b7..68b87d858a5 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -247,7 +247,7 @@ void Parse::load_interpreter_state(Node* osr_buf) {
     Node *displaced_hdr = fetch_interpreter_state((index*2) + 1, T_ADDRESS, monitors_addr, osr_buf);
 
 
-    store_to_memory(control(), box, displaced_hdr, T_ADDRESS, Compile::AliasIdxRaw, MemNode::unordered);
+    store_to_memory(control(), box, displaced_hdr, T_ADDRESS, MemNode::unordered);
 
     // Build a bogus FastLockNode (no code will be generated) and push the
     // monitor into our debug info.
@@ -2272,7 +2272,7 @@ void Parse::add_safepoint() {
   Node *polladr;
   Node *thread = _gvn.transform(new ThreadLocalNode());
   Node *polling_page_load_addr = _gvn.transform(basic_plus_adr(top(), thread, in_bytes(JavaThread::polling_page_offset())));
-  polladr = make_load(control(), polling_page_load_addr, TypeRawPtr::BOTTOM, T_ADDRESS, Compile::AliasIdxRaw, MemNode::unordered);
+  polladr = make_load(control(), polling_page_load_addr, TypeRawPtr::BOTTOM, T_ADDRESS, MemNode::unordered);
   sfpnt->init_req(TypeFunc::Parms+0, _gvn.transform(polladr));
 
   // Fix up the JVM State edges
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index d428024e53e..f7b17361913 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -1376,9 +1376,9 @@ static volatile int _trap_stress_counter = 0;
 
 void Parse::increment_trap_stress_counter(Node*& counter, Node*& incr_store) {
   Node* counter_addr = makecon(TypeRawPtr::make((address)&_trap_stress_counter));
-  counter = make_load(control(), counter_addr, TypeInt::INT, T_INT, Compile::AliasIdxRaw, MemNode::unordered);
+  counter = make_load(control(), counter_addr, TypeInt::INT, T_INT, MemNode::unordered);
   counter = _gvn.transform(new AddINode(counter, intcon(1)));
-  incr_store = store_to_memory(control(), counter_addr, counter, T_INT, Compile::AliasIdxRaw, MemNode::unordered);
+  incr_store = store_to_memory(control(), counter_addr, counter, T_INT, MemNode::unordered);
 }
 
 //----------------------------------do_ifnull----------------------------------
diff --git a/src/hotspot/share/opto/parse3.cpp b/src/hotspot/share/opto/parse3.cpp
index a9fad4e3633..0a65d904c64 100644
--- a/src/hotspot/share/opto/parse3.cpp
+++ b/src/hotspot/share/opto/parse3.cpp
@@ -131,6 +131,8 @@ void Parse::do_get_xxx(Node* obj, ciField* field, bool is_field) {
   int offset = field->offset_in_bytes();
   const TypePtr* adr_type = C->alias_type(field)->adr_type();
   Node *adr = basic_plus_adr(obj, obj, offset);
+  assert(C->get_alias_index(adr_type) == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
+    "slice of address and input slice don't match");
 
   // Build the resultant type of the load
   const Type *type;
@@ -204,6 +206,8 @@ void Parse::do_put_xxx(Node* obj, ciField* field, bool is_field) {
   int offset = field->offset_in_bytes();
   const TypePtr* adr_type = C->alias_type(field)->adr_type();
   Node* adr = basic_plus_adr(obj, obj, offset);
+  assert(C->get_alias_index(adr_type) == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
+    "slice of address and input slice don't match");
   BasicType bt = field->layout_type();
   // Value to be stored
   Node* val = type2size[bt] == 1 ? pop() : pop_pair();
@@ -406,7 +410,7 @@ void Parse::do_multianewarray() {
       // Fill-in it with values
       for (j = 0; j < ndimensions; j++) {
         Node *dims_elem = array_element_address(dims, intcon(j), T_INT);
-        store_to_memory(control(), dims_elem, length[j], T_INT, TypeAryPtr::INTS, MemNode::unordered);
+        store_to_memory(control(), dims_elem, length[j], T_INT, MemNode::unordered);
       }
     }
 
diff --git a/src/hotspot/share/opto/phase.cpp b/src/hotspot/share/opto/phase.cpp
index d3e34a4dc69..8ab98f8a3f3 100644
--- a/src/hotspot/share/opto/phase.cpp
+++ b/src/hotspot/share/opto/phase.cpp
@@ -39,6 +39,16 @@ elapsedTimer Phase::_t_stubCompilation;
 // The counters to use for LogCompilation
 elapsedTimer Phase::timers[max_phase_timers];
 
+const char* Phase::get_phase_trace_id_text(PhaseTraceId id) {
+  static const char* const texts[] = {
+  #define DEF_TEXT(name, text) text,
+      ALL_PHASE_TRACE_IDS(DEF_TEXT)
+  #undef DEF_TEXT
+      nullptr
+  };
+  return texts[(int)id];
+}
+
 //------------------------------Phase------------------------------------------
 Phase::Phase( PhaseNumber pnum ) : _pnum(pnum), C( pnum == Compiler ? nullptr : Compile::current()) {
   // Poll for requests from shutdown mechanism to quiesce compiler (4448539, 4448544).
diff --git a/src/hotspot/share/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp
index db2327f378f..5d86618fc32 100644
--- a/src/hotspot/share/opto/phase.hpp
+++ b/src/hotspot/share/opto/phase.hpp
@@ -64,64 +64,71 @@ class Phase : public StackObj {
     last_phase
   };
 
+#define ALL_PHASE_TRACE_IDS(f)                                   \
+    f(   _t_parser,                  "parse")                    \
+    f(   _t_optimizer,               "optimizer")                \
+    f(     _t_escapeAnalysis,        "escapeAnalysis")           \
+    f(       _t_connectionGraph,     "connectionGraph")          \
+    f(       _t_macroEliminate,      "macroEliminate")           \
+    f(     _t_iterGVN,               "iterGVN")                  \
+    f(     _t_incrInline,            "incrementalInline")        \
+    f(       _t_incrInline_ideal,    "incrementalInline_ideal")  \
+    f(       _t_incrInline_igvn,     "incrementalInline_igvn")   \
+    f(       _t_incrInline_pru,      "incrementalInline_pru")    \
+    f(       _t_incrInline_inline,   "incrementalInline_inline") \
+    f(     _t_vector,                "")                         \
+    f(       _t_vector_elimination,  "vector_elimination")       \
+    f(         _t_vector_igvn,       "incrementalInline_igvn")   \
+    f(         _t_vector_pru,        "vector_pru")               \
+    f(     _t_renumberLive,          "")                         \
+    f(     _t_idealLoop,             "idealLoop")                \
+    f(       _t_autoVectorize,       "autoVectorize")            \
+    f(     _t_idealLoopVerify,       "idealLoopVerify")          \
+    f(     _t_ccp,                   "ccp")                      \
+    f(     _t_iterGVN2,              "iterGVN2")                 \
+    f(     _t_macroExpand,           "macroExpand")              \
+    f(     _t_barrierExpand,         "barrierExpand")            \
+    f(     _t_graphReshaping,        "graphReshape")             \
+    f(   _t_matcher,                 "matcher")                  \
+    f(     _t_postselect_cleanup,    "postselect_cleanup")       \
+    f(   _t_scheduler,               "scheduler")                \
+    f(   _t_registerAllocation,      "regalloc")                 \
+    f(     _t_ctorChaitin,           "ctorChaitin")              \
+    f(     _t_buildIFGvirtual,       "buildIFG_virt")            \
+    f(     _t_buildIFGphysical,      "buildIFG")                 \
+    f(     _t_computeLive,           "computeLive")              \
+    f(     _t_regAllocSplit,         "regAllocSplit")            \
+    f(     _t_postAllocCopyRemoval,  "postAllocCopyRemoval")     \
+    f(     _t_mergeMultidefs,        "mergeMultidefs")           \
+    f(     _t_fixupSpills,           "fixupSpills")              \
+    f(     _t_chaitinCompact,        "chaitinCompact")           \
+    f(     _t_chaitinCoalesce1,      "chaitinCoalesce1")         \
+    f(     _t_chaitinCoalesce2,      "chaitinCoalesce2")         \
+    f(     _t_chaitinCoalesce3,      "chaitinCoalesce3")         \
+    f(     _t_chaitinCacheLRG,       "chaitinCacheLRG")          \
+    f(     _t_chaitinSimplify,       "chaitinSimplify")          \
+    f(     _t_chaitinSelect,         "chaitinSelect")            \
+    f(   _t_blockOrdering,           "blockOrdering")            \
+    f(   _t_peephole,                "peephole")                 \
+    f(   _t_postalloc_expand,        "postalloc_expand")         \
+    f(   _t_output,                  "output")                   \
+    f(     _t_instrSched,            "isched")                   \
+    f(     _t_shortenBranches,       "shorten branches")         \
+    f(     _t_buildOopMaps,          "bldOopMaps")               \
+    f(     _t_fillBuffer,            "fill buffer")              \
+    f(     _t_registerMethod,        "install_code")             \
+    f(   _t_temporaryTimer1,         "tempTimer1")               \
+    f(   _t_temporaryTimer2,         "tempTimer2")
+
   enum PhaseTraceId {
-    _t_parser,
-    _t_optimizer,
-      _t_escapeAnalysis,
-        _t_connectionGraph,
-        _t_macroEliminate,
-      _t_iterGVN,
-      _t_incrInline,
-        _t_incrInline_ideal,
-        _t_incrInline_igvn,
-        _t_incrInline_pru,
-        _t_incrInline_inline,
-      _t_vector,
-        _t_vector_elimination,
-          _t_vector_igvn,
-          _t_vector_pru,
-      _t_renumberLive,
-      _t_idealLoop,
-        _t_autoVectorize,
-      _t_idealLoopVerify,
-      _t_ccp,
-      _t_iterGVN2,
-      _t_macroExpand,
-      _t_barrierExpand,
-      _t_graphReshaping,
-    _t_matcher,
-      _t_postselect_cleanup,
-    _t_scheduler,
-    _t_registerAllocation,
-      _t_ctorChaitin,
-      _t_buildIFGvirtual,
-      _t_buildIFGphysical,
-      _t_computeLive,
-      _t_regAllocSplit,
-      _t_postAllocCopyRemoval,
-      _t_mergeMultidefs,
-      _t_fixupSpills,
-      _t_chaitinCompact,
-      _t_chaitinCoalesce1,
-      _t_chaitinCoalesce2,
-      _t_chaitinCoalesce3,
-      _t_chaitinCacheLRG,
-      _t_chaitinSimplify,
-      _t_chaitinSelect,
-    _t_blockOrdering,
-    _t_peephole,
-    _t_postalloc_expand,
-    _t_output,
-      _t_instrSched,
-      _t_shortenBranches,
-      _t_buildOopMaps,
-      _t_fillBuffer,
-      _t_registerMethod,
-    _t_temporaryTimer1,
-    _t_temporaryTimer2,
+#define DEFID(name, text) name,
+    ALL_PHASE_TRACE_IDS(DEFID)
+#undef DEFID
     max_phase_timers
    };
 
+  static const char* get_phase_trace_id_text(PhaseTraceId id);
+
   static elapsedTimer timers[max_phase_timers];
 
 protected:
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index f766146a894..c91a7bba078 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -27,6 +27,7 @@
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "opto/addnode.hpp"
 #include "opto/block.hpp"
 #include "opto/callnode.hpp"
 #include "opto/castnode.hpp"
@@ -1634,12 +1635,19 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
-  // If changed AddP inputs, check Stores for loop invariant
-  if( use_op == Op_AddP ) {
+  // If changed AddP inputs:
+  // - check Stores for loop invariant, and
+  // - if the changed input is the offset, check constant-offset AddP users for
+  //   address expression flattening.
+  if (use_op == Op_AddP) {
+    bool offset_changed = n == use->in(AddPNode::Offset);
     for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
       Node* u = use->fast_out(i2);
-      if (u->is_Mem())
+      if (u->is_Mem()) {
         worklist.push(u);
+      } else if (offset_changed && u->is_AddP() && u->in(AddPNode::Offset)->is_Con()) {
+        worklist.push(u);
+      }
     }
   }
   // If changed initialization activity, check dependent Stores
diff --git a/src/hotspot/share/opto/postaloc.cpp b/src/hotspot/share/opto/postaloc.cpp
index bc336e1e0a9..ac91d8a775e 100644
--- a/src/hotspot/share/opto/postaloc.cpp
+++ b/src/hotspot/share/opto/postaloc.cpp
@@ -401,7 +401,7 @@ bool PhaseChaitin::eliminate_copy_of_constant(Node* val, Node* n,
 // all the uses that we've seen so far to use the merge. After that we keep replacing the new defs in the same lrg
 // as they get encountered with the merge node and keep adding these defs to the merge inputs.
 void PhaseChaitin::merge_multidefs() {
-  Compile::TracePhase tp("mergeMultidefs", &timers[_t_mergeMultidefs]);
+  Compile::TracePhase tp(_t_mergeMultidefs);
   ResourceMark rm;
   // Keep track of the defs seen in registers and collect their uses in the block.
   RegToDefUseMap reg2defuse(_max_reg, _max_reg, RegDefUse());
@@ -501,7 +501,7 @@ int PhaseChaitin::possibly_merge_multidef(Node *n, uint k, Block *block, RegToDe
 // When we see a use from a reg-reg Copy, we will attempt to use the copy's
 // source directly and make the copy go dead.
 void PhaseChaitin::post_allocate_copy_removal() {
-  Compile::TracePhase tp("postAllocCopyRemoval", &timers[_t_postAllocCopyRemoval]);
+  Compile::TracePhase tp(_t_postAllocCopyRemoval);
   ResourceMark rm;
 
   // Need a mapping from basic block Node_Lists.  We need a Node_List to
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index ee218063567..5e600eab2f0 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -152,7 +152,6 @@ void TemplateAssertionPredicate::rewire_loop_data_dependencies(IfTrueNode* targe
   }
 }
 
-
 // Template Assertion Predicates always have the dedicated OpaqueTemplateAssertionPredicate to identify them.
 bool TemplateAssertionPredicate::is_predicate(Node* node) {
   if (!may_be_assertion_predicate_if(node)) {
@@ -172,13 +171,31 @@ IfTrueNode* TemplateAssertionPredicate::clone_and_replace_init(Node* new_control
       template_assertion_expression.clone_and_replace_init(new_opaque_init, new_control, phase);
   AssertionPredicateIfCreator assertion_predicate_if_creator(phase);
   IfTrueNode* success_proj = assertion_predicate_if_creator.create_for_template(new_control, _if_node->Opcode(),
-                                                                                new_opaque_node NOT_PRODUCT(COMMA
-                                                                                _if_node->assertion_predicate_type()));
+                                                                                new_opaque_node,
+                                                                                _if_node->assertion_predicate_type());
   assert(PhaseIdealLoop::assertion_predicate_has_loop_opaque_node(success_proj->in(0)->as_If()),
          "Template Assertion Predicates must have OpaqueLoop* nodes in the bool expression");
   return success_proj;
 }
 
+// Replace the input to OpaqueLoopStrideNode with 'new_stride' and leave the other nodes unchanged.
+void TemplateAssertionPredicate::replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) const {
+  TemplateAssertionExpression expression(opaque_node());
+  expression.replace_opaque_stride_input(new_stride, igvn);
+}
+
+// Create a new Initialized Assertion Predicate from this template at 'new_control' and return the success projection
+// of the newly created Initialized Assertion Predicate.
+IfTrueNode* TemplateAssertionPredicate::initialize(PhaseIdealLoop* phase, Node* new_control) const {
+  assert(phase->assertion_predicate_has_loop_opaque_node(head()),
+         "must find OpaqueLoop* nodes for Template Assertion Predicate");
+  InitializedAssertionPredicateCreator initialized_assertion_predicate(phase);
+  IfTrueNode* success_proj = initialized_assertion_predicate.create_from_template(head(), new_control);
+  assert(!phase->assertion_predicate_has_loop_opaque_node(success_proj->in(0)->as_If()),
+         "Initialized Assertion Predicates do not have OpaqueLoop* nodes in the bool expression anymore");
+  return success_proj;
+}
+
 // Initialized Assertion Predicates always have the dedicated OpaqueInitiailizedAssertionPredicate node to identify
 // them.
 bool InitializedAssertionPredicate::is_predicate(Node* node) {
@@ -189,6 +206,12 @@ bool InitializedAssertionPredicate::is_predicate(Node* node) {
   return if_node->in(1)->is_OpaqueInitializedAssertionPredicate();
 }
 
+void InitializedAssertionPredicate::kill(PhaseIdealLoop* phase) const {
+  Node* true_con = phase->igvn().intcon(1);
+  phase->set_ctrl(true_con, phase->C->root());
+  phase->igvn().replace_input_of(_if_node, 1, true_con);
+}
+
 #ifdef ASSERT
 // Check that the block has at most one Parse Predicate and that we only find Regular Predicate nodes (i.e. IfProj,
 // If, or RangeCheck nodes).
@@ -388,6 +411,63 @@ TemplateAssertionExpression::clone(const TransformStrategyForOpaqueLoopNodes& tr
   return opaque_node_clone->as_OpaqueTemplateAssertionPredicate();
 }
 
+// This class is used to replace the input to OpaqueLoopStrideNode with a new node while leaving the other nodes
+// unchanged.
+class ReplaceOpaqueStrideInput : public StackObj {
+  PhaseIterGVN& _igvn;
+  Unique_Node_List _nodes_to_visit;
+
+ public:
+  ReplaceOpaqueStrideInput(OpaqueTemplateAssertionPredicateNode* start_node, PhaseIterGVN& igvn) : _igvn(igvn) {
+    _nodes_to_visit.push(start_node);
+  }
+  NONCOPYABLE(ReplaceOpaqueStrideInput);
+
+  void replace(Node* new_opaque_stride_input) {
+    for (uint i = 0; i < _nodes_to_visit.size(); i++) {
+      Node* next = _nodes_to_visit[i];
+      for (uint j = 1; j < next->req(); j++) {
+        Node* input = next->in(j);
+        if (input->is_OpaqueLoopStride()) {
+          assert(TemplateAssertionExpressionNode::is_maybe_in_expression(input), "must also pass node filter");
+          _igvn.replace_input_of(input, 1, new_opaque_stride_input);
+        } else if (TemplateAssertionExpressionNode::is_maybe_in_expression(input)) {
+          _nodes_to_visit.push(input);
+        }
+      }
+    }
+  }
+};
+
+// Replace the input to OpaqueLoopStrideNode with 'new_stride' and leave the other nodes unchanged.
+void TemplateAssertionExpression::replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) {
+  ReplaceOpaqueStrideInput replace_opaque_stride_input(_opaque_node, igvn);
+  replace_opaque_stride_input.replace(new_stride);
+}
+
+// The transformations of this class fold the OpaqueLoop* nodes by returning their inputs.
+class RemoveOpaqueLoopNodesStrategy : public TransformStrategyForOpaqueLoopNodes {
+ public:
+  Node* transform_opaque_init(OpaqueLoopInitNode* opaque_init) const override {
+    return opaque_init->in(1);
+  }
+
+  Node* transform_opaque_stride(OpaqueLoopStrideNode* opaque_stride) const override {
+    return opaque_stride->in(1);
+  }
+};
+
+OpaqueInitializedAssertionPredicateNode*
+TemplateAssertionExpression::clone_and_fold_opaque_loop_nodes(Node* new_control, PhaseIdealLoop* phase) {
+  RemoveOpaqueLoopNodesStrategy remove_opaque_loop_nodes_strategy;
+  OpaqueTemplateAssertionPredicateNode* cloned_template_opaque = clone(remove_opaque_loop_nodes_strategy, new_control,
+                                                                       phase);
+  OpaqueInitializedAssertionPredicateNode* opaque_initialized_opaque =
+      new OpaqueInitializedAssertionPredicateNode(cloned_template_opaque->in(1)->as_Bool(), phase->C);
+  phase->register_new_node(opaque_initialized_opaque, new_control);
+  return opaque_initialized_opaque;
+}
+
 // Check if this node belongs a Template Assertion Expression (including OpaqueLoop* nodes).
 bool TemplateAssertionExpressionNode::is_in_expression(Node* node) {
   if (is_maybe_in_expression(node)) {
@@ -466,19 +546,19 @@ class AssertionPredicateExpressionCreator : public StackObj {
 // Creates an If with a success and a fail path with the given assertion_expression. The only difference to
 // create_for_initialized() is that we use a template specific Halt message on the fail path.
 IfTrueNode* AssertionPredicateIfCreator::create_for_template(Node* new_control, const int if_opcode,
-                                                             Node* assertion_expression NOT_PRODUCT(COMMA
-                                                             const AssertionPredicateType assertion_predicate_type)) {
+                                                             Node* assertion_expression,
+                                                             const AssertionPredicateType assertion_predicate_type) {
   const char* halt_message = "Template Assertion Predicates are always removed before code generation";
-  return create(new_control, if_opcode, assertion_expression, halt_message NOT_PRODUCT(COMMA assertion_predicate_type));
+  return create(new_control, if_opcode, assertion_expression, halt_message, assertion_predicate_type);
 }
 
 // Creates an If with a success and a fail path with the given assertion_expression. The only difference to
 // create_for_template() is that we use a initialized specific Halt message on the fail path.
 IfTrueNode* AssertionPredicateIfCreator::create_for_initialized(Node* new_control, const int if_opcode,
-                                                                Node* assertion_expression NOT_PRODUCT(COMMA
-                                                                const AssertionPredicateType assertion_predicate_type)) {
+                                                                Node* assertion_expression,
+                                                                const AssertionPredicateType assertion_predicate_type) {
   const char* halt_message = "Initialized Assertion Predicate cannot fail";
-  return create(new_control, if_opcode, assertion_expression, halt_message NOT_PRODUCT(COMMA assertion_predicate_type));
+  return create(new_control, if_opcode, assertion_expression, halt_message, assertion_predicate_type);
 }
 
 // Creates the If node for an Assertion Predicate with a success path and a fail path having a Halt node:
@@ -491,28 +571,25 @@ IfTrueNode* AssertionPredicateIfCreator::create_for_initialized(Node* new_contro
 //           proj      with Halt
 //
 IfTrueNode* AssertionPredicateIfCreator::create(Node* new_control, const int if_opcode, Node* assertion_expression,
-                                                const char* halt_message NOT_PRODUCT(COMMA
-                                                const AssertionPredicateType assertion_predicate_type)) {
+                                                const char* halt_message,
+                                                const AssertionPredicateType assertion_predicate_type) {
   assert(assertion_expression->is_OpaqueTemplateAssertionPredicate() ||
          assertion_expression->is_OpaqueInitializedAssertionPredicate(), "not a valid assertion expression");
   IdealLoopTree* loop = _phase->get_loop(new_control);
-  IfNode* if_node = create_if_node(new_control, if_opcode, assertion_expression, loop
-                                   NOT_PRODUCT(COMMA assertion_predicate_type));
+  IfNode* if_node = create_if_node(new_control, if_opcode, assertion_expression, loop, assertion_predicate_type);
   create_fail_path(if_node, loop, halt_message);
   return create_success_path(if_node, loop);
 }
 
 IfNode* AssertionPredicateIfCreator::create_if_node(Node* new_control, const int if_opcode, Node* assertion_expression,
-                                                    IdealLoopTree* loop NOT_PRODUCT(COMMA
-                                                    const AssertionPredicateType assertion_predicate_type)) {
+                                                    IdealLoopTree* loop,
+                                                    const AssertionPredicateType assertion_predicate_type) {
   IfNode* if_node;
   if (if_opcode == Op_If) {
-    if_node = new IfNode(new_control, assertion_expression, PROB_MAX, COUNT_UNKNOWN
-                         NOT_PRODUCT(COMMA assertion_predicate_type));
+    if_node = new IfNode(new_control, assertion_expression, PROB_MAX, COUNT_UNKNOWN, assertion_predicate_type);
   } else {
     assert(if_opcode == Op_RangeCheck, "must be range check");
-    if_node = new RangeCheckNode(new_control, assertion_expression, PROB_MAX, COUNT_UNKNOWN
-                                 NOT_PRODUCT(COMMA assertion_predicate_type));
+    if_node = new RangeCheckNode(new_control, assertion_expression, PROB_MAX, COUNT_UNKNOWN, assertion_predicate_type);
   }
   _phase->register_control(if_node, loop, new_control);
   return if_node;
@@ -551,13 +628,13 @@ IfTrueNode* TemplateAssertionPredicateCreator::create_with_uncommon_trap(
       create_for_init_value(new_control, opaque_init, does_overflow);
   IfTrueNode* template_predicate_success_proj =
       create_if_node_with_uncommon_trap(template_assertion_predicate_expression, parse_predicate_success_proj,
-                                        deopt_reason, if_opcode, does_overflow
-                                        NOT_PRODUCT(COMMA AssertionPredicateType::InitValue));
+                                        deopt_reason, if_opcode, does_overflow,
+                                        AssertionPredicateType::InitValue);
   template_assertion_predicate_expression = create_for_last_value(template_predicate_success_proj, opaque_init,
                                                                   does_overflow);
   return create_if_node_with_uncommon_trap(template_assertion_predicate_expression, parse_predicate_success_proj,
-                                           deopt_reason, if_opcode, does_overflow
-                                           NOT_PRODUCT(COMMA AssertionPredicateType::LastValue));
+                                           deopt_reason, if_opcode, does_overflow,
+                                           AssertionPredicateType::LastValue);
 }
 
 OpaqueLoopInitNode* TemplateAssertionPredicateCreator::create_opaque_init(Node* new_control) {
@@ -576,11 +653,10 @@ TemplateAssertionPredicateCreator::create_for_init_value(Node* new_control, Opaq
 IfTrueNode* TemplateAssertionPredicateCreator::create_if_node_with_uncommon_trap(
     OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression,
     ParsePredicateSuccessProj* parse_predicate_success_proj, const Deoptimization::DeoptReason deopt_reason,
-    const int if_opcode, const bool does_overflow
-    NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type)) {
+    const int if_opcode, const bool does_overflow, const AssertionPredicateType assertion_predicate_type) {
   IfTrueNode* success_proj = _phase->create_new_if_for_predicate(parse_predicate_success_proj, nullptr, deopt_reason,
-                                                                 does_overflow ? Op_If : if_opcode, false
-                                                                 NOT_PRODUCT(COMMA assertion_predicate_type));
+                                                                 does_overflow ? Op_If : if_opcode, false,
+                                                                 assertion_predicate_type);
   _phase->igvn().replace_input_of(success_proj->in(0), 1, template_assertion_predicate_expression);
   return success_proj;
 }
@@ -608,12 +684,12 @@ Node* TemplateAssertionPredicateCreator::create_last_value(Node* new_control, Op
 }
 
 IfTrueNode* TemplateAssertionPredicateCreator::create_if_node_with_halt(
-    Node* new_control, OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression, bool does_overflow
-    NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type)) {
+    Node* new_control, OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression,
+    const bool does_overflow, const AssertionPredicateType assertion_predicate_type) {
   AssertionPredicateIfCreator assertion_predicate_if_creator(_phase);
   return assertion_predicate_if_creator.create_for_template(new_control, does_overflow ? Op_If : Op_RangeCheck,
-                                                            template_assertion_predicate_expression
-                                                            NOT_PRODUCT(COMMA assertion_predicate_type));
+                                                            template_assertion_predicate_expression,
+                                                            assertion_predicate_type);
 }
 
 // Creates an init and last value Template Assertion Predicate connected together with a Halt node on the failing path.
@@ -624,12 +700,12 @@ IfTrueNode* TemplateAssertionPredicateCreator::create_with_halt(Node* new_contro
   OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression =
       create_for_init_value(new_control, opaque_init, does_overflow);
   IfTrueNode* template_predicate_success_proj =
-      create_if_node_with_halt(new_control, template_assertion_predicate_expression, does_overflow
-                               NOT_PRODUCT(COMMA AssertionPredicateType::InitValue));
+      create_if_node_with_halt(new_control, template_assertion_predicate_expression, does_overflow,
+                               AssertionPredicateType::InitValue);
   template_assertion_predicate_expression = create_for_last_value(template_predicate_success_proj, opaque_init,
                                                                   does_overflow);
   return create_if_node_with_halt(template_predicate_success_proj, template_assertion_predicate_expression,
-                                  does_overflow NOT_PRODUCT(COMMA AssertionPredicateType::LastValue));
+                                  does_overflow, AssertionPredicateType::LastValue);
 }
 
 InitializedAssertionPredicateCreator::InitializedAssertionPredicateCreator(PhaseIdealLoop* phase)
@@ -660,29 +736,42 @@ IfTrueNode* InitializedAssertionPredicateCreator::create_from_template(IfNode* t
                                                                        Node* new_stride) {
   OpaqueInitializedAssertionPredicateNode* assertion_expression =
       create_assertion_expression_from_template(template_assertion_predicate, new_control, new_init, new_stride);
-  return create_control_nodes(new_control, template_assertion_predicate->Opcode(), assertion_expression
-                              NOT_PRODUCT(COMMA template_assertion_predicate->assertion_predicate_type()));
+  return create_control_nodes(new_control, template_assertion_predicate->Opcode(), assertion_expression,
+                              template_assertion_predicate->assertion_predicate_type());
+}
+
+// Create a new Initialized Assertion Predicate from 'template_assertion_predicate' by cloning it but omitting the
+// OpaqueLoop*Notes (i.e. taking their inputs instead).
+IfTrueNode* InitializedAssertionPredicateCreator::create_from_template(IfNode* template_assertion_predicate,
+                                                                       Node* new_control) {
+  OpaqueTemplateAssertionPredicateNode* template_opaque =
+      template_assertion_predicate->in(1)->as_OpaqueTemplateAssertionPredicate();
+  TemplateAssertionExpression template_assertion_expression(template_opaque);
+  OpaqueInitializedAssertionPredicateNode* assertion_expression =
+      template_assertion_expression.clone_and_fold_opaque_loop_nodes(new_control, _phase);
+  return create_control_nodes(new_control, template_assertion_predicate->Opcode(), assertion_expression,
+                              template_assertion_predicate->assertion_predicate_type());
 }
 
 // Create a new Initialized Assertion Predicate directly without a template.
 IfTrueNode* InitializedAssertionPredicateCreator::create(Node* operand, Node* new_control, const jint stride,
-                                                         const int scale, Node* offset, Node* range NOT_PRODUCT(COMMA
-                                                         AssertionPredicateType assertion_predicate_type)) {
+                                                         const int scale, Node* offset, Node* range,
+                                                         const AssertionPredicateType assertion_predicate_type) {
   AssertionPredicateExpressionCreator expression_creator(stride, scale, offset, range, _phase);
   bool does_overflow;
   OpaqueInitializedAssertionPredicateNode* assertion_expression =
       expression_creator.create_for_initialized(new_control, operand, does_overflow);
-  return create_control_nodes(new_control, does_overflow ? Op_If : Op_RangeCheck, assertion_expression
-                              NOT_PRODUCT(COMMA assertion_predicate_type));
+  return create_control_nodes(new_control, does_overflow ? Op_If : Op_RangeCheck, assertion_expression,
+                              assertion_predicate_type);
 }
 
 // Creates the CFG nodes for the Initialized Assertion Predicate.
 IfTrueNode* InitializedAssertionPredicateCreator::create_control_nodes(
-    Node* new_control, const int if_opcode, OpaqueInitializedAssertionPredicateNode* assertion_expression
-    NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type)) {
+    Node* new_control, const int if_opcode, OpaqueInitializedAssertionPredicateNode* assertion_expression,
+    const AssertionPredicateType assertion_predicate_type) {
   AssertionPredicateIfCreator assertion_predicate_if_creator(_phase);
-  return assertion_predicate_if_creator.create_for_initialized(new_control, if_opcode, assertion_expression
-                                                               NOT_PRODUCT(COMMA assertion_predicate_type));
+  return assertion_predicate_if_creator.create_for_initialized(new_control, if_opcode, assertion_expression,
+                                                               assertion_predicate_type);
 }
 
 // Create a new Assertion Expression based from the given template to be used as bool input for the Initialized
@@ -768,7 +857,7 @@ void CreateAssertionPredicatesVisitor::visit(const TemplateAssertionPredicate& t
 
 // Create an Initialized Assertion Predicate from the provided Template Assertion Predicate.
 IfTrueNode* CreateAssertionPredicatesVisitor::initialize_from_template(
-const TemplateAssertionPredicate& template_assertion_predicate) const {
+    const TemplateAssertionPredicate& template_assertion_predicate) const {
   IfNode* template_head = template_assertion_predicate.head();
   IfTrueNode* initialized_predicate = _phase->create_initialized_assertion_predicate(template_head, _init, _stride,
                                                                                      _new_control);
@@ -783,3 +872,40 @@ IfTrueNode* CreateAssertionPredicatesVisitor::clone_template_and_replace_init_in
   _phase->register_new_node(opaque_init, _new_control);
   return template_assertion_predicate.clone_and_replace_init(_new_control, opaque_init, _phase);
 }
+
+// Clone the Template Assertion Predicate and set a new input for the OpaqueLoopStrideNode.
+void UpdateStrideForAssertionPredicates::visit(const TemplateAssertionPredicate& template_assertion_predicate) {
+  if (!template_assertion_predicate.is_last_value()) {
+    // Only Last Value Assertion Predicates have an OpaqueLoopStrideNode.
+    return;
+  }
+  replace_opaque_stride_input(template_assertion_predicate);
+  Node* template_tail_control_out = template_assertion_predicate.tail()->unique_ctrl_out();
+  IfTrueNode* initialized_success_proj = initialize_from_updated_template(template_assertion_predicate);
+  connect_initialized_assertion_predicate(template_tail_control_out, initialized_success_proj);
+}
+
+// Replace the input to OpaqueLoopStrideNode with 'new_stride' and leave the other nodes unchanged.
+void UpdateStrideForAssertionPredicates::replace_opaque_stride_input(
+    const TemplateAssertionPredicate& template_assertion_predicate) const {
+  template_assertion_predicate.replace_opaque_stride_input(_new_stride, _phase->igvn());
+}
+
+IfTrueNode* UpdateStrideForAssertionPredicates::initialize_from_updated_template(
+    const TemplateAssertionPredicate& template_assertion_predicate) const {
+  IfTrueNode* initialized_success_proj = template_assertion_predicate.initialize(_phase, template_assertion_predicate.tail());
+  return initialized_success_proj;
+}
+
+// The newly created Initialized Assertion Predicate can safely be inserted because this visitor is already visiting
+// the Template Assertion Predicate above this. So, we will not accidentally visit this again and kill it with the
+// visit() method for Initialized Assertion Predicates.
+void UpdateStrideForAssertionPredicates::connect_initialized_assertion_predicate(
+    Node* new_control_out, IfTrueNode* initialized_success_proj) const {
+  if (new_control_out->is_Loop()) {
+    _phase->igvn().replace_input_of(new_control_out, LoopNode::EntryControl, initialized_success_proj);
+  } else {
+    _phase->igvn().replace_input_of(new_control_out, 0, initialized_success_proj);
+  }
+  _phase->set_idom(new_control_out, initialized_success_proj, _phase->dom_depth(new_control_out));
+}
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index f57948f8ab9..342650cd966 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -201,7 +201,6 @@ class TemplateAssertionPredicate;
  * Main Loop Head
  */
 
-#ifndef PRODUCT
 // Assertion Predicates are either emitted to check the initial value of a range check in the first iteration or the last
 // value of a range check in the last iteration of a loop.
 enum class AssertionPredicateType {
@@ -211,7 +210,6 @@ enum class AssertionPredicateType {
   // Used for the Initialized Assertion Predicate emitted during Range Check Elimination for the final IV value.
   FinalIv
 };
-#endif // NOT PRODUCT
 
 // Interface to represent a C2 predicate. A predicate is always represented by two CFG nodes:
 // - An If node (head)
@@ -377,8 +375,8 @@ class RuntimePredicate : public Predicate {
 
 // Class to represent a Template Assertion Predicate.
 class TemplateAssertionPredicate : public Predicate {
-  IfTrueNode* _success_proj;
-  IfNode* _if_node;
+  IfTrueNode* const _success_proj;
+  IfNode* const _if_node;
 
  public:
   explicit TemplateAssertionPredicate(IfTrueNode* success_proj)
@@ -403,7 +401,13 @@ class TemplateAssertionPredicate : public Predicate {
     return _success_proj;
   }
 
+  bool is_last_value() const {
+    return _if_node->assertion_predicate_type() == AssertionPredicateType::LastValue;
+  }
+
   IfTrueNode* clone_and_replace_init(Node* new_control, OpaqueLoopInitNode* new_opaque_init, PhaseIdealLoop* phase) const;
+  void replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) const;
+  IfTrueNode* initialize(PhaseIdealLoop* phase, Node* new_control) const;
   void rewire_loop_data_dependencies(IfTrueNode* target_predicate, const NodeInLoopBody& data_in_loop_body,
                                      PhaseIdealLoop* phase) const;
   static bool is_predicate(Node* node);
@@ -412,8 +416,8 @@ class TemplateAssertionPredicate : public Predicate {
 // Class to represent an Initialized Assertion Predicate which always has a halt node on the failing path.
 // This predicate should never fail at runtime by design.
 class InitializedAssertionPredicate : public Predicate {
-  IfTrueNode* _success_proj;
-  IfNode* _if_node;
+  IfTrueNode* const _success_proj;
+  IfNode* const _if_node;
 
  public:
   explicit InitializedAssertionPredicate(IfTrueNode* success_proj)
@@ -434,6 +438,11 @@ class InitializedAssertionPredicate : public Predicate {
     return _success_proj;
   }
 
+  bool is_last_value() const {
+    return _if_node->assertion_predicate_type() == AssertionPredicateType::LastValue;
+  }
+
+  void kill(PhaseIdealLoop* phase) const;
   static bool is_predicate(Node* node);
 };
 
@@ -461,6 +470,8 @@ class TemplateAssertionExpression : public StackObj {
   OpaqueTemplateAssertionPredicateNode* clone_and_replace_init(Node* new_init, Node* new_ctrl, PhaseIdealLoop* phase);
   OpaqueTemplateAssertionPredicateNode* clone_and_replace_init_and_stride(Node* new_control, Node* new_init,
                                                                           Node* new_stride, PhaseIdealLoop* phase);
+  void replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn);
+  OpaqueInitializedAssertionPredicateNode* clone_and_fold_opaque_loop_nodes(Node* new_ctrl, PhaseIdealLoop* phase);
 };
 
 // Class to represent a node being part of a Template Assertion Expression. Note that this is not an IR node.
@@ -545,15 +556,15 @@ class AssertionPredicateIfCreator : public StackObj {
   explicit AssertionPredicateIfCreator(PhaseIdealLoop* const phase) : _phase(phase) {}
   NONCOPYABLE(AssertionPredicateIfCreator);
 
-  IfTrueNode* create_for_initialized(Node* new_control, int if_opcode, Node* assertion_expression
-                                     NOT_PRODUCT(COMMA const AssertionPredicateType assertion_predicate_type));
-  IfTrueNode* create_for_template(Node* new_control, int if_opcode, Node* assertion_expression
-                                  NOT_PRODUCT(COMMA const AssertionPredicateType assertion_predicate_type));
+  IfTrueNode* create_for_initialized(Node* new_control, int if_opcode, Node* assertion_expression,
+                                     AssertionPredicateType assertion_predicate_type);
+  IfTrueNode* create_for_template(Node* new_control, int if_opcode, Node* assertion_expression,
+                                  AssertionPredicateType assertion_predicate_type);
  private:
-  IfTrueNode* create(Node* new_control, int if_opcode, Node* assertion_expression, const char* halt_message
-                     NOT_PRODUCT(COMMA const AssertionPredicateType assertion_predicate_type));
-  IfNode* create_if_node(Node* new_control, int if_opcode, Node* assertion_expression, IdealLoopTree* loop
-                         NOT_PRODUCT(COMMA const AssertionPredicateType assertion_predicate_type));
+  IfTrueNode* create(Node* new_control, int if_opcode, Node* assertion_expression, const char* halt_message,
+                     AssertionPredicateType assertion_predicate_type);
+  IfNode* create_if_node(Node* new_control, int if_opcode, Node* assertion_expression, IdealLoopTree* loop,
+                         AssertionPredicateType assertion_predicate_type);
   IfTrueNode* create_success_path(IfNode* if_node, IdealLoopTree* loop);
   void create_fail_path(IfNode* if_node, IdealLoopTree* loop, const char* halt_message);
   void create_halt_node(IfFalseNode* fail_proj, IdealLoopTree* loop, const char* halt_message);
@@ -576,12 +587,10 @@ class TemplateAssertionPredicateCreator : public StackObj {
   IfTrueNode* create_if_node_with_uncommon_trap(OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression,
                                                 ParsePredicateSuccessProj* parse_predicate_success_proj,
                                                 Deoptimization::DeoptReason deopt_reason, int if_opcode,
-                                                bool does_overflow
-                                                NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type));
+                                                bool does_overflow, AssertionPredicateType assertion_predicate_type);
   IfTrueNode* create_if_node_with_halt(Node* new_control,
                                        OpaqueTemplateAssertionPredicateNode* template_assertion_predicate_expression,
-                                       bool does_overflow
-                                       NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type));
+                                       bool does_overflow, AssertionPredicateType assertion_predicate_type);
 
  public:
   TemplateAssertionPredicateCreator(CountedLoopNode* loop_head, int scale, Node* offset, Node* range,
@@ -608,16 +617,17 @@ class InitializedAssertionPredicateCreator : public StackObj {
 
   IfTrueNode* create_from_template(IfNode* template_assertion_predicate, Node* new_control, Node* new_init,
                                    Node* new_stride);
-  IfTrueNode* create(Node* operand, Node* new_control, jint stride, int scale, Node* offset, Node* range
-                     NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type));
+  IfTrueNode* create_from_template(IfNode* template_assertion_predicate, Node* new_control);
+  IfTrueNode* create(Node* operand, Node* new_control, jint stride, int scale, Node* offset, Node* range,
+                     AssertionPredicateType assertion_predicate_type);
 
  private:
   OpaqueInitializedAssertionPredicateNode* create_assertion_expression_from_template(IfNode* template_assertion_predicate,
                                                                                      Node* new_control, Node* new_init,
                                                                                      Node* new_stride);
   IfTrueNode* create_control_nodes(Node* new_control, int if_opcode,
-                                   OpaqueInitializedAssertionPredicateNode* assertion_expression
-                                   NOT_PRODUCT(COMMA AssertionPredicateType assertion_predicate_type));
+                                   OpaqueInitializedAssertionPredicateNode* assertion_expression,
+                                   AssertionPredicateType assertion_predicate_type);
 };
 
 // This class iterates through all predicates of a Regular Predicate Block and applies the given visitor to each.
@@ -1010,4 +1020,57 @@ class CreateAssertionPredicatesVisitor : public PredicateVisitor {
   }
 };
 
+// This visitor collects all Template Assertion Predicates If nodes or the corresponding Opaque nodes, depending on the
+// provided 'get_opaque' flag, to the provided list.
+class TemplateAssertionPredicateCollector : public PredicateVisitor {
+  Unique_Node_List& _list;
+  const bool _get_opaque;
+
+ public:
+  TemplateAssertionPredicateCollector(Unique_Node_List& list, const bool get_opaque)
+      : _list(list),
+        _get_opaque(get_opaque) {}
+
+  using PredicateVisitor::visit;
+
+  void visit(const TemplateAssertionPredicate& template_assertion_predicate) override {
+    if (_get_opaque) {
+      _list.push(template_assertion_predicate.opaque_node());
+    } else {
+      _list.push(template_assertion_predicate.tail());
+    }
+  }
+};
+
+// This visitor updates the stride for an Assertion Predicate during Loop Unrolling. The inputs to the OpaqueLoopStride
+// nodes Template of Template Assertion Predicates are updated and new Initialized Assertion Predicates are created
+// from the updated templates. The old Initialized Assertion Predicates are killed.
+class UpdateStrideForAssertionPredicates : public PredicateVisitor {
+  Node* const _new_stride;
+  PhaseIdealLoop* const _phase;
+
+  void replace_opaque_stride_input(const TemplateAssertionPredicate& template_assertion_predicate) const;
+  IfTrueNode* initialize_from_updated_template(const TemplateAssertionPredicate& template_assertion_predicate) const;
+  void connect_initialized_assertion_predicate(Node* new_control_out, IfTrueNode* initialized_success_proj) const;
+
+ public:
+  UpdateStrideForAssertionPredicates(Node* const new_stride, PhaseIdealLoop* phase)
+      : _new_stride(new_stride),
+        _phase(phase) {}
+  NONCOPYABLE(UpdateStrideForAssertionPredicates);
+
+  using PredicateVisitor::visit;
+
+  void visit(const TemplateAssertionPredicate& template_assertion_predicate) override;
+
+  // Kill the old Initialized Assertion Predicates with old strides before unrolling. The new Initialized Assertion
+  // Predicates are inserted after the Template Assertion Predicate which ensures that we are not accidentally visiting
+  // and killing a newly created Initialized Assertion Predicate here.
+  void visit(const InitializedAssertionPredicate& initialized_assertion_predicate) override {
+    if (initialized_assertion_predicate.is_last_value()) {
+      // Only Last Value Initialized Assertion Predicates need to be killed and updated.
+      initialized_assertion_predicate.kill(_phase);
+    }
+  }
+};
 #endif // SHARE_OPTO_PREDICATES_HPP
diff --git a/src/hotspot/share/opto/reg_split.cpp b/src/hotspot/share/opto/reg_split.cpp
index 6d948aff011..9e41c397643 100644
--- a/src/hotspot/share/opto/reg_split.cpp
+++ b/src/hotspot/share/opto/reg_split.cpp
@@ -495,7 +495,7 @@ bool PhaseChaitin::prompt_use( Block *b, uint lidx ) {
 //       Else, hoist LRG back up to register only (ie - split is also DEF)
 // We will compute a new maxlrg as we go
 uint PhaseChaitin::Split(uint maxlrg, ResourceArea* split_arena) {
-  Compile::TracePhase tp("regAllocSplit", &timers[_t_regAllocSplit]);
+  Compile::TracePhase tp(_t_regAllocSplit);
 
   // Free thread local resources used by this method on exit.
   ResourceMark rm(split_arena);
diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 7bf75c93055..7eb5f5da168 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -1325,7 +1325,7 @@ void PhaseStringOpts::getChars(GraphKit& kit, Node* arg, Node* dst_array, BasicT
   Node* index = __ SubI(charPos, __ intcon((bt == T_BYTE) ? 1 : 2));
   Node* ch = __ AddI(r, __ intcon('0'));
   Node* st = __ store_to_memory(kit.control(), kit.array_element_address(dst_array, index, T_BYTE),
-                                ch, bt, byte_adr_idx, MemNode::unordered, false /* require_atomic_access */,
+                                ch, bt, MemNode::unordered, false /* require_atomic_access */,
                                 false /* unaligned */, (bt != T_BYTE) /* mismatched */);
 
   iff = kit.create_and_map_if(head, __ Bool(__ CmpI(q, __ intcon(0)), BoolTest::ne),
@@ -1364,8 +1364,8 @@ void PhaseStringOpts::getChars(GraphKit& kit, Node* arg, Node* dst_array, BasicT
   } else {
     Node* index = __ SubI(charPos, __ intcon((bt == T_BYTE) ? 1 : 2));
     st = __ store_to_memory(kit.control(), kit.array_element_address(dst_array, index, T_BYTE),
-                            sign, bt, byte_adr_idx, MemNode::unordered, false /* require_atomic_access */,
-                            false /* unaligned */, (bt != T_BYTE) /* mismatched */);
+                            sign, bt, MemNode::unordered, false /* require_atomic_access */, false /* unaligned */,
+                            (bt != T_BYTE) /* mismatched */);
 
     final_merge->init_req(merge_index + 1, kit.control());
     final_mem->init_req(merge_index + 1, st);
diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index 9ab62c282d1..99b4c62fec7 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -42,7 +42,7 @@ static bool is_vector_shuffle(ciKlass* klass) {
 
 
 void PhaseVector::optimize_vector_boxes() {
-  Compile::TracePhase tp("vector_elimination", &timers[_t_vector_elimination]);
+  Compile::TracePhase tp(_t_vector_elimination);
 
   // Signal GraphKit it's post-parse phase.
   assert(C->inlining_incrementally() == false, "sanity");
@@ -66,13 +66,13 @@ void PhaseVector::optimize_vector_boxes() {
 void PhaseVector::do_cleanup() {
   if (C->failing())  return;
   {
-    Compile::TracePhase tp("vector_pru", &timers[_t_vector_pru]);
+    Compile::TracePhase tp(_t_vector_pru);
     ResourceMark rm;
     PhaseRemoveUseless pru(C->initial_gvn(), *C->igvn_worklist());
     if (C->failing())  return;
   }
   {
-    Compile::TracePhase tp("incrementalInline_igvn", &timers[_t_vector_igvn]);
+    Compile::TracePhase tp(_t_vector_igvn);
     _igvn.reset_from_gvn(C->initial_gvn());
     _igvn.optimize();
     if (C->failing())  return;
diff --git a/src/hotspot/share/prims/jniFastGetField.hpp b/src/hotspot/share/prims/jniFastGetField.hpp
index 525ff0aba87..0e4c4c849e0 100644
--- a/src/hotspot/share/prims/jniFastGetField.hpp
+++ b/src/hotspot/share/prims/jniFastGetField.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,17 +71,6 @@ class JNI_FastGetField : AllStatic {
 #endif // AARCH64
 
  public:
-#if defined(_WINDOWS) && !defined(_WIN64)
-  static GetBooleanField_t jni_fast_GetBooleanField_fp;
-  static GetByteField_t    jni_fast_GetByteField_fp;
-  static GetCharField_t    jni_fast_GetCharField_fp;
-  static GetShortField_t   jni_fast_GetShortField_fp;
-  static GetIntField_t     jni_fast_GetIntField_fp;
-  static GetLongField_t    jni_fast_GetLongField_fp;
-  static GetFloatField_t   jni_fast_GetFloatField_fp;
-  static GetDoubleField_t  jni_fast_GetDoubleField_fp;
-#endif
-
   static address generate_fast_get_boolean_field();
   static address generate_fast_get_byte_field();
   static address generate_fast_get_char_field();
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index f0f14a05031..a027351ff7b 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -378,7 +378,7 @@ JVM_ENTRY(jobjectArray, JVM_GetProperties(JNIEnv *env))
   // Add the sun.management.compiler property for the compiler's name
   {
 #undef CSIZE
-#if defined(_LP64) || defined(_WIN64)
+#if defined(_LP64)
   #define CSIZE "64-Bit "
 #else
   #define CSIZE
@@ -1269,87 +1269,6 @@ JVM_ENTRY(jobject, JVM_GetProtectionDomain(JNIEnv *env, jclass cls))
 JVM_END
 
 
-// Returns the inherited_access_control_context field of the running thread.
-JVM_ENTRY(jobject, JVM_GetInheritedAccessControlContext(JNIEnv *env, jclass cls))
-  oop result = java_lang_Thread::inherited_access_control_context(thread->threadObj());
-  return JNIHandles::make_local(THREAD, result);
-JVM_END
-
-JVM_ENTRY(jobject, JVM_GetStackAccessControlContext(JNIEnv *env, jclass cls))
-  if (!UsePrivilegedStack) return nullptr;
-
-  ResourceMark rm(THREAD);
-  GrowableArray<Handle>* local_array = new GrowableArray<Handle>(12);
-  JvmtiVMObjectAllocEventCollector oam;
-
-  // count the protection domains on the execution stack. We collapse
-  // duplicate consecutive protection domains into a single one, as
-  // well as stopping when we hit a privileged frame.
-
-  oop previous_protection_domain = nullptr;
-  Handle privileged_context(thread, nullptr);
-  bool is_privileged = false;
-  oop protection_domain = nullptr;
-
-  // Iterate through Java frames
-  vframeStream vfst(thread);
-  for(; !vfst.at_end(); vfst.next()) {
-    // get method of frame
-    Method* method = vfst.method();
-
-    // stop at the first privileged frame
-    if (method->method_holder() == vmClasses::AccessController_klass() &&
-      method->name() == vmSymbols::executePrivileged_name())
-    {
-      // this frame is privileged
-      is_privileged = true;
-
-      javaVFrame *priv = vfst.asJavaVFrame();       // executePrivileged
-
-      StackValueCollection* locals = priv->locals();
-      StackValue* ctx_sv = locals->at(1); // AccessControlContext context
-      StackValue* clr_sv = locals->at(2); // Class<?> caller
-      assert(!ctx_sv->obj_is_scalar_replaced(), "found scalar-replaced object");
-      assert(!clr_sv->obj_is_scalar_replaced(), "found scalar-replaced object");
-      privileged_context    = ctx_sv->get_obj();
-      Handle caller         = clr_sv->get_obj();
-
-      Klass *caller_klass = java_lang_Class::as_Klass(caller());
-      protection_domain  = caller_klass->protection_domain();
-    } else {
-      protection_domain = method->method_holder()->protection_domain();
-    }
-
-    if ((previous_protection_domain != protection_domain) && (protection_domain != nullptr)) {
-      local_array->push(Handle(thread, protection_domain));
-      previous_protection_domain = protection_domain;
-    }
-
-    if (is_privileged) break;
-  }
-
-
-  // either all the domains on the stack were system domains, or
-  // we had a privileged system domain
-  if (local_array->is_empty()) {
-    if (is_privileged && privileged_context.is_null()) return nullptr;
-
-    oop result = java_security_AccessControlContext::create(objArrayHandle(), is_privileged, privileged_context, CHECK_NULL);
-    return JNIHandles::make_local(THREAD, result);
-  }
-
-  objArrayOop context = oopFactory::new_objArray(vmClasses::ProtectionDomain_klass(),
-                                                 local_array->length(), CHECK_NULL);
-  objArrayHandle h_context(thread, context);
-  for (int index = 0; index < local_array->length(); index++) {
-    h_context->obj_at_put(index, local_array->at(index)());
-  }
-
-  oop result = java_security_AccessControlContext::create(h_context, is_privileged, privileged_context, CHECK_NULL);
-
-  return JNIHandles::make_local(THREAD, result);
-JVM_END
-
 class ScopedValueBindingsResolver {
 public:
   InstanceKlass* Carrier_klass;
@@ -3089,6 +3008,10 @@ JVM_ENTRY(void, JVM_SetCurrentThread(JNIEnv* env, jobject thisThread,
                                      jobject theThread))
   oop threadObj = JNIHandles::resolve(theThread);
   thread->set_vthread(threadObj);
+
+  // Set lock id of new current Thread
+  thread->set_lock_id(java_lang_Thread::thread_id(threadObj));
+
   JFR_ONLY(Jfr::on_set_current_thread(thread, threadObj);)
 JVM_END
 
@@ -3955,6 +3878,39 @@ JVM_ENTRY(void, JVM_VirtualThreadDisableSuspend(JNIEnv* env, jclass clazz, jbool
 #endif
 JVM_END
 
+JVM_ENTRY(void, JVM_VirtualThreadPinnedEvent(JNIEnv* env, jclass ignored, jstring op))
+#if INCLUDE_JFR
+  freeze_result result = THREAD->last_freeze_fail_result();
+  assert(result != freeze_ok, "sanity check");
+  EventVirtualThreadPinned event(UNTIMED);
+  event.set_starttime(THREAD->last_freeze_fail_time());
+  if (event.should_commit()) {
+    ResourceMark rm(THREAD);
+    const char *str = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(op));
+    THREAD->post_vthread_pinned_event(&event, str, result);
+  }
+#endif
+JVM_END
+
+JVM_ENTRY(jobject, JVM_TakeVirtualThreadListToUnblock(JNIEnv* env, jclass ignored))
+  ParkEvent* parkEvent = ObjectMonitor::vthread_unparker_ParkEvent();
+  assert(parkEvent != nullptr, "not initialized");
+
+  OopHandle& list_head = ObjectMonitor::vthread_cxq_head();
+  oop vthread_head = nullptr;
+  while (true) {
+    if (list_head.peek() != nullptr) {
+      for (;;) {
+        oop head = list_head.resolve();
+        if (list_head.cmpxchg(head, nullptr) == head) {
+          return JNIHandles::make_local(THREAD, head);
+        }
+      }
+    }
+    ThreadBlockInVM tbivm(THREAD);
+    parkEvent->park();
+  }
+JVM_END
 /*
  * Return the current class's class file version.  The low order 16 bits of the
  * returned jint contain the class's major version.  The high order 16 bits
diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp
index 1231fd5019f..6dd205082a0 100644
--- a/src/hotspot/share/prims/jvmtiAgent.cpp
+++ b/src/hotspot/share/prims/jvmtiAgent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "jni.h"
+#include "jvm.h"
 #include "jvm_io.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "prims/jvmtiEnvBase.hpp"
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 097ce331540..ff3dad67960 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1350,10 +1350,6 @@ JvmtiEnv::GetOwnedMonitorInfo(jthread thread, jint* owned_monitor_count_ptr, job
   JavaThread* calling_thread = JavaThread::current();
   HandleMark hm(calling_thread);
 
-  // growable array of jvmti monitors info on the C-heap
-  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list =
-      new (mtServiceability) GrowableArray<jvmtiMonitorStackDepthInfo*>(1, mtServiceability);
-
   JvmtiVTMSTransitionDisabler disabler(thread);
   ThreadsListHandle tlh(calling_thread);
 
@@ -1361,23 +1357,29 @@ JvmtiEnv::GetOwnedMonitorInfo(jthread thread, jint* owned_monitor_count_ptr, job
   oop thread_oop = nullptr;
   jvmtiError err = get_threadOop_and_JavaThread(tlh.list(), thread, calling_thread, &java_thread, &thread_oop);
   if (err != JVMTI_ERROR_NONE) {
-    delete owned_monitors_list;
     return err;
   }
 
-  if (java_thread != nullptr) {
-    Handle thread_handle(calling_thread, thread_oop);
-    EscapeBarrier eb(true, calling_thread, java_thread);
-    if (!eb.deoptimize_objects(MaxJavaStackTraceDepth)) {
-      delete owned_monitors_list;
-      return JVMTI_ERROR_OUT_OF_MEMORY;
-    }
-    // get owned monitors info with handshake
-    GetOwnedMonitorInfoClosure op(this, calling_thread, owned_monitors_list);
-    JvmtiHandshake::execute(&op, &tlh, java_thread, thread_handle);
-    err = op.result();
+  if (LockingMode == LM_LEGACY && java_thread == nullptr) {
+    *owned_monitor_count_ptr = 0;
+    return JVMTI_ERROR_NONE;
   }
 
+  // growable array of jvmti monitors info on the C-heap
+  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list =
+      new (mtServiceability) GrowableArray<jvmtiMonitorStackDepthInfo*>(1, mtServiceability);
+
+  Handle thread_handle(calling_thread, thread_oop);
+  EscapeBarrier eb(java_thread != nullptr, calling_thread, java_thread);
+  if (!eb.deoptimize_objects(MaxJavaStackTraceDepth)) {
+    delete owned_monitors_list;
+    return JVMTI_ERROR_OUT_OF_MEMORY;
+  }
+  // get owned monitors info with handshake
+  GetOwnedMonitorInfoClosure op(this, calling_thread, owned_monitors_list);
+  JvmtiHandshake::execute(&op, &tlh, java_thread, thread_handle);
+  err = op.result();
+
   jint owned_monitor_count = owned_monitors_list->length();
   if (err == JVMTI_ERROR_NONE) {
     if ((err = allocate(owned_monitor_count * sizeof(jobject *),
@@ -1408,10 +1410,6 @@ JvmtiEnv::GetOwnedMonitorStackDepthInfo(jthread thread, jint* monitor_info_count
   JavaThread* calling_thread = JavaThread::current();
   HandleMark hm(calling_thread);
 
-  // growable array of jvmti monitors info on the C-heap
-  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list =
-         new (mtServiceability) GrowableArray<jvmtiMonitorStackDepthInfo*>(1, mtServiceability);
-
   JvmtiVTMSTransitionDisabler disabler(thread);
   ThreadsListHandle tlh(calling_thread);
 
@@ -1419,23 +1417,29 @@ JvmtiEnv::GetOwnedMonitorStackDepthInfo(jthread thread, jint* monitor_info_count
   oop thread_oop = nullptr;
   jvmtiError err = get_threadOop_and_JavaThread(tlh.list(), thread, calling_thread, &java_thread, &thread_oop);
   if (err != JVMTI_ERROR_NONE) {
-    delete owned_monitors_list;
     return err;
   }
 
-  if (java_thread != nullptr) {
-    Handle thread_handle(calling_thread, thread_oop);
-    EscapeBarrier eb(true, calling_thread, java_thread);
-    if (!eb.deoptimize_objects(MaxJavaStackTraceDepth)) {
-      delete owned_monitors_list;
-      return JVMTI_ERROR_OUT_OF_MEMORY;
-    }
-    // get owned monitors info with handshake
-    GetOwnedMonitorInfoClosure op(this, calling_thread, owned_monitors_list);
-    JvmtiHandshake::execute(&op, &tlh, java_thread, thread_handle);
-    err = op.result();
+  if (LockingMode == LM_LEGACY && java_thread == nullptr) {
+    *monitor_info_count_ptr = 0;
+    return JVMTI_ERROR_NONE;
   }
 
+  // growable array of jvmti monitors info on the C-heap
+  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list =
+      new (mtServiceability) GrowableArray<jvmtiMonitorStackDepthInfo*>(1, mtServiceability);
+
+  Handle thread_handle(calling_thread, thread_oop);
+  EscapeBarrier eb(java_thread != nullptr, calling_thread, java_thread);
+  if (!eb.deoptimize_objects(MaxJavaStackTraceDepth)) {
+    delete owned_monitors_list;
+    return JVMTI_ERROR_OUT_OF_MEMORY;
+  }
+  // get owned monitors info with handshake
+  GetOwnedMonitorInfoClosure op(this, calling_thread, owned_monitors_list);
+  JvmtiHandshake::execute(&op, &tlh, java_thread, thread_handle);
+  err = op.result();
+
   jint owned_monitor_count = owned_monitors_list->length();
   if (err == JVMTI_ERROR_NONE) {
     if ((err = allocate(owned_monitor_count * sizeof(jvmtiMonitorStackDepthInfo),
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index c28afbb1c51..422bbced802 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -652,13 +652,19 @@ JavaThread* JvmtiEnvBase::get_JavaThread_or_null(oop vthread) {
 }
 
 // An unmounted vthread may have an empty stack.
-// Otherwise, it always has the yield0() and yield() frames we need to hide.
-// The methods yield0() and yield() are annotated with the @JvmtiHideEvents.
+// If unmounted from Java, it always has the yield0() and yield() frames we
+// need to hide. The methods yield0() and yield() are annotated with the @JvmtiHideEvents.
 javaVFrame*
-JvmtiEnvBase::skip_yield_frames_for_unmounted_vthread(javaVFrame* jvf) {
+JvmtiEnvBase::skip_yield_frames_for_unmounted_vthread(oop vthread, javaVFrame* jvf) {
   if (jvf == nullptr) {
     return jvf; // empty stack is possible
   }
+  if (java_lang_VirtualThread::is_preempted(vthread)) {
+    // Top method should not be from Continuation class.
+    assert(jvf->method()->method_holder() != vmClasses::Continuation_klass(), "");
+    return jvf;
+  }
+
   assert(jvf->method()->jvmti_hide_events(), "sanity check");
   assert(jvf->method()->method_holder() == vmClasses::Continuation_klass(), "expected Continuation class");
   jvf = jvf->java_sender(); // skip yield0 frame
@@ -721,7 +727,7 @@ JvmtiEnvBase::get_vthread_jvf(oop vthread) {
   } else {
     vframeStream vfs(cont);
     jvf = vfs.at_end() ? nullptr : vfs.asJavaVFrame();
-    jvf = skip_yield_frames_for_unmounted_vthread(jvf);
+    jvf = skip_yield_frames_for_unmounted_vthread(vthread, jvf);
   }
   return jvf;
 }
@@ -1023,18 +1029,18 @@ JvmtiEnvBase::get_owned_monitors(JavaThread *calling_thread, JavaThread* java_th
 }
 
 jvmtiError
-JvmtiEnvBase::get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread, javaVFrame* jvf,
-                                 GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list) {
+JvmtiEnvBase::get_owned_monitors(JavaThread* calling_thread, JavaThread* carrier, javaVFrame* jvf,
+                                 GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list, oop vthread) {
   jvmtiError err = JVMTI_ERROR_NONE;
   Thread *current_thread = Thread::current();
-  assert(java_thread->is_handshake_safe_for(current_thread),
+  assert(carrier == nullptr || carrier->is_handshake_safe_for(current_thread),
          "call by myself or at handshake");
 
   int depth = 0;
   for ( ; jvf != nullptr; jvf = jvf->java_sender()) {
     if (MaxJavaStackTraceDepth == 0 || depth++ < MaxJavaStackTraceDepth) {  // check for stack too deep
       // Add locked objects for this frame into list.
-      err = get_locked_objects_in_frame(calling_thread, java_thread, jvf, owned_monitors_list, depth - 1);
+      err = get_locked_objects_in_frame(calling_thread, carrier, jvf, owned_monitors_list, depth - 1, vthread);
       if (err != JVMTI_ERROR_NONE) {
         return err;
       }
@@ -1043,7 +1049,7 @@ JvmtiEnvBase::get_owned_monitors(JavaThread* calling_thread, JavaThread* java_th
 
   // Get off stack monitors. (e.g. acquired via jni MonitorEnter).
   JvmtiMonitorClosure jmc(calling_thread, owned_monitors_list, this);
-  ObjectSynchronizer::owned_monitors_iterate(&jmc, java_thread);
+  ObjectSynchronizer::owned_monitors_iterate(&jmc, carrier != nullptr ? carrier->threadObj() : vthread);
   err = jmc.error();
 
   return err;
@@ -1051,8 +1057,9 @@ JvmtiEnvBase::get_owned_monitors(JavaThread* calling_thread, JavaThread* java_th
 
 // Save JNI local handles for any objects that this frame owns.
 jvmtiError
-JvmtiEnvBase::get_locked_objects_in_frame(JavaThread* calling_thread, JavaThread* java_thread,
-                                 javaVFrame *jvf, GrowableArray<jvmtiMonitorStackDepthInfo*>* owned_monitors_list, jint stack_depth) {
+JvmtiEnvBase::get_locked_objects_in_frame(JavaThread* calling_thread, JavaThread* target,
+                                 javaVFrame *jvf, GrowableArray<jvmtiMonitorStackDepthInfo*>* owned_monitors_list,
+                                 jint stack_depth, oop vthread) {
   jvmtiError err = JVMTI_ERROR_NONE;
   Thread* current_thread = Thread::current();
   ResourceMark rm(current_thread);
@@ -1069,9 +1076,17 @@ JvmtiEnvBase::get_locked_objects_in_frame(JavaThread* calling_thread, JavaThread
     // at a safepoint or the calling thread is operating on itself so
     // it cannot leave the underlying wait() call.
     // Save object of current wait() call (if any) for later comparison.
-    ObjectMonitor *mon = java_thread->current_waiting_monitor();
-    if (mon != nullptr) {
-      wait_obj = mon->object();
+    if (target != nullptr) {
+      ObjectMonitor *mon = target->current_waiting_monitor();
+      if (mon != nullptr) wait_obj = mon->object();
+    } else {
+      assert(vthread != nullptr, "no vthread oop");
+      oop cont = java_lang_VirtualThread::continuation(vthread);
+      assert(cont != nullptr, "vthread with no continuation");
+      stackChunkOop chunk = jdk_internal_vm_Continuation::tail(cont);
+      assert(chunk != nullptr, "unmounted vthread should have a chunk");
+      ObjectMonitor *mon = chunk->current_waiting_monitor();
+      if (mon != nullptr) wait_obj = mon->object();
     }
   }
   oop pending_obj = nullptr;
@@ -1080,9 +1095,17 @@ JvmtiEnvBase::get_locked_objects_in_frame(JavaThread* calling_thread, JavaThread
     // at a safepoint or the calling thread is operating on itself so
     // it cannot leave the underlying enter() call.
     // Save object of current enter() call (if any) for later comparison.
-    ObjectMonitor *mon = java_thread->current_pending_monitor();
-    if (mon != nullptr) {
-      pending_obj = mon->object();
+    if (target != nullptr) {
+      ObjectMonitor *mon = target->current_pending_monitor();
+      if (mon != nullptr) pending_obj = mon->object();
+    } else {
+      assert(vthread != nullptr, "no vthread oop");
+      oop cont = java_lang_VirtualThread::continuation(vthread);
+      assert(cont != nullptr, "vthread with no continuation");
+      stackChunkOop chunk = jdk_internal_vm_Continuation::tail(cont);
+      assert(chunk != nullptr, "unmounted vthread should have a chunk");
+      ObjectMonitor *mon = chunk->current_pending_monitor();
+      if (mon != nullptr) pending_obj = mon->object();
     }
   }
 
@@ -1533,9 +1556,13 @@ JvmtiEnvBase::get_object_monitor_usage(JavaThread* calling_thread, jobject objec
          waiter != nullptr && (nWait == 0 || waiter != mon->first_waiter());
          waiter = mon->next_waiter(waiter)) {
       JavaThread *w = mon->thread_of_waiter(waiter);
-      oop thread_oop = get_vthread_or_thread_oop(w);
-      if (thread_oop->is_a(vmClasses::BaseVirtualThread_klass())) {
+      if (w == nullptr) {
         skipped++;
+      } else {
+        oop thread_oop = get_vthread_or_thread_oop(w);
+        if (thread_oop->is_a(vmClasses::BaseVirtualThread_klass())) {
+          skipped++;
+        }
       }
       nWait++;
     }
@@ -1583,15 +1610,19 @@ JvmtiEnvBase::get_object_monitor_usage(JavaThread* calling_thread, jobject objec
       jint skipped = 0;
       for (int i = 0; i < nWait; i++) {
         JavaThread *w = mon->thread_of_waiter(waiter);
-        oop thread_oop = get_vthread_or_thread_oop(w);
-        bool is_virtual = thread_oop->is_a(vmClasses::BaseVirtualThread_klass());
-        assert(w != nullptr, "sanity check");
+        bool is_virtual;
+        if (w == nullptr) {
+          is_virtual = true;
+        } else {
+          oop thread_oop = get_vthread_or_thread_oop(w);
+          is_virtual = thread_oop->is_a(vmClasses::BaseVirtualThread_klass());
+        }
         if (is_virtual) {
           skipped++;
         } else {
           // If the thread was found on the ObjectWaiter list, then
           // it has not been notified.
-          Handle th(current_thread, get_vthread_or_thread_oop(w));
+          Handle th(current_thread, w->threadObj());
           ret.notify_waiters[i - skipped] = (jthread)jni_reference(calling_thread, th);
         }
         waiter = mon->next_waiter(waiter);
@@ -2509,18 +2540,18 @@ GetOwnedMonitorInfoClosure::do_thread(Thread *target) {
 
 void
 GetOwnedMonitorInfoClosure::do_vthread(Handle target_h) {
-  assert(_target_jt != nullptr, "sanity check");
   Thread* current = Thread::current();
   ResourceMark rm(current); // vframes are resource allocated
   HandleMark hm(current);
 
   javaVFrame *jvf = JvmtiEnvBase::get_vthread_jvf(target_h());
 
-  if (!_target_jt->is_exiting() && _target_jt->threadObj() != nullptr) {
+  if (_target_jt == nullptr || (!_target_jt->is_exiting() && _target_jt->threadObj() != nullptr)) {
     _result = ((JvmtiEnvBase *)_env)->get_owned_monitors(_calling_thread,
                                                          _target_jt,
                                                          jvf,
-                                                         _owned_monitors_list);
+                                                         _owned_monitors_list,
+                                                         target_h());
   }
 }
 
@@ -2538,6 +2569,13 @@ GetCurrentContendedMonitorClosure::do_thread(Thread *target) {
 void
 GetCurrentContendedMonitorClosure::do_vthread(Handle target_h) {
   if (_target_jt == nullptr) {
+    oop cont = java_lang_VirtualThread::continuation(target_h());
+    assert(cont != nullptr, "vthread with no continuation");
+    stackChunkOop chunk = jdk_internal_vm_Continuation::tail(cont);
+    assert(chunk != nullptr, "unmounted vthread should have a chunk");
+    if (chunk->current_pending_monitor() != nullptr) {
+      *_owned_monitor_ptr = JNIHandles::make_local(_calling_thread, chunk->current_pending_monitor()->object());
+    }
     _result = JVMTI_ERROR_NONE; // target virtual thread is unmounted
     return;
   }
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.hpp b/src/hotspot/share/prims/jvmtiEnvBase.hpp
index e8769d423c5..217731cd8f0 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.hpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp
@@ -358,7 +358,7 @@ class JvmtiEnvBase : public CHeapObj<mtInternal> {
                                    JavaThread* java_thread,
                                    javaVFrame *jvf,
                                    GrowableArray<jvmtiMonitorStackDepthInfo*>* owned_monitors_list,
-                                   jint depth);
+                                   jint depth, oop vthread = nullptr);
  public:
   static javaVFrame* jvf_for_thread_and_depth(JavaThread* java_thread, jint depth);
 
@@ -366,7 +366,7 @@ class JvmtiEnvBase : public CHeapObj<mtInternal> {
   static bool get_field_descriptor(Klass* k, jfieldID field, fieldDescriptor* fd);
 
   // check and skip frames hidden in mount/unmount transitions
-  static javaVFrame* skip_yield_frames_for_unmounted_vthread(javaVFrame* jvf);
+  static javaVFrame* skip_yield_frames_for_unmounted_vthread(oop vthread, javaVFrame* jvf);
   static javaVFrame* check_and_skip_hidden_frames(bool is_in_VTMS_transition, javaVFrame* jvf);
   static javaVFrame* check_and_skip_hidden_frames(JavaThread* jt, javaVFrame* jvf);
 
@@ -422,8 +422,8 @@ class JvmtiEnvBase : public CHeapObj<mtInternal> {
                                            jobject* monitor_ptr, bool is_virtual);
   jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread,
                                 GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list);
-  jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread, javaVFrame* jvf,
-                                GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list);
+  jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* carrier, javaVFrame* jvf,
+                                GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list, oop vthread);
   static jvmtiError check_top_frame(Thread* current_thread, JavaThread* java_thread,
                                     jvalue value, TosState tos, Handle* ret_ob_h);
   jvmtiError force_early_return(jthread thread, jvalue value, TosState tos);
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index b2e9fb9a4ab..087f426c537 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -2870,6 +2870,19 @@ void JvmtiExport::post_monitor_waited(JavaThread *thread, ObjectMonitor *obj_mnt
   }
 }
 
+void JvmtiExport::vthread_post_monitor_waited(JavaThread *current, ObjectMonitor *obj_mntr, jboolean timed_out) {
+  Handle vthread(current, current->vthread());
+
+  // Finish the VTMS transition temporarily to post the event.
+  JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)vthread.raw_value(), false);
+
+  // Post event.
+  JvmtiExport::post_monitor_waited(current, obj_mntr, timed_out);
+
+  // Go back to VTMS transition state.
+  JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount((jthread)vthread.raw_value(), true);
+}
+
 void JvmtiExport::post_vm_object_alloc(JavaThread *thread, oop object) {
   if (object == nullptr) {
     return;
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
index e98020aef1d..e0fb84f2c03 100644
--- a/src/hotspot/share/prims/jvmtiExport.hpp
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -397,6 +397,7 @@ class JvmtiExport : public AllStatic {
   static void post_monitor_contended_entered(JavaThread *thread, ObjectMonitor *obj_mntr) NOT_JVMTI_RETURN;
   static void post_monitor_wait(JavaThread *thread, oop obj, jlong timeout) NOT_JVMTI_RETURN;
   static void post_monitor_waited(JavaThread *thread, ObjectMonitor *obj_mntr, jboolean timed_out) NOT_JVMTI_RETURN;
+  static void vthread_post_monitor_waited(JavaThread *current, ObjectMonitor *obj_mntr, jboolean timed_out) NOT_JVMTI_RETURN;
   static void post_object_free(JvmtiEnv* env, GrowableArray<jlong>* objects) NOT_JVMTI_RETURN;
   static void post_resource_exhausted(jint resource_exhausted_flags, const char* detail) NOT_JVMTI_RETURN;
   static void record_vm_internal_object_allocation(oop object) NOT_JVMTI_RETURN;
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index bc91c105073..97a4ae10970 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -2306,10 +2306,11 @@ bool StackRefCollector::report_native_stack_refs(jmethodID method) {
   _blk->set_context(_thread_tag, _tid, _depth, method);
   if (_is_top_frame) {
     // JNI locals for the top frame.
-    assert(_java_thread != nullptr, "sanity");
-    _java_thread->active_handles()->oops_do(_blk);
-    if (_blk->stopped()) {
-      return false;
+    if (_java_thread != nullptr) {
+      _java_thread->active_handles()->oops_do(_blk);
+      if (_blk->stopped()) {
+        return false;
+      }
     }
   } else {
     if (_last_entry_frame != nullptr) {
diff --git a/src/hotspot/share/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp
index 368d5eb264e..7de782c807b 100644
--- a/src/hotspot/share/prims/nativeLookup.cpp
+++ b/src/hotspot/share/prims/nativeLookup.cpp
@@ -250,9 +250,9 @@ static address lookup_special_native(const char* jni_name) {
   return nullptr;
 }
 
-address NativeLookup::lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style, TRAPS) {
+address NativeLookup::lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, TRAPS) {
   address entry;
-  const char* jni_name = compute_complete_jni_name(pure_name, long_name, args_size, os_style);
+  const char* jni_name = compute_complete_jni_name(pure_name, long_name, args_size);
 
 
   // If the loader is null we have a system class, so we attempt a lookup in
@@ -306,17 +306,10 @@ address NativeLookup::lookup_style(const methodHandle& method, char* pure_name,
   return entry;
 }
 
-const char* NativeLookup::compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size, bool os_style) {
+const char* NativeLookup::compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size) {
   stringStream st;
-  if (os_style) {
-    os::print_jni_name_prefix_on(&st, args_size);
-  }
-
   st.print_raw(pure_name);
   st.print_raw(long_name);
-  if (os_style) {
-    os::print_jni_name_suffix_on(&st, args_size);
-  }
 
   return st.as_string();
 }
@@ -339,7 +332,7 @@ address NativeLookup::lookup_entry(const methodHandle& method, TRAPS) {
                 + method->size_of_parameters(); // actual parameters
 
   // 1) Try JNI short style
-  entry = lookup_style(method, pure_name, "",        args_size, true,  CHECK_NULL);
+  entry = lookup_style(method, pure_name, "",        args_size, CHECK_NULL);
   if (entry != nullptr) return entry;
 
   // Compute long name
@@ -351,15 +344,7 @@ address NativeLookup::lookup_entry(const methodHandle& method, TRAPS) {
   }
 
   // 2) Try JNI long style
-  entry = lookup_style(method, pure_name, long_name, args_size, true,  CHECK_NULL);
-  if (entry != nullptr) return entry;
-
-  // 3) Try JNI short style without os prefix/suffix
-  entry = lookup_style(method, pure_name, "",        args_size, false, CHECK_NULL);
-  if (entry != nullptr) return entry;
-
-  // 4) Try JNI long style without os prefix/suffix
-  entry = lookup_style(method, pure_name, long_name, args_size, false, CHECK_NULL);
+  entry = lookup_style(method, pure_name, long_name, args_size, CHECK_NULL);
 
   return entry; // null indicates not found
 }
diff --git a/src/hotspot/share/prims/nativeLookup.hpp b/src/hotspot/share/prims/nativeLookup.hpp
index a24768024f7..b9615377e30 100644
--- a/src/hotspot/share/prims/nativeLookup.hpp
+++ b/src/hotspot/share/prims/nativeLookup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,12 @@
 class NativeLookup : AllStatic {
  private:
   // Style specific lookup
-  static address lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style, TRAPS);
+  static address lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, TRAPS);
   static address lookup_base (const methodHandle& method, TRAPS);
   static address lookup_entry(const methodHandle& method, TRAPS);
   static address lookup_entry_prefixed(const methodHandle& method, TRAPS);
 
-  static const char* compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size, bool os_style);
+  static const char* compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size);
  public:
   // JNI name computation
   static char* pure_jni_name(const methodHandle& method);
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index e19da95e075..d4b5e293c09 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1721,8 +1721,13 @@ int WhiteBox::array_bytes_to_length(size_t bytes) {
 ///////////////
 // MetaspaceTestContext and MetaspaceTestArena
 WB_ENTRY(jlong, WB_CreateMetaspaceTestContext(JNIEnv* env, jobject wb, jlong commit_limit, jlong reserve_limit))
+  assert(is_aligned(commit_limit, BytesPerWord),
+         "WB_CreateMetaspaceTestContext: commit_limit is not a multiple of the system word byte size");
+  assert(is_aligned(reserve_limit, BytesPerWord),
+         "WB_CreateMetaspaceTestContext: reserve_limit is not a multiple of the system word byte size");
   metaspace::MetaspaceTestContext* context =
-      new metaspace::MetaspaceTestContext("whitebox-metaspace-context", (size_t) commit_limit, (size_t) reserve_limit);
+      new metaspace::MetaspaceTestContext("whitebox-metaspace-context", (size_t) commit_limit / BytesPerWord,
+                                          (size_t) reserve_limit / BytesPerWord);
   return (jlong)p2i(context);
 WB_END
 
@@ -1740,14 +1745,14 @@ WB_ENTRY(void, WB_PrintMetaspaceTestContext(JNIEnv* env, jobject wb, jlong conte
   context0->print_on(tty);
 WB_END
 
-WB_ENTRY(jlong, WB_GetTotalCommittedWordsInMetaspaceTestContext(JNIEnv* env, jobject wb, jlong context))
+WB_ENTRY(jlong, WB_GetTotalCommittedBytesInMetaspaceTestContext(JNIEnv* env, jobject wb, jlong context))
   metaspace::MetaspaceTestContext* context0 = (metaspace::MetaspaceTestContext*) context;
-  return context0->committed_words();
+  return (jlong)context0->committed_words() * BytesPerWord;
 WB_END
 
-WB_ENTRY(jlong, WB_GetTotalUsedWordsInMetaspaceTestContext(JNIEnv* env, jobject wb, jlong context))
+WB_ENTRY(jlong, WB_GetTotalUsedBytesInMetaspaceTestContext(JNIEnv* env, jobject wb, jlong context))
   metaspace::MetaspaceTestContext* context0 = (metaspace::MetaspaceTestContext*) context;
-  return context0->used_words();
+  return (jlong)context0->used_words() * BytesPerWord;
 WB_END
 
 WB_ENTRY(jlong, WB_CreateArenaInTestContext(JNIEnv* env, jobject wb, jlong context, jboolean is_micro))
@@ -1760,21 +1765,33 @@ WB_ENTRY(void, WB_DestroyMetaspaceTestArena(JNIEnv* env, jobject wb, jlong arena
   delete (metaspace::MetaspaceTestArena*) arena;
 WB_END
 
-WB_ENTRY(jlong, WB_AllocateFromMetaspaceTestArena(JNIEnv* env, jobject wb, jlong arena, jlong word_size))
-  metaspace::MetaspaceTestArena* arena0 = (metaspace::MetaspaceTestArena*) arena;
-  MetaWord* p = arena0->allocate((size_t) word_size);
+WB_ENTRY(jlong, WB_AllocateFromMetaspaceTestArena(JNIEnv* env, jobject wb, jlong arena, jlong size))
+  assert(is_aligned(size, BytesPerWord),
+         "WB_AllocateFromMetaspaceTestArena: size is not a multiple of the system word byte size");
+  metaspace::MetaspaceTestArena *arena0 = (metaspace::MetaspaceTestArena *)arena;
+  MetaWord *p = arena0->allocate((size_t) size / BytesPerWord);
   return (jlong)p2i(p);
 WB_END
 
-WB_ENTRY(void, WB_DeallocateToMetaspaceTestArena(JNIEnv* env, jobject wb, jlong arena, jlong p, jlong word_size))
+WB_ENTRY(void, WB_DeallocateToMetaspaceTestArena(JNIEnv* env, jobject wb, jlong arena, jlong p, jlong size))
+  assert(is_aligned(size, BytesPerWord),
+         "WB_DeallocateToMetaspaceTestArena: size is not a multiple of the system word byte size");
   metaspace::MetaspaceTestArena* arena0 = (metaspace::MetaspaceTestArena*) arena;
-  arena0->deallocate((MetaWord*)p, (size_t) word_size);
+  arena0->deallocate((MetaWord*)p, (size_t) size / BytesPerWord);
 WB_END
 
 WB_ENTRY(jlong, WB_GetMaxMetaspaceAllocationSize(JNIEnv* env, jobject wb))
   return (jlong) Metaspace::max_allocation_word_size() * BytesPerWord;
 WB_END
 
+WB_ENTRY(jlong, WB_WordSize(JNIEnv* env))
+  return (jlong)BytesPerWord;
+WB_END
+
+WB_ENTRY(jlong, WB_RootChunkWordSize(JNIEnv* env))
+  return (jlong)Metaspace::reserve_alignment_words();
+WB_END
+
 //////////////
 
 WB_ENTRY(jlong, WB_AllocateMetaspace(JNIEnv* env, jobject wb, jobject class_loader, jlong size))
@@ -2956,8 +2973,8 @@ static JNINativeMethod methods[] = {
   {CC"destroyMetaspaceTestContext", CC"(J)V",         (void*)&WB_DestroyMetaspaceTestContext},
   {CC"purgeMetaspaceTestContext", CC"(J)V",           (void*)&WB_PurgeMetaspaceTestContext},
   {CC"printMetaspaceTestContext", CC"(J)V",           (void*)&WB_PrintMetaspaceTestContext},
-  {CC"getTotalCommittedWordsInMetaspaceTestContext", CC"(J)J",(void*)&WB_GetTotalCommittedWordsInMetaspaceTestContext},
-  {CC"getTotalUsedWordsInMetaspaceTestContext", CC"(J)J", (void*)&WB_GetTotalUsedWordsInMetaspaceTestContext},
+  {CC"getTotalCommittedBytesInMetaspaceTestContext", CC"(J)J",(void*)&WB_GetTotalCommittedBytesInMetaspaceTestContext},
+  {CC"getTotalUsedBytesInMetaspaceTestContext", CC"(J)J", (void*)&WB_GetTotalUsedBytesInMetaspaceTestContext},
   {CC"createArenaInTestContext", CC"(JZ)J",           (void*)&WB_CreateArenaInTestContext},
   {CC"destroyMetaspaceTestArena", CC"(J)V",           (void*)&WB_DestroyMetaspaceTestArena},
   {CC"allocateFromMetaspaceTestArena", CC"(JJ)J",     (void*)&WB_AllocateFromMetaspaceTestArena},
@@ -2977,6 +2994,8 @@ static JNINativeMethod methods[] = {
   {CC"cleanMetaspaces", CC"()V",                      (void*)&WB_CleanMetaspaces},
   {CC"rss", CC"()J",                                  (void*)&WB_Rss},
   {CC"printString", CC"(Ljava/lang/String;I)Ljava/lang/String;", (void*)&WB_PrintString},
+  {CC"wordSize", CC"()J",                             (void*)&WB_WordSize},
+  {CC"rootChunkWordSize", CC"()J",                    (void*)&WB_RootChunkWordSize}
 };
 
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index bcb6b919023..e9262a48086 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1429,13 +1429,6 @@ void Arguments::set_use_compressed_oops() {
 #endif // _LP64
 }
 
-void Arguments::set_use_compressed_klass_ptrs() {
-#ifdef _LP64
-  assert(!UseCompressedClassPointers || CompressedClassSpaceSize <= KlassEncodingMetaspaceMax,
-         "CompressedClassSpaceSize is too large for UseCompressedClassPointers");
-#endif // _LP64
-}
-
 void Arguments::set_conservative_max_heap_alignment() {
   // The conservative maximum required alignment for the heap is the maximum of
   // the alignments imposed by several sources: any requirements from the heap
@@ -1454,7 +1447,6 @@ jint Arguments::set_ergonomics_flags() {
 
 #ifdef _LP64
   set_use_compressed_oops();
-  set_use_compressed_klass_ptrs();
 
   // Also checks that certain machines are slower with compressed oops
   // in vm_version initialization code.
@@ -1825,6 +1817,15 @@ bool Arguments::check_vm_args_consistency() {
   }
 #endif
 
+#ifndef _LP64
+  if (LockingMode == LM_LEGACY) {
+    FLAG_SET_CMDLINE(LockingMode, LM_LIGHTWEIGHT);
+    // Self-forwarding in bit 3 of the mark-word conflicts
+    // with 4-byte-aligned stack-locks.
+    warning("Legacy locking not supported on this platform");
+  }
+#endif
+
   if (UseObjectMonitorTable && LockingMode != LM_LIGHTWEIGHT) {
     // ObjectMonitorTable requires lightweight locking.
     FLAG_SET_CMDLINE(UseObjectMonitorTable, false);
@@ -3648,6 +3649,32 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
     Arguments::print_on(&st);
   }
 
+#ifdef _LP64
+  if (UseCompactObjectHeaders && FLAG_IS_CMDLINE(UseCompressedClassPointers) && !UseCompressedClassPointers) {
+    warning("Compact object headers require compressed class pointers. Disabling compact object headers.");
+    FLAG_SET_DEFAULT(UseCompactObjectHeaders, false);
+  }
+  if (UseCompactObjectHeaders && LockingMode != LM_LIGHTWEIGHT) {
+    FLAG_SET_DEFAULT(LockingMode, LM_LIGHTWEIGHT);
+  }
+  if (UseCompactObjectHeaders && !UseObjectMonitorTable) {
+    // If UseCompactObjectHeaders is on the command line, turn on UseObjectMonitorTable.
+    if (FLAG_IS_CMDLINE(UseCompactObjectHeaders)) {
+      FLAG_SET_DEFAULT(UseObjectMonitorTable, true);
+
+    // If UseObjectMonitorTable is on the command line, turn off UseCompactObjectHeaders.
+    } else if (FLAG_IS_CMDLINE(UseObjectMonitorTable)) {
+      FLAG_SET_DEFAULT(UseCompactObjectHeaders, false);
+    // If neither on the command line, the defaults are incompatible, but turn on UseObjectMonitorTable.
+    } else {
+      FLAG_SET_DEFAULT(UseObjectMonitorTable, true);
+    }
+  }
+  if (UseCompactObjectHeaders && !UseCompressedClassPointers) {
+    FLAG_SET_DEFAULT(UseCompressedClassPointers, true);
+  }
+#endif
+
   return JNI_OK;
 }
 
@@ -3661,6 +3688,10 @@ jint Arguments::apply_ergo() {
 
   GCConfig::arguments()->initialize();
 
+  if (UseCompressedClassPointers) {
+    CompressedKlassPointers::pre_initialize();
+  }
+
   CDSConfig::initialize();
 
   // Initialize Metaspace flags and alignments
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index ac842285fd8..2105d21430a 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -263,7 +263,6 @@ class Arguments : AllStatic {
   // GC ergonomics
   static void set_conservative_max_heap_alignment();
   static void set_use_compressed_oops();
-  static void set_use_compressed_klass_ptrs();
   static jint set_ergonomics_flags();
   // Limits the given heap size by the maximum amount of virtual
   // memory this process is currently allowed to use. It also takes
diff --git a/src/hotspot/share/runtime/basicLock.hpp b/src/hotspot/share/runtime/basicLock.hpp
index 193aa63cf8f..cbdb65c8ec6 100644
--- a/src/hotspot/share/runtime/basicLock.hpp
+++ b/src/hotspot/share/runtime/basicLock.hpp
@@ -88,6 +88,7 @@ class BasicObjectLock {
  public:
   // Manipulation
   oop      obj() const                                { return _obj;  }
+  oop*     obj_adr()                                  { return &_obj; }
   void set_obj(oop obj)                               { _obj = obj; }
   BasicLock* lock()                                   { return &_lock; }
 
diff --git a/src/hotspot/share/runtime/continuation.cpp b/src/hotspot/share/runtime/continuation.cpp
index fb697dd4920..fd9e4615498 100644
--- a/src/hotspot/share/runtime/continuation.cpp
+++ b/src/hotspot/share/runtime/continuation.cpp
@@ -26,6 +26,8 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "oops/method.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiThreadState.inline.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/continuationHelper.inline.hpp"
@@ -33,6 +35,7 @@
 #include "runtime/continuationWrapper.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -54,6 +57,112 @@ JVM_ENTRY(void, CONT_unpin(JNIEnv* env, jclass cls)) {
 }
 JVM_END
 
+#if INCLUDE_JVMTI
+class JvmtiUnmountBeginMark : public StackObj {
+  Handle _vthread;
+  JavaThread* _target;
+  freeze_result _result;
+  bool _failed;
+
+ public:
+  JvmtiUnmountBeginMark(JavaThread* t) :
+    _vthread(t, t->vthread()), _target(t), _result(freeze_pinned_native), _failed(false) {
+    assert(!_target->is_in_VTMS_transition(), "must be");
+
+    if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+      JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount((jthread)_vthread.raw_value(), true);
+
+      // Don't preempt if there is a pending popframe or earlyret operation. This can
+      // be installed in start_VTMS_transition() so we need to check it here.
+      if (JvmtiExport::can_pop_frame() || JvmtiExport::can_force_early_return()) {
+        JvmtiThreadState* state = _target->jvmti_thread_state();
+        if (_target->has_pending_popframe() || (state != nullptr && state->is_earlyret_pending())) {
+          _failed = true;
+        }
+      }
+
+      // Don't preempt in case there is an async exception installed since
+      // we would incorrectly throw it during the unmount logic in the carrier.
+      if (_target->has_async_exception_condition()) {
+        _failed = true;
+      }
+    } else {
+      _target->set_is_in_VTMS_transition(true);
+      java_lang_Thread::set_is_in_VTMS_transition(_vthread(), true);
+    }
+  }
+  ~JvmtiUnmountBeginMark() {
+    assert(!_target->is_suspended(), "must be");
+
+    assert(_target->is_in_VTMS_transition(), "must be");
+    assert(java_lang_Thread::is_in_VTMS_transition(_vthread()), "must be");
+
+    // Read it again since for late binding agents the flag could have
+    // been set while blocked in the allocation path during freeze.
+    bool jvmti_present = JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events();
+
+    if (_result != freeze_ok) {
+      // Undo transition
+      if (jvmti_present) {
+        JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)_vthread.raw_value(), false);
+      } else {
+        _target->set_is_in_VTMS_transition(false);
+        java_lang_Thread::set_is_in_VTMS_transition(_vthread(), false);
+      }
+    }
+  }
+  void set_result(freeze_result res) { _result = res; }
+  bool failed() { return _failed; }
+};
+
+static bool is_vthread_safe_to_preempt_for_jvmti(JavaThread* target) {
+  if (target->is_in_VTMS_transition()) {
+    // We caught target at the end of a mount transition.
+    return false;
+  }
+  return true;
+}
+#endif // INCLUDE_JVMTI
+
+static bool is_vthread_safe_to_preempt(JavaThread* target, oop vthread) {
+  assert(java_lang_VirtualThread::is_instance(vthread), "");
+  if (java_lang_VirtualThread::state(vthread) != java_lang_VirtualThread::RUNNING) {  // inside transition
+    return false;
+  }
+  return JVMTI_ONLY(is_vthread_safe_to_preempt_for_jvmti(target)) NOT_JVMTI(true);
+}
+
+typedef freeze_result (*FreezeContFnT)(JavaThread*, intptr_t*);
+
+static void verify_preempt_preconditions(JavaThread* target, oop continuation) {
+  assert(target == JavaThread::current(), "no support for external preemption");
+  assert(target->has_last_Java_frame(), "");
+  assert(!target->preempting(), "");
+  assert(target->last_continuation() != nullptr, "");
+  assert(target->last_continuation()->cont_oop(target) == continuation, "");
+  assert(Continuation::continuation_scope(continuation) == java_lang_VirtualThread::vthread_scope(), "");
+  assert(!target->has_pending_exception(), "");
+}
+
+freeze_result Continuation::try_preempt(JavaThread* target, oop continuation) {
+  verify_preempt_preconditions(target, continuation);
+
+  if (LockingMode == LM_LEGACY) {
+    return freeze_unsupported;
+  }
+
+  if (!is_vthread_safe_to_preempt(target, target->vthread())) {
+    return freeze_pinned_native;
+  }
+
+  JVMTI_ONLY(JvmtiUnmountBeginMark jubm(target);)
+  JVMTI_ONLY(if (jubm.failed()) return freeze_pinned_native;)
+  freeze_result res = CAST_TO_FN_PTR(FreezeContFnT, freeze_preempt_entry())(target, target->last_Java_sp());
+  log_trace(continuations, preempt)("try_preempt: %d", res);
+  JVMTI_ONLY(jubm.set_result(res);)
+  return res;
+}
+
 #ifndef PRODUCT
 static jlong java_tid(JavaThread* thread) {
   return java_lang_Thread::thread_id(thread->threadObj());
diff --git a/src/hotspot/share/runtime/continuation.hpp b/src/hotspot/share/runtime/continuation.hpp
index e579e993f07..e678e0bd42b 100644
--- a/src/hotspot/share/runtime/continuation.hpp
+++ b/src/hotspot/share/runtime/continuation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,9 +47,26 @@ void continuations_init();
 class javaVFrame;
 class JavaThread;
 
+// should match Continuation.pinnedReason() in Continuation.java
+enum freeze_result {
+  freeze_ok = 0,
+  freeze_ok_bottom = 1,
+  freeze_pinned_cs = 2,
+  freeze_pinned_native = 3,
+  freeze_pinned_monitor = 4,
+  freeze_exception = 5,
+  freeze_not_mounted = 6,
+  freeze_unsupported = 7
+};
+
 class Continuation : AllStatic {
 public:
 
+  enum preempt_kind {
+    freeze_on_monitorenter,
+    freeze_on_wait
+  };
+
   enum thaw_kind {
     thaw_top = 0,
     thaw_return_barrier = 1,
@@ -69,9 +86,12 @@ class Continuation : AllStatic {
   static void init();
 
   static address freeze_entry();
+  static address freeze_preempt_entry();
   static int prepare_thaw(JavaThread* thread, bool return_barrier);
   static address thaw_entry();
 
+  static freeze_result try_preempt(JavaThread* target, oop continuation);
+
   static ContinuationEntry* get_continuation_entry_for_continuation(JavaThread* thread, oop continuation);
   static ContinuationEntry* get_continuation_entry_for_sp(JavaThread* thread, intptr_t* const sp);
   static ContinuationEntry* get_continuation_entry_for_entry_frame(JavaThread* thread, const frame& f);
diff --git a/src/hotspot/share/runtime/continuationEntry.cpp b/src/hotspot/share/runtime/continuationEntry.cpp
index 31b062292f0..254287df18d 100644
--- a/src/hotspot/share/runtime/continuationEntry.cpp
+++ b/src/hotspot/share/runtime/continuationEntry.cpp
@@ -36,16 +36,23 @@
 #include "runtime/stubRoutines.hpp"
 
 int ContinuationEntry::_return_pc_offset = 0;
+int ContinuationEntry::_thaw_call_pc_offset = 0;
+int ContinuationEntry::_cleanup_offset = 0;
 address ContinuationEntry::_return_pc = nullptr;
+address ContinuationEntry::_thaw_call_pc = nullptr;
+address ContinuationEntry::_cleanup_pc = nullptr;
 nmethod* ContinuationEntry::_enter_special = nullptr;
 int ContinuationEntry::_interpreted_entry_offset = 0;
 
 void ContinuationEntry::set_enter_code(nmethod* nm, int interpreted_entry_offset) {
   assert(_return_pc_offset != 0, "");
   _return_pc = nm->code_begin() + _return_pc_offset;
+  _thaw_call_pc = nm->code_begin() + _thaw_call_pc_offset;
+  _cleanup_pc = nm->code_begin() + _cleanup_offset;
 
   _enter_special = nm;
   _interpreted_entry_offset = interpreted_entry_offset;
+
   assert(_enter_special->code_contains(compiled_entry()),    "entry not in enterSpecial");
   assert(_enter_special->code_contains(interpreted_entry()), "entry not in enterSpecial");
   assert(interpreted_entry() < compiled_entry(), "unexpected code layout");
diff --git a/src/hotspot/share/runtime/continuationEntry.hpp b/src/hotspot/share/runtime/continuationEntry.hpp
index ac76cd6f088..990ee6c6a42 100644
--- a/src/hotspot/share/runtime/continuationEntry.hpp
+++ b/src/hotspot/share/runtime/continuationEntry.hpp
@@ -57,11 +57,16 @@ class ContinuationEntry {
 
 public:
   static int _return_pc_offset; // friend gen_continuation_enter
+  static int _thaw_call_pc_offset;
+  static int _cleanup_offset;
+
   static void set_enter_code(nmethod* nm, int interpreted_entry_offset);
   static bool is_interpreted_call(address call_address);
 
 private:
   static address _return_pc;
+  static address _thaw_call_pc;
+  static address _cleanup_pc;
   static nmethod* _enter_special;
   static int _interpreted_entry_offset;
 
@@ -101,6 +106,9 @@ class ContinuationEntry {
   intptr_t* entry_sp() const { return (intptr_t*)this; }
   intptr_t* entry_fp() const;
 
+  static address thaw_call_pc_address() { return (address)&_thaw_call_pc; }
+  static address cleanup_pc() { return _cleanup_pc; }
+
   static address compiled_entry();
   static address interpreted_entry();
 
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index ce2e2bdb9ff..be4fef5255c 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -55,6 +55,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
+#include "runtime/objectMonitor.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/smallRegisterMap.inline.hpp"
@@ -66,6 +67,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/vmError.hpp"
 #if INCLUDE_ZGC
 #include "gc/z/zStackChunkGCData.inline.hpp"
 #endif
@@ -179,6 +181,7 @@ static void verify_continuation(oop continuation) { Continuation::debug_verify_c
 static void do_deopt_after_thaw(JavaThread* thread);
 static bool do_verify_after_thaw(JavaThread* thread, stackChunkOop chunk, outputStream* st);
 static void log_frames(JavaThread* thread);
+static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp, bool preempted);
 static void print_frame_layout(const frame& f, bool callee_complete, outputStream* st = tty);
 
 #define assert_pfl(p, ...) \
@@ -198,27 +201,8 @@ static void verify_continuation(oop continuation) { }
 #define assert_pfl(p, ...)
 #endif
 
-// should match Continuation.preemptStatus() in Continuation.java
-enum freeze_result {
-  freeze_ok = 0,
-  freeze_ok_bottom = 1,
-  freeze_pinned_cs = 2,
-  freeze_pinned_native = 3,
-  freeze_pinned_monitor = 4,
-  freeze_exception = 5
-};
-
-const char* freeze_result_names[6] = {
-  "freeze_ok",
-  "freeze_ok_bottom",
-  "freeze_pinned_cs",
-  "freeze_pinned_native",
-  "freeze_pinned_monitor",
-  "freeze_exception"
-};
-
 static freeze_result is_pinned0(JavaThread* thread, oop cont_scope, bool safepoint);
-template<typename ConfigT> static inline int freeze_internal(JavaThread* current, intptr_t* const sp);
+template<typename ConfigT, bool preempt> static inline freeze_result freeze_internal(JavaThread* current, intptr_t* const sp);
 
 static inline int prepare_thaw_internal(JavaThread* thread, bool return_barrier);
 template<typename ConfigT> static inline intptr_t* thaw_internal(JavaThread* thread, const Continuation::thaw_kind kind);
@@ -234,7 +218,7 @@ static JRT_BLOCK_ENTRY(int, freeze(JavaThread* current, intptr_t* sp))
     current->set_cont_fastpath(nullptr);
   }
 
-  return ConfigT::freeze(current, sp);
+  return checked_cast<int>(ConfigT::freeze(current, sp));
 JRT_END
 
 JRT_LEAF(int, Continuation::prepare_thaw(JavaThread* thread, bool return_barrier))
@@ -245,8 +229,11 @@ template<typename ConfigT>
 static JRT_LEAF(intptr_t*, thaw(JavaThread* thread, int kind))
   // TODO: JRT_LEAF and NoHandleMark is problematic for JFR events.
   // vFrameStreamCommon allocates Handles in RegisterMap for continuations.
+  // Also the preemption case with JVMTI events enabled might safepoint so
+  // undo the NoSafepointVerifier here and rely on handling by ContinuationWrapper.
   // JRT_ENTRY instead?
   ResetNoHandleMark rnhm;
+  DEBUG_ONLY(PauseNoSafepointVerifier pnsv(&__nsv);)
 
   // we might modify the code cache via BarrierSetNMethod::nmethod_entry_barrier
   MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));
@@ -268,8 +255,12 @@ class Config {
   typedef Config<oops, BarrierSetT> SelfT;
   using OopT = std::conditional_t<oops == oop_kind::NARROW, narrowOop, oop>;
 
-  static int freeze(JavaThread* thread, intptr_t* const sp) {
-    return freeze_internal<SelfT>(thread, sp);
+  static freeze_result freeze(JavaThread* thread, intptr_t* const sp) {
+    return freeze_internal<SelfT, false>(thread, sp);
+  }
+
+  static freeze_result freeze_preempt(JavaThread* thread, intptr_t* const sp) {
+    return freeze_internal<SelfT, true>(thread, sp);
   }
 
   static intptr_t* thaw(JavaThread* thread, Continuation::thaw_kind kind) {
@@ -312,14 +303,13 @@ static oop get_continuation(JavaThread* thread) {
   assert(thread->threadObj() != nullptr, "");
   return java_lang_Thread::continuation(thread->threadObj());
 }
+#endif // ASSERT
 
 inline void clear_anchor(JavaThread* thread) {
   thread->frame_anchor()->clear();
 }
 
-static void set_anchor(JavaThread* thread, intptr_t* sp) {
-  address pc = ContinuationHelper::return_address_at(
-                 sp - frame::sender_sp_ret_address_offset());
+static void set_anchor(JavaThread* thread, intptr_t* sp, address pc) {
   assert(pc != nullptr, "");
 
   JavaFrameAnchor* anchor = thread->frame_anchor();
@@ -330,7 +320,12 @@ static void set_anchor(JavaThread* thread, intptr_t* sp) {
   assert(thread->has_last_Java_frame(), "");
   assert(thread->last_frame().cb() != nullptr, "");
 }
-#endif // ASSERT
+
+static void set_anchor(JavaThread* thread, intptr_t* sp) {
+  address pc = ContinuationHelper::return_address_at(
+           sp - frame::sender_sp_ret_address_offset());
+  set_anchor(thread, sp, pc);
+}
 
 static void set_anchor_to_entry(JavaThread* thread, ContinuationEntry* entry) {
   JavaFrameAnchor* anchor = thread->frame_anchor();
@@ -373,11 +368,16 @@ class FreezeBase : public StackObj {
   JavaThread* const _thread;
   ContinuationWrapper& _cont;
   bool _barriers; // only set when we allocate a chunk
-  const bool _preempt; // used only on the slow path
-  const intptr_t * const _frame_sp; // Top frame sp for this freeze
 
   intptr_t* _bottom_address;
 
+  // Used for preemption only
+  const bool _preempt;
+  frame _last_frame;
+
+  // Used to support freezing with held monitors
+  int _monitors_in_lockstack;
+
   int _freeze_size; // total size of all frames plus metadata in words.
   int _total_align_size;
 
@@ -397,7 +397,7 @@ class FreezeBase : public StackObj {
   NOT_PRODUCT(int _frames;)
   DEBUG_ONLY(intptr_t* _last_write;)
 
-  inline FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp);
+  inline FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp, bool preempt);
 
 public:
   NOINLINE freeze_result freeze_slow();
@@ -408,6 +408,8 @@ class FreezeBase : public StackObj {
 
   inline int size_if_fast_freeze_available();
 
+  inline frame& last_frame() { return _last_frame; }
+
 #ifdef ASSERT
   bool check_valid_fast_path();
 #endif
@@ -429,9 +431,9 @@ class FreezeBase : public StackObj {
 private:
   // slow path
   frame freeze_start_frame();
-  frame freeze_start_frame_safepoint_stub(frame f);
+  frame freeze_start_frame_on_preempt();
   NOINLINE freeze_result recurse_freeze(frame& f, frame& caller, int callee_argsize, bool callee_interpreted, bool top);
-  inline frame freeze_start_frame_yield_stub(frame f);
+  inline frame freeze_start_frame_yield_stub();
   template<typename FKind>
   inline freeze_result recurse_freeze_java_frame(const frame& f, frame& caller, int fsize, int argsize);
   inline void before_freeze_java_frame(const frame& f, const frame& caller, int fsize, int argsize, bool is_bottom_frame);
@@ -441,8 +443,11 @@ class FreezeBase : public StackObj {
   NOINLINE freeze_result recurse_freeze_interpreted_frame(frame& f, frame& caller, int callee_argsize, bool callee_interpreted);
   freeze_result recurse_freeze_compiled_frame(frame& f, frame& caller, int callee_argsize, bool callee_interpreted);
   NOINLINE freeze_result recurse_freeze_stub_frame(frame& f, frame& caller);
+  NOINLINE freeze_result recurse_freeze_native_frame(frame& f, frame& caller);
   NOINLINE void finish_freeze(const frame& f, const frame& top);
 
+  void freeze_lockstack(stackChunkOop chunk);
+
   inline bool stack_overflow();
 
   static frame sender(const frame& f) { return f.is_interpreted_frame() ? sender<ContinuationHelper::InterpretedFrame>(f)
@@ -452,6 +457,7 @@ class FreezeBase : public StackObj {
   inline void set_top_frame_metadata_pd(const frame& hf);
   inline void patch_pd(frame& callee, const frame& caller);
   void adjust_interpreted_frame_unextended_sp(frame& f);
+  static inline void prepare_freeze_interpreted_top_frame(frame& f);
   static inline void relativize_interpreted_frame_metadata(const frame& f, const frame& hf);
 
 protected:
@@ -465,8 +471,8 @@ class Freeze : public FreezeBase {
   stackChunkOop allocate_chunk(size_t stack_size, int argsize_md);
 
 public:
-  inline Freeze(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp)
-    : FreezeBase(thread, cont, frame_sp) {}
+  inline Freeze(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp, bool preempt)
+    : FreezeBase(thread, cont, frame_sp, preempt) {}
 
   freeze_result try_freeze_fast();
 
@@ -474,8 +480,8 @@ class Freeze : public FreezeBase {
   virtual stackChunkOop allocate_chunk_slow(size_t stack_size, int argsize_md) override { return allocate_chunk(stack_size, argsize_md); }
 };
 
-FreezeBase::FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp) :
-    _thread(thread), _cont(cont), _barriers(false), _preempt(false), _frame_sp(frame_sp) {
+FreezeBase::FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp, bool preempt) :
+    _thread(thread), _cont(cont), _barriers(false), _preempt(preempt), _last_frame(false /* no initialization */) {
   DEBUG_ONLY(_jvmti_event_collector = nullptr;)
 
   assert(_thread != nullptr, "");
@@ -506,16 +512,27 @@ FreezeBase::FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t*
 #else
   static const int doYield_stub_frame_size = frame::native_abi_reg_args_size >> LogBytesPerWord;
 #endif
-  assert(SharedRuntime::cont_doYield_stub()->frame_size() == doYield_stub_frame_size, "");
+  // With preemption doYield() might not have been resolved yet
+  assert(_preempt || SharedRuntime::cont_doYield_stub()->frame_size() == doYield_stub_frame_size, "");
+
+  if (preempt) {
+    _last_frame = _thread->last_frame();
+  }
 
   // properties of the continuation on the stack; all sizes are in words
-  _cont_stack_top    = frame_sp + doYield_stub_frame_size; // we don't freeze the doYield stub frame
+  _cont_stack_top    = frame_sp + (!preempt ? doYield_stub_frame_size : 0); // we don't freeze the doYield stub frame
   _cont_stack_bottom = _cont.entrySP() + (_cont.argsize() == 0 ? frame::metadata_words_at_top : 0)
       - ContinuationHelper::frame_align_words(_cont.argsize()); // see alignment in thaw
 
   log_develop_trace(continuations)("freeze size: %d argsize: %d top: " INTPTR_FORMAT " bottom: " INTPTR_FORMAT,
     cont_size(), _cont.argsize(), p2i(_cont_stack_top), p2i(_cont_stack_bottom));
   assert(cont_size() > 0, "");
+
+  if (LockingMode != LM_LIGHTWEIGHT) {
+    _monitors_in_lockstack = 0;
+  } else {
+    _monitors_in_lockstack = _thread->lock_stack().monitor_count();
+  }
 }
 
 void FreezeBase::init_rest() { // we want to postpone some initialization after chunk handling
@@ -524,6 +541,14 @@ void FreezeBase::init_rest() { // we want to postpone some initialization after
   NOT_PRODUCT(_frames = 0;)
 }
 
+void FreezeBase::freeze_lockstack(stackChunkOop chunk) {
+  assert(chunk->sp_address() - chunk->start_address() >= _monitors_in_lockstack, "no room for lockstack");
+
+  _thread->lock_stack().move_to_address((oop*)chunk->start_address());
+  chunk->set_lockstack_size(checked_cast<uint8_t>(_monitors_in_lockstack));
+  chunk->set_has_lockstack(true);
+}
+
 void FreezeBase::copy_to_chunk(intptr_t* from, intptr_t* to, int size) {
   stackChunkOop chunk = _cont.tail();
   chunk->copy_from_stack_to_chunk(from, to, size);
@@ -554,7 +579,7 @@ freeze_result Freeze<ConfigT>::try_freeze_fast() {
   DEBUG_ONLY(_fast_freeze_size = size_if_fast_freeze_available();)
   assert(_fast_freeze_size == 0, "");
 
-  stackChunkOop chunk = allocate_chunk(cont_size() + frame::metadata_words, _cont.argsize() + frame::metadata_words_at_top);
+  stackChunkOop chunk = allocate_chunk(cont_size() + frame::metadata_words + _monitors_in_lockstack, _cont.argsize() + frame::metadata_words_at_top);
   if (freeze_fast_new_chunk(chunk)) {
     return freeze_ok;
   }
@@ -587,6 +612,8 @@ int FreezeBase::size_if_fast_freeze_available() {
     total_size_needed -= _cont.argsize() + frame::metadata_words_at_top;
   }
 
+  total_size_needed += _monitors_in_lockstack;
+
   int chunk_free_room = chunk_sp - frame::metadata_words_at_bottom;
   bool available = chunk_free_room >= total_size_needed;
   log_develop_trace(continuations)("chunk available: %s size: %d argsize: %d top: " INTPTR_FORMAT " bottom: " INTPTR_FORMAT,
@@ -668,7 +695,7 @@ bool FreezeBase::freeze_fast_new_chunk(stackChunkOop chunk) {
 
   // in a fresh chunk, we freeze *with* the bottom-most frame's stack arguments.
   // They'll then be stored twice: in the chunk and in the parent chunk's top frame
-  const int chunk_start_sp = cont_size() + frame::metadata_words;
+  const int chunk_start_sp = cont_size() + frame::metadata_words + _monitors_in_lockstack;
   assert(chunk_start_sp == chunk->stack_size(), "");
 
   DEBUG_ONLY(_orig_chunk_sp = chunk->start_address() + chunk_start_sp;)
@@ -697,7 +724,7 @@ void FreezeBase::freeze_fast_copy(stackChunkOop chunk, int chunk_start_sp CONT_J
   assert(chunk_start_sp >= cont_size(), "no room in the chunk");
 
   const int chunk_new_sp = chunk_start_sp - cont_size(); // the chunk's new sp, after freeze
-  assert(!(_fast_freeze_size > 0) || _orig_chunk_sp - (chunk->start_address() + chunk_new_sp) == _fast_freeze_size, "");
+  assert(!(_fast_freeze_size > 0) || (_orig_chunk_sp - (chunk->start_address() + chunk_new_sp)) == (_fast_freeze_size - _monitors_in_lockstack), "");
 
   intptr_t* chunk_top = chunk->start_address() + chunk_new_sp;
 #ifdef ASSERT
@@ -734,9 +761,24 @@ void FreezeBase::freeze_fast_copy(stackChunkOop chunk, int chunk_start_sp CONT_J
 
   // We're always writing to a young chunk, so the GC can't see it until the next safepoint.
   chunk->set_sp(chunk_new_sp);
+
   // set chunk->pc to the return address of the topmost frame in the chunk
-  chunk->set_pc(ContinuationHelper::return_address_at(
+  if (_preempt) {
+    // On aarch64/riscv64, the return pc of the top frame won't necessarily be at sp[-1].
+    // Also, on x64, if the top frame is the native wrapper frame, sp[-1] will not
+    // be the pc we used when creating the oopmap. Get the top's frame last pc from
+    // the anchor instead.
+    address last_pc = _last_frame.pc();
+    ContinuationHelper::patch_return_address_at(chunk_top - frame::sender_sp_ret_address_offset(), last_pc);
+    chunk->set_pc(last_pc);
+  } else {
+    chunk->set_pc(ContinuationHelper::return_address_at(
                   _cont_stack_top - frame::sender_sp_ret_address_offset()));
+  }
+
+  if (_monitors_in_lockstack > 0) {
+    freeze_lockstack(chunk);
+  }
 
   _cont.write();
 
@@ -802,43 +844,32 @@ NOINLINE freeze_result FreezeBase::freeze_slow() {
 }
 
 frame FreezeBase::freeze_start_frame() {
-  frame f = _thread->last_frame();
   if (LIKELY(!_preempt)) {
-    return freeze_start_frame_yield_stub(f);
+    return freeze_start_frame_yield_stub();
   } else {
-    return freeze_start_frame_safepoint_stub(f);
+    return freeze_start_frame_on_preempt();
   }
 }
 
-frame FreezeBase::freeze_start_frame_yield_stub(frame f) {
+frame FreezeBase::freeze_start_frame_yield_stub() {
+  frame f = _thread->last_frame();
   assert(SharedRuntime::cont_doYield_stub()->contains(f.pc()), "must be");
   f = sender<ContinuationHelper::NonInterpretedUnknownFrame>(f);
   assert(Continuation::is_frame_in_continuation(_thread->last_continuation(), f), "");
   return f;
 }
 
-frame FreezeBase::freeze_start_frame_safepoint_stub(frame f) {
-#if (defined(X86) || defined(AARCH64) || defined(RISCV64)) && !defined(ZERO)
-  f.set_fp(f.real_fp()); // f.set_fp(*Frame::callee_link_address(f)); // ????
-#else
-  Unimplemented();
-#endif
-  if (!Interpreter::contains(f.pc())) {
-    assert(ContinuationHelper::Frame::is_stub(f.cb()), "must be");
-    assert(f.oop_map() != nullptr, "must be");
-
-    if (Interpreter::contains(ContinuationHelper::StubFrame::return_pc(f))) {
-      f = sender<ContinuationHelper::StubFrame>(f); // Safepoint stub in interpreter
-    }
-  }
-  assert(Continuation::is_frame_in_continuation(_thread->last_continuation(), f), "");
-  return f;
+frame FreezeBase::freeze_start_frame_on_preempt() {
+  assert(_last_frame.sp() == _thread->last_frame().sp(), "_last_frame should be already initialized");
+  assert(Continuation::is_frame_in_continuation(_thread->last_continuation(), _last_frame), "");
+  return _last_frame;
 }
 
 // The parameter callee_argsize includes metadata that has to be part of caller/callee overlap.
 NOINLINE freeze_result FreezeBase::recurse_freeze(frame& f, frame& caller, int callee_argsize, bool callee_interpreted, bool top) {
   assert(f.unextended_sp() < _bottom_address, ""); // see recurse_freeze_java_frame
-  assert(f.is_interpreted_frame() || ((top && _preempt) == ContinuationHelper::Frame::is_stub(f.cb())), "");
+  assert(f.is_interpreted_frame() || ((top && _preempt) == ContinuationHelper::Frame::is_stub(f.cb()))
+         || ((top && _preempt) == f.is_native_frame()), "");
 
   if (stack_overflow()) {
     return freeze_exception;
@@ -851,16 +882,14 @@ NOINLINE freeze_result FreezeBase::recurse_freeze(frame& f, frame& caller, int c
     }
     return recurse_freeze_compiled_frame(f, caller, callee_argsize, callee_interpreted);
   } else if (f.is_interpreted_frame()) {
-    assert((_preempt && top) || !f.interpreter_frame_method()->is_native(), "");
-    if (_preempt && top && f.interpreter_frame_method()->is_native()) {
-      // int native entry
-      return freeze_pinned_native;
-    }
-
+    assert(!f.interpreter_frame_method()->is_native() || (top && _preempt), "");
     return recurse_freeze_interpreted_frame(f, caller, callee_argsize, callee_interpreted);
-  } else if (_preempt && top && ContinuationHelper::Frame::is_stub(f.cb())) {
-    return recurse_freeze_stub_frame(f, caller);
+  } else if (top && _preempt) {
+    assert(f.is_native_frame() || f.is_runtime_frame(), "");
+    return f.is_native_frame() ? recurse_freeze_native_frame(f, caller) : recurse_freeze_stub_frame(f, caller);
   } else {
+    // Frame can't be frozen. Most likely the call_stub or upcall_stub
+    // which indicates there are further natives frames up the stack.
     return freeze_pinned_native;
   }
 }
@@ -920,6 +949,7 @@ inline void FreezeBase::after_freeze_java_frame(const frame& hf, bool is_bottom_
 freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, int argsize_md) {
   int argsize = argsize_md - frame::metadata_words_at_top;
   assert(callee.is_interpreted_frame()
+    || ContinuationHelper::Frame::is_stub(callee.cb())
     || callee.cb()->as_nmethod()->is_osr_method()
     || argsize == _cont.argsize(), "argsize: %d cont.argsize: %d", argsize, _cont.argsize());
   log_develop_trace(continuations)("bottom: " INTPTR_FORMAT " count %d size: %d argsize: %d",
@@ -962,6 +992,8 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
           || unextended_sp == chunk->to_offset(StackChunkFrameStream<ChunkFrames::Mixed>(chunk).unextended_sp()), "");
   assert(chunk != nullptr || unextended_sp < _freeze_size, "");
 
+  _freeze_size += _monitors_in_lockstack;
+
   // _barriers can be set to true by an allocation in freeze_fast, in which case the chunk is available
   bool allocated_old_in_freeze_fast = _barriers;
   assert(!allocated_old_in_freeze_fast || (unextended_sp >= _freeze_size && chunk->is_empty()),
@@ -1016,12 +1048,23 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
   assert(!chunk->is_empty() || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).is_done(), "");
   assert(!chunk->is_empty() || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).to_frame().is_empty(), "");
 
+  if (_preempt) {
+    frame f = _thread->last_frame();
+    if (f.is_interpreted_frame()) {
+      // Some platforms do not save the last_sp in the top interpreter frame on VM calls.
+      // We need it so that on resume we can restore the sp to the right place, since
+      // thawing might add an alignment word to the expression stack (see finish_thaw()).
+      // We do it now that we know freezing will be successful.
+      prepare_freeze_interpreted_top_frame(f);
+    }
+  }
+
   // We unwind frames after the last safepoint so that the GC will have found the oops in the frames, but before
   // writing into the chunk. This is so that an asynchronous stack walk (not at a safepoint) that suspends us here
   // will either see no continuation or a consistent chunk.
   unwind_frames();
 
-  chunk->set_max_thawing_size(chunk->max_thawing_size() + _freeze_size - frame::metadata_words);
+  chunk->set_max_thawing_size(chunk->max_thawing_size() + _freeze_size - _monitors_in_lockstack - frame::metadata_words);
 
   if (lt.develop_is_enabled()) {
     LogStream ls(lt);
@@ -1029,6 +1072,10 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
     chunk->print_on(&ls);
   }
 
+  if (_monitors_in_lockstack > 0) {
+    freeze_lockstack(chunk);
+  }
+
   // The topmost existing frame in the chunk; or an empty frame if the chunk is empty
   caller = StackChunkFrameStream<ChunkFrames::Mixed>(chunk).to_frame();
 
@@ -1048,13 +1095,14 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
 
   frame entry = sender(callee);
 
-  assert(Continuation::is_return_barrier_entry(entry.pc()) || Continuation::is_continuation_enterSpecial(entry), "");
+  assert((!empty && Continuation::is_return_barrier_entry(entry.pc())) || (empty && Continuation::is_continuation_enterSpecial(entry)), "");
   assert(callee.is_interpreted_frame() || entry.sp() == entry.unextended_sp(), "");
 #endif
 
   return freeze_ok_bottom;
 }
 
+// After freezing a frame we need to possibly adjust some values related to the caller frame.
 void FreezeBase::patch(const frame& f, frame& hf, const frame& caller, bool is_bottom_frame) {
   if (is_bottom_frame) {
     // If we're the bottom frame, we need to replace the return barrier with the real
@@ -1113,8 +1161,8 @@ NOINLINE freeze_result FreezeBase::recurse_freeze_interpreted_frame(frame& f, fr
   // including metadata between f and its args
   const int argsize = ContinuationHelper::InterpretedFrame::stack_argsize(f) + frame::metadata_words_at_top;
 
-  log_develop_trace(continuations)("recurse_freeze_interpreted_frame %s _size: %d fsize: %d argsize: %d",
-    frame_method->name_and_sig_as_C_string(), _freeze_size, fsize, argsize);
+  log_develop_trace(continuations)("recurse_freeze_interpreted_frame %s _size: %d fsize: %d argsize: %d callee_interpreted: %d",
+    frame_method->name_and_sig_as_C_string(), _freeze_size, fsize, argsize, callee_interpreted);
   // we'd rather not yield inside methods annotated with @JvmtiMountTransition
   assert(!ContinuationHelper::Frame::frame_method(f)->jvmti_mount_transition(), "");
 
@@ -1191,7 +1239,8 @@ freeze_result FreezeBase::recurse_freeze_compiled_frame(frame& f, frame& caller,
   assert(!is_bottom_frame || !caller.is_compiled_frame() || (heap_frame_top + fsize) == (caller.unextended_sp() + argsize), "");
 
   if (caller.is_interpreted_frame()) {
-    _total_align_size += frame::align_wiggle; // See Thaw::align
+    // When thawing the frame we might need to add alignment (see Thaw::align)
+    _total_align_size += frame::align_wiggle;
   }
 
   patch(f, hf, caller, is_bottom_frame);
@@ -1204,44 +1253,77 @@ freeze_result FreezeBase::recurse_freeze_compiled_frame(frame& f, frame& caller,
 }
 
 NOINLINE freeze_result FreezeBase::recurse_freeze_stub_frame(frame& f, frame& caller) {
-  intptr_t* const stack_frame_top = ContinuationHelper::StubFrame::frame_top(f, 0, 0);
+  DEBUG_ONLY(frame fsender = sender(f);)
+  assert(fsender.is_compiled_frame(), "sender should be compiled frame");
+
+  intptr_t* const stack_frame_top = ContinuationHelper::StubFrame::frame_top(f);
   const int fsize = f.cb()->frame_size();
 
   log_develop_trace(continuations)("recurse_freeze_stub_frame %s _size: %d fsize: %d :: " INTPTR_FORMAT " - " INTPTR_FORMAT,
     f.cb()->name(), _freeze_size, fsize, p2i(stack_frame_top), p2i(stack_frame_top+fsize));
 
-  // recurse_freeze_java_frame and freeze inlined here because we need to use a full RegisterMap for lock ownership
-  NOT_PRODUCT(_frames++;)
-  _freeze_size += fsize;
+  freeze_result result = recurse_freeze_java_frame<ContinuationHelper::StubFrame>(f, caller, fsize, 0);
+  if (UNLIKELY(result > freeze_ok_bottom)) {
+    return result;
+  }
 
-  RegisterMap map(_cont.thread(),
-                  RegisterMap::UpdateMap::include,
-                  RegisterMap::ProcessFrames::skip,
-                  RegisterMap::WalkContinuation::skip);
-  map.set_include_argument_oops(false);
-  ContinuationHelper::update_register_map<ContinuationHelper::StubFrame>(f, &map);
-  f.oop_map()->update_register_map(&f, &map); // we have callee-save registers in this case
-  frame senderf = sender<ContinuationHelper::StubFrame>(f);
-  assert(senderf.unextended_sp() < _bottom_address - 1, "");
-  assert(senderf.is_compiled_frame(), "");
-
-  if (UNLIKELY(senderf.oop_map() == nullptr)) {
-    // native frame
+  assert(result == freeze_ok, "should have caller");
+  DEBUG_ONLY(before_freeze_java_frame(f, caller, fsize, 0, false /*is_bottom_frame*/);)
+
+  frame hf = new_heap_frame<ContinuationHelper::StubFrame>(f, caller);
+  intptr_t* heap_frame_top = ContinuationHelper::StubFrame::frame_top(hf);
+
+  copy_to_chunk(stack_frame_top, heap_frame_top, fsize);
+
+  patch(f, hf, caller, false /*is_bottom_frame*/);
+
+  DEBUG_ONLY(after_freeze_java_frame(hf, false /*is_bottom_frame*/);)
+
+  caller = hf;
+  return freeze_ok;
+}
+
+NOINLINE freeze_result FreezeBase::recurse_freeze_native_frame(frame& f, frame& caller) {
+  if (!f.cb()->as_nmethod()->method()->is_object_wait0()) {
+    assert(f.cb()->as_nmethod()->method()->is_synchronized(), "");
+    // Synchronized native method case. Unlike the interpreter native wrapper, the compiled
+    // native wrapper tries to acquire the monitor after marshalling the arguments from the
+    // caller into the native convention. This is so that we have a valid oopMap in case of
+    // having to block in the slow path. But that would require freezing those registers too
+    // and then fixing them back on thaw in case of oops. To avoid complicating things and
+    // given that this would be a rare case anyways just pin the vthread to the carrier.
     return freeze_pinned_native;
   }
 
-  freeze_result result = recurse_freeze_compiled_frame(senderf, caller, 0, 0); // This might be deoptimized
+  intptr_t* const stack_frame_top = ContinuationHelper::NativeFrame::frame_top(f);
+  // There are no stackargs but argsize must include the metadata
+  const int argsize = frame::metadata_words_at_top;
+  const int fsize = f.cb()->frame_size() + argsize;
+
+  log_develop_trace(continuations)("recurse_freeze_native_frame %s _size: %d fsize: %d :: " INTPTR_FORMAT " - " INTPTR_FORMAT,
+    f.cb()->name(), _freeze_size, fsize, p2i(stack_frame_top), p2i(stack_frame_top+fsize));
+
+  freeze_result result = recurse_freeze_java_frame<ContinuationHelper::NativeFrame>(f, caller, fsize, argsize);
   if (UNLIKELY(result > freeze_ok_bottom)) {
     return result;
   }
-  assert(result != freeze_ok_bottom, "");
-  assert(!caller.is_interpreted_frame(), "");
 
-  DEBUG_ONLY(before_freeze_java_frame(f, caller, fsize, 0, false);)
-  frame hf = new_heap_frame<ContinuationHelper::StubFrame>(f, caller);
-  intptr_t* heap_frame_top = ContinuationHelper::StubFrame::frame_top(hf, 0, 0);
+  assert(result == freeze_ok, "should have caller frame");
+  DEBUG_ONLY(before_freeze_java_frame(f, caller, fsize, argsize, false /* is_bottom_frame */);)
+
+  frame hf = new_heap_frame<ContinuationHelper::NativeFrame>(f, caller);
+  intptr_t* heap_frame_top = ContinuationHelper::NativeFrame::frame_top(hf);
+
   copy_to_chunk(stack_frame_top, heap_frame_top, fsize);
-  DEBUG_ONLY(after_freeze_java_frame(hf, false);)
+
+  if (caller.is_interpreted_frame()) {
+    // When thawing the frame we might need to add alignment (see Thaw::align)
+    _total_align_size += frame::align_wiggle;
+  }
+
+  patch(f, hf, caller, false /* is_bottom_frame */);
+
+  DEBUG_ONLY(after_freeze_java_frame(hf, false /* is_bottom_frame */);)
 
   caller = hf;
   return freeze_ok;
@@ -1264,6 +1346,8 @@ NOINLINE void FreezeBase::finish_freeze(const frame& f, const frame& top) {
 
   chunk->set_max_thawing_size(chunk->max_thawing_size() + _total_align_size);
 
+  assert(chunk->sp_address() - chunk->start_address() >= _monitors_in_lockstack, "clash with lockstack");
+
   // At this point the chunk is consistent
 
   if (UNLIKELY(_barriers)) {
@@ -1293,6 +1377,7 @@ NOINLINE void FreezeBase::finish_freeze(const frame& f, const frame& top) {
     ls.print_cr("top hframe after (freeze):");
     assert(_cont.last_frame().is_heap_frame(), "should be");
     _cont.last_frame().print_on(&ls);
+    DEBUG_ONLY(print_frame_layout(top, false, &ls);)
   }
 
   assert(_cont.chunk_invariant(), "");
@@ -1327,6 +1412,9 @@ class StackChunkAllocator : public MemAllocator {
 
     // zero out fields (but not the stack)
     const size_t hs = oopDesc::header_size();
+    if (oopDesc::has_klass_gap()) {
+      oopDesc::set_klass_gap(mem, 0);
+    }
     Copy::fill_to_aligned_words(mem + hs, vmClasses::StackChunk_klass()->size_helper() - hs);
 
     int bottom = (int)_stack_size - _argsize_md;
@@ -1435,6 +1523,8 @@ stackChunkOop Freeze<ConfigT>::allocate_chunk(size_t stack_size, int argsize_md)
   assert(chunk->is_empty(), "");
   assert(chunk->flags() == 0, "");
   assert(chunk->is_gc_mode() == false, "");
+  assert(chunk->lockstack_size() == 0, "");
+  assert(chunk->object_waiter() == nullptr, "");
 
   // fields are uninitialized
   chunk->set_parent_access<IS_DEST_UNINITIALIZED>(_cont.last_nonempty_chunk());
@@ -1505,6 +1595,29 @@ static void jvmti_yield_cleanup(JavaThread* thread, ContinuationWrapper& cont) {
   }
   invalidate_jvmti_stack(thread);
 }
+
+static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, frame top) {
+  assert(current->vthread() != nullptr, "must be");
+
+  HandleMarkCleaner hm(current);
+  Handle vth(current, current->vthread());
+
+  ContinuationWrapper::SafepointOp so(current, cont);
+
+  // Since we might safepoint set the anchor so that the stack can be walked.
+  set_anchor(current, top.sp());
+
+  JRT_BLOCK
+    JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)vth.raw_value(), false);
+
+    if (current->pending_contended_entered_event()) {
+      JvmtiExport::post_monitor_contended_entered(current, current->contended_entered_monitor());
+      current->set_contended_entered_monitor(nullptr);
+    }
+  JRT_BLOCK_END
+
+  clear_anchor(current);
+}
 #endif // INCLUDE_JVMTI
 
 #ifdef ASSERT
@@ -1517,7 +1630,8 @@ static bool monitors_on_stack(JavaThread* thread) {
   map.set_include_argument_oops(false);
   for (frame f = thread->last_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
     if ((f.is_interpreted_frame() && ContinuationHelper::InterpretedFrame::is_owning_locks(f)) ||
-        (f.is_compiled_frame() && ContinuationHelper::CompiledFrame::is_owning_locks(map.thread(), &map, f))) {
+        (f.is_compiled_frame() && ContinuationHelper::CompiledFrame::is_owning_locks(map.thread(), &map, f)) ||
+        (f.is_native_frame() && ContinuationHelper::NativeFrame::is_owning_locks(map.thread(), f))) {
       return true;
     }
   }
@@ -1534,8 +1648,9 @@ bool FreezeBase::check_valid_fast_path() {
                   RegisterMap::ProcessFrames::skip,
                   RegisterMap::WalkContinuation::skip);
   map.set_include_argument_oops(false);
-  for (frame f = freeze_start_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
-    if (!f.is_compiled_frame() || f.is_deoptimized_frame()) {
+  bool is_top_frame = true;
+  for (frame f = freeze_start_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map), is_top_frame = false) {
+    if (!((f.is_compiled_frame() && !f.is_deoptimized_frame()) || (is_top_frame && (f.is_runtime_frame() || f.is_native_frame())))) {
       return false;
     }
   }
@@ -1543,34 +1658,45 @@ bool FreezeBase::check_valid_fast_path() {
 }
 #endif // ASSERT
 
-static inline int freeze_epilog(JavaThread* thread, ContinuationWrapper& cont) {
+static inline freeze_result freeze_epilog(ContinuationWrapper& cont) {
   verify_continuation(cont.continuation());
   assert(!cont.is_empty(), "");
-  // This is done for the sake of the enterSpecial frame
-  StackWatermarkSet::after_unwind(thread);
 
   log_develop_debug(continuations)("=== End of freeze cont ### #" INTPTR_FORMAT, cont.hash());
-
-  return 0;
+  return freeze_ok;
 }
 
-static int freeze_epilog(JavaThread* thread, ContinuationWrapper& cont, freeze_result res) {
+static freeze_result freeze_epilog(JavaThread* thread, ContinuationWrapper& cont, freeze_result res) {
   if (UNLIKELY(res != freeze_ok)) {
+    JFR_ONLY(thread->set_last_freeze_fail_result(res);)
     verify_continuation(cont.continuation());
     log_develop_trace(continuations)("=== end of freeze (fail %d)", res);
     return res;
   }
 
   JVMTI_ONLY(jvmti_yield_cleanup(thread, cont)); // can safepoint
-  return freeze_epilog(thread, cont);
+  return freeze_epilog(cont);
 }
 
-template<typename ConfigT>
-static inline int freeze_internal(JavaThread* current, intptr_t* const sp) {
+static freeze_result preempt_epilog(ContinuationWrapper& cont, freeze_result res, frame& old_last_frame) {
+  if (UNLIKELY(res != freeze_ok)) {
+    verify_continuation(cont.continuation());
+    log_develop_trace(continuations)("=== end of freeze (fail %d)", res);
+    return res;
+  }
+
+  patch_return_pc_with_preempt_stub(old_last_frame);
+  cont.tail()->set_preempted(true);
+
+  return freeze_epilog(cont);
+}
+
+template<typename ConfigT, bool preempt>
+static inline freeze_result freeze_internal(JavaThread* current, intptr_t* const sp) {
   assert(!current->has_pending_exception(), "");
 
 #ifdef ASSERT
-  log_trace(continuations)("~~~~ freeze sp: " INTPTR_FORMAT, p2i(current->last_continuation()->entry_sp()));
+  log_trace(continuations)("~~~~ freeze sp: " INTPTR_FORMAT "JavaThread: " INTPTR_FORMAT, p2i(current->last_continuation()->entry_sp()), p2i(current));
   log_frames(current);
 #endif
 
@@ -1588,8 +1714,10 @@ static inline int freeze_internal(JavaThread* current, intptr_t* const sp) {
 
   assert(entry->is_virtual_thread() == (entry->scope(current) == java_lang_VirtualThread::vthread_scope()), "");
 
-  assert(monitors_on_stack(current) == ((current->held_monitor_count() - current->jni_monitor_count()) > 0),
+  assert(LockingMode != LM_LEGACY || (monitors_on_stack(current) == ((current->held_monitor_count() - current->jni_monitor_count()) > 0)),
          "Held monitor count and locks on stack invariant: " INT64_FORMAT " JNI: " INT64_FORMAT, (int64_t)current->held_monitor_count(), (int64_t)current->jni_monitor_count());
+  assert(LockingMode == LM_LEGACY || (current->held_monitor_count() == 0 && current->jni_monitor_count() == 0),
+         "Held monitor count should only be used for LM_LEGACY: " INT64_FORMAT " JNI: " INT64_FORMAT, (int64_t)current->held_monitor_count(), (int64_t)current->jni_monitor_count());
 
   if (entry->is_pinned() || current->held_monitor_count() > 0) {
     log_develop_debug(continuations)("PINNED due to critical section/hold monitor");
@@ -1597,26 +1725,36 @@ static inline int freeze_internal(JavaThread* current, intptr_t* const sp) {
     freeze_result res = entry->is_pinned() ? freeze_pinned_cs : freeze_pinned_monitor;
     log_develop_trace(continuations)("=== end of freeze (fail %d)", res);
     // Avoid Thread.yield() loops without safepoint polls.
-    if (SafepointMechanism::should_process(current)) {
+    if (SafepointMechanism::should_process(current) && !preempt) {
       cont.done(); // allow safepoint
       ThreadInVMfromJava tivmfj(current);
     }
     return res;
   }
 
-  Freeze<ConfigT> freeze(current, cont, sp);
+  Freeze<ConfigT> freeze(current, cont, sp, preempt);
 
   assert(!current->cont_fastpath() || freeze.check_valid_fast_path(), "");
   bool fast = UseContinuationFastPath && current->cont_fastpath();
   if (fast && freeze.size_if_fast_freeze_available() > 0) {
     freeze.freeze_fast_existing_chunk();
     CONT_JFR_ONLY(freeze.jfr_info().post_jfr_event(&event, oopCont, current);)
-    freeze_epilog(current, cont);
-    return 0;
+    return !preempt ? freeze_epilog(cont) : preempt_epilog(cont, freeze_ok, freeze.last_frame());
+  }
+
+  if (preempt) {
+    JvmtiSampledObjectAllocEventCollector jsoaec(false);
+    freeze.set_jvmti_event_collector(&jsoaec);
+
+    freeze_result res = fast ? freeze.try_freeze_fast() : freeze.freeze_slow();
+
+    CONT_JFR_ONLY(freeze.jfr_info().post_jfr_event(&event, oopCont, current);)
+    preempt_epilog(cont, res, freeze.last_frame());
+    return res;
   }
 
   log_develop_trace(continuations)("chunk unavailable; transitioning to VM");
-  assert(current == JavaThread::current(), "must be current thread except for preempt");
+  assert(current == JavaThread::current(), "must be current thread");
   JRT_BLOCK
     // delays a possible JvmtiSampledObjectAllocEventCollector in alloc_chunk
     JvmtiSampledObjectAllocEventCollector jsoaec(false);
@@ -1751,6 +1889,7 @@ class ThawBase : public StackObj {
 
   intptr_t* _fastpath;
   bool _barriers;
+  bool _preempted_case;
   intptr_t* _top_unextended_sp_before_thaw;
   int _align_size;
   DEBUG_ONLY(intptr_t* _top_stack_address);
@@ -1769,18 +1908,24 @@ class ThawBase : public StackObj {
   }
 
   void clear_chunk(stackChunkOop chunk);
+  template<bool check_stub>
   int remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &argsize);
   void copy_from_chunk(intptr_t* from, intptr_t* to, int size);
 
+  void thaw_lockstack(stackChunkOop chunk);
+
   // fast path
   inline void prefetch_chunk_pd(void* start, int size_words);
   void patch_return(intptr_t* sp, bool is_last);
 
-  // slow path
-  NOINLINE intptr_t* thaw_slow(stackChunkOop chunk, bool return_barrier);
+  intptr_t* handle_preempted_continuation(intptr_t* sp, Continuation::preempt_kind preempt_kind, bool fast_case);
+  inline intptr_t* push_cleanup_continuation();
+  void throw_interrupted_exception(JavaThread* current, frame& top);
+
+  void recurse_thaw(const frame& heap_frame, frame& caller, int num_frames, bool top_on_preempt_case);
+  void finish_thaw(frame& f);
 
 private:
-  void recurse_thaw(const frame& heap_frame, frame& caller, int num_frames, bool top);
   template<typename FKind> bool recurse_thaw_java_frame(frame& caller, int num_frames);
   void finalize_thaw(frame& entry, int argsize);
 
@@ -1794,12 +1939,13 @@ class ThawBase : public StackObj {
   NOINLINE void recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames);
   void recurse_thaw_compiled_frame(const frame& hf, frame& caller, int num_frames, bool stub_caller);
   void recurse_thaw_stub_frame(const frame& hf, frame& caller, int num_frames);
-  void finish_thaw(frame& f);
+  void recurse_thaw_native_frame(const frame& hf, frame& caller, int num_frames);
 
   void push_return_frame(frame& f);
   inline frame new_entry_frame();
   template<typename FKind> frame new_stack_frame(const frame& hf, frame& caller, bool bottom);
   inline void patch_pd(frame& f, const frame& sender);
+  inline void patch_pd(frame& f, intptr_t* caller_sp);
   inline intptr_t* align(const frame& hf, intptr_t* frame_sp, frame& caller, bool bottom);
 
   void maybe_set_fastpath(intptr_t* sp) { if (sp > _fastpath) _fastpath = sp; }
@@ -1823,7 +1969,9 @@ class Thaw : public ThawBase {
   }
 
   inline intptr_t* thaw(Continuation::thaw_kind kind);
+  template<bool check_stub = false>
   NOINLINE intptr_t* thaw_fast(stackChunkOop chunk);
+  NOINLINE intptr_t* thaw_slow(stackChunkOop chunk, Continuation::thaw_kind kind);
   inline void patch_caller_links(intptr_t* sp, intptr_t* bottom);
 };
 
@@ -1839,7 +1987,7 @@ inline intptr_t* Thaw<ConfigT>::thaw(Continuation::thaw_kind kind) {
 
   _barriers = chunk->requires_barriers();
   return (LIKELY(can_thaw_fast(chunk))) ? thaw_fast(chunk)
-                                        : thaw_slow(chunk, kind != Continuation::thaw_top);
+                                        : thaw_slow(chunk, kind);
 }
 
 class ReconstructedStack : public StackObj {
@@ -1872,6 +2020,7 @@ inline void ThawBase::clear_chunk(stackChunkOop chunk) {
   chunk->set_max_thawing_size(0);
 }
 
+template<bool check_stub>
 int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &argsize) {
   bool empty = false;
   StackChunkFrameStream<ChunkFrames::CompiledOnly> f(chunk);
@@ -1879,9 +2028,30 @@ int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &arg
   assert(chunk_sp == f.sp(), "");
   assert(chunk_sp == f.unextended_sp(), "");
 
-  const int frame_size = f.cb()->frame_size();
+  int frame_size = f.cb()->frame_size();
   argsize = f.stack_argsize();
 
+  assert(!f.is_stub() || check_stub, "");
+  if (check_stub && f.is_stub()) {
+    // If we don't thaw the top compiled frame too, after restoring the saved
+    // registers back in Java, we would hit the return barrier to thaw one more
+    // frame effectively overwriting the restored registers during that call.
+    f.next(SmallRegisterMap::instance(), true /* stop */);
+    assert(!f.is_done(), "");
+
+    f.get_cb();
+    assert(f.is_compiled(), "");
+    frame_size += f.cb()->frame_size();
+    argsize = f.stack_argsize();
+
+    if (f.cb()->as_nmethod()->is_marked_for_deoptimization()) {
+      // The caller of the runtime stub when the continuation is preempted is not at a
+      // Java call instruction, and so cannot rely on nmethod patching for deopt.
+      log_develop_trace(continuations)("Deoptimizing runtime stub caller");
+      f.to_frame().deoptimize(nullptr); // the null thread simply avoids the assertion in deoptimize which we're not set up for
+    }
+  }
+
   f.next(SmallRegisterMap::instance(), true /* stop */);
   empty = f.is_done();
   assert(!empty || argsize == chunk->argsize(), "");
@@ -1909,6 +2079,18 @@ int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &arg
   return frame_size + argsize + frame::metadata_words_at_top;
 }
 
+void ThawBase::thaw_lockstack(stackChunkOop chunk) {
+  int lockStackSize = chunk->lockstack_size();
+  assert(lockStackSize > 0 && lockStackSize <= LockStack::CAPACITY, "");
+
+  oop tmp_lockstack[LockStack::CAPACITY];
+  chunk->transfer_lockstack(tmp_lockstack, _barriers);
+  _thread->lock_stack().move_from_address(tmp_lockstack, lockStackSize);
+
+  chunk->set_lockstack_size(0);
+  chunk->set_has_lockstack(false);
+}
+
 void ThawBase::copy_from_chunk(intptr_t* from, intptr_t* to, int size) {
   assert(to >= _top_stack_address, "overwrote past thawing space"
     " to: " INTPTR_FORMAT " top_address: " INTPTR_FORMAT, p2i(to), p2i(_top_stack_address));
@@ -1927,6 +2109,7 @@ void ThawBase::patch_return(intptr_t* sp, bool is_last) {
 }
 
 template <typename ConfigT>
+template<bool check_stub>
 NOINLINE intptr_t* Thaw<ConfigT>::thaw_fast(stackChunkOop chunk) {
   assert(chunk == _cont.tail(), "");
   assert(!chunk->has_mixed_frames(), "");
@@ -1960,7 +2143,7 @@ NOINLINE intptr_t* Thaw<ConfigT>::thaw_fast(stackChunkOop chunk) {
     empty = true;
   } else { // thaw a single frame
     partial = true;
-    thaw_size = remove_top_compiled_frame_from_chunk(chunk, argsize);
+    thaw_size = remove_top_compiled_frame_from_chunk<check_stub>(chunk, argsize);
     empty = chunk->is_empty();
   }
 
@@ -2016,11 +2199,70 @@ inline bool ThawBase::seen_by_gc() {
   return _barriers || _cont.tail()->is_gc_mode();
 }
 
-NOINLINE intptr_t* ThawBase::thaw_slow(stackChunkOop chunk, bool return_barrier) {
+static inline void relativize_chunk_concurrently(stackChunkOop chunk) {
+#if INCLUDE_ZGC || INCLUDE_SHENANDOAHGC
+  if (UseZGC || UseShenandoahGC) {
+    chunk->relativize_derived_pointers_concurrently();
+  }
+#endif
+}
+
+template <typename ConfigT>
+NOINLINE intptr_t* Thaw<ConfigT>::thaw_slow(stackChunkOop chunk, Continuation::thaw_kind kind) {
+  Continuation::preempt_kind preempt_kind;
+  bool retry_fast_path = false;
+
+  _preempted_case = chunk->preempted();
+  if (_preempted_case) {
+    if (chunk->object_waiter() != nullptr) {
+      // Mounted again after preemption. Resume the pending monitor operation,
+      // which will be either a monitorenter or Object.wait() call.
+      assert(chunk->current_pending_monitor() != nullptr || chunk->current_waiting_monitor() != nullptr, "");
+      ObjectWaiter* waiter = chunk->object_waiter();
+      ObjectMonitor* mon = waiter->monitor();
+      preempt_kind = waiter->is_wait() ? Continuation::freeze_on_wait : Continuation::freeze_on_monitorenter;
+
+      bool mon_acquired = mon->resume_operation(_thread, waiter, _cont);
+      assert(!mon_acquired || mon->has_owner(_thread), "invariant");
+      if (!mon_acquired) {
+        // Failed to acquire monitor. Return to enterSpecial to unmount again.
+        return push_cleanup_continuation();
+      }
+      chunk = _cont.tail();  // reload oop in case of safepoint in resume_operation (if posting JVMTI events).
+    } else {
+      // Preemption cancelled in moniterenter case. We actually acquired
+      // the monitor after freezing all frames so nothing to do.
+      preempt_kind = Continuation::freeze_on_monitorenter;
+    }
+    // Call this first to avoid racing with GC threads later when modifying the chunk flags.
+    relativize_chunk_concurrently(chunk);
+    chunk->set_preempted(false);
+    retry_fast_path = true;
+  } else {
+    relativize_chunk_concurrently(chunk);
+  }
+
+  // On first thaw after freeze restore oops to the lockstack if any.
+  assert(chunk->lockstack_size() == 0 || kind == Continuation::thaw_top, "");
+  if (kind == Continuation::thaw_top && chunk->lockstack_size() > 0) {
+    thaw_lockstack(chunk);
+    retry_fast_path = true;
+  }
+
+  // Retry the fast path now that we possibly cleared the FLAG_HAS_LOCKSTACK
+  // and FLAG_PREEMPTED flags from the stackChunk.
+  if (retry_fast_path && can_thaw_fast(chunk)) {
+    intptr_t* sp = thaw_fast<true>(chunk);
+    if (_preempted_case) {
+      return handle_preempted_continuation(sp, preempt_kind, true /* fast_case */);
+    }
+    return sp;
+  }
+
   LogTarget(Trace, continuations) lt;
   if (lt.develop_is_enabled()) {
     LogStream ls(lt);
-    ls.print_cr("thaw slow return_barrier: %d " INTPTR_FORMAT, return_barrier, p2i(chunk));
+    ls.print_cr("thaw slow return_barrier: %d " INTPTR_FORMAT, kind, p2i(chunk));
     chunk->print_on(true, &ls);
   }
 
@@ -2034,7 +2276,7 @@ NOINLINE intptr_t* ThawBase::thaw_slow(stackChunkOop chunk, bool return_barrier)
 
   DEBUG_ONLY(_frames = 0;)
   _align_size = 0;
-  int num_frames = (return_barrier ? 1 : 2);
+  int num_frames = kind == Continuation::thaw_top ? 2 : 1;
 
   _stream = StackChunkFrameStream<ChunkFrames::Mixed>(chunk);
   _top_unextended_sp_before_thaw = _stream.unextended_sp();
@@ -2047,14 +2289,8 @@ NOINLINE intptr_t* ThawBase::thaw_slow(stackChunkOop chunk, bool return_barrier)
     heap_frame.print_value_on(&ls);
   }
 
-#if INCLUDE_ZGC || INCLUDE_SHENANDOAHGC
-  if (UseZGC || UseShenandoahGC) {
-    _cont.tail()->relativize_derived_pointers_concurrently();
-  }
-#endif
-
   frame caller; // the thawed caller on the stack
-  recurse_thaw(heap_frame, caller, num_frames, true);
+  recurse_thaw(heap_frame, caller, num_frames, _preempted_case);
   finish_thaw(caller); // caller is now the topmost thawed frame
   _cont.write();
 
@@ -2065,18 +2301,21 @@ NOINLINE intptr_t* ThawBase::thaw_slow(stackChunkOop chunk, bool return_barrier)
   _thread->set_cont_fastpath(_fastpath);
 
   intptr_t* sp = caller.sp();
+
+  if (_preempted_case) {
+    return handle_preempted_continuation(sp, preempt_kind, false /* fast_case */);
+  }
   return sp;
 }
 
-void ThawBase::recurse_thaw(const frame& heap_frame, frame& caller, int num_frames, bool top) {
+void ThawBase::recurse_thaw(const frame& heap_frame, frame& caller, int num_frames, bool top_on_preempt_case) {
   log_develop_debug(continuations)("thaw num_frames: %d", num_frames);
   assert(!_cont.is_empty(), "no more frames");
   assert(num_frames > 0, "");
   assert(!heap_frame.is_empty(), "");
 
-  if (top && heap_frame.is_safepoint_blob_frame()) {
-    assert(ContinuationHelper::Frame::is_stub(heap_frame.cb()), "cb: %s", heap_frame.cb()->name());
-    recurse_thaw_stub_frame(heap_frame, caller, num_frames);
+  if (top_on_preempt_case && (heap_frame.is_native_frame() || heap_frame.is_runtime_frame())) {
+    heap_frame.is_native_frame() ? recurse_thaw_native_frame(heap_frame, caller, 2) : recurse_thaw_stub_frame(heap_frame, caller, 2);
   } else if (!heap_frame.is_interpreted_frame()) {
     recurse_thaw_compiled_frame(heap_frame, caller, num_frames, false);
   } else {
@@ -2106,7 +2345,7 @@ bool ThawBase::recurse_thaw_java_frame(frame& caller, int num_frames) {
     finalize_thaw(caller, FKind::interpreted ? 0 : argsize);
     return true; // bottom
   } else { // recurse
-    recurse_thaw(_stream.to_frame(), caller, num_frames - 1, false);
+    recurse_thaw(_stream.to_frame(), caller, num_frames - 1, false /* top_on_preempt_case */);
     return false;
   }
 }
@@ -2196,6 +2435,59 @@ void ThawBase::clear_bitmap_bits(address start, address end) {
   assert(effective_end == end || !chunk->bitmap().at(chunk->bit_index_for(effective_end)), "bit should not be set");
 }
 
+intptr_t* ThawBase::handle_preempted_continuation(intptr_t* sp, Continuation::preempt_kind preempt_kind, bool fast_case) {
+  assert(preempt_kind == Continuation::freeze_on_wait || preempt_kind == Continuation::freeze_on_monitorenter, "");
+  frame top(sp);
+  assert(top.pc() == *(address*)(sp - frame::sender_sp_ret_address_offset()), "");
+
+#if INCLUDE_JVMTI
+  // Finish the VTMS transition.
+  assert(_thread->is_in_VTMS_transition(), "must be");
+  bool is_vthread = Continuation::continuation_scope(_cont.continuation()) == java_lang_VirtualThread::vthread_scope();
+  if (is_vthread) {
+    if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+      jvmti_mount_end(_thread, _cont, top);
+    } else {
+      _thread->set_is_in_VTMS_transition(false);
+      java_lang_Thread::set_is_in_VTMS_transition(_thread->vthread(), false);
+    }
+  }
+#endif
+
+  if (fast_case) {
+    // If we thawed in the slow path the runtime stub/native wrapper frame already
+    // has the correct fp (see ThawBase::new_stack_frame). On the fast path though,
+    // we copied the original fp at the time of freeze which now will have to be fixed.
+    assert(top.is_runtime_frame() || top.is_native_frame(), "");
+    int fsize = top.cb()->frame_size();
+    patch_pd(top, sp + fsize);
+  }
+
+  if (preempt_kind == Continuation::freeze_on_wait) {
+    // Check now if we need to throw IE exception.
+    if (_thread->pending_interrupted_exception()) {
+      throw_interrupted_exception(_thread, top);
+      _thread->set_pending_interrupted_exception(false);
+    }
+  } else if (top.is_runtime_frame()) {
+    // The continuation might now run on a different platform thread than the previous time so
+    // we need to adjust the current thread saved in the stub frame before restoring registers.
+    JavaThread** thread_addr = frame::saved_thread_address(top);
+    if (thread_addr != nullptr) *thread_addr = _thread;
+  }
+  return sp;
+}
+
+void ThawBase::throw_interrupted_exception(JavaThread* current, frame& top) {
+  ContinuationWrapper::SafepointOp so(current, _cont);
+  // Since we might safepoint set the anchor so that the stack can be walked.
+  set_anchor(current, top.sp());
+  JRT_BLOCK
+    THROW(vmSymbols::java_lang_InterruptedException());
+  JRT_BLOCK_END
+  clear_anchor(current);
+}
+
 NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames) {
   assert(hf.is_interpreted_frame(), "");
 
@@ -2239,7 +2531,9 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
 
   maybe_set_fastpath(f.sp());
 
-  const int locals = hf.interpreter_frame_method()->max_locals();
+  Method* m = hf.interpreter_frame_method();
+  assert(!m->is_native() || !is_bottom_frame, "should be top frame of thaw_top case; missing caller frame");
+  const int locals = m->max_locals();
 
   if (!is_bottom_frame) {
     // can only fix caller once this frame is thawed (due to callee saved regs)
@@ -2256,8 +2550,8 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
 }
 
 void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int num_frames, bool stub_caller) {
-  assert(!hf.is_interpreted_frame(), "");
-  assert(_cont.is_preempted() || !stub_caller, "stub caller not at preemption");
+  assert(hf.is_compiled_frame(), "");
+  assert(_preempted_case || !stub_caller, "stub caller not at preemption");
 
   if (!stub_caller && UNLIKELY(seen_by_gc())) { // recurse_thaw_stub_frame already invoked our barriers with a full regmap
     _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
@@ -2270,7 +2564,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
   assert(caller.sp() == caller.unextended_sp(), "");
 
   if ((!is_bottom_frame && caller.is_interpreted_frame()) || (is_bottom_frame && Interpreter::contains(_cont.tail()->pc()))) {
-    _align_size += frame::align_wiggle; // we add one whether or not we've aligned because we add it in freeze_interpreted_frame
+    _align_size += frame::align_wiggle; // we add one whether or not we've aligned because we add it in recurse_freeze_compiled_frame
   }
 
   // new_stack_frame must construct the resulting frame using hf.pc() rather than hf.raw_pc() because the frame is not
@@ -2303,10 +2597,9 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
   if (hf.is_deoptimized_frame()) {
     maybe_set_fastpath(f.sp());
   } else if (_thread->is_interp_only_mode()
-              || (_cont.is_preempted() && f.cb()->as_nmethod()->is_marked_for_deoptimization())) {
+              || (stub_caller && f.cb()->as_nmethod()->is_marked_for_deoptimization())) {
     // The caller of the safepoint stub when the continuation is preempted is not at a call instruction, and so
     // cannot rely on nmethod patching for deopt.
-    assert(_thread->is_interp_only_mode() || stub_caller, "expected a stub-caller");
 
     log_develop_trace(continuations)("Deoptimizing thawed frame");
     DEBUG_ONLY(ContinuationHelper::Frame::patch_pc(f, nullptr));
@@ -2334,7 +2627,8 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
 void ThawBase::recurse_thaw_stub_frame(const frame& hf, frame& caller, int num_frames) {
   DEBUG_ONLY(_frames++;)
 
-  {
+  if (UNLIKELY(seen_by_gc())) {
+    // Process the stub's caller here since we might need the full map.
     RegisterMap map(nullptr,
                     RegisterMap::UpdateMap::include,
                     RegisterMap::ProcessFrames::skip,
@@ -2342,41 +2636,89 @@ void ThawBase::recurse_thaw_stub_frame(const frame& hf, frame& caller, int num_f
     map.set_include_argument_oops(false);
     _stream.next(&map);
     assert(!_stream.is_done(), "");
-    if (UNLIKELY(seen_by_gc())) { // we're now doing this on the stub's caller
-      _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, &map);
-    }
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, &map);
+  } else {
+    _stream.next(SmallRegisterMap::instance());
     assert(!_stream.is_done(), "");
   }
 
-  recurse_thaw_compiled_frame(_stream.to_frame(), caller, num_frames, true); // this could be deoptimized
+  recurse_thaw_compiled_frame(_stream.to_frame(), caller, num_frames, true);
 
-  DEBUG_ONLY(before_thaw_java_frame(hf, caller, false, num_frames);)
-
-  assert(ContinuationHelper::Frame::is_stub(hf.cb()), "");
+  assert(caller.is_compiled_frame(), "");
   assert(caller.sp() == caller.unextended_sp(), "");
-  assert(!caller.is_interpreted_frame(), "");
 
-  int fsize = ContinuationHelper::StubFrame::size(hf);
+  DEBUG_ONLY(before_thaw_java_frame(hf, caller, false /*is_bottom_frame*/, num_frames);)
 
   frame f = new_stack_frame<ContinuationHelper::StubFrame>(hf, caller, false);
   intptr_t* stack_frame_top = f.sp();
   intptr_t* heap_frame_top = hf.sp();
+  int fsize = ContinuationHelper::StubFrame::size(hf);
 
   copy_from_chunk(heap_frame_top - frame::metadata_words, stack_frame_top - frame::metadata_words,
                   fsize + frame::metadata_words);
 
-  { // can only fix caller once this frame is thawed (due to callee saved regs)
-    RegisterMap map(nullptr,
-                    RegisterMap::UpdateMap::include,
-                    RegisterMap::ProcessFrames::skip,
-                    RegisterMap::WalkContinuation::skip); // map.clear();
-    map.set_include_argument_oops(false);
-    f.oop_map()->update_register_map(&f, &map);
-    ContinuationHelper::update_register_map_with_callee(caller, &map);
-    _cont.tail()->fix_thawed_frame(caller, &map);
+  patch(f, caller, false /*is_bottom_frame*/);
+
+  // can only fix caller once this frame is thawed (due to callee saved regs)
+  RegisterMap map(nullptr,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  map.set_include_argument_oops(false);
+  f.oop_map()->update_register_map(&f, &map);
+  ContinuationHelper::update_register_map_with_callee(caller, &map);
+  _cont.tail()->fix_thawed_frame(caller, &map);
+
+  DEBUG_ONLY(after_thaw_java_frame(f, false /*is_bottom_frame*/);)
+  caller = f;
+}
+
+void ThawBase::recurse_thaw_native_frame(const frame& hf, frame& caller, int num_frames) {
+  assert(hf.is_native_frame(), "");
+  assert(_preempted_case && hf.cb()->as_nmethod()->method()->is_object_wait0(), "");
+
+  if (UNLIKELY(seen_by_gc())) { // recurse_thaw_stub_frame already invoked our barriers with a full regmap
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
   }
 
-  DEBUG_ONLY(after_thaw_java_frame(f, false);)
+  const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::NativeFrame>(caller, num_frames);
+  assert(!is_bottom_frame, "");
+
+  DEBUG_ONLY(before_thaw_java_frame(hf, caller, is_bottom_frame, num_frames);)
+
+  assert(caller.sp() == caller.unextended_sp(), "");
+
+  if (caller.is_interpreted_frame()) {
+    _align_size += frame::align_wiggle; // we add one whether or not we've aligned because we add it in recurse_freeze_native_frame
+  }
+
+  // new_stack_frame must construct the resulting frame using hf.pc() rather than hf.raw_pc() because the frame is not
+  // yet laid out in the stack, and so the original_pc is not stored in it.
+  // As a result, f.is_deoptimized_frame() is always false and we must test hf to know if the frame is deoptimized.
+  frame f = new_stack_frame<ContinuationHelper::NativeFrame>(hf, caller, false /* bottom */);
+  intptr_t* const stack_frame_top = f.sp();
+  intptr_t* const heap_frame_top = hf.unextended_sp();
+
+  int fsize = ContinuationHelper::NativeFrame::size(hf);
+  assert(fsize <= (int)(caller.unextended_sp() - f.unextended_sp()), "");
+
+  intptr_t* from = heap_frame_top - frame::metadata_words_at_bottom;
+  intptr_t* to   = stack_frame_top - frame::metadata_words_at_bottom;
+  int sz = fsize + frame::metadata_words_at_bottom;
+
+  copy_from_chunk(from, to, sz); // copying good oops because we invoked barriers above
+
+  patch(f, caller, false /* bottom */);
+
+  // f.is_deoptimized_frame() is always false and we must test hf.is_deoptimized_frame() (see comment above)
+  assert(!f.is_deoptimized_frame(), "");
+  assert(!hf.is_deoptimized_frame(), "");
+  assert(!f.cb()->as_nmethod()->is_marked_for_deoptimization(), "");
+
+  // can only fix caller once this frame is thawed (due to callee saved regs); this happens on the stack
+  _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
+
+  DEBUG_ONLY(after_thaw_java_frame(f, false /* bottom */);)
   caller = f;
 }
 
@@ -2463,30 +2805,11 @@ static inline intptr_t* thaw_internal(JavaThread* thread, const Continuation::th
   clear_anchor(thread);
 #endif
 
+  DEBUG_ONLY(bool preempted = cont.tail()->preempted();)
   Thaw<ConfigT> thw(thread, cont);
   intptr_t* const sp = thw.thaw(kind);
   assert(is_aligned(sp, frame::frame_alignment), "");
-
-  // All or part of the frames have been thawed so we know they don't hold any monitors except JNI monitors.
-  assert(thread->held_monitor_count() == thread->jni_monitor_count(), "Must be");
-
-#ifdef ASSERT
-  intptr_t* sp0 = sp;
-  set_anchor(thread, sp0);
-  log_frames(thread);
-  if (LoomVerifyAfterThaw) {
-    assert(do_verify_after_thaw(thread, cont.tail(), tty), "");
-  }
-  assert(ContinuationEntry::assert_entry_frame_laid_out(thread), "");
-  clear_anchor(thread);
-
-  LogTarget(Trace, continuations) lt;
-  if (lt.develop_is_enabled()) {
-    LogStream ls(lt);
-    ls.print_cr("Jumping to frame (thaw):");
-    frame(sp).print_value_on(&ls);
-  }
-#endif
+  DEBUG_ONLY(log_frames_after_thaw(thread, cont, sp, preempted);)
 
   CONT_JFR_ONLY(thw.jfr_info().post_jfr_event(&event, cont.continuation(), thread);)
 
@@ -2591,7 +2914,7 @@ static void log_frames(JavaThread* thread) {
   }
   LogStream ls(lt);
 
-  ls.print_cr("------- frames ---------");
+  ls.print_cr("------- frames --------- for thread " INTPTR_FORMAT, p2i(thread));
   if (!thread->has_last_Java_frame()) {
     ls.print_cr("NO ANCHOR!");
   }
@@ -2615,8 +2938,8 @@ static void log_frames(JavaThread* thread) {
 
     int i = 0;
     int post_entry = -1;
-    for (frame f = thread->last_frame(); !f.is_entry_frame(); f = f.sender(&map)) {
-      f.describe(values, i++, &map);
+    for (frame f = thread->last_frame(); !f.is_first_frame(); f = f.sender(&map), i++) {
+      f.describe(values, i, &map, i == 0);
       if (post_entry >= 0 || Continuation::is_continuation_enterSpecial(f))
         post_entry++;
       if (post_entry >= show_entry_callers)
@@ -2627,6 +2950,33 @@ static void log_frames(JavaThread* thread) {
 
   ls.print_cr("======= end frames =========");
 }
+
+static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp, bool preempted) {
+  intptr_t* sp0 = sp;
+  address pc0 = *(address*)(sp - frame::sender_sp_ret_address_offset());
+
+  if (preempted && sp0 == cont.entrySP()) {
+    // Still preempted (monitor not acquired) so no frames were thawed.
+    assert(cont.tail()->preempted(), "");
+    set_anchor(thread, cont.entrySP(), cont.entryPC());
+  } else {
+    set_anchor(thread, sp0);
+  }
+
+  log_frames(thread);
+  if (LoomVerifyAfterThaw) {
+    assert(do_verify_after_thaw(thread, cont.tail(), tty), "");
+  }
+  assert(ContinuationEntry::assert_entry_frame_laid_out(thread), "");
+  clear_anchor(thread);
+
+  LogTarget(Trace, continuations) lt;
+  if (lt.develop_is_enabled()) {
+    LogStream ls(lt);
+    ls.print_cr("Jumping to frame (thaw):");
+    frame(sp).print_value_on(&ls);
+  }
+}
 #endif // ASSERT
 
 #include CPU_HEADER_INLINE(continuationFreezeThaw)
@@ -2647,13 +2997,14 @@ static void print_frame_layout(const frame& f, bool callee_complete, outputStrea
   if (callee_complete) {
     frame::update_map_with_saved_link(&map, ContinuationHelper::Frame::callee_link_address(f));
   }
-  const_cast<frame&>(f).describe(values, 0, &map);
+  const_cast<frame&>(f).describe(values, 0, &map, true);
   values.print_on(static_cast<JavaThread*>(nullptr), st);
 }
 #endif
 
 static address thaw_entry   = nullptr;
 static address freeze_entry = nullptr;
+static address freeze_preempt_entry = nullptr;
 
 address Continuation::thaw_entry() {
   return ::thaw_entry;
@@ -2663,6 +3014,10 @@ address Continuation::freeze_entry() {
   return ::freeze_entry;
 }
 
+address Continuation::freeze_preempt_entry() {
+  return ::freeze_preempt_entry;
+}
+
 class ConfigResolve {
 public:
   static void resolve() { resolve_compressed(); }
@@ -2696,6 +3051,7 @@ class ConfigResolve {
     typedef Config<use_compressed ? oop_kind::NARROW : oop_kind::WIDE, BarrierSetT> SelectedConfigT;
 
     freeze_entry = (address)freeze<SelectedConfigT>;
+    freeze_preempt_entry = (address)SelectedConfigT::freeze_preempt;
 
     // If we wanted, we could templatize by kind and have three different thaw entries
     thaw_entry   = (address)thaw<SelectedConfigT>;
diff --git a/src/hotspot/share/runtime/continuationHelper.hpp b/src/hotspot/share/runtime/continuationHelper.hpp
index 6d8474e1844..0b3e6c72452 100644
--- a/src/hotspot/share/runtime/continuationHelper.hpp
+++ b/src/hotspot/share/runtime/continuationHelper.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ class ContinuationHelper {
   class InterpretedFrame;
   class NonInterpretedUnknownFrame;
   class CompiledFrame;
+  class NativeFrame;
   class StubFrame;
 };
 
@@ -65,6 +66,7 @@ class ContinuationHelper::Frame : public AllStatic {
 public:
   static const bool interpreted = false;
   static const bool stub = false;
+  static const bool native = false;
 
   static inline intptr_t** callee_link_address(const frame& f);
   static Method* frame_method(const frame& f);
@@ -133,11 +135,25 @@ class ContinuationHelper::CompiledFrame : public ContinuationHelper::NonInterpre
 #endif
 };
 
+class ContinuationHelper::NativeFrame : public ContinuationHelper::NonInterpretedFrame {
+public:
+  static const bool native = true;
+
+  static bool is_instance(const frame& f);
+
+#ifdef ASSERT
+  static bool is_owning_locks(JavaThread* current, const frame& f);
+#endif
+
+  static int stack_argsize(const frame& f) { return 0; }
+};
+
 class ContinuationHelper::StubFrame : public ContinuationHelper::NonInterpretedFrame {
 public:
   static const bool stub = true;
 
   static bool is_instance(const frame& f);
+  static int stack_argsize(const frame& f) { return 0; }
 };
 
 #endif // SHARE_VM_RUNTIME_CONTINUATIONHELPER_HPP
diff --git a/src/hotspot/share/runtime/continuationHelper.inline.hpp b/src/hotspot/share/runtime/continuationHelper.inline.hpp
index d6b18a75815..279e2a5ffd5 100644
--- a/src/hotspot/share/runtime/continuationHelper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationHelper.inline.hpp
@@ -32,7 +32,9 @@
 #include "compiler/oopMap.inline.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "runtime/frame.inline.hpp"
+#include "runtime/objectMonitor.hpp"
 #include "runtime/stackValue.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/macros.hpp"
 
 #include CPU_HEADER_INLINE(continuationHelper)
@@ -53,7 +55,7 @@ inline bool ContinuationHelper::NonInterpretedUnknownFrame::is_instance(const fr
 }
 
 inline bool ContinuationHelper::Frame::is_stub(CodeBlob* cb) {
-  return cb != nullptr && (cb->is_safepoint_stub() || cb->is_runtime_stub());
+  return cb != nullptr && cb->is_runtime_stub();
 }
 
 inline Method* ContinuationHelper::Frame::frame_method(const frame& f) {
@@ -195,6 +197,26 @@ bool ContinuationHelper::CompiledFrame::is_owning_locks(JavaThread* thread, Regi
 }
 #endif
 
+inline bool ContinuationHelper::NativeFrame::is_instance(const frame& f) {
+  return f.is_native_frame();
+}
+
+#ifdef ASSERT
+inline bool ContinuationHelper::NativeFrame::is_owning_locks(JavaThread* thread, const frame& f) {
+  assert(NativeFrame::is_instance(f), "");
+
+  Method* method = f.cb()->as_nmethod()->method();
+  if (!method->is_synchronized()) {
+    return false;
+  } else {
+    // Just verify we are actually the owner
+    oop synced_obj = f.get_native_receiver();
+    assert(ObjectSynchronizer::current_thread_holds_lock(thread, Handle(thread, synced_obj)), "must be owner");
+    return true;
+  }
+}
+#endif
+
 inline bool ContinuationHelper::StubFrame::is_instance(const frame& f) {
   return !f.is_interpreted_frame() && is_stub(f.cb());
 }
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.cpp b/src/hotspot/share/runtime/continuationJavaClasses.cpp
index d9f2d05b7e9..5ab96f9cf4f 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.cpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,6 +87,8 @@ int jdk_internal_vm_StackChunk::_pc_offset;
 int jdk_internal_vm_StackChunk::_bottom_offset;
 int jdk_internal_vm_StackChunk::_flags_offset;
 int jdk_internal_vm_StackChunk::_maxThawingSize_offset;
+int jdk_internal_vm_StackChunk::_lockStackSize_offset;
+int jdk_internal_vm_StackChunk::_objectWaiter_offset;
 int jdk_internal_vm_StackChunk::_cont_offset;
 
 #define STACKCHUNK_FIELDS_DO(macro) \
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.hpp b/src/hotspot/share/runtime/continuationJavaClasses.hpp
index 05cba90a0f5..d100ef17871 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,10 +71,12 @@ class jdk_internal_vm_Continuation: AllStatic {
 
 // Interface to jdk.internal.vm.StackChunk objects
 #define STACKCHUNK_INJECTED_FIELDS(macro)                                          \
-  macro(jdk_internal_vm_StackChunk, cont,           continuation_signature, false) \
-  macro(jdk_internal_vm_StackChunk, flags,          byte_signature,         false) \
-  macro(jdk_internal_vm_StackChunk, pc,             intptr_signature,       false) \
-  macro(jdk_internal_vm_StackChunk, maxThawingSize, int_signature,          false) \
+  macro(jdk_internal_vm_StackChunk, cont,            continuation_signature, false) \
+  macro(jdk_internal_vm_StackChunk, flags,           byte_signature,         false) \
+  macro(jdk_internal_vm_StackChunk, pc,              intptr_signature,       false) \
+  macro(jdk_internal_vm_StackChunk, maxThawingSize,  int_signature,          false) \
+  macro(jdk_internal_vm_StackChunk, lockStackSize,   byte_signature,         false) \
+  macro(jdk_internal_vm_StackChunk, objectWaiter,    intptr_signature,       false) \
 
 class jdk_internal_vm_StackChunk: AllStatic {
   friend class JavaClasses;
@@ -86,6 +88,8 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static int _bottom_offset;
   static int _flags_offset;
   static int _maxThawingSize_offset;
+  static int _lockStackSize_offset;
+  static int _objectWaiter_offset;
   static int _cont_offset;
 
 
@@ -124,6 +128,12 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static inline int maxThawingSize(oop chunk);
   static inline void set_maxThawingSize(oop chunk, int value);
 
+  static inline uint8_t lockStackSize(oop chunk);
+  static inline void set_lockStackSize(oop chunk, uint8_t value);
+
+  static inline address objectWaiter(oop chunk);
+  static inline void set_objectWaiter(oop chunk, address mon);
+
   // cont oop's processing is essential for the chunk's GC protocol
   static inline oop cont(oop chunk);
   template<typename P>
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
index b2dea2d704a..b4400c59c68 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,4 +185,21 @@ inline void jdk_internal_vm_StackChunk::set_maxThawingSize(oop chunk, int value)
   chunk->int_field_put(_maxThawingSize_offset, value);
 }
 
+// lockStackSize is read concurrently by GC threads so we use Atomic.
+inline uint8_t jdk_internal_vm_StackChunk::lockStackSize(oop chunk) {
+  return Atomic::load(chunk->field_addr<uint8_t>(_lockStackSize_offset));
+}
+
+inline void jdk_internal_vm_StackChunk::set_lockStackSize(oop chunk, uint8_t value) {
+  Atomic::store(chunk->field_addr<uint8_t>(_lockStackSize_offset), value);
+}
+
+inline address jdk_internal_vm_StackChunk::objectWaiter(oop chunk) {
+  return chunk->address_field(_objectWaiter_offset);
+}
+
+inline void jdk_internal_vm_StackChunk::set_objectWaiter(oop chunk, address value) {
+  chunk->address_field_put(_objectWaiter_offset, value);
+}
+
 #endif // SHARE_RUNTIME_CONTINUATIONJAVACLASSES_INLINE_HPP
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 2006f340450..9992d42622f 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -122,6 +122,10 @@ DeoptimizationScope::~DeoptimizationScope() {
 }
 
 void DeoptimizationScope::mark(nmethod* nm, bool inc_recompile_counts) {
+  if (!nm->can_be_deoptimized()) {
+    return;
+  }
+
   ConditionalMutexLocker ml(NMethodState_lock, !NMethodState_lock->owned_by_self(), Mutex::_no_safepoint_check_flag);
 
   // If it's already marked but we still need it to be deopted.
@@ -1666,7 +1670,7 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray<MonitorInf
           assert(mon_info->owner()->is_locked(), "object must be locked now");
           assert(obj->mark().has_monitor(), "must be");
           assert(!deoptee_thread->lock_stack().contains(obj()), "must be");
-          assert(ObjectSynchronizer::read_monitor(thread, obj(), obj->mark())->owner() == deoptee_thread, "must be");
+          assert(ObjectSynchronizer::read_monitor(thread, obj(), obj->mark())->has_owner(deoptee_thread), "must be");
         } else {
           ObjectSynchronizer::enter_for(obj, lock, deoptee_thread);
           assert(mon_info->owner()->is_locked(), "object must be locked now");
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 17078a69ab9..738b89e77bd 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -497,7 +497,6 @@ jint frame::interpreter_frame_expression_stack_size() const {
   return (jint)stack_size;
 }
 
-
 // (frame::interpreter_frame_sender_sp accessor is in frame_<arch>.cpp)
 
 const char* frame::print_name() const {
@@ -577,10 +576,21 @@ void frame::interpreter_frame_print_on(outputStream* st) const {
        current < interpreter_frame_monitor_begin();
        current = next_monitor_in_interpreter_frame(current)) {
     st->print(" - obj    [%s", current->obj() == nullptr ? "null" : "");
-    if (current->obj() != nullptr) current->obj()->print_value_on(st);
+    oop obj = current->obj();
+    if (obj != nullptr) {
+      if (!is_heap_frame()) {
+        obj->print_value_on(st);
+      } else {
+        // Might be an invalid oop. We don't have the
+        // stackChunk to correct it so just print address.
+        st->print(INTPTR_FORMAT, p2i(obj));
+      }
+    }
     st->print_cr("]");
     st->print(" - lock   [");
-    current->lock()->print_on(st, current->obj());
+    if (!is_heap_frame()) {
+      current->lock()->print_on(st, obj);
+    }
     st->print_cr("]");
   }
   // monitor
@@ -1085,7 +1095,7 @@ oop frame::retrieve_receiver(RegisterMap* reg_map) {
 }
 
 
-BasicLock* frame::get_native_monitor() {
+BasicLock* frame::get_native_monitor() const {
   nmethod* nm = (nmethod*)_cb;
   assert(_cb != nullptr && _cb->is_nmethod() && nm->method()->is_native(),
          "Should not call this unless it's a native nmethod");
@@ -1094,7 +1104,7 @@ BasicLock* frame::get_native_monitor() {
   return (BasicLock*) &sp()[byte_offset / wordSize];
 }
 
-oop frame::get_native_receiver() {
+oop frame::get_native_receiver() const {
   nmethod* nm = (nmethod*)_cb;
   assert(_cb != nullptr && _cb->is_nmethod() && nm->method()->is_native(),
          "Should not call this unless it's a native nmethod");
@@ -1340,9 +1350,14 @@ class FrameValuesOopMapClosure: public OopMapClosure {
 
 // callers need a ResourceMark because of name_and_sig_as_C_string() usage,
 // RA allocated string is returned to the caller
-void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_map) {
+void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_map, bool top) {
   // boundaries: sp and the 'real' frame pointer
   values.describe(-1, sp(), err_msg("sp for #%d", frame_no), 0);
+  if (top) {
+    values.describe(-1, sp() - 1, err_msg("sp[-1] for #%d", frame_no), 0);
+    values.describe(-1, sp() - 2, err_msg("sp[-2] for #%d", frame_no), 0);
+  }
+
   intptr_t* frame_pointer = real_fp(); // Note: may differ from fp()
 
   // print frame info at the highest boundary
@@ -1414,7 +1429,7 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
   } else if (is_entry_frame()) {
     // For now just label the frame
     values.describe(-1, info_address, err_msg("#%d entry frame", frame_no), 2);
-  } else if (cb()->is_nmethod()) {
+  } else if (is_compiled_frame()) {
     // For now just label the frame
     nmethod* nm = cb()->as_nmethod();
     values.describe(-1, info_address,
@@ -1517,17 +1532,16 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
         oop_map()->all_type_do(this, OopMapValue::callee_saved_value, &valuesFn);
       }
     }
-
-    if (nm->method()->is_continuation_enter_intrinsic()) {
-      ContinuationEntry* ce = Continuation::get_continuation_entry_for_entry_frame(reg_map->thread(), *this); // (ContinuationEntry*)unextended_sp();
-      ce->describe(values, frame_no);
-    }
   } else if (is_native_frame()) {
     // For now just label the frame
     nmethod* nm = cb()->as_nmethod_or_null();
     values.describe(-1, info_address,
                     FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
                                        p2i(nm), nm->method()->name_and_sig_as_C_string()), 2);
+    if (nm->method()->is_continuation_enter_intrinsic()) {
+      ContinuationEntry* ce = Continuation::get_continuation_entry_for_entry_frame(reg_map->thread(), *this); // (ContinuationEntry*)unextended_sp();
+      ce->describe(values, frame_no);
+    }
   } else {
     // provide default info if not handled before
     char *info = (char *) "special frame";
diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
index 50aafce3837..fe531cff8a6 100644
--- a/src/hotspot/share/runtime/frame.hpp
+++ b/src/hotspot/share/runtime/frame.hpp
@@ -337,8 +337,8 @@ class frame {
   // Return the monitor owner and BasicLock for compiled synchronized
   // native methods. Used by JVMTI's GetLocalInstance method
   // (via VM_GetReceiver) to retrieve the receiver from a native wrapper frame.
-  BasicLock* get_native_monitor();
-  oop        get_native_receiver();
+  BasicLock* get_native_monitor() const;
+  oop        get_native_receiver() const;
 
   // Find receiver for an invoke when arguments are just pushed on stack (i.e., callee stack-frame is
   // not setup)
@@ -426,6 +426,8 @@ class frame {
   oop saved_oop_result(RegisterMap* map) const;
   void set_saved_oop_result(RegisterMap* map, oop obj);
 
+  static JavaThread** saved_thread_address(const frame& f);
+
   // For debugging
  private:
   const char* print_name() const;
@@ -442,7 +444,7 @@ class frame {
 
 #ifndef PRODUCT
   // Add annotated descriptions of memory locations belonging to this frame to values
-  void describe(FrameValues& values, int frame_no, const RegisterMap* reg_map=nullptr);
+  void describe(FrameValues& values, int frame_no, const RegisterMap* reg_map=nullptr, bool top = false);
 #endif
 
   // Conversion from a VMReg to physical stack location
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index b568e769304..70b537bf2d7 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -128,6 +128,9 @@ const size_t minimumSymbolTableSize = 1024;
           "Use 32-bit class pointers in 64-bit VM. "                        \
           "lp64_product means flag is always constant in 32 bit VM")        \
                                                                             \
+  product(bool, UseCompactObjectHeaders, false, EXPERIMENTAL,               \
+          "Use compact 64-bit object headers in 64-bit VM")                 \
+                                                                            \
   product(int, ObjectAlignmentInBytes, 8,                                   \
           "Default object alignment in bytes, 8 is minimum")                \
           range(8, 256)                                                     \
@@ -144,6 +147,7 @@ const size_t minimumSymbolTableSize = 1024;
                            constraint)
 const bool UseCompressedOops = false;
 const bool UseCompressedClassPointers = false;
+const bool UseCompactObjectHeaders = false;
 const int ObjectAlignmentInBytes = 8;
 
 #endif // _LP64
@@ -677,9 +681,6 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, PrintCodeCacheExtension, false,                             \
           "Print extension of code cache")                                  \
                                                                             \
-  develop(bool, UsePrivilegedStack, true,                                   \
-          "Enable the security JVM functions")                              \
-                                                                            \
   product(bool, ClassUnloading, true,                                       \
           "Do unloading of classes")                                        \
                                                                             \
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 285c2de17fa..fd9f75c41b4 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -83,6 +83,7 @@
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
+#include "runtime/threadIdentifier.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/threadStatisticalInfo.hpp"
 #include "runtime/threadWXSetters.inline.hpp"
@@ -235,6 +236,8 @@ void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name
   // constructor calls Thread.current(), which must be set here.
   java_lang_Thread::set_thread(thread_oop(), this);
   set_threadOopHandles(thread_oop());
+  // Set the lock_id to the next thread_id temporarily while initialization runs.
+  set_lock_id(ThreadIdentifier::next());
 
   JavaValue result(T_VOID);
   if (thread_name != nullptr) {
@@ -260,6 +263,9 @@ void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name
                             Handle(),
                             CHECK);
   }
+  // Update the lock_id with the tid value.
+  set_lock_id(java_lang_Thread::thread_id(thread_oop()));
+
   os::set_priority(this, NormPriority);
 
   if (daemon) {
@@ -429,6 +435,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _current_waiting_monitor(nullptr),
   _active_handles(nullptr),
   _free_handle_block(nullptr),
+  _lock_id(0),
 
   _suspend_flags(0),
 
@@ -448,6 +455,8 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _is_in_VTMS_transition(false),
   _is_disable_suspend(false),
   _VTMS_transition_mark(false),
+  _on_monitor_waited_event(false),
+  _contended_entered_monitor(nullptr),
 #ifdef ASSERT
   _is_VTMS_transition_disabler(false),
 #endif
@@ -488,6 +497,10 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _jni_monitor_count(0),
   _unlocked_inflated_monitor(nullptr),
 
+  _preempt_alternate_return(nullptr),
+  _preemption_cancelled(false),
+  _pending_interrupted_exception(false),
+
   _handshake(this),
 
   _popframe_preserved_args(nullptr),
@@ -501,6 +514,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _parker(),
 
   _class_to_be_initialized(nullptr),
+  _class_being_initialized(nullptr),
 
   _SleepEvent(ParkEvent::Allocate(this)),
 
@@ -1162,6 +1176,7 @@ void JavaThread::send_async_exception(JavaThread* target, oop java_throwable) {
 
 #if INCLUDE_JVMTI
 void JavaThread::set_is_in_VTMS_transition(bool val) {
+  assert(is_in_VTMS_transition() != val, "already %s transition", val ? "inside" : "outside");
   _is_in_VTMS_transition = val;
 }
 
@@ -1525,9 +1540,8 @@ void JavaThread::print_on(outputStream *st, bool print_extended_info) const {
   st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12));
   if (thread_oop != nullptr) {
     if (is_vthread_mounted()) {
-      oop vt = vthread();
-      assert(vt != nullptr, "");
-      st->print_cr("   Carrying virtual thread #" INT64_FORMAT, (int64_t)java_lang_Thread::thread_id(vt));
+      // _lock_id is the thread ID of the mounted virtual thread
+      st->print_cr("   Carrying virtual thread #" INT64_FORMAT, lock_id());
     } else {
       st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
     }
@@ -1711,6 +1725,7 @@ void JavaThread::prepare(jobject jni_thread, ThreadPriority prio) {
   assert(InstanceKlass::cast(thread_oop->klass())->is_linked(),
          "must be initialized");
   set_threadOopHandles(thread_oop());
+  set_lock_id(java_lang_Thread::thread_id(thread_oop()));
 
   if (prio == NoPriority) {
     prio = java_lang_Thread::priority(thread_oop());
@@ -1990,6 +2005,14 @@ void JavaThread::trace_stack() {
 // this slow-path.
 void JavaThread::inc_held_monitor_count(intx i, bool jni) {
 #ifdef SUPPORT_MONITOR_COUNT
+
+  if (LockingMode != LM_LEGACY) {
+    // Nothing to do. Just do some sanity check.
+    assert(_held_monitor_count == 0, "counter should not be used");
+    assert(_jni_monitor_count == 0, "counter should not be used");
+    return;
+  }
+
   assert(_held_monitor_count >= 0, "Must always be non-negative: " INTX_FORMAT, _held_monitor_count);
   _held_monitor_count += i;
   if (jni) {
@@ -1998,18 +2021,26 @@ void JavaThread::inc_held_monitor_count(intx i, bool jni) {
   }
   assert(_held_monitor_count >= _jni_monitor_count, "Monitor count discrepancy detected - held count "
          INTX_FORMAT " is less than JNI count " INTX_FORMAT, _held_monitor_count, _jni_monitor_count);
-#endif
+#endif // SUPPORT_MONITOR_COUNT
 }
 
 // Slow-path decrement of the held monitor counts. JNI unlocking is always
 // this slow-path.
 void JavaThread::dec_held_monitor_count(intx i, bool jni) {
 #ifdef SUPPORT_MONITOR_COUNT
+
+  if (LockingMode != LM_LEGACY) {
+    // Nothing to do. Just do some sanity check.
+    assert(_held_monitor_count == 0, "counter should not be used");
+    assert(_jni_monitor_count == 0, "counter should not be used");
+    return;
+  }
+
   _held_monitor_count -= i;
-  assert(_held_monitor_count >= 0, "Must always be greater than 0: " INTX_FORMAT, _held_monitor_count);
+  assert(_held_monitor_count >= 0, "Must always be non-negative: " INTX_FORMAT, _held_monitor_count);
   if (jni) {
     _jni_monitor_count -= i;
-    assert(_jni_monitor_count >= 0, "Must always be greater than 0: " INTX_FORMAT, _jni_monitor_count);
+    assert(_jni_monitor_count >= 0, "Must always be non-negative: " INTX_FORMAT, _jni_monitor_count);
   }
   // When a thread is detaching with still owned JNI monitors, the logic that releases
   // the monitors doesn't know to set the "jni" flag and so the counts can get out of sync.
@@ -2017,7 +2048,7 @@ void JavaThread::dec_held_monitor_count(intx i, bool jni) {
   // JNI count is directly set to zero.
   assert(_held_monitor_count >= _jni_monitor_count || is_exiting(), "Monitor count discrepancy detected - held count "
          INTX_FORMAT " is less than JNI count " INTX_FORMAT, _held_monitor_count, _jni_monitor_count);
-#endif
+#endif // SUPPORT_MONITOR_COUNT
 }
 
 frame JavaThread::vthread_last_frame() {
@@ -2199,6 +2230,7 @@ void JavaThread::start_internal_daemon(JavaThread* current, JavaThread* target,
 
   // Now bind the thread_oop to the target JavaThread.
   target->set_threadOopHandles(thread_oop());
+  target->set_lock_id(java_lang_Thread::thread_id(thread_oop()));
 
   Threads::add(target); // target is now visible for safepoint/handshake
   // Publish the JavaThread* in java.lang.Thread after the JavaThread* is
@@ -2295,3 +2327,38 @@ void JavaThread::add_oop_handles_for_release() {
   _oop_handle_list = new_head;
   Service_lock->notify_all();
 }
+
+#if INCLUDE_JFR
+void JavaThread::set_last_freeze_fail_result(freeze_result result) {
+  assert(result != freeze_ok, "sanity check");
+  _last_freeze_fail_result = result;
+  _last_freeze_fail_time = Ticks::now();
+}
+
+// Post jdk.VirtualThreadPinned event
+void JavaThread::post_vthread_pinned_event(EventVirtualThreadPinned* event, const char* op, freeze_result result) {
+  assert(result != freeze_ok, "sanity check");
+  if (event->should_commit()) {
+    char reason[256];
+    if (class_to_be_initialized() != nullptr) {
+      ResourceMark rm(this);
+      jio_snprintf(reason, sizeof reason, "Waited for initialization of %s by another thread",
+                   class_to_be_initialized()->external_name());
+      event->set_pinnedReason(reason);
+    } else if (class_being_initialized() != nullptr) {
+      ResourceMark rm(this);
+      jio_snprintf(reason, sizeof(reason), "VM call to %s.<clinit> on stack",
+                   class_being_initialized()->external_name());
+      event->set_pinnedReason(reason);
+    } else if (result == freeze_pinned_native) {
+      event->set_pinnedReason("Native or VM frame on stack");
+    } else {
+      jio_snprintf(reason, sizeof(reason), "Freeze or preempt failed (%d)", result);
+      event->set_pinnedReason(reason);
+    }
+    event->set_blockingOperation(op);
+    event->set_carrierThread(JFR_JVM_THREAD_ID(this));
+    event->commit();
+  }
+}
+#endif
\ No newline at end of file
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 249a1e4dc87..e24138583b8 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -30,6 +30,7 @@
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
 #include "oops/oopHandle.hpp"
+#include "runtime/continuationEntry.hpp"
 #include "runtime/frame.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handshake.hpp"
@@ -41,16 +42,17 @@
 #include "runtime/stackOverflow.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadHeapSampler.hpp"
+#include "runtime/threadIdentifier.hpp"
 #include "runtime/threadStatisticalInfo.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_JFR
 #include "jfr/support/jfrThreadExtension.hpp"
+#include "utilities/ticks.hpp"
 #endif
 
 class AsyncExceptionHandshake;
-class ContinuationEntry;
 class DeoptResourceMark;
 class InternalOOMEMark;
 class JNIHandleBlock;
@@ -77,6 +79,8 @@ class javaVFrame;
 class JavaThread;
 typedef void (*ThreadFunction)(JavaThread*, TRAPS);
 
+class EventVirtualThreadPinned;
+
 class JavaThread: public Thread {
   friend class VMStructs;
   friend class JVMCIVMStructs;
@@ -159,7 +163,18 @@ class JavaThread: public Thread {
   // One-element thread local free list
   JNIHandleBlock* _free_handle_block;
 
+  // ID used as owner for inflated monitors. Same as the j.l.Thread.tid of the
+  // current _vthread object, except during creation of the primordial and JNI
+  // attached thread cases where this field can have a temporary value.
+  int64_t _lock_id;
+
  public:
+  void set_lock_id(int64_t tid) {
+    assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "invalid tid");
+    _lock_id = tid;
+  }
+  int64_t lock_id() const { return _lock_id; }
+
   // For tracking the heavyweight monitor the thread is pending on.
   ObjectMonitor* current_pending_monitor() {
     // Use Atomic::load() to prevent data race between concurrent modification and
@@ -313,6 +328,8 @@ class JavaThread: public Thread {
   bool                  _is_in_VTMS_transition;          // thread is in virtual thread mount state transition
   bool                  _is_disable_suspend;             // JVMTI suspend is temporarily disabled; used on current thread only
   bool                  _VTMS_transition_mark;           // used for sync between VTMS transitions and disablers
+  bool                  _on_monitor_waited_event;        // Avoid callee arg processing for enterSpecial when posting waited event
+  ObjectMonitor*        _contended_entered_monitor;      // Monitor for pending monitor_contended_entered callback
 #ifdef ASSERT
   bool                  _is_VTMS_transition_disabler;    // thread currently disabled VTMS transitions
 #endif
@@ -454,8 +471,8 @@ class JavaThread: public Thread {
   int _frames_to_pop_failed_realloc;
 
   ContinuationEntry* _cont_entry;
-  intptr_t* _cont_fastpath; // the sp of the oldest known interpreted/call_stub frame inside the
-                            // continuation that we know about
+  intptr_t* _cont_fastpath; // the sp of the oldest known interpreted/call_stub/upcall_stub/native_wrapper
+                            // frame inside the continuation that we know about
   int _cont_fastpath_thread_state; // whether global thread state allows continuation fastpath (JVMTI)
 
   // It's signed for error detection.
@@ -463,6 +480,28 @@ class JavaThread: public Thread {
   intx _jni_monitor_count;
   ObjectMonitor* _unlocked_inflated_monitor;
 
+  // This is the field we poke in the interpreter and native
+  // wrapper (Object.wait) to check for preemption.
+  address _preempt_alternate_return;
+  // When preempting on monitorenter we could have acquired the
+  // monitor after freezing all vthread frames. In that case we
+  // set this field so that in the preempt stub we call thaw again
+  // instead of unmounting.
+  bool _preemption_cancelled;
+  // For Object.wait() we set this field to know if we need to
+  // throw IE at the end of thawing before returning to Java.
+  bool _pending_interrupted_exception;
+
+ public:
+  bool preemption_cancelled()           { return _preemption_cancelled; }
+  void set_preemption_cancelled(bool b) { _preemption_cancelled = b; }
+
+  bool pending_interrupted_exception()           { return _pending_interrupted_exception; }
+  void set_pending_interrupted_exception(bool b) { _pending_interrupted_exception = b; }
+
+  bool preempting()           { return _preempt_alternate_return != nullptr; }
+  void set_preempt_alternate_return(address val) { _preempt_alternate_return = val; }
+
 private:
 
   friend class VMThread;
@@ -627,7 +666,7 @@ class JavaThread: public Thread {
 
   intx held_monitor_count() { return _held_monitor_count; }
   intx jni_monitor_count()  { return _jni_monitor_count;  }
-  void clear_jni_monitor_count() { _jni_monitor_count = 0;   }
+  void clear_jni_monitor_count() { _jni_monitor_count = 0; }
 
   // Support for SharedRuntime::monitor_exit_helper()
   ObjectMonitor* unlocked_inflated_monitor() const { return _unlocked_inflated_monitor; }
@@ -682,12 +721,19 @@ class JavaThread: public Thread {
   bool VTMS_transition_mark() const              { return Atomic::load(&_VTMS_transition_mark); }
   void set_VTMS_transition_mark(bool val)        { Atomic::store(&_VTMS_transition_mark, val); }
 
+  bool on_monitor_waited_event()             { return _on_monitor_waited_event; }
+  void set_on_monitor_waited_event(bool val) { _on_monitor_waited_event = val; }
+
+  bool pending_contended_entered_event()         { return _contended_entered_monitor != nullptr; }
+  ObjectMonitor* contended_entered_monitor()     { return _contended_entered_monitor; }
 #ifdef ASSERT
   bool is_VTMS_transition_disabler() const       { return _is_VTMS_transition_disabler; }
   void set_is_VTMS_transition_disabler(bool val);
 #endif
 #endif
 
+  void set_contended_entered_monitor(ObjectMonitor* val) NOT_JVMTI_RETURN JVMTI_ONLY({ _contended_entered_monitor = val; })
+
   // Support for object deoptimization and JFR suspension
   void handle_special_runtime_exit_condition();
   bool has_special_runtime_exit_condition() {
@@ -838,10 +884,14 @@ class JavaThread: public Thread {
   static ByteSize doing_unsafe_access_offset() { return byte_offset_of(JavaThread, _doing_unsafe_access); }
   NOT_PRODUCT(static ByteSize requires_cross_modify_fence_offset()  { return byte_offset_of(JavaThread, _requires_cross_modify_fence); })
 
+  static ByteSize lock_id_offset()            { return byte_offset_of(JavaThread, _lock_id); }
+
   static ByteSize cont_entry_offset()         { return byte_offset_of(JavaThread, _cont_entry); }
   static ByteSize cont_fastpath_offset()      { return byte_offset_of(JavaThread, _cont_fastpath); }
   static ByteSize held_monitor_count_offset() { return byte_offset_of(JavaThread, _held_monitor_count); }
   static ByteSize jni_monitor_count_offset()  { return byte_offset_of(JavaThread, _jni_monitor_count); }
+  static ByteSize preemption_cancelled_offset()  { return byte_offset_of(JavaThread, _preemption_cancelled); }
+  static ByteSize preempt_alternate_return_offset() { return byte_offset_of(JavaThread, _preempt_alternate_return); }
   static ByteSize unlocked_inflated_monitor_offset() { return byte_offset_of(JavaThread, _unlocked_inflated_monitor); }
 
 #if INCLUDE_JVMTI
@@ -1161,11 +1211,23 @@ class JavaThread: public Thread {
   void set_class_to_be_initialized(InstanceKlass* k);
   InstanceKlass* class_to_be_initialized() const;
 
+  // Track executing class initializer, see ThreadInClassInitializer
+  void set_class_being_initialized(InstanceKlass* k);
+  InstanceKlass* class_being_initialized() const;
+
 private:
   InstanceKlass* _class_to_be_initialized;
+  InstanceKlass* _class_being_initialized;
 
   // java.lang.Thread.sleep support
   ParkEvent * _SleepEvent;
+
+#if INCLUDE_JFR
+  // Support for jdk.VirtualThreadPinned event
+  freeze_result _last_freeze_fail_result;
+  Ticks _last_freeze_fail_time;
+#endif
+
 public:
   bool sleep(jlong millis);
   bool sleep_nanos(jlong nanos);
@@ -1174,6 +1236,15 @@ class JavaThread: public Thread {
   void interrupt();
   bool is_interrupted(bool clear_interrupted);
 
+#if INCLUDE_JFR
+  // Support for jdk.VirtualThreadPinned event
+  freeze_result last_freeze_fail_result() { return _last_freeze_fail_result; }
+  Ticks& last_freeze_fail_time() { return _last_freeze_fail_time; }
+  void set_last_freeze_fail_result(freeze_result result);
+#endif
+  void post_vthread_pinned_event(EventVirtualThreadPinned* event, const char* op, freeze_result result) NOT_JFR_RETURN();
+
+
   // This is only for use by JVMTI RawMonitorWait. It emulates the actions of
   // the Java code in Object::wait which are not present in RawMonitorWait.
   bool get_and_clear_interrupted();
@@ -1261,4 +1332,36 @@ class JNIHandleMark : public StackObj {
   ~JNIHandleMark() { _thread->pop_jni_handle_block(); }
 };
 
+class NoPreemptMark {
+  ContinuationEntry* _ce;
+  bool _unpin;
+ public:
+  NoPreemptMark(JavaThread* thread) : _ce(thread->last_continuation()), _unpin(false) {
+    if (_ce != nullptr) _unpin = _ce->pin();
+  }
+  ~NoPreemptMark() { if (_unpin) _ce->unpin(); }
+};
+
+class ThreadOnMonitorWaitedEvent {
+  JavaThread* _thread;
+ public:
+  ThreadOnMonitorWaitedEvent(JavaThread* thread) : _thread(thread) {
+    JVMTI_ONLY(_thread->set_on_monitor_waited_event(true);)
+  }
+  ~ThreadOnMonitorWaitedEvent() { JVMTI_ONLY(_thread->set_on_monitor_waited_event(false);) }
+};
+
+class ThreadInClassInitializer : public StackObj {
+  JavaThread* _thread;
+  InstanceKlass* _previous;
+ public:
+  ThreadInClassInitializer(JavaThread* thread, InstanceKlass* ik) : _thread(thread) {
+    _previous = _thread->class_being_initialized();
+    _thread->set_class_being_initialized(ik);
+  }
+  ~ThreadInClassInitializer() {
+    _thread->set_class_being_initialized(_previous);
+  }
+};
+
 #endif // SHARE_RUNTIME_JAVATHREAD_HPP
diff --git a/src/hotspot/share/runtime/javaThread.inline.hpp b/src/hotspot/share/runtime/javaThread.inline.hpp
index fabb589c2b5..f434fc161bb 100644
--- a/src/hotspot/share/runtime/javaThread.inline.hpp
+++ b/src/hotspot/share/runtime/javaThread.inline.hpp
@@ -241,10 +241,20 @@ inline InstanceKlass* JavaThread::class_to_be_initialized() const {
   return _class_to_be_initialized;
 }
 
+inline void JavaThread::set_class_being_initialized(InstanceKlass* k) {
+  assert(k != nullptr || _class_being_initialized != nullptr, "incorrect usage");
+  assert(this == Thread::current(), "Only the current thread can set this field");
+  _class_being_initialized = k;
+}
+
+inline InstanceKlass* JavaThread::class_being_initialized() const {
+  return _class_being_initialized;
+}
+
 inline void JavaThread::om_set_monitor_cache(ObjectMonitor* monitor) {
   assert(UseObjectMonitorTable, "must be");
   assert(monitor != nullptr, "use om_clear_monitor_cache to clear");
-  assert(this == current() || monitor->owner_raw() == this, "only add owned monitors for other threads");
+  assert(this == current() || monitor->has_owner(this), "only add owned monitors for other threads");
   assert(this == current() || is_obj_deopt_suspend(), "thread must not run concurrently");
 
   _om_cache.set_monitor(monitor);
diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.cpp b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
index 7cf7c201faf..b3bcd5f7029 100644
--- a/src/hotspot/share/runtime/lightweightSynchronizer.cpp
+++ b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
@@ -344,7 +344,7 @@ ObjectMonitor* LightweightSynchronizer::get_or_insert_monitor_from_table(oop obj
   }
 
   ObjectMonitor* alloced_monitor = new ObjectMonitor(object);
-  alloced_monitor->set_owner_anonymous();
+  alloced_monitor->set_anonymous_owner();
 
   // Try insert monitor
   monitor = add_monitor(current, alloced_monitor, object);
@@ -623,8 +623,6 @@ void LightweightSynchronizer::enter_for(Handle obj, BasicLock* lock, JavaThread*
     ObjectSynchronizer::handle_sync_on_value_based_class(obj, locking_thread);
   }
 
-  locking_thread->inc_held_monitor_count();
-
   CacheSetter cache_setter(locking_thread, lock);
 
   LockStack& lock_stack = locking_thread->lock_stack();
@@ -654,8 +652,6 @@ void LightweightSynchronizer::enter(Handle obj, BasicLock* lock, JavaThread* cur
     ObjectSynchronizer::handle_sync_on_value_based_class(obj, current);
   }
 
-  current->inc_held_monitor_count();
-
   CacheSetter cache_setter(current, lock);
 
   // Used when deflation is observed. Progress here requires progress
@@ -745,7 +741,7 @@ void LightweightSynchronizer::exit(oop object, JavaThread* current) {
   assert(mark.has_monitor(), "must be");
   // The monitor exists
   ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, object, mark);
-  if (monitor->is_owner_anonymous()) {
+  if (monitor->has_anonymous_owner()) {
     assert(current->lock_stack().contains(object), "current must have object on its lock stack");
     monitor->set_owner_from_anonymous(current);
     monitor->set_recursions(current->lock_stack().remove(object) - 1);
@@ -790,7 +786,7 @@ ObjectMonitor* LightweightSynchronizer::inflate_locked_or_imse(oop obj, ObjectSy
     assert(mark.has_monitor(), "must be");
     ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, obj, mark);
     if (monitor != nullptr) {
-      if (monitor->is_owner_anonymous()) {
+      if (monitor->has_anonymous_owner()) {
         LockStack& lock_stack = current->lock_stack();
         if (lock_stack.contains(obj)) {
           // Current thread owns the lock but someone else inflated it.
@@ -808,10 +804,10 @@ ObjectMonitor* LightweightSynchronizer::inflate_locked_or_imse(oop obj, ObjectSy
   }
 }
 
-ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* inflating_thread, Thread* current) {
+ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current) {
 
-  // The JavaThread* inflating_thread parameter is only used by LM_LIGHTWEIGHT and requires
-  // that the inflating_thread == Thread::current() or is suspended throughout the call by
+  // The JavaThread* locking_thread parameter is only used by LM_LIGHTWEIGHT and requires
+  // that the locking_thread == Thread::current() or is suspended throughout the call by
   // some other mechanism.
   // Even with LM_LIGHTWEIGHT the thread might be nullptr when called from a non
   // JavaThread. (As may still be the case from FastHashCode). However it is only
@@ -826,10 +822,10 @@ ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, O
     // The mark can be in one of the following states:
     // *  inflated     - Just return if using stack-locking.
     //                   If using fast-locking and the ObjectMonitor owner
-    //                   is anonymous and the inflating_thread owns the
-    //                   object lock, then we make the inflating_thread
+    //                   is anonymous and the locking_thread owns the
+    //                   object lock, then we make the locking_thread
     //                   the ObjectMonitor owner and remove the lock from
-    //                   the inflating_thread's lock stack.
+    //                   the locking_thread's lock stack.
     // *  fast-locked  - Coerce it to inflated from fast-locked.
     // *  unlocked     - Aggressively inflate the object.
 
@@ -838,42 +834,42 @@ ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, O
       ObjectMonitor* inf = mark.monitor();
       markWord dmw = inf->header();
       assert(dmw.is_neutral(), "invariant: header=" INTPTR_FORMAT, dmw.value());
-      if (inf->is_owner_anonymous() &&
-          inflating_thread != nullptr && inflating_thread->lock_stack().contains(object)) {
-        inf->set_owner_from_anonymous(inflating_thread);
-        size_t removed = inflating_thread->lock_stack().remove(object);
+      if (inf->has_anonymous_owner() &&
+          locking_thread != nullptr && locking_thread->lock_stack().contains(object)) {
+        inf->set_owner_from_anonymous(locking_thread);
+        size_t removed = locking_thread->lock_stack().remove(object);
         inf->set_recursions(removed - 1);
       }
       return inf;
     }
 
     // CASE: fast-locked
-    // Could be fast-locked either by the inflating_thread or by some other thread.
+    // Could be fast-locked either by the locking_thread or by some other thread.
     //
     // Note that we allocate the ObjectMonitor speculatively, _before_
     // attempting to set the object's mark to the new ObjectMonitor. If
-    // the inflating_thread owns the monitor, then we set the ObjectMonitor's
-    // owner to the inflating_thread. Otherwise, we set the ObjectMonitor's owner
+    // the locking_thread owns the monitor, then we set the ObjectMonitor's
+    // owner to the locking_thread. Otherwise, we set the ObjectMonitor's owner
     // to anonymous. If we lose the race to set the object's mark to the
     // new ObjectMonitor, then we just delete it and loop around again.
     //
     if (mark.is_fast_locked()) {
       ObjectMonitor* monitor = new ObjectMonitor(object);
       monitor->set_header(mark.set_unlocked());
-      bool own = inflating_thread != nullptr && inflating_thread->lock_stack().contains(object);
+      bool own = locking_thread != nullptr && locking_thread->lock_stack().contains(object);
       if (own) {
-        // Owned by inflating_thread.
-        monitor->set_owner_from(nullptr, inflating_thread);
+        // Owned by locking_thread.
+        monitor->set_owner(locking_thread);
       } else {
         // Owned by somebody else.
-        monitor->set_owner_anonymous();
+        monitor->set_anonymous_owner();
       }
       markWord monitor_mark = markWord::encode(monitor);
       markWord old_mark = object->cas_set_mark(monitor_mark, mark);
       if (old_mark == mark) {
         // Success! Return inflated monitor.
         if (own) {
-          size_t removed = inflating_thread->lock_stack().remove(object);
+          size_t removed = locking_thread->lock_stack().remove(object);
           monitor->set_recursions(removed - 1);
         }
         // Once the ObjectMonitor is configured and object is associated
@@ -956,7 +952,7 @@ ObjectMonitor* LightweightSynchronizer::inflate_fast_locked_object(oop object, O
     // ObjectMonitors are always inserted as anonymously owned, this thread is
     // the current holder of the monitor. So unless the entry is stale and
     // contains a deflating monitor it must be anonymously owned.
-    if (monitor->is_owner_anonymous()) {
+    if (monitor->has_anonymous_owner()) {
       // The monitor must be anonymously owned if it was added
       assert(monitor == get_monitor_from_table(current, object), "The monitor must be found");
       // New fresh monitor
@@ -1077,7 +1073,7 @@ ObjectMonitor* LightweightSynchronizer::inflate_and_enter(oop object, ObjectSync
     // CASE: inflated
     if (mark.has_monitor()) {
       LockStack& lock_stack = locking_thread->lock_stack();
-      if (monitor->is_owner_anonymous() && lock_stack.contains(object)) {
+      if (monitor->has_anonymous_owner() && lock_stack.contains(object)) {
         // The lock is fast-locked by the locking thread,
         // convert it to a held monitor with a known owner.
         monitor->set_owner_from_anonymous(locking_thread);
@@ -1189,7 +1185,6 @@ bool LightweightSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread*
   // Only for 32bit which has limited support for fast locking outside the runtime.
   if (lock_stack.try_recursive_enter(obj)) {
     // Recursive lock successful.
-    current->inc_held_monitor_count();
     return true;
   }
 
@@ -1198,7 +1193,6 @@ bool LightweightSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread*
     if (obj->cas_set_mark(locked_mark, mark) == mark) {
       // Successfully fast-locked, push object to lock-stack and return.
       lock_stack.push(obj);
-      current->inc_held_monitor_count();
       return true;
     }
   }
@@ -1216,7 +1210,6 @@ bool LightweightSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread*
     if (monitor->try_enter(current)) {
       // ObjectMonitor enter successful.
       cache_setter.set_monitor(monitor);
-      current->inc_held_monitor_count();
       return true;
     }
   }
diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.hpp b/src/hotspot/share/runtime/lightweightSynchronizer.hpp
index c546988f778..fdd753e9b9c 100644
--- a/src/hotspot/share/runtime/lightweightSynchronizer.hpp
+++ b/src/hotspot/share/runtime/lightweightSynchronizer.hpp
@@ -63,7 +63,7 @@ class LightweightSynchronizer : AllStatic {
   static void enter(Handle obj, BasicLock* lock, JavaThread* current);
   static void exit(oop object, JavaThread* current);
 
-  static ObjectMonitor* inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* inflating_thread, Thread* current);
+  static ObjectMonitor* inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current);
   static ObjectMonitor* inflate_locked_or_imse(oop object, ObjectSynchronizer::InflateCause cause, TRAPS);
   static ObjectMonitor* inflate_fast_locked_object(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
   static ObjectMonitor* inflate_and_enter(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
diff --git a/src/hotspot/share/runtime/lockStack.hpp b/src/hotspot/share/runtime/lockStack.hpp
index de32eb41259..dbc958a71e2 100644
--- a/src/hotspot/share/runtime/lockStack.hpp
+++ b/src/hotspot/share/runtime/lockStack.hpp
@@ -118,6 +118,10 @@ class LockStack {
   // Tests whether the oop is on this lock-stack.
   inline bool contains(oop o) const;
 
+  inline int monitor_count() const;
+  inline void move_to_address(oop* start);
+  inline void move_from_address(oop* start, int count);
+
   // GC support
   inline void oops_do(OopClosure* cl);
 
diff --git a/src/hotspot/share/runtime/lockStack.inline.hpp b/src/hotspot/share/runtime/lockStack.inline.hpp
index 515ca94c741..0516a85356d 100644
--- a/src/hotspot/share/runtime/lockStack.inline.hpp
+++ b/src/hotspot/share/runtime/lockStack.inline.hpp
@@ -215,8 +215,33 @@ inline bool LockStack::contains(oop o) const {
   return false;
 }
 
+inline int LockStack::monitor_count() const {
+  int end = to_index(_top);
+  assert(end <= CAPACITY, "invariant");
+  return end;
+}
+
+inline void LockStack::move_to_address(oop* start) {
+  int end = to_index(_top);
+  for (int i = 0; i < end; i++) {
+    start[i] = _base[i];
+    DEBUG_ONLY(_base[i] = nullptr;)
+  }
+  _top = lock_stack_base_offset;
+}
+
+inline void LockStack::move_from_address(oop* start, int count) {
+  assert(to_index(_top) == 0, "lockstack should be empty");
+  for (int i = 0; i < count; i++) {
+    _base[i] = start[i];
+    _top += oopSize;
+  }
+}
+
 inline void LockStack::oops_do(OopClosure* cl) {
-  verify("pre-oops-do");
+  // We don't perform pre oops_do verify here because this function
+  // is used by the GC to fix the oops.
+
   int end = to_index(_top);
   for (int i = 0; i < end; i++) {
     cl->do_oop(&_base[i]);
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 76d0674e8c6..a0a6e5626e4 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -135,7 +135,6 @@ Mutex*   SharedDecoder_lock           = nullptr;
 Mutex*   DCmdFactory_lock             = nullptr;
 Mutex*   NMTQuery_lock                = nullptr;
 Mutex*   NMTCompilationCostHistory_lock = nullptr;
-Mutex*   NmtVirtualMemory_lock          = nullptr;
 
 #if INCLUDE_CDS
 #if INCLUDE_JVMTI
@@ -294,11 +293,10 @@ void mutex_init() {
   MUTEX_DEFN(CodeHeapStateAnalytics_lock     , PaddedMutex  , safepoint);
   MUTEX_DEFN(ThreadsSMRDelete_lock           , PaddedMonitor, service-2); // Holds ConcurrentHashTableResize_lock
   MUTEX_DEFN(ThreadIdTableCreate_lock        , PaddedMutex  , safepoint);
-  MUTEX_DEFN(SharedDecoder_lock              , PaddedMutex  , service-5); // Must be lower than NmtVirtualMemory_lock due to MemTracker::print_containing_region
+  MUTEX_DEFN(SharedDecoder_lock              , PaddedMutex  , tty-1);
   MUTEX_DEFN(DCmdFactory_lock                , PaddedMutex  , nosafepoint);
   MUTEX_DEFN(NMTQuery_lock                   , PaddedMutex  , safepoint);
   MUTEX_DEFN(NMTCompilationCostHistory_lock  , PaddedMutex  , nosafepoint);
-  MUTEX_DEFN(NmtVirtualMemory_lock           , PaddedMutex  , service-4);
 #if INCLUDE_CDS
 #if INCLUDE_JVMTI
   MUTEX_DEFN(CDSClassFileStream_lock         , PaddedMutex  , safepoint);
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index cc465bfc191..7cca1d94bf2 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -117,7 +117,6 @@ extern Mutex*   SharedDecoder_lock;              // serializes access to the dec
 extern Mutex*   DCmdFactory_lock;                // serialize access to DCmdFactory information
 extern Mutex*   NMTQuery_lock;                   // serialize NMT Dcmd queries
 extern Mutex*   NMTCompilationCostHistory_lock;  // guards NMT compilation cost history
-extern Mutex*   NmtVirtualMemory_lock;           // guards NMT virtual memory updates
 #if INCLUDE_CDS
 #if INCLUDE_JVMTI
 extern Mutex*   CDSClassFileStream_lock;         // FileMapInfo::open_stream_for_jvmti
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 3ea987801db..7d1998ca849 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -39,6 +39,7 @@
 #include "prims/jvmtiDeferredUpdates.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/continuationWrapper.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -53,6 +54,7 @@
 #include "runtime/safefetch.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/threads.hpp"
 #include "services/threadService.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/dtrace.hpp"
@@ -114,27 +116,41 @@ DEBUG_ONLY(static volatile bool InitDone = false;)
 
 OopStorage* ObjectMonitor::_oop_storage = nullptr;
 
+OopHandle ObjectMonitor::_vthread_cxq_head;
+ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
+
 // -----------------------------------------------------------------------------
 // Theory of operations -- Monitors lists, thread residency, etc:
 //
 // * A thread acquires ownership of a monitor by successfully
-//   CAS()ing the _owner field from null to non-null.
+//   CAS()ing the _owner field from NO_OWNER/DEFLATER_MARKER to
+//   its tid (return value from owner_from()).
 //
 // * Invariant: A thread appears on at most one monitor list --
 //   cxq, EntryList or WaitSet -- at any one time.
 //
 // * Contending threads "push" themselves onto the cxq with CAS
 //   and then spin/park.
+//   If the thread is a virtual thread it will first attempt to
+//   unmount itself. The virtual thread will first try to freeze
+//   all frames in the heap. If the operation fails it will just
+//   follow the regular path for platform threads. If the operation
+//   succeeds, it will push itself onto the cxq with CAS and then
+//   return back to Java to continue the unmount logic.
 //
 // * After a contending thread eventually acquires the lock it must
 //   dequeue itself from either the EntryList or the cxq.
 //
 // * The exiting thread identifies and unparks an "heir presumptive"
-//   tentative successor thread on the EntryList.  Critically, the
-//   exiting thread doesn't unlink the successor thread from the EntryList.
-//   After having been unparked, the wakee will recontend for ownership of
-//   the monitor.   The successor (wakee) will either acquire the lock or
-//   re-park itself.
+//   tentative successor thread on the EntryList. In case the successor
+//   is an unmounted virtual thread, the exiting thread will first try
+//   to add it to the list of vthreads waiting to be unblocked, and on
+//   success it will unpark the special unblocker thread instead, which
+//   will be in charge of submitting the vthread back to the scheduler
+//   queue. Critically, the exiting thread doesn't unlink the successor
+//   thread from the EntryList. After having been unparked/re-scheduled,
+//   the wakee will recontend for ownership of the monitor. The successor
+//   (wakee) will either acquire the lock or re-park/unmount itself.
 //
 //   Succession is provided for by a policy of competitive handoff.
 //   The exiting thread does _not_ grant or pass ownership to the
@@ -196,20 +212,18 @@ OopStorage* ObjectMonitor::_oop_storage = nullptr;
 //
 // * The monitor synchronization subsystem avoids the use of native
 //   synchronization primitives except for the narrow platform-specific
-//   park-unpark abstraction.  See the comments in os_solaris.cpp regarding
+//   park-unpark abstraction.  See the comments in os_posix.cpp regarding
 //   the semantics of park-unpark.  Put another way, this monitor implementation
-//   depends only on atomic operations and park-unpark.  The monitor subsystem
-//   manages all RUNNING->BLOCKED and BLOCKED->READY transitions while the
-//   underlying OS manages the READY<->RUN transitions.
+//   depends only on atomic operations and park-unpark.
 //
 // * Waiting threads reside on the WaitSet list -- wait() puts
 //   the caller onto the WaitSet.
 //
 // * notify() or notifyAll() simply transfers threads from the WaitSet to
 //   either the EntryList or cxq.  Subsequent exit() operations will
-//   unpark the notifyee.  Unparking a notifee in notify() is inefficient -
-//   it's likely the notifyee would simply impale itself on the lock held
-//   by the notifier.
+//   unpark/re-schedule the notifyee. Unparking/re-scheduling a notifyee in
+//   notify() is inefficient - it's likely the notifyee would simply impale
+//   itself on the lock held by the notifier.
 
 // Check that object() and set_object() are called from the right context:
 static void check_object_context() {
@@ -237,18 +251,19 @@ static void check_object_context() {
 ObjectMonitor::ObjectMonitor(oop object) :
   _metadata(0),
   _object(_oop_storage, object),
-  _owner(nullptr),
+  _owner(NO_OWNER),
   _previous_owner_tid(0),
   _next_om(nullptr),
   _recursions(0),
   _EntryList(nullptr),
   _cxq(nullptr),
-  _succ(nullptr),
+  _succ(NO_OWNER),
   _SpinDuration(ObjectMonitor::Knob_SpinLimit),
   _contentions(0),
   _WaitSet(nullptr),
   _waiters(0),
-  _WaitSetLock(0)
+  _WaitSetLock(0),
+  _stack_locker(nullptr)
 { }
 
 ObjectMonitor::~ObjectMonitor() {
@@ -263,7 +278,7 @@ oop ObjectMonitor::object() const {
 void ObjectMonitor::ExitOnSuspend::operator()(JavaThread* current) {
   if (current->is_suspended()) {
     _om->_recursions = 0;
-    _om->_succ = nullptr;
+    _om->clear_successor();
     // Don't need a full fence after clearing successor here because of the call to exit().
     _om->exit(current, false /* not_suspended */);
     _om_exited = true;
@@ -274,8 +289,8 @@ void ObjectMonitor::ExitOnSuspend::operator()(JavaThread* current) {
 
 void ObjectMonitor::ClearSuccOnSuspend::operator()(JavaThread* current) {
   if (current->is_suspended()) {
-    if (_om->_succ == current) {
-      _om->_succ = nullptr;
+    if (_om->has_successor(current)) {
+      _om->clear_successor();
       OrderAccess::fence(); // always do a full fence when successor is cleared
     }
   }
@@ -310,13 +325,13 @@ bool ObjectMonitor::TryLockWithContentionMark(JavaThread* locking_thread, Object
   assert(contention_mark._monitor == this, "must be");
   assert(!is_being_async_deflated(), "must be");
 
-  void* prev_owner = try_set_owner_from(nullptr, locking_thread);
+  int64_t prev_owner = try_set_owner_from(NO_OWNER, locking_thread);
   bool success = false;
 
-  if (prev_owner == nullptr) {
+  if (prev_owner == NO_OWNER) {
     assert(_recursions == 0, "invariant");
     success = true;
-  } else if (prev_owner == locking_thread) {
+  } else if (prev_owner == owner_from(locking_thread)) {
     _recursions++;
     success = true;
   } else if (prev_owner == DEFLATER_MARKER) {
@@ -334,21 +349,16 @@ bool ObjectMonitor::TryLockWithContentionMark(JavaThread* locking_thread, Object
       // recognizes that the async deflation was cancelled.
       contention_mark.extend();
       success = true;
-    } else if (prev_owner == nullptr) {
+    } else if (prev_owner == NO_OWNER) {
       // At this point we cannot race with deflation as we have both incremented
       // contentions, seen contention > 0 and seen a DEFLATER_MARKER.
       // success will only be false if this races with something other than
       // deflation.
-      prev_owner = try_set_owner_from(nullptr, locking_thread);
-      success = prev_owner == nullptr;
+      prev_owner = try_set_owner_from(NO_OWNER, locking_thread);
+      success = prev_owner == NO_OWNER;
     }
-  } else if (LockingMode == LM_LEGACY && locking_thread->is_lock_owned((address)prev_owner)) {
-    assert(_recursions == 0, "must be");
-    _recursions = 1;
-    set_owner_from_BasicLock(prev_owner, locking_thread);
-    success = true;
   }
-  assert(!success || owner_raw() == locking_thread, "must be");
+  assert(!success || has_owner(locking_thread), "must be");
 
   return success;
 }
@@ -361,8 +371,8 @@ void ObjectMonitor::enter_for_with_contention_mark(JavaThread* locking_thread, O
   bool success = TryLockWithContentionMark(locking_thread, contention_mark);
 
   assert(success, "Failed to enter_for: locking_thread=" INTPTR_FORMAT
-         ", this=" INTPTR_FORMAT "{owner=" INTPTR_FORMAT "}",
-         p2i(locking_thread), p2i(this), p2i(owner_raw()));
+         ", this=" INTPTR_FORMAT "{owner=" INT64_FORMAT "}",
+         p2i(locking_thread), p2i(this), owner_raw());
 }
 
 bool ObjectMonitor::enter_for(JavaThread* locking_thread) {
@@ -382,9 +392,9 @@ bool ObjectMonitor::enter_for(JavaThread* locking_thread) {
   bool success = TryLockWithContentionMark(locking_thread, contention_mark);
 
   assert(success, "Failed to enter_for: locking_thread=" INTPTR_FORMAT
-         ", this=" INTPTR_FORMAT "{owner=" INTPTR_FORMAT "}",
-         p2i(locking_thread), p2i(this), p2i(owner_raw()));
-  assert(owner_raw() == locking_thread, "must be");
+         ", this=" INTPTR_FORMAT "{owner=" INT64_FORMAT "}",
+         p2i(locking_thread), p2i(this), owner_raw());
+  assert(has_owner(locking_thread), "must be");
   return true;
 }
 
@@ -402,18 +412,11 @@ bool ObjectMonitor::try_enter(JavaThread* current, bool check_for_recursion) {
     return false;
   }
 
-  if (r == TryLockResult::HasOwner && owner() == current) {
+  if (r == TryLockResult::HasOwner && has_owner(current)) {
     _recursions++;
     return true;
   }
 
-  void* cur = owner_raw();
-  if (LockingMode == LM_LEGACY && current->is_lock_owned((address)cur)) {
-    assert(_recursions == 0, "internal state error");
-    _recursions = 1;
-    set_owner_from_BasicLock(cur, current);  // Convert from BasicLock* to Thread*.
-    return true;
-  }
   return false;
 }
 
@@ -436,7 +439,7 @@ bool ObjectMonitor::spin_enter(JavaThread* current) {
   // Note that if we acquire the monitor from an initial spin
   // we forgo posting JVMTI events and firing DTRACE probes.
   if (TrySpin(current)) {
-    assert(owner_raw() == current, "must be current: owner=" INTPTR_FORMAT, p2i(owner_raw()));
+    assert(has_owner(current), "must be current: owner=" INT64_FORMAT, owner_raw());
     assert(_recursions == 0, "must be 0: recursions=" INTX_FORMAT, _recursions);
     assert_mark_word_consistency();
     return true;
@@ -452,8 +455,8 @@ bool ObjectMonitor::enter(JavaThread* current) {
     return true;
   }
 
-  assert(owner_raw() != current, "invariant");
-  assert(_succ != current, "invariant");
+  assert(!has_owner(current), "invariant");
+  assert(!has_successor(current), "invariant");
   assert(!SafepointSynchronize::is_at_safepoint(), "invariant");
   assert(current->thread_state() != _thread_blocked, "invariant");
 
@@ -472,19 +475,22 @@ bool ObjectMonitor::enter(JavaThread* current) {
 
 void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonitorContentionMark &cm) {
   assert(current == JavaThread::current(), "must be");
-  assert(owner_raw() != current, "must be");
+  assert(!has_owner(current), "must be");
   assert(cm._monitor == this, "must be");
   assert(!is_being_async_deflated(), "must be");
 
   JFR_ONLY(JfrConditionalFlush<EventJavaMonitorEnter> flush(current);)
-  EventJavaMonitorEnter event;
-  if (event.is_started()) {
-    event.set_monitorClass(object()->klass());
+  EventJavaMonitorEnter enter_event;
+  if (enter_event.is_started()) {
+    enter_event.set_monitorClass(object()->klass());
     // Set an address that is 'unique enough', such that events close in
     // time and with the same address are likely (but not guaranteed) to
     // belong to the same object.
-    event.set_address((uintptr_t)this);
+    enter_event.set_address((uintptr_t)this);
   }
+  EventVirtualThreadPinned vthread_pinned_event;
+
+  freeze_result result;
 
   { // Change java thread status to indicate blocked on monitor enter.
     JavaThreadBlockedOnMonitorEnterState jtbmes(current, this);
@@ -503,6 +509,30 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
       // ParkEvent associated with this ObjectMonitor.
     }
 
+    ContinuationEntry* ce = current->last_continuation();
+    if (ce != nullptr && ce->is_virtual_thread()) {
+      result = Continuation::try_preempt(current, ce->cont_oop(current));
+      if (result == freeze_ok) {
+        bool acquired = VThreadMonitorEnter(current);
+        if (acquired) {
+          // We actually acquired the monitor while trying to add the vthread to the
+          // _cxq so cancel preemption. We will still go through the preempt stub
+          // but instead of unmounting we will call thaw to continue execution.
+          current->set_preemption_cancelled(true);
+          if (JvmtiExport::should_post_monitor_contended_entered()) {
+            // We are going to call thaw again after this and finish the VMTS
+            // transition so no need to do it here. We will post the event there.
+            current->set_contended_entered_monitor(this);
+          }
+        }
+        current->set_current_pending_monitor(nullptr);
+        DEBUG_ONLY(int state = java_lang_VirtualThread::state(current->vthread()));
+        assert((acquired && current->preemption_cancelled() && state == java_lang_VirtualThread::RUNNING) ||
+               (!acquired && !current->preemption_cancelled() && state == java_lang_VirtualThread::BLOCKING), "invariant");
+        return;
+      }
+    }
+
     OSThreadContendState osts(current->osthread());
 
     assert(current->thread_state() == _thread_in_vm, "invariant");
@@ -523,7 +553,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
       }
       if (!eos.exited()) {
         // ExitOnSuspend did not exit the OM
-        assert(owner_raw() == current, "invariant");
+        assert(has_owner(current), "invariant");
         break;
       }
     }
@@ -536,8 +566,8 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
 
   // Must either set _recursions = 0 or ASSERT _recursions == 0.
   assert(_recursions == 0, "invariant");
-  assert(owner_raw() == current, "invariant");
-  assert(_succ != current, "invariant");
+  assert(has_owner(current), "invariant");
+  assert(!has_successor(current), "invariant");
   assert_mark_word_consistency();
 
   // The thread -- now the owner -- is back in vm mode.
@@ -562,10 +592,17 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
     // event handler consumed an unpark() issued by the thread that
     // just exited the monitor.
   }
-  if (event.should_commit()) {
-    event.set_previousOwner(_previous_owner_tid);
-    event.commit();
+  if (enter_event.should_commit()) {
+    enter_event.set_previousOwner(_previous_owner_tid);
+    enter_event.commit();
   }
+
+  ContinuationEntry* ce = current->last_continuation();
+  if (ce != nullptr && ce->is_virtual_thread()) {
+    assert(result != freeze_ok, "sanity check");
+    current->post_vthread_pinned_event(&vthread_pinned_event, "Contended monitor enter", result);
+  }
+
   OM_PERFDATA_OP(ContendedLockAttempts, inc());
 }
 
@@ -573,8 +610,8 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
 // Callers must compensate as needed.
 
 ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
-  void* own = owner_raw();
-  void* first_own = own;
+  int64_t own = owner_raw();
+  int64_t first_own = own;
 
   for (;;) {
     if (own == DEFLATER_MARKER) {
@@ -593,9 +630,9 @@ ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
         // Deflation won or change of owner; dont spin
         break;
       }
-    } else if (own == nullptr) {
-      void* prev_own = try_set_owner_from(nullptr, current);
-      if (prev_own == nullptr) {
+    } else if (own == NO_OWNER) {
+      int64_t prev_own = try_set_owner_from(NO_OWNER, current);
+      if (prev_own == NO_OWNER) {
         assert(_recursions == 0, "invariant");
         return TryLockResult::Success;
       } else {
@@ -634,7 +671,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
   if (obj == nullptr) {
     // If the object died, we can recycle the monitor without racing with
     // Java threads. The GC already broke the association with the object.
-    set_owner_from(nullptr, DEFLATER_MARKER);
+    set_owner_from_raw(NO_OWNER, DEFLATER_MARKER);
     assert(contentions() >= 0, "must be non-negative: contentions=%d", contentions());
     _contentions = INT_MIN; // minimum negative int
   } else {
@@ -643,7 +680,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
     // Set a null owner to DEFLATER_MARKER to force any contending thread
     // through the slow path. This is just the first part of the async
     // deflation dance.
-    if (try_set_owner_from(nullptr, DEFLATER_MARKER) != nullptr) {
+    if (try_set_owner_from_raw(NO_OWNER, DEFLATER_MARKER) != NO_OWNER) {
       // The owner field is no longer null so we lost the race since the
       // ObjectMonitor is now busy.
       return false;
@@ -654,7 +691,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
       // is_busy() above or has already entered and waited on
       // it which makes it busy so no deflation. Restore owner to
       // null if it is still DEFLATER_MARKER.
-      if (try_set_owner_from(DEFLATER_MARKER, nullptr) != DEFLATER_MARKER) {
+      if (try_set_owner_from_raw(DEFLATER_MARKER, NO_OWNER) != DEFLATER_MARKER) {
         // Deferred decrement for the JT EnterI() that cancelled the async deflation.
         add_to_contentions(-1);
       }
@@ -667,7 +704,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
       // Contentions was no longer 0 so we lost the race since the
       // ObjectMonitor is now busy. Restore owner to null if it is
       // still DEFLATER_MARKER:
-      if (try_set_owner_from(DEFLATER_MARKER, nullptr) != DEFLATER_MARKER) {
+      if (try_set_owner_from_raw(DEFLATER_MARKER, NO_OWNER) != DEFLATER_MARKER) {
         // Deferred decrement for the JT EnterI() that cancelled the async deflation.
         add_to_contentions(-1);
       }
@@ -768,7 +805,7 @@ void ObjectMonitor::install_displaced_markword_in_object(const oop obj) {
 const char* ObjectMonitor::is_busy_to_string(stringStream* ss) {
   ss->print("is_busy: waiters=%d"
             ", contentions=%d"
-            ", owner=" PTR_FORMAT
+            ", owner=" INT64_FORMAT
             ", cxq=" PTR_FORMAT
             ", EntryList=" PTR_FORMAT,
             _waiters,
@@ -776,8 +813,8 @@ const char* ObjectMonitor::is_busy_to_string(stringStream* ss) {
             owner_is_DEFLATER_MARKER()
                 // We report null instead of DEFLATER_MARKER here because is_busy()
                 // ignores DEFLATER_MARKER values.
-                ? p2i(nullptr)
-                : p2i(owner_raw()),
+                ? NO_OWNER
+                : owner_raw(),
             p2i(_cxq),
             p2i(_EntryList));
   return ss->base();
@@ -788,8 +825,8 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   // Try the lock - TATAS
   if (TryLock(current) == TryLockResult::Success) {
-    assert(_succ != current, "invariant");
-    assert(owner_raw() == current, "invariant");
+    assert(!has_successor(current), "invariant");
+    assert(has_owner(current), "invariant");
     return;
   }
 
@@ -803,14 +840,14 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // effects.
 
   if (TrySpin(current)) {
-    assert(owner_raw() == current, "invariant");
-    assert(_succ != current, "invariant");
+    assert(has_owner(current), "invariant");
+    assert(!has_successor(current), "invariant");
     return;
   }
 
   // The Spin failed -- Enqueue and park the thread ...
-  assert(_succ != current, "invariant");
-  assert(owner_raw() != current, "invariant");
+  assert(!has_successor(current), "invariant");
+  assert(!has_owner(current), "invariant");
 
   // Enqueue "current" on ObjectMonitor's _cxq.
   //
@@ -838,8 +875,8 @@ void ObjectMonitor::EnterI(JavaThread* current) {
     // Interference - the CAS failed because _cxq changed.  Just retry.
     // As an optional optimization we retry the lock.
     if (TryLock(current) == TryLockResult::Success) {
-      assert(_succ != current, "invariant");
-      assert(owner_raw() == current, "invariant");
+      assert(!has_successor(current), "invariant");
+      assert(has_owner(current), "invariant");
       return;
     }
   }
@@ -855,15 +892,38 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // to defer the state transitions until absolutely necessary,
   // and in doing so avoid some transitions ...
 
+  // For virtual threads that are pinned, do a timed-park instead to
+  // alleviate some deadlocks cases where the succesor is an unmounted
+  // virtual thread that cannot run. This can happen in particular when
+  // this virtual thread is currently loading/initializing a class, and
+  // all other carriers have a vthread pinned to it waiting for said class
+  // to be loaded/initialized.
+  static int MAX_RECHECK_INTERVAL = 1000;
+  int recheck_interval = 1;
+  bool do_timed_parked = false;
+  ContinuationEntry* ce = current->last_continuation();
+  if (ce != nullptr && ce->is_virtual_thread()) {
+    do_timed_parked = true;
+  }
+
   for (;;) {
 
     if (TryLock(current) == TryLockResult::Success) {
       break;
     }
-    assert(owner_raw() != current, "invariant");
+    assert(!has_owner(current), "invariant");
 
     // park self
-    current->_ParkEvent->park();
+    if (do_timed_parked) {
+      current->_ParkEvent->park((jlong) recheck_interval);
+      // Increase the recheck_interval, but clamp the value.
+      recheck_interval *= 8;
+      if (recheck_interval > MAX_RECHECK_INTERVAL) {
+        recheck_interval = MAX_RECHECK_INTERVAL;
+      }
+    } else {
+      current->_ParkEvent->park();
+    }
 
     if (TryLock(current) == TryLockResult::Success) {
       break;
@@ -893,7 +953,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
     // just spin again.  This pattern can repeat, leaving _succ to simply
     // spin on a CPU.
 
-    if (_succ == current) _succ = nullptr;
+    if (has_successor(current)) clear_successor();
 
     // Invariant: after clearing _succ a thread *must* retry _owner before parking.
     OrderAccess::fence();
@@ -907,11 +967,11 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // The head of cxq is volatile but the interior is stable.
   // In addition, current.TState is stable.
 
-  assert(owner_raw() == current, "invariant");
+  assert(has_owner(current), "invariant");
 
   UnlinkAfterAcquire(current, &node);
-  if (_succ == current) {
-    _succ = nullptr;
+  if (has_successor(current)) {
+    clear_successor();
     // Note that we don't need to do OrderAccess::fence() after clearing
     // _succ here, since we own the lock.
   }
@@ -958,7 +1018,7 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
   for (;;) {
     ObjectWaiter::TStates v = currentNode->TState;
     guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
-    assert(owner_raw() != current, "invariant");
+    assert(!has_owner(current), "invariant");
 
     // This thread has been notified so try to reacquire the lock.
     if (TryLock(current) == TryLockResult::Success) {
@@ -994,7 +1054,7 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
 
     // Assuming this is not a spurious wakeup we'll normally
     // find that _succ == current.
-    if (_succ == current) _succ = nullptr;
+    if (has_successor(current)) clear_successor();
 
     // Invariant: after clearing _succ a contending thread
     // *must* retry  _owner before parking.
@@ -1017,22 +1077,152 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
   // The head of cxq is volatile but the interior is stable.
   // In addition, current.TState is stable.
 
-  assert(owner_raw() == current, "invariant");
+  assert(has_owner(current), "invariant");
   assert_mark_word_consistency();
   UnlinkAfterAcquire(current, currentNode);
-  if (_succ == current) _succ = nullptr;
-  assert(_succ != current, "invariant");
+  if (has_successor(current)) clear_successor();
+  assert(!has_successor(current), "invariant");
   currentNode->TState = ObjectWaiter::TS_RUN;
   OrderAccess::fence();      // see comments at the end of EnterI()
 }
 
+// This method is called from two places:
+// - On monitorenter contention with a null waiter.
+// - After Object.wait() times out or the target is interrupted to reenter the
+//   monitor, with the existing waiter.
+// For the Object.wait() case we do not delete the ObjectWaiter in case we
+// succesfully acquire the monitor since we are going to need it on return.
+bool ObjectMonitor::VThreadMonitorEnter(JavaThread* current, ObjectWaiter* waiter) {
+  if (TryLock(current) == TryLockResult::Success) {
+    assert(has_owner(current), "invariant");
+    assert(!has_successor(current), "invariant");
+    return true;
+  }
+
+  oop vthread = current->vthread();
+  ObjectWaiter* node = waiter != nullptr ? waiter : new ObjectWaiter(vthread, this);
+  node->_prev   = (ObjectWaiter*) 0xBAD;
+  node->TState  = ObjectWaiter::TS_CXQ;
+
+  // Push node associated with vthread onto the front of the _cxq.
+  ObjectWaiter* nxt;
+  for (;;) {
+    node->_next = nxt = _cxq;
+    if (Atomic::cmpxchg(&_cxq, nxt, node) == nxt) break;
+
+    // Interference - the CAS failed because _cxq changed.  Just retry.
+    // As an optional optimization we retry the lock.
+    if (TryLock(current) == TryLockResult::Success) {
+      assert(has_owner(current), "invariant");
+      assert(!has_successor(current), "invariant");
+      if (waiter == nullptr) delete node;  // for Object.wait() don't delete yet
+      return true;
+    }
+  }
+
+  // We have to try once more since owner could have exited monitor and checked
+  // _cxq before we added the node to the queue.
+  if (TryLock(current) == TryLockResult::Success) {
+    assert(has_owner(current), "invariant");
+    UnlinkAfterAcquire(current, node);
+    if (has_successor(current)) clear_successor();
+    if (waiter == nullptr) delete node;  // for Object.wait() don't delete yet
+    return true;
+  }
+
+  assert(java_lang_VirtualThread::state(vthread) == java_lang_VirtualThread::RUNNING, "wrong state for vthread");
+  java_lang_VirtualThread::set_state(vthread, java_lang_VirtualThread::BLOCKING);
+
+  // We didn't succeed in acquiring the monitor so increment _contentions and
+  // save ObjectWaiter* in the chunk since we will need it when resuming execution.
+  add_to_contentions(1);
+  oop cont = java_lang_VirtualThread::continuation(vthread);
+  stackChunkOop chunk  = jdk_internal_vm_Continuation::tail(cont);
+  chunk->set_object_waiter(node);
+  return false;
+}
+
+// Called from thaw code to resume the monitor operation that caused the vthread
+// to be unmounted. Method returns true if the monitor is successfully acquired,
+// which marks the end of the monitor operation, otherwise it returns false.
+bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont) {
+  assert(java_lang_VirtualThread::state(current->vthread()) == java_lang_VirtualThread::RUNNING, "wrong state for vthread");
+  assert(!has_owner(current), "");
+
+  if (node->is_wait() && !node->at_reenter()) {
+    bool acquired_monitor = VThreadWaitReenter(current, node, cont);
+    if (acquired_monitor) return true;
+  }
+
+  // Retry acquiring monitor...
+
+  int state = node->TState;
+  guarantee(state == ObjectWaiter::TS_ENTER || state == ObjectWaiter::TS_CXQ, "invariant");
+
+  if (TryLock(current) == TryLockResult::Success) {
+    VThreadEpilog(current, node);
+    return true;
+  }
+
+  oop vthread = current->vthread();
+  if (has_successor(current)) clear_successor();
+
+  // Invariant: after clearing _succ a thread *must* retry acquiring the monitor.
+  OrderAccess::fence();
+
+  if (TryLock(current) == TryLockResult::Success) {
+    VThreadEpilog(current, node);
+    return true;
+  }
+
+  // We will return to Continuation.run() and unmount so set the right state.
+  java_lang_VirtualThread::set_state(vthread, java_lang_VirtualThread::BLOCKING);
+
+  return false;
+}
+
+void ObjectMonitor::VThreadEpilog(JavaThread* current, ObjectWaiter* node) {
+  assert(has_owner(current), "invariant");
+  add_to_contentions(-1);
+
+  if (has_successor(current)) clear_successor();
+
+  guarantee(_recursions == 0, "invariant");
+
+  if (node->is_wait()) {
+    _recursions = node->_recursions;   // restore the old recursion count
+    _waiters--;                        // decrement the number of waiters
+
+    if (node->_interrupted) {
+      // We will throw at thaw end after finishing the mount transition.
+      current->set_pending_interrupted_exception(true);
+    }
+  }
+
+  UnlinkAfterAcquire(current, node);
+  delete node;
+
+  // Remove the ObjectWaiter* from the stackChunk.
+  oop vthread = current->vthread();
+  oop cont = java_lang_VirtualThread::continuation(vthread);
+  stackChunkOop chunk  = jdk_internal_vm_Continuation::tail(cont);
+  chunk->set_object_waiter(nullptr);
+
+  if (JvmtiExport::should_post_monitor_contended_entered()) {
+    // We are going to call thaw again after this and finish the VMTS
+    // transition so no need to do it here. We will post the event there.
+    current->set_contended_entered_monitor(this);
+  }
+}
+
 // By convention we unlink a contending thread from EntryList|cxq immediately
 // after the thread acquires the lock in ::enter().  Equally, we could defer
 // unlinking the thread until ::exit()-time.
 
 void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* currentNode) {
-  assert(owner_raw() == current, "invariant");
-  assert(currentNode->_thread == current, "invariant");
+  assert(has_owner(current), "invariant");
+  assert((!currentNode->is_vthread() && currentNode->thread() == current) ||
+         (currentNode->is_vthread() && currentNode->vthread() == current->vthread()), "invariant");
 
   if (currentNode->TState == ObjectWaiter::TS_ENTER) {
     // Normal case: remove current from the DLL EntryList .
@@ -1151,32 +1341,25 @@ void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* curren
 // of such futile wakups is low.
 
 void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
-  void* cur = owner_raw();
-  if (current != cur) {
-    if (LockingMode != LM_LIGHTWEIGHT && current->is_lock_owned((address)cur)) {
-      assert(_recursions == 0, "invariant");
-      set_owner_from_BasicLock(cur, current);  // Convert from BasicLock* to Thread*.
-      _recursions = 0;
-    } else {
-      // Apparent unbalanced locking ...
-      // Naively we'd like to throw IllegalMonitorStateException.
-      // As a practical matter we can neither allocate nor throw an
-      // exception as ::exit() can be called from leaf routines.
-      // see x86_32.ad Fast_Unlock() and the I1 and I2 properties.
-      // Upon deeper reflection, however, in a properly run JVM the only
-      // way we should encounter this situation is in the presence of
-      // unbalanced JNI locking. TODO: CheckJNICalls.
-      // See also: CR4414101
+  if (!has_owner(current)) {
+    // Apparent unbalanced locking ...
+    // Naively we'd like to throw IllegalMonitorStateException.
+    // As a practical matter we can neither allocate nor throw an
+    // exception as ::exit() can be called from leaf routines.
+    // see x86_32.ad Fast_Unlock() and the I1 and I2 properties.
+    // Upon deeper reflection, however, in a properly run JVM the only
+    // way we should encounter this situation is in the presence of
+    // unbalanced JNI locking. TODO: CheckJNICalls.
+    // See also: CR4414101
 #ifdef ASSERT
-      LogStreamHandle(Error, monitorinflation) lsh;
-      lsh.print_cr("ERROR: ObjectMonitor::exit(): thread=" INTPTR_FORMAT
-                    " is exiting an ObjectMonitor it does not own.", p2i(current));
-      lsh.print_cr("The imbalance is possibly caused by JNI locking.");
-      print_debug_style_on(&lsh);
-      assert(false, "Non-balanced monitor enter/exit!");
+    LogStreamHandle(Error, monitorinflation) lsh;
+    lsh.print_cr("ERROR: ObjectMonitor::exit(): thread=" INTPTR_FORMAT
+                  " is exiting an ObjectMonitor it does not own.", p2i(current));
+    lsh.print_cr("The imbalance is possibly caused by JNI locking.");
+    print_debug_style_on(&lsh);
+    assert(false, "Non-balanced monitor enter/exit!");
 #endif
-      return;
-    }
+    return;
   }
 
   if (_recursions != 0) {
@@ -1193,18 +1376,18 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
 #endif
 
   for (;;) {
-    assert(current == owner_raw(), "invariant");
+    assert(has_owner(current), "invariant");
 
     // Drop the lock.
     // release semantics: prior loads and stores from within the critical section
     // must not float (reorder) past the following store that drops the lock.
     // Uses a storeload to separate release_store(owner) from the
-    // successor check. The try_set_owner() below uses cmpxchg() so
+    // successor check. The try_set_owner_from() below uses cmpxchg() so
     // we get the fence down there.
     release_clear_owner(current);
     OrderAccess::storeload();
 
-    if ((intptr_t(_EntryList)|intptr_t(_cxq)) == 0 || _succ != nullptr) {
+    if ((intptr_t(_EntryList)|intptr_t(_cxq)) == 0 || has_successor()) {
       return;
     }
     // Other threads are blocked trying to acquire the lock.
@@ -1246,7 +1429,7 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
       return;
     }
 
-    guarantee(owner_raw() == current, "invariant");
+    guarantee(has_owner(current), "invariant");
 
     ObjectWaiter* w = nullptr;
 
@@ -1311,7 +1494,7 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
     // See if we can abdicate to a spinner instead of waking a thread.
     // A primary goal of the implementation is to reduce the
     // context-switch rate.
-    if (_succ != nullptr) continue;
+    if (has_successor()) continue;
 
     w = _EntryList;
     if (w != nullptr) {
@@ -1323,7 +1506,7 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
 }
 
 void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
-  assert(owner_raw() == current, "invariant");
+  assert(has_owner(current), "invariant");
 
   // Exit protocol:
   // 1. ST _succ = wakee
@@ -1331,8 +1514,19 @@ void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
   // 2. ST _owner = nullptr
   // 3. unpark(wakee)
 
-  _succ = Wakee->_thread;
-  ParkEvent * Trigger = Wakee->_event;
+  oop vthread = nullptr;
+  ParkEvent * Trigger;
+  if (!Wakee->is_vthread()) {
+    JavaThread* t = Wakee->thread();
+    assert(t != nullptr, "");
+    Trigger = t->_ParkEvent;
+    set_successor(t);
+  } else {
+    vthread = Wakee->vthread();
+    assert(vthread != nullptr, "");
+    Trigger = ObjectMonitor::vthread_unparker_ParkEvent();
+    set_successor(vthread);
+  }
 
   // Hygiene -- once we've set _owner = nullptr we can't safely dereference Wakee again.
   // The thread associated with Wakee may have grabbed the lock and "Wakee" may be
@@ -1345,34 +1539,29 @@ void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
   OrderAccess::fence();
 
   DTRACE_MONITOR_PROBE(contended__exit, this, object(), current);
-  Trigger->unpark();
+
+  if (vthread == nullptr) {
+    // Platform thread case.
+    Trigger->unpark();
+  } else if (java_lang_VirtualThread::set_onWaitingList(vthread, vthread_cxq_head())) {
+    // Virtual thread case.
+    Trigger->unpark();
+  }
 
   // Maintain stats and report events to JVMTI
   OM_PERFDATA_OP(Parks, inc());
 }
 
-// complete_exit exits a lock returning recursion count
-// complete_exit requires an inflated monitor
-// The _owner field is not always the Thread addr even with an
-// inflated monitor, e.g. the monitor can be inflated by a non-owning
-// thread due to contention.
+// Exits the monitor returning recursion count. _owner should
+// be set to current's tid, i.e. no ANONYMOUS_OWNER allowed.
 intx ObjectMonitor::complete_exit(JavaThread* current) {
   assert(InitDone, "Unexpectedly not initialized");
+  guarantee(has_owner(current), "complete_exit not owner");
 
-  void* cur = owner_raw();
-  if (current != cur) {
-    if (LockingMode != LM_LIGHTWEIGHT && current->is_lock_owned((address)cur)) {
-      assert(_recursions == 0, "internal state error");
-      set_owner_from_BasicLock(cur, current);  // Convert from BasicLock* to Thread*.
-      _recursions = 0;
-    }
-  }
-
-  guarantee(current == owner_raw(), "complete_exit not owner");
   intx save = _recursions; // record the old recursion count
   _recursions = 0;         // set the recursion level to be 0
   exit(current);           // exit the monitor
-  guarantee(owner_raw() != current, "invariant");
+  guarantee(!has_owner(current), "invariant");
   return save;
 }
 
@@ -1395,14 +1584,8 @@ intx ObjectMonitor::complete_exit(JavaThread* current) {
 // is not the owner, that exception will be replaced by the IMSE.
 bool ObjectMonitor::check_owner(TRAPS) {
   JavaThread* current = THREAD;
-  void* cur = owner_raw();
-  assert(cur != anon_owner_ptr(), "no anon owner here");
-  if (cur == current) {
-    return true;
-  }
-  if (LockingMode != LM_LIGHTWEIGHT && current->is_lock_owned((address)cur)) {
-    set_owner_from_BasicLock(cur, current);  // Convert from BasicLock* to Thread*.
-    _recursions = 0;
+  int64_t cur = owner_raw();
+  if (cur == owner_from(current)) {
     return true;
   }
   THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
@@ -1437,6 +1620,32 @@ static void post_monitor_wait_event(EventJavaMonitorWait* event,
   event->commit();
 }
 
+static void vthread_monitor_waited_event(JavaThread *current, ObjectWaiter* node, ContinuationWrapper& cont, EventJavaMonitorWait* event, jboolean timed_out) {
+  // Since we might safepoint set the anchor so that the stack can we walked.
+  assert(current->last_continuation() != nullptr, "");
+  JavaFrameAnchor* anchor = current->frame_anchor();
+  anchor->set_last_Java_sp(current->last_continuation()->entry_sp());
+  anchor->set_last_Java_pc(current->last_continuation()->entry_pc());
+
+  ContinuationWrapper::SafepointOp so(current, cont);
+
+  JRT_BLOCK
+    if (event->should_commit()) {
+      long timeout = java_lang_VirtualThread::timeout(current->vthread());
+      post_monitor_wait_event(event, node->_monitor, node->_notifier_tid, timeout, timed_out);
+    }
+    if (JvmtiExport::should_post_monitor_waited()) {
+      // We mark this call in case of an upcall to Java while posting the event.
+      // If somebody walks the stack in that case, processing the enterSpecial
+      // frame should not include processing callee arguments since there is no
+      // actual callee (see nmethod::preserve_callee_argument_oops()).
+      ThreadOnMonitorWaitedEvent tmwe(current);
+      JvmtiExport::vthread_post_monitor_waited(current, node->_monitor, timed_out);
+    }
+  JRT_BLOCK_END
+  current->frame_anchor()->clear();
+}
+
 // -----------------------------------------------------------------------------
 // Wait/Notify/NotifyAll
 //
@@ -1449,7 +1658,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 
   CHECK_OWNER();  // Throws IMSE if not owner.
 
-  EventJavaMonitorWait event;
+  EventJavaMonitorWait wait_event;
+  EventVirtualThreadPinned vthread_pinned_event;
 
   // check for a pending interrupt
   if (interruptible && current->is_interrupted(true) && !HAS_PENDING_EXCEPTION) {
@@ -1467,8 +1677,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       // consume an unpark() meant for the ParkEvent associated with
       // this ObjectMonitor.
     }
-    if (event.should_commit()) {
-      post_monitor_wait_event(&event, this, 0, millis, false);
+    if (wait_event.should_commit()) {
+      post_monitor_wait_event(&wait_event, this, 0, millis, false);
     }
     THROW(vmSymbols::java_lang_InterruptedException());
     return;
@@ -1476,6 +1686,17 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 
   current->set_current_waiting_monitor(this);
 
+  freeze_result result;
+  ContinuationEntry* ce = current->last_continuation();
+  if (ce != nullptr && ce->is_virtual_thread()) {
+    result = Continuation::try_preempt(current, ce->cont_oop(current));
+    if (result == freeze_ok) {
+      VThreadWait(current, millis);
+      current->set_current_waiting_monitor(nullptr);
+      return;
+    }
+  }
+
   // create a node to be put into the queue
   // Critically, after we reset() the event but prior to park(), we must check
   // for a pending interrupt.
@@ -1499,7 +1720,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   _waiters++;                  // increment the number of waiters
   _recursions = 0;             // set the recursion level to be 1
   exit(current);               // exit the monitor
-  guarantee(owner_raw() != current, "invariant");
+  guarantee(!has_owner(current), "invariant");
 
   // The thread is on the WaitSet list - now park() it.
   // On MP systems it's conceivable that a brief spin before we park
@@ -1525,7 +1746,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       ThreadBlockInVMPreprocess<ClearSuccOnSuspend> tbivs(current, csos, true /* allow_suspend */);
       if (interrupted || HAS_PENDING_EXCEPTION) {
         // Intentionally empty
-      } else if (node._notified == 0) {
+      } else if (!node._notified) {
         if (millis <= 0) {
           current->_ParkEvent->park();
         } else {
@@ -1553,7 +1774,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       Thread::SpinAcquire(&_WaitSetLock, "WaitSet - unlink");
       if (node.TState == ObjectWaiter::TS_WAIT) {
         DequeueSpecificWaiter(&node);       // unlink from WaitSet
-        assert(node._notified == 0, "invariant");
+        assert(!node._notified, "invariant");
         node.TState = ObjectWaiter::TS_RUN;
       }
       Thread::SpinRelease(&_WaitSetLock);
@@ -1565,7 +1786,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     // No other threads will asynchronously modify TState.
     guarantee(node.TState != ObjectWaiter::TS_WAIT, "invariant");
     OrderAccess::loadload();
-    if (_succ == current) _succ = nullptr;
+    if (has_successor(current)) clear_successor();
     WasNotified = node._notified;
 
     // Reentry phase -- reacquire the monitor.
@@ -1579,7 +1800,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     if (JvmtiExport::should_post_monitor_waited()) {
       JvmtiExport::post_monitor_waited(current, this, ret == OS_TIMEOUT);
 
-      if (node._notified != 0 && _succ == current) {
+      if (node._notified && has_successor(current)) {
         // In this part of the monitor wait-notify-reenter protocol it
         // is possible (and normal) for another thread to do a fastpath
         // monitor enter-exit while this thread is still trying to get
@@ -1595,19 +1816,28 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
         // We redo the unpark() to ensure forward progress, i.e., we
         // don't want all pending threads hanging (parked) with none
         // entering the unlocked monitor.
-        node._event->unpark();
+        current->_ParkEvent->unpark();
       }
     }
 
-    if (event.should_commit()) {
-      post_monitor_wait_event(&event, this, node._notifier_tid, millis, ret == OS_TIMEOUT);
+    if (wait_event.should_commit()) {
+      post_monitor_wait_event(&wait_event, this, node._notifier_tid, millis, ret == OS_TIMEOUT);
+    }
+
+    if (ce != nullptr && ce->is_virtual_thread()) {
+      assert(result != freeze_ok, "sanity check");
+      current->post_vthread_pinned_event(&vthread_pinned_event, "Object.wait", result);
     }
 
     OrderAccess::fence();
 
-    assert(owner_raw() != current, "invariant");
+    assert(!has_owner(current), "invariant");
     ObjectWaiter::TStates v = node.TState;
     if (v == ObjectWaiter::TS_RUN) {
+      // We use the NoPreemptMark for the very rare case where the previous
+      // preempt attempt failed due to OOM. The preempt on monitor contention
+      // could succeed but we can't unmount now.
+      NoPreemptMark npm(current);
       enter(current);
     } else {
       guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
@@ -1620,8 +1850,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     // Node is about to go out-of-scope, but even if it were immortal we wouldn't
     // want residual elements associated with this thread left on any lists.
     guarantee(node.TState == ObjectWaiter::TS_RUN, "invariant");
-    assert(owner_raw() == current, "invariant");
-    assert(_succ != current, "invariant");
+    assert(has_owner(current), "invariant");
+    assert(!has_successor(current), "invariant");
   } // OSThreadWaitState()
 
   current->set_current_waiting_monitor(nullptr);
@@ -1634,8 +1864,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   _waiters--;             // decrement the number of waiters
 
   // Verify a few postconditions
-  assert(owner_raw() == current, "invariant");
-  assert(_succ != current, "invariant");
+  assert(has_owner(current), "invariant");
+  assert(!has_successor(current), "invariant");
   assert_mark_word_consistency();
 
   // check if the notification happened
@@ -1651,7 +1881,6 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   // Monitor notify has precedence over thread interrupt.
 }
 
-
 // Consider:
 // If the lock is cool (cxq == null && succ == null) and we're on an MP system
 // then instead of transferring a thread from the WaitSet to the EntryList
@@ -1662,16 +1891,32 @@ void ObjectMonitor::INotify(JavaThread* current) {
   ObjectWaiter* iterator = DequeueWaiter();
   if (iterator != nullptr) {
     guarantee(iterator->TState == ObjectWaiter::TS_WAIT, "invariant");
-    guarantee(iterator->_notified == 0, "invariant");
+    guarantee(!iterator->_notified, "invariant");
     // Disposition - what might we do with iterator ?
     // a.  add it directly to the EntryList - either tail (policy == 1)
     //     or head (policy == 0).
     // b.  push it onto the front of the _cxq (policy == 2).
     // For now we use (b).
 
+    if (iterator->is_vthread()) {
+      oop vthread = iterator->vthread();
+      java_lang_VirtualThread::set_notified(vthread, true);
+      int old_state = java_lang_VirtualThread::state(vthread);
+      // If state is not WAIT/TIMED_WAIT then target could still be on
+      // unmount transition, or wait could have already timed-out or target
+      // could have been interrupted. In the first case, the target itself
+      // will set the state to BLOCKED at the end of the unmount transition.
+      // In the other cases the target would have been already unblocked so
+      // there is nothing to do.
+      if (old_state == java_lang_VirtualThread::WAIT ||
+          old_state == java_lang_VirtualThread::TIMED_WAIT) {
+        java_lang_VirtualThread::cmpxchg_state(vthread, old_state, java_lang_VirtualThread::BLOCKED);
+      }
+    }
+
     iterator->TState = ObjectWaiter::TS_ENTER;
 
-    iterator->_notified = 1;
+    iterator->_notified = true;
     iterator->_notifier_tid = JFR_THREAD_ID(current);
 
     ObjectWaiter* list = _EntryList;
@@ -1704,7 +1949,9 @@ void ObjectMonitor::INotify(JavaThread* current) {
     // on _WaitSetLock so it's not profitable to reduce the length of the
     // critical section.
 
-    iterator->wait_reenter_begin(this);
+    if (!iterator->is_vthread()) {
+      iterator->wait_reenter_begin(this);
+    }
   }
   Thread::SpinRelease(&_WaitSetLock);
 }
@@ -1755,6 +2002,94 @@ void ObjectMonitor::notifyAll(TRAPS) {
   OM_PERFDATA_OP(Notifications, inc(tally));
 }
 
+void ObjectMonitor::VThreadWait(JavaThread* current, jlong millis) {
+  oop vthread = current->vthread();
+  ObjectWaiter* node = new ObjectWaiter(vthread, this);
+  node->_is_wait = true;
+  node->TState = ObjectWaiter::TS_WAIT;
+  java_lang_VirtualThread::set_notified(vthread, false);  // Reset notified flag
+
+  // Enter the waiting queue, which is a circular doubly linked list in this case
+  // but it could be a priority queue or any data structure.
+  // _WaitSetLock protects the wait queue.  Normally the wait queue is accessed only
+  // by the owner of the monitor *except* in the case where park()
+  // returns because of a timeout or interrupt.  Contention is exceptionally rare
+  // so we use a simple spin-lock instead of a heavier-weight blocking lock.
+
+  Thread::SpinAcquire(&_WaitSetLock, "WaitSet - add");
+  AddWaiter(node);
+  Thread::SpinRelease(&_WaitSetLock);
+
+  node->_recursions = _recursions;   // record the old recursion count
+  _recursions = 0;                   // set the recursion level to be 0
+  _waiters++;                        // increment the number of waiters
+  exit(current);                     // exit the monitor
+  guarantee(!has_owner(current), "invariant");
+
+  assert(java_lang_VirtualThread::state(vthread) == java_lang_VirtualThread::RUNNING, "wrong state for vthread");
+  java_lang_VirtualThread::set_state(vthread, millis == 0 ? java_lang_VirtualThread::WAITING : java_lang_VirtualThread::TIMED_WAITING);
+  java_lang_VirtualThread::set_timeout(vthread, millis);
+
+  // Save the ObjectWaiter* in the chunk since we will need it when resuming execution.
+  oop cont = java_lang_VirtualThread::continuation(vthread);
+  stackChunkOop chunk  = jdk_internal_vm_Continuation::tail(cont);
+  chunk->set_object_waiter(node);
+}
+
+bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont) {
+  // The first time we run after being preempted on Object.wait() we
+  // need to check if we were interrupted or the wait timed-out, and
+  // in that case remove ourselves from the _WaitSet queue.
+  if (node->TState == ObjectWaiter::TS_WAIT) {
+    Thread::SpinAcquire(&_WaitSetLock, "WaitSet - unlink");
+    if (node->TState == ObjectWaiter::TS_WAIT) {
+      DequeueSpecificWaiter(node);       // unlink from WaitSet
+      assert(!node->_notified, "invariant");
+      node->TState = ObjectWaiter::TS_RUN;
+    }
+    Thread::SpinRelease(&_WaitSetLock);
+  }
+
+  // If this was an interrupted case, set the _interrupted boolean so that
+  // once we re-acquire the monitor we know if we need to throw IE or not.
+  ObjectWaiter::TStates state = node->TState;
+  bool was_notified = state == ObjectWaiter::TS_ENTER || state == ObjectWaiter::TS_CXQ;
+  assert(was_notified || state == ObjectWaiter::TS_RUN, "");
+  node->_interrupted = !was_notified && current->is_interrupted(false);
+
+  // Post JFR and JVMTI events.
+  EventJavaMonitorWait wait_event;
+  if (wait_event.should_commit() || JvmtiExport::should_post_monitor_waited()) {
+    vthread_monitor_waited_event(current, node, cont, &wait_event, !was_notified && !node->_interrupted);
+  }
+
+  // Mark that we are at reenter so that we don't call this method again.
+  node->_at_reenter = true;
+
+  if (!was_notified) {
+    bool acquired = VThreadMonitorEnter(current, node);
+    if (acquired) {
+      guarantee(_recursions == 0, "invariant");
+      _recursions = node->_recursions;   // restore the old recursion count
+      _waiters--;                        // decrement the number of waiters
+
+      if (node->_interrupted) {
+        // We will throw at thaw end after finishing the mount transition.
+        current->set_pending_interrupted_exception(true);
+      }
+
+      delete node;
+      stackChunkOop chunk  = cont.tail();
+      chunk->set_object_waiter(nullptr);
+      return true;
+    }
+  } else {
+    // Already moved to _cxq or _EntryList by notifier, so just add to contentions.
+    add_to_contentions(1);
+  }
+  return false;
+}
+
 // -----------------------------------------------------------------------------
 // Adaptive Spinning Support
 //
@@ -1908,10 +2243,10 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
   // CONSIDER: use Prefetch::write() to avoid RTS->RTO upgrades
   // when preparing to LD...CAS _owner, etc and the CAS is likely
   // to succeed.
-  if (_succ == nullptr) {
-    _succ = current;
+  if (!has_successor()) {
+    set_successor(current);
   }
-  Thread* prv = nullptr;
+  int64_t prv = NO_OWNER;
 
   // There are three ways to exit the following loop:
   // 1.  A successful spin where this thread has acquired the lock.
@@ -1949,14 +2284,14 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
     // the spin without prejudice or apply a "penalty" to the
     // spin count-down variable "ctr", reducing it by 100, say.
 
-    JavaThread* ox = static_cast<JavaThread*>(owner_raw());
-    if (ox == nullptr) {
-      ox = static_cast<JavaThread*>(try_set_owner_from(nullptr, current));
-      if (ox == nullptr) {
+    int64_t ox = owner_raw();
+    if (ox == NO_OWNER) {
+      ox = try_set_owner_from(NO_OWNER, current);
+      if (ox == NO_OWNER) {
         // The CAS succeeded -- this thread acquired ownership
         // Take care of some bookkeeping to exit spin state.
-        if (_succ == current) {
-          _succ = nullptr;
+        if (has_successor(current)) {
+          clear_successor();
         }
 
         // Increase _SpinDuration :
@@ -1979,13 +2314,13 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
     }
 
     // Did lock ownership change hands ?
-    if (ox != prv && prv != nullptr) {
+    if (ox != prv && prv != NO_OWNER) {
       break;
     }
     prv = ox;
 
-    if (_succ == nullptr) {
-      _succ = current;
+    if (!has_successor()) {
+      set_successor(current);
     }
   }
 
@@ -1994,8 +2329,8 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
     _SpinDuration = adjust_down(_SpinDuration);
   }
 
-  if (_succ == current) {
-    _succ = nullptr;
+  if (has_successor(current)) {
+    clear_successor();
     // Invariant: after setting succ=null a contending thread
     // must recheck-retry _owner before parking.  This usually happens
     // in the normal usage of TrySpin(), but it's safest
@@ -2016,13 +2351,33 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
 ObjectWaiter::ObjectWaiter(JavaThread* current) {
   _next     = nullptr;
   _prev     = nullptr;
-  _notified = 0;
+  _thread   = current;
+  _monitor  = nullptr;
   _notifier_tid = 0;
+  _recursions = 0;
   TState    = TS_RUN;
-  _thread   = current;
-  _event    = _thread->_ParkEvent;
+  _notified = false;
+  _is_wait  = false;
+  _at_reenter = false;
+  _interrupted = false;
   _active   = false;
-  assert(_event != nullptr, "invariant");
+}
+
+ObjectWaiter::ObjectWaiter(oop vthread, ObjectMonitor* mon) : ObjectWaiter(nullptr) {
+  assert(oopDesc::is_oop(vthread), "");
+  _vthread = OopHandle(JavaThread::thread_oop_storage(), vthread);
+  _monitor = mon;
+}
+
+ObjectWaiter::~ObjectWaiter() {
+  if (is_vthread()) {
+    assert(vthread() != nullptr, "");
+    _vthread.release(JavaThread::thread_oop_storage());
+  }
+}
+
+oop ObjectWaiter::vthread() const {
+  return _vthread.resolve();
 }
 
 void ObjectWaiter::wait_reenter_begin(ObjectMonitor * const mon) {
@@ -2140,12 +2495,18 @@ void ObjectMonitor::Initialize() {
   DEBUG_ONLY(InitDone = true;)
 }
 
+// We can't call this during Initialize() because BarrierSet needs to be set.
+void ObjectMonitor::Initialize2() {
+  _vthread_cxq_head = OopHandle(JavaThread::thread_oop_storage(), nullptr);
+  _vthread_unparker_ParkEvent = ParkEvent::Allocate(nullptr);
+}
+
 void ObjectMonitor::print_on(outputStream* st) const {
   // The minimal things to print for markWord printing, more can be added for debugging and logging.
   st->print("{contentions=0x%08x,waiters=0x%08x"
-            ",recursions=" INTX_FORMAT ",owner=" INTPTR_FORMAT "}",
+            ",recursions=" INTX_FORMAT ",owner=" INT64_FORMAT "}",
             contentions(), waiters(), recursions(),
-            p2i(owner()));
+            owner());
 }
 void ObjectMonitor::print() const { print_on(tty); }
 
@@ -2188,7 +2549,7 @@ void ObjectMonitor::print_debug_style_on(outputStream* st) const {
   st->print_cr("    ...");
   st->print_cr("    [%d] = '\\0'", (int)sizeof(_pad_buf0) - 1);
   st->print_cr("  }");
-  st->print_cr("  _owner = " INTPTR_FORMAT, p2i(owner_raw()));
+  st->print_cr("  _owner = " INT64_FORMAT, owner_raw());
   st->print_cr("  _previous_owner_tid = " UINT64_FORMAT, _previous_owner_tid);
   st->print_cr("  _pad_buf1 = {");
   st->print_cr("    [0] = '\\0'");
@@ -2199,7 +2560,7 @@ void ObjectMonitor::print_debug_style_on(outputStream* st) const {
   st->print_cr("  _recursions = " INTX_FORMAT, _recursions);
   st->print_cr("  _EntryList = " INTPTR_FORMAT, p2i(_EntryList));
   st->print_cr("  _cxq = " INTPTR_FORMAT, p2i(_cxq));
-  st->print_cr("  _succ = " INTPTR_FORMAT, p2i(_succ));
+  st->print_cr("  _succ = " INT64_FORMAT, successor());
   st->print_cr("  _SpinDuration = %d", _SpinDuration);
   st->print_cr("  _contentions = %d", contentions());
   st->print_cr("  _WaitSet = " INTPTR_FORMAT, p2i(_WaitSet));
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 30d2e509416..c205eedf684 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -28,34 +28,48 @@
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
 #include "oops/markWord.hpp"
+#include "oops/oopHandle.hpp"
 #include "oops/weakHandle.hpp"
+#include "runtime/javaThread.hpp"
 #include "runtime/perfDataTypes.hpp"
 #include "utilities/checkedCast.hpp"
 
 class ObjectMonitor;
 class ObjectMonitorContentionMark;
 class ParkEvent;
+class BasicLock;
+class ContinuationWrapper;
 
-// ObjectWaiter serves as a "proxy" or surrogate thread.
-// TODO-FIXME: Eliminate ObjectWaiter and use the thread-specific
-// ParkEvent instead.  Beware, however, that the JVMTI code
-// knows about ObjectWaiters, so we'll have to reconcile that code.
-// See next_waiter(), first_waiter(), etc.
 
-class ObjectWaiter : public StackObj {
+class ObjectWaiter : public CHeapObj<mtThread> {
  public:
-  enum TStates { TS_UNDEF, TS_READY, TS_RUN, TS_WAIT, TS_ENTER, TS_CXQ };
+  enum TStates : uint8_t { TS_UNDEF, TS_READY, TS_RUN, TS_WAIT, TS_ENTER, TS_CXQ };
   ObjectWaiter* volatile _next;
   ObjectWaiter* volatile _prev;
-  JavaThread*   _thread;
-  uint64_t      _notifier_tid;
-  ParkEvent *   _event;
-  volatile int  _notified;
+  JavaThread*     _thread;
+  OopHandle      _vthread;
+  ObjectMonitor* _monitor;
+  uint64_t  _notifier_tid;
+  int         _recursions;
   volatile TStates TState;
-  bool          _active;           // Contention monitoring is enabled
+  volatile bool _notified;
+  bool           _is_wait;
+  bool        _at_reenter;
+  bool       _interrupted;
+  bool            _active;    // Contention monitoring is enabled
  public:
   ObjectWaiter(JavaThread* current);
-
+  ObjectWaiter(oop vthread, ObjectMonitor* mon);
+  ~ObjectWaiter();
+  JavaThread* thread()      const { return _thread; }
+  bool is_vthread()         const { return _thread == nullptr; }
+  uint8_t state()           const { return TState; }
+  ObjectMonitor* monitor()  const { return _monitor; }
+  bool is_wait()            const { return _is_wait; }
+  bool notified()           const { return _notified; }
+  bool at_reenter()         const { return _at_reenter; }
+  bool at_monitorenter()    const { return !_is_wait || _at_reenter || _notified; }
+  oop vthread() const;
   void wait_reenter_begin(ObjectMonitor *mon);
   void wait_reenter_end(ObjectMonitor *mon);
 };
@@ -132,6 +146,11 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   static OopStorage* _oop_storage;
 
+  // List of j.l.VirtualThread waiting to be unblocked by unblocker thread.
+  static OopHandle _vthread_cxq_head;
+  // ParkEvent of unblocker thread.
+  static ParkEvent* _vthread_unparker_ParkEvent;
+
   // The sync code expects the metadata field to be at offset zero (0).
   // Enforced by the assert() in metadata_addr().
   // * LM_LIGHTWEIGHT with UseObjectMonitorTable:
@@ -146,24 +165,12 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   // its cache line with _metadata.
   DEFINE_PAD_MINUS_SIZE(0, OM_CACHE_LINE_SIZE, sizeof(_metadata) +
                         sizeof(WeakHandle));
-  // Used by async deflation as a marker in the _owner field.
-  // Note that the choice of the two markers is peculiar:
-  // - They need to represent values that cannot be pointers. In particular,
-  //   we achieve this by using the lowest two bits.
-  // - ANONYMOUS_OWNER should be a small value, it is used in generated code
-  //   and small values encode much better.
-  // - We test for anonymous owner by testing for the lowest bit, therefore
-  //   DEFLATER_MARKER must *not* have that bit set.
-  static const uintptr_t DEFLATER_MARKER_VALUE = 2;
-  #define DEFLATER_MARKER reinterpret_cast<void*>(DEFLATER_MARKER_VALUE)
- public:
-  // NOTE: Typed as uintptr_t so that we can pick it up in SA, via vmStructs.
-  static const uintptr_t ANONYMOUS_OWNER = 1;
 
- private:
-  static void* anon_owner_ptr() { return reinterpret_cast<void*>(ANONYMOUS_OWNER); }
+  static const int64_t NO_OWNER = 0;
+  static const int64_t ANONYMOUS_OWNER = 1;
+  static const int64_t DEFLATER_MARKER = 2;
 
-  void* volatile _owner;            // pointer to owning thread OR BasicLock
+  int64_t volatile _owner;  // Either tid of owner, NO_OWNER, ANONYMOUS_OWNER or DEFLATER_MARKER.
   volatile uint64_t _previous_owner_tid;  // thread id of the previous owner of the monitor
   // Separate _owner and _next_om on different cache lines since
   // both can have busy multi-threaded access. _previous_owner_tid is only
@@ -178,7 +185,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
                                       // acting as proxies for Threads.
 
   ObjectWaiter* volatile _cxq;      // LL of recently-arrived threads blocked on entry.
-  JavaThread* volatile _succ;       // Heir presumptive thread - used for futile wakeup throttling
+  int64_t volatile _succ;           // Heir presumptive thread - used for futile wakeup throttling
 
   volatile int _SpinDuration;
 
@@ -191,9 +198,16 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   volatile int  _waiters;           // number of waiting threads
   volatile int _WaitSetLock;        // protects Wait Queue - simple spinlock
 
+  // Used in LM_LEGACY mode to store BasicLock* in case of inflation by contending thread.
+  BasicLock* volatile _stack_locker;
+
  public:
 
   static void Initialize();
+  static void Initialize2();
+
+  static OopHandle& vthread_cxq_head() { return _vthread_cxq_head; }
+  static ParkEvent* vthread_unparker_ParkEvent() { return _vthread_unparker_ParkEvent; }
 
   // Only perform a PerfData operation if the PerfData object has been
   // allocated and if the PerfDataManager has not freed the PerfData
@@ -249,7 +263,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   void                set_hash(intptr_t hash);
 
   bool is_busy() const {
-    // TODO-FIXME: assert _owner == null implies _recursions = 0
+    // TODO-FIXME: assert _owner == NO_OWNER implies _recursions = 0
     intptr_t ret_code = intptr_t(_waiters) | intptr_t(_cxq) | intptr_t(_EntryList);
     int cnts = contentions(); // read once
     if (cnts > 0) {
@@ -266,48 +280,75 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   // Returns true if this OM has an owner, false otherwise.
   bool      has_owner() const;
-  void*     owner() const;  // Returns null if DEFLATER_MARKER is observed.
-  void*     owner_raw() const;
+  int64_t   owner() const;  // Returns NO_OWNER if DEFLATER_MARKER is observed.
+  int64_t   owner_raw() const;
+
+  // These methods return the value we set in _owner when acquiring
+  // the monitor with the given thread/vthread (tid).
+  static int64_t owner_from(JavaThread* thread);
+  static int64_t owner_from(oop vthread);
+
   // Returns true if owner field == DEFLATER_MARKER and false otherwise.
   bool      owner_is_DEFLATER_MARKER() const;
   // Returns true if 'this' is being async deflated and false otherwise.
   bool      is_being_async_deflated();
-  // Clear _owner field; current value must match old_value.
-  void      release_clear_owner(void* old_value);
+  // Clear _owner field; current value must match thread's tid.
+  void      release_clear_owner(JavaThread* thread);
   // Simply set _owner field to new_value; current value must match old_value.
-  void      set_owner_from(void* old_value, void* new_value);
-  // Simply set _owner field to current; current value must match basic_lock_p.
-  void      set_owner_from_BasicLock(void* basic_lock_p, JavaThread* current);
+  void      set_owner_from_raw(int64_t old_value, int64_t new_value);
+  // Same as above but uses tid of current as new value.
+  void      set_owner_from(int64_t old_value, JavaThread* current);
   // Try to set _owner field to new_value if the current value matches
   // old_value, using Atomic::cmpxchg(). Otherwise, does not change the
   // _owner field. Returns the prior value of the _owner field.
-  void*     try_set_owner_from(void* old_value, void* new_value);
-
-  void set_owner_anonymous() {
-    set_owner_from(nullptr, anon_owner_ptr());
+  int64_t   try_set_owner_from_raw(int64_t old_value, int64_t new_value);
+  // Same as above but uses tid of current as new_value.
+  int64_t   try_set_owner_from(int64_t old_value, JavaThread* current);
+
+  // Methods to check and set _succ. The successor is the thread selected
+  // from _cxq/_EntryList by the current owner when releasing the monitor,
+  // to run again and re-try acquiring the monitor. It is used to avoid
+  // unnecessary wake-ups if there is already a successor set.
+  bool      has_successor() const;
+  bool      has_successor(JavaThread* thread) const;
+  void      set_successor(JavaThread* thread);
+  void      set_successor(oop vthread);
+  void      clear_successor();
+  int64_t   successor() const;
+
+  // Returns true if _owner field == tid of thread, false otherwise.
+  bool has_owner(JavaThread* thread) const { return owner() == owner_from(thread); }
+  // Set _owner field to tid of thread; current value must be NO_OWNER.
+  void set_owner(JavaThread* thread) { set_owner_from(NO_OWNER, thread); }
+  // Try to set _owner field from NO_OWNER to tid of thread.
+  bool try_set_owner(JavaThread* thread) {
+    return try_set_owner_from(NO_OWNER, thread) == NO_OWNER;
   }
 
-  bool is_owner_anonymous() const {
-    return owner_raw() == anon_owner_ptr();
+  bool has_anonymous_owner() const { return owner_raw() == ANONYMOUS_OWNER; }
+  void set_anonymous_owner() {
+    set_owner_from_raw(NO_OWNER, ANONYMOUS_OWNER);
   }
-
-  void set_owner_from_anonymous(Thread* owner) {
-    set_owner_from(anon_owner_ptr(), owner);
+  void set_owner_from_anonymous(JavaThread* owner) {
+    set_owner_from(ANONYMOUS_OWNER, owner);
   }
 
+  // Get and set _stack_locker.
+  BasicLock* stack_locker() const;
+  void set_stack_locker(BasicLock* locker);
+
   // Simply get _next_om field.
   ObjectMonitor* next_om() const;
   // Simply set _next_om field to new_value.
   void set_next_om(ObjectMonitor* new_value);
 
-  int       waiters() const;
-
   int       contentions() const;
   void      add_to_contentions(int value);
   intx      recursions() const                                         { return _recursions; }
   void      set_recursions(size_t recursions);
 
   // JVM/TI GetObjectMonitorUsage() needs this:
+  int waiters() const;
   ObjectWaiter* first_waiter()                                         { return _WaitSet; }
   ObjectWaiter* next_waiter(ObjectWaiter* o)                           { return o->_next; }
   JavaThread* thread_of_waiter(ObjectWaiter* o)                        { return o->_thread; }
@@ -351,6 +392,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   bool      spin_enter(JavaThread* current);
   void      enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark& contention_mark);
   void      exit(JavaThread* current, bool not_suspended = true);
+  bool      resume_operation(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont);
   void      wait(jlong millis, bool interruptible, TRAPS);
   void      notify(TRAPS);
   void      notifyAll(TRAPS);
@@ -373,6 +415,10 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   void      ReenterI(JavaThread* current, ObjectWaiter* current_node);
   void      UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* current_node);
 
+  bool      VThreadMonitorEnter(JavaThread* current, ObjectWaiter* node = nullptr);
+  void      VThreadWait(JavaThread* current, jlong millis);
+  bool      VThreadWaitReenter(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont);
+  void      VThreadEpilog(JavaThread* current, ObjectWaiter* node);
 
   enum class TryLockResult { Interference = -1, HasOwner = 0, Success = 1 };
 
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index 6d3c6ff24c3..64e233a1ff5 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -32,23 +32,34 @@
 #include "oops/markWord.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
+#include "runtime/javaThread.inline.hpp"
 #include "runtime/lockStack.inline.hpp"
 #include "runtime/synchronizer.hpp"
+#include "runtime/threadIdentifier.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+inline int64_t ObjectMonitor::owner_from(JavaThread* thread) {
+  int64_t tid = thread->lock_id();
+  assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "must be reasonable");
+  return tid;
+}
+
+inline int64_t ObjectMonitor::owner_from(oop vthread) {
+  int64_t tid = java_lang_Thread::thread_id(vthread);
+  assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "must be reasonable");
+  return tid;
+}
+
 inline bool ObjectMonitor::is_entered(JavaThread* current) const {
-  if (LockingMode == LM_LIGHTWEIGHT) {
-    if (is_owner_anonymous()) {
+  if (has_anonymous_owner()) {
+    if (LockingMode == LM_LIGHTWEIGHT) {
       return current->lock_stack().contains(object());
     } else {
-      return current == owner_raw();
+      return current->is_lock_owned((address)stack_locker());
     }
   } else {
-    void* owner = owner_raw();
-    if (current == owner || current->is_lock_owned((address)owner)) {
-      return true;
-    }
+    return has_owner(current);
   }
   return false;
 }
@@ -92,23 +103,29 @@ inline int ObjectMonitor::waiters() const {
 }
 
 inline bool ObjectMonitor::has_owner() const {
-  void* owner = owner_raw();
-  return owner != nullptr && owner != DEFLATER_MARKER;
+  int64_t owner = owner_raw();
+  return owner != NO_OWNER && owner != DEFLATER_MARKER;
 }
 
-// Returns null if DEFLATER_MARKER is observed.
-inline void* ObjectMonitor::owner() const {
-  void* owner = owner_raw();
-  return owner != DEFLATER_MARKER ? owner : nullptr;
+// Returns NO_OWNER if DEFLATER_MARKER is observed.
+inline int64_t ObjectMonitor::owner() const {
+  int64_t owner = owner_raw();
+  return owner != DEFLATER_MARKER ? owner : NO_OWNER;
 }
 
-inline void* ObjectMonitor::owner_raw() const {
+inline int64_t ObjectMonitor::owner_raw() const {
   return Atomic::load(&_owner);
 }
 
+inline BasicLock* ObjectMonitor::stack_locker() const {
+  return Atomic::load(&_stack_locker);
+}
+
+inline void ObjectMonitor::set_stack_locker(BasicLock* locker) {
+  Atomic::store(&_stack_locker, locker);
+}
+
 // Returns true if owner field == DEFLATER_MARKER and false otherwise.
-// This accessor is called when we really need to know if the owner
-// field == DEFLATER_MARKER and any non-null value won't do the trick.
 inline bool ObjectMonitor::owner_is_DEFLATER_MARKER() const {
   return owner_raw() == DEFLATER_MARKER;
 }
@@ -135,63 +152,82 @@ inline void ObjectMonitor::set_recursions(size_t recursions) {
 }
 
 // Clear _owner field; current value must match old_value.
-inline void ObjectMonitor::release_clear_owner(void* old_value) {
+inline void ObjectMonitor::release_clear_owner(JavaThread* old_owner) {
+  int64_t old_value = owner_from(old_owner);
 #ifdef ASSERT
-  void* prev = Atomic::load(&_owner);
-  assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
-         ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
+  int64_t prev = Atomic::load(&_owner);
+  assert(prev == old_value, "unexpected prev owner=" INT64_FORMAT
+         ", expected=" INT64_FORMAT, prev, old_value);
 #endif
-  Atomic::release_store(&_owner, (void*)nullptr);
+  Atomic::release_store(&_owner, NO_OWNER);
   log_trace(monitorinflation, owner)("release_clear_owner(): mid="
-                                     INTPTR_FORMAT ", old_value=" INTPTR_FORMAT,
-                                     p2i(this), p2i(old_value));
+                                     INTPTR_FORMAT ", old_value=" INT64_FORMAT,
+                                     p2i(this), old_value);
 }
 
 // Simply set _owner field to new_value; current value must match old_value.
 // (Simple means no memory sync needed.)
-inline void ObjectMonitor::set_owner_from(void* old_value, void* new_value) {
+inline void ObjectMonitor::set_owner_from_raw(int64_t old_value, int64_t new_value) {
 #ifdef ASSERT
-  void* prev = Atomic::load(&_owner);
-  assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
-         ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
+  int64_t prev = Atomic::load(&_owner);
+  assert((int64_t)prev < ThreadIdentifier::current(), "must be reasonable");
+  assert(prev == old_value, "unexpected prev owner=" INT64_FORMAT
+         ", expected=" INT64_FORMAT, prev, old_value);
 #endif
   Atomic::store(&_owner, new_value);
   log_trace(monitorinflation, owner)("set_owner_from(): mid="
-                                     INTPTR_FORMAT ", old_value=" INTPTR_FORMAT
-                                     ", new_value=" INTPTR_FORMAT, p2i(this),
-                                     p2i(old_value), p2i(new_value));
+                                     INTPTR_FORMAT ", old_value=" INT64_FORMAT
+                                     ", new_value=" INT64_FORMAT, p2i(this),
+                                     old_value, new_value);
 }
 
-// Simply set _owner field to self; current value must match basic_lock_p.
-inline void ObjectMonitor::set_owner_from_BasicLock(void* basic_lock_p, JavaThread* current) {
-#ifdef ASSERT
-  void* prev = Atomic::load(&_owner);
-  assert(prev == basic_lock_p, "unexpected prev owner=" INTPTR_FORMAT
-         ", expected=" INTPTR_FORMAT, p2i(prev), p2i(basic_lock_p));
-#endif
-  // Non-null owner field to non-null owner field is safe without
-  // cmpxchg() as long as all readers can tolerate either flavor.
-  Atomic::store(&_owner, current);
-  log_trace(monitorinflation, owner)("set_owner_from_BasicLock(): mid="
-                                     INTPTR_FORMAT ", basic_lock_p="
-                                     INTPTR_FORMAT ", new_value=" INTPTR_FORMAT,
-                                     p2i(this), p2i(basic_lock_p), p2i(current));
+inline void ObjectMonitor::set_owner_from(int64_t old_value, JavaThread* current) {
+  set_owner_from_raw(old_value, owner_from(current));
 }
 
 // Try to set _owner field to new_value if the current value matches
 // old_value. Otherwise, does not change the _owner field. Returns
 // the prior value of the _owner field.
-inline void* ObjectMonitor::try_set_owner_from(void* old_value, void* new_value) {
-  void* prev = Atomic::cmpxchg(&_owner, old_value, new_value);
+inline int64_t ObjectMonitor::try_set_owner_from_raw(int64_t old_value, int64_t new_value) {
+  assert((int64_t)new_value < ThreadIdentifier::current(), "must be reasonable");
+  int64_t prev = Atomic::cmpxchg(&_owner, old_value, new_value);
   if (prev == old_value) {
     log_trace(monitorinflation, owner)("try_set_owner_from(): mid="
-                                       INTPTR_FORMAT ", prev=" INTPTR_FORMAT
-                                       ", new=" INTPTR_FORMAT, p2i(this),
-                                       p2i(prev), p2i(new_value));
+                                       INTPTR_FORMAT ", prev=" INT64_FORMAT
+                                       ", new=" INT64_FORMAT, p2i(this),
+                                       prev, new_value);
   }
   return prev;
 }
 
+inline int64_t ObjectMonitor::try_set_owner_from(int64_t old_value, JavaThread* current) {
+  return try_set_owner_from_raw(old_value, owner_from(current));
+}
+
+inline bool ObjectMonitor::has_successor() const {
+  return Atomic::load(&_succ) != NO_OWNER;
+}
+
+inline bool ObjectMonitor::has_successor(JavaThread* thread) const {
+  return owner_from(thread) == Atomic::load(&_succ);
+}
+
+inline void ObjectMonitor::set_successor(JavaThread* thread) {
+  Atomic::store(&_succ, owner_from(thread));
+}
+
+inline void ObjectMonitor::set_successor(oop vthread) {
+  Atomic::store(&_succ, java_lang_Thread::thread_id(vthread));
+}
+
+inline void ObjectMonitor::clear_successor() {
+  Atomic::store(&_succ, NO_OWNER);
+}
+
+inline int64_t ObjectMonitor::successor() const {
+  return Atomic::load(&_succ);
+}
+
 // The _next_om field can be concurrently read and modified so we
 // use Atomic operations to disable compiler optimizations that
 // might try to elide loading and/or storing this field.
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 2395510f27f..d8e539ca115 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1083,6 +1083,26 @@ void os::print_dhm(outputStream* st, const char* startStr, long sec) {
   st->print_cr("%s %ld days %ld:%02ld hours", startStr, days, hours, minutes);
 }
 
+void os::print_tos_pc(outputStream* st, const void* context) {
+  if (context == nullptr) return;
+
+  // First of all, carefully determine sp without inspecting memory near pc.
+  // See comment below.
+  intptr_t* sp = nullptr;
+  fetch_frame_from_context(context, &sp, nullptr);
+  print_tos(st, (address)sp);
+  st->cr();
+
+  // Note: it may be unsafe to inspect memory near pc. For example, pc may
+  // point to garbage if entry point in an nmethod is corrupted. Leave
+  // this at the end, and hope for the best.
+  // This version of fetch_frame_from_context finds the caller pc if the actual
+  // one is bad.
+  address pc = fetch_frame_from_context(context).pc();
+  print_instructions(st, pc);
+  st->cr();
+}
+
 void os::print_tos(outputStream* st, address sp) {
   st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp));
   print_hex_dump(st, sp, sp + 512, sizeof(intptr_t));
@@ -2166,7 +2186,7 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     res = pd_uncommit_memory(addr, bytes, executable);
     if (res) {
       MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
@@ -2188,7 +2208,7 @@ bool os::release_memory(char* addr, size_t bytes) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     res = pd_release_memory(addr, bytes);
     if (res) {
       MemTracker::record_virtual_memory_release((address)addr, bytes);
@@ -2273,7 +2293,7 @@ char* os::map_memory(int fd, const char* file_name, size_t file_offset,
 bool os::unmap_memory(char *addr, size_t bytes) {
   bool result;
   if (MemTracker::enabled()) {
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     result = pd_unmap_memory(addr, bytes);
     if (result) {
       MemTracker::record_virtual_memory_release((address)addr, bytes);
@@ -2312,7 +2332,7 @@ char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size
 bool os::release_memory_special(char* addr, size_t bytes) {
   bool res;
   if (MemTracker::enabled()) {
-    NmtVirtualMemoryLocker ml;
+    ThreadCritical tc;
     res = pd_release_memory_special(addr, bytes);
     if (res) {
       MemTracker::record_virtual_memory_release((address)addr, bytes);
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 323b8d2df8d..2f665df5bba 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -882,10 +882,6 @@ class os: AllStatic {
   // Fills in path to jvm.dll/libjvm.so (used by the Disassembler)
   static void     jvm_path(char *buf, jint buflen);
 
-  // JNI names
-  static void     print_jni_name_prefix_on(outputStream* st, int args_size);
-  static void     print_jni_name_suffix_on(outputStream* st, int args_size);
-
   // Init os specific system properties values
   static void init_system_properties_values();
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index e4d4e6aea0f..a9ad42ec5f2 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -1971,7 +1971,7 @@ void SharedRuntime::monitor_exit_helper(oopDesc* obj, BasicLock* lock, JavaThrea
   // hasn't been deallocated.
   ObjectMonitor* m = current->unlocked_inflated_monitor();
   if (m != nullptr) {
-    assert(m->owner_raw() != current, "must be");
+    assert(!m->has_owner(current), "must be");
     current->clear_unlocked_inflated_monitor();
 
     // We need to reacquire the lock before we can call ObjectSynchronizer::exit().
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index f530c0ad2a8..854d4dcf1ad 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -512,6 +512,10 @@ class SharedRuntime: AllStatic {
   // On PowerPC it includes the 4 words holding the old TOC & LR glue.
   static uint in_preserve_stack_slots();
 
+  static VMReg thread_register();
+
+  static void continuation_enter_cleanup(MacroAssembler* masm);
+
   // Is vector's size (in bytes) bigger than a size saved by default?
   // For example, on x86 16 bytes XMM registers are saved by default.
   static bool is_wide_vector(int size);
diff --git a/src/hotspot/share/runtime/sharedRuntimeTrans.cpp b/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
index 5285819ee96..78788d487b7 100644
--- a/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
+++ b/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
@@ -42,7 +42,7 @@
 // Enabling optimizations in this file causes incorrect code to be
 // generated; can not figure out how to turn down optimization for one
 // file in the IDE on Windows
-#ifdef WIN32
+#ifdef _WINDOWS
 # pragma warning( disable: 4748 ) // /GS can not protect parameters and local variables from local buffer overrun because optimizations are disabled in function
 # pragma optimize ( "", off )
 #endif
@@ -671,6 +671,6 @@ JRT_LEAF(jdouble, SharedRuntime::dpow(jdouble x, jdouble y))
   return __ieee754_pow(x, y);
 JRT_END
 
-#ifdef WIN32
+#ifdef _WINDOWS
 # pragma optimize ( "", on )
 #endif
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
index 6937feb1517..207203dbb35 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ class StackChunkFrameStream : public StackObj {
   inline bool is_stub() const;
   inline bool is_compiled() const;
   CodeBlob* cb() const { return _cb; }
+  inline void get_cb();
   const ImmutableOopMap* oopmap() const { if (_oopmap == nullptr) get_oopmap(); return _oopmap; }
   inline int frame_size() const;
   inline int stack_argsize() const;
@@ -98,7 +99,6 @@ class StackChunkFrameStream : public StackObj {
 
  private:
   inline address get_pc() const;
-  inline void get_cb();
 
   inline int interpreter_frame_size() const;
   inline int interpreter_frame_num_oops() const;
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index c56034786c9..734d31d3390 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -106,7 +106,7 @@ StackChunkFrameStream<frame_kind>::StackChunkFrameStream(stackChunkOop chunk, co
 
 template <ChunkFrames frame_kind>
 inline bool StackChunkFrameStream<frame_kind>::is_stub() const {
-  return cb() != nullptr && (_cb->is_safepoint_stub() || _cb->is_runtime_stub());
+  return cb() != nullptr && _cb->is_runtime_stub();
 }
 
 template <ChunkFrames frame_kind>
@@ -196,7 +196,14 @@ inline int StackChunkFrameStream<frame_kind>::stack_argsize() const {
 
 template <ChunkFrames frame_kind>
 inline int StackChunkFrameStream<frame_kind>::num_oops() const {
-  return is_interpreted() ? interpreter_frame_num_oops() : oopmap()->num_oops();
+  if (is_interpreted()) {
+    return interpreter_frame_num_oops();
+  } else if (is_compiled()) {
+    return oopmap()->num_oops();
+  } else {
+    assert(is_stub(), "invariant");
+    return 0;
+  }
 }
 
 template <ChunkFrames frame_kind>
@@ -208,7 +215,7 @@ template <ChunkFrames frame_kind>
 template <typename RegisterMapT>
 inline void StackChunkFrameStream<frame_kind>::next(RegisterMapT* map, bool stop) {
   update_reg_map(map);
-  bool safepoint = is_stub();
+  bool is_runtime_stub = is_stub();
   if (frame_kind == ChunkFrames::Mixed) {
     if (is_interpreted()) {
       next_for_interpreter_frame();
@@ -232,8 +239,9 @@ inline void StackChunkFrameStream<frame_kind>::next(RegisterMapT* map, bool stop
 
   get_cb();
   update_reg_map_pd(map);
-  if (safepoint && cb() != nullptr) { // there's no post-call nop and no fast oopmap lookup
-    _oopmap = cb()->oop_map_for_return_address(pc());
+  if (is_runtime_stub && cb() != nullptr) { // there's no post-call nop and no fast oopmap lookup
+    // caller could have been deoptimized so use orig_pc()
+    _oopmap = cb()->oop_map_for_return_address(orig_pc());
   }
 }
 
@@ -300,9 +308,8 @@ inline void StackChunkFrameStream<ChunkFrames::Mixed>::update_reg_map(RegisterMa
 template<>
 template<>
 inline void StackChunkFrameStream<ChunkFrames::CompiledOnly>::update_reg_map(RegisterMap* map) {
-  assert(map->in_cont(), "");
-  assert(map->stack_chunk()() == _chunk, "");
-  if (map->update_map()) {
+  assert(!map->in_cont() || map->stack_chunk() == _chunk, "");
+  if (map->update_map() && is_stub()) {
     frame f = to_frame();
     oopmap()->update_register_map(&f, map); // we have callee-save registers in this case
   }
diff --git a/src/hotspot/share/runtime/stackValue.cpp b/src/hotspot/share/runtime/stackValue.cpp
index c0b511ed537..cc6e0bb92d6 100644
--- a/src/hotspot/share/runtime/stackValue.cpp
+++ b/src/hotspot/share/runtime/stackValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,7 +293,7 @@ address StackValue::stack_value_address(const frame* fr, const RegisterMapT* reg
   return value_addr;
 }
 
-BasicLock* StackValue::resolve_monitor_lock(const frame* fr, Location location) {
+BasicLock* StackValue::resolve_monitor_lock(const frame& fr, Location location) {
   assert(location.is_stack(), "for now we only look at the stack");
   int word_offset = location.stack_offset() / wordSize;
   // (stack picture)
@@ -304,7 +304,7 @@ BasicLock* StackValue::resolve_monitor_lock(const frame* fr, Location location)
   // the word_offset is the distance from the stack pointer to the lowest address
   // The frame's original stack pointer, before any extension by its callee
   // (due to Compiler1 linkage on SPARC), must be used.
-  return (BasicLock*) (fr->unextended_sp() + word_offset);
+  return (BasicLock*) (fr.unextended_sp() + word_offset);
 }
 
 
diff --git a/src/hotspot/share/runtime/stackValue.hpp b/src/hotspot/share/runtime/stackValue.hpp
index 517c4cf9e77..5001675872c 100644
--- a/src/hotspot/share/runtime/stackValue.hpp
+++ b/src/hotspot/share/runtime/stackValue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,7 +123,7 @@ class StackValue : public ResourceObj {
   static StackValue* create_stack_value_from_oop_location(stackChunkOop chunk, void* addr);
   static StackValue* create_stack_value_from_narrowOop_location(stackChunkOop chunk, void* addr, bool is_register);
 
-  static BasicLock*  resolve_monitor_lock(const frame* fr, Location location);
+  static BasicLock*  resolve_monitor_lock(const frame& fr, Location location);
 
   template<typename RegisterMapT>
   static StackValue* create_stack_value(const frame* fr, const RegisterMapT* reg_map, ScopeValue* sv);
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index c881b64b592..5253bcd0571 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -186,6 +186,7 @@ address StubRoutines::_array_partition  = nullptr;
 address StubRoutines::_cont_thaw          = nullptr;
 address StubRoutines::_cont_returnBarrier = nullptr;
 address StubRoutines::_cont_returnBarrierExc = nullptr;
+address StubRoutines::_cont_preempt_stub = nullptr;
 
 address StubRoutines::_upcall_stub_exception_handler = nullptr;
 address StubRoutines::_upcall_stub_load_target = nullptr;
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index f025742b605..4c96738ce4b 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -292,6 +292,7 @@ class StubRoutines: AllStatic {
   static address _cont_thaw;
   static address _cont_returnBarrier;
   static address _cont_returnBarrierExc;
+  static address _cont_preempt_stub;
 
   // Vector Math Routines
   static address _vector_f_math[VectorSupport::NUM_VEC_SIZES][VectorSupport::NUM_VECTOR_OP_MATH];
@@ -501,6 +502,7 @@ class StubRoutines: AllStatic {
   static address cont_thaw()           { return _cont_thaw; }
   static address cont_returnBarrier()  { return _cont_returnBarrier; }
   static address cont_returnBarrierExc(){return _cont_returnBarrierExc; }
+  static address cont_preempt_stub()   { return _cont_preempt_stub; }
 
   static address upcall_stub_exception_handler() {
     assert(_upcall_stub_exception_handler != nullptr, "not implemented");
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index d8fb7a4734a..cba1918529c 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -361,7 +361,7 @@ bool ObjectSynchronizer::quick_notify(oopDesc* obj, JavaThread* current, bool al
       return false;
     }
     assert(mon->object() == oop(obj), "invariant");
-    if (mon->owner() != current) return false;  // slow-path for IMS exception
+    if (!mon->has_owner(current)) return false;  // slow-path for IMS exception
 
     if (mon->first_waiter() != nullptr) {
       // We have one or more waiters. Since this is an inflated monitor
@@ -424,14 +424,13 @@ bool ObjectSynchronizer::quick_enter_legacy(oop obj, BasicLock* lock, JavaThread
     if (m->object_peek() == nullptr) {
       return false;
     }
-    JavaThread* const owner = static_cast<JavaThread*>(m->owner_raw());
 
     // Lock contention and Transactional Lock Elision (TLE) diagnostics
     // and observability
     // Case: light contention possibly amenable to TLE
     // Case: TLE inimical operations such as nested/recursive synchronization
 
-    if (owner == current) {
+    if (m->has_owner(current)) {
       m->_recursions++;
       current->inc_held_monitor_count();
       return true;
@@ -448,7 +447,7 @@ bool ObjectSynchronizer::quick_enter_legacy(oop obj, BasicLock* lock, JavaThread
     // and last are the inflated Java Monitor (ObjectMonitor) checks.
     lock->set_displaced_header(markWord::unused_mark());
 
-    if (owner == nullptr && m->try_set_owner_from(nullptr, current) == nullptr) {
+    if (!m->has_owner() && m->try_set_owner(current)) {
       assert(m->_recursions == 0, "invariant");
       current->inc_held_monitor_count();
       return true;
@@ -658,7 +657,7 @@ void ObjectSynchronizer::exit_legacy(oop object, BasicLock* lock, JavaThread* cu
   // The ObjectMonitor* can't be async deflated until ownership is
   // dropped inside exit() and the ObjectMonitor* must be !is_busy().
   ObjectMonitor* monitor = inflate(current, object, inflate_cause_vm_internal);
-  assert(!monitor->is_owner_anonymous(), "must not be");
+  assert(!monitor->has_anonymous_owner(), "must not be");
   monitor->exit(current);
 }
 
@@ -666,6 +665,10 @@ void ObjectSynchronizer::exit_legacy(oop object, BasicLock* lock, JavaThread* cu
 // JNI locks on java objects
 // NOTE: must use heavy weight monitor to handle jni monitor enter
 void ObjectSynchronizer::jni_enter(Handle obj, JavaThread* current) {
+  // Top native frames in the stack will not be seen if we attempt
+  // preemption, since we start walking from the last Java anchor.
+  NoPreemptMark npm(current);
+
   if (obj->klass()->is_value_based()) {
     handle_sync_on_value_based_class(obj, current);
   }
@@ -717,7 +720,7 @@ void ObjectSynchronizer::jni_exit(oop obj, TRAPS) {
 // -----------------------------------------------------------------------------
 // Internal VM locks on java objects
 // standard constructor, allows locking failures
-ObjectLocker::ObjectLocker(Handle obj, JavaThread* thread) {
+ObjectLocker::ObjectLocker(Handle obj, JavaThread* thread) : _npm(thread) {
   _thread = thread;
   _thread->check_for_valid_safepoint_state();
   _obj = obj;
@@ -1165,7 +1168,7 @@ JavaThread* ObjectSynchronizer::get_lock_owner(ThreadsList * t_list, Handle h_ob
   if (LockingMode == LM_LEGACY && mark.has_locker()) {
     // stack-locked so header points into owner's stack.
     // owning_thread_from_monitor_owner() may also return null here:
-    return Threads::owning_thread_from_monitor_owner(t_list, (address) mark.locker());
+    return Threads::owning_thread_from_stacklock(t_list, (address) mark.locker());
   }
 
   if (LockingMode == LM_LIGHTWEIGHT && mark.is_fast_locked()) {
@@ -1229,7 +1232,7 @@ void ObjectSynchronizer::owned_monitors_iterate_filtered(MonitorClosure* closure
     // only interested in an owned ObjectMonitor and ownership
     // cannot be dropped under the calling contexts so the
     // ObjectMonitor cannot be async deflated.
-    if (monitor->has_owner() && filter(monitor->owner_raw())) {
+    if (monitor->has_owner() && filter(monitor)) {
       assert(!monitor->is_being_async_deflated(), "Owned monitors should not be deflating");
 
       closure->do_monitor(monitor);
@@ -1240,13 +1243,20 @@ void ObjectSynchronizer::owned_monitors_iterate_filtered(MonitorClosure* closure
 // Iterate ObjectMonitors where the owner == thread; this does NOT include
 // ObjectMonitors where owner is set to a stack-lock address in thread.
 void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure, JavaThread* thread) {
-  auto thread_filter = [&](void* owner) { return owner == thread; };
+  int64_t key = ObjectMonitor::owner_from(thread);
+  auto thread_filter = [&](ObjectMonitor* monitor) { return monitor->owner() == key; };
+  return owned_monitors_iterate_filtered(closure, thread_filter);
+}
+
+void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure, oop vthread) {
+  int64_t key = ObjectMonitor::owner_from(vthread);
+  auto thread_filter = [&](ObjectMonitor* monitor) { return monitor->owner() == key; };
   return owned_monitors_iterate_filtered(closure, thread_filter);
 }
 
 // Iterate ObjectMonitors owned by any thread.
 void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure) {
-  auto all_filter = [&](void* owner) { return true; };
+  auto all_filter = [&](ObjectMonitor* monitor) { return true; };
   return owned_monitors_iterate_filtered(closure, all_filter);
 }
 
@@ -1418,16 +1428,22 @@ void ObjectSynchronizer::inflate_helper(oop obj) {
 ObjectMonitor* ObjectSynchronizer::inflate(Thread* current, oop obj, const InflateCause cause) {
   assert(current == Thread::current(), "must be");
   assert(LockingMode != LM_LIGHTWEIGHT, "only inflate through enter");
-  return inflate_impl(obj, cause);
+  return inflate_impl(current->is_Java_thread() ? JavaThread::cast(current) : nullptr, obj, cause);
 }
 
 ObjectMonitor* ObjectSynchronizer::inflate_for(JavaThread* thread, oop obj, const InflateCause cause) {
   assert(thread == Thread::current() || thread->is_obj_deopt_suspend(), "must be");
   assert(LockingMode != LM_LIGHTWEIGHT, "LM_LIGHTWEIGHT cannot use inflate_for");
-  return inflate_impl(obj, cause);
+  return inflate_impl(thread, obj, cause);
 }
 
-ObjectMonitor* ObjectSynchronizer::inflate_impl(oop object, const InflateCause cause) {
+ObjectMonitor* ObjectSynchronizer::inflate_impl(JavaThread* locking_thread, oop object, const InflateCause cause) {
+  // The JavaThread* locking_thread requires that the locking_thread == Thread::current() or
+  // is suspended throughout the call by some other mechanism.
+  // The thread might be nullptr when called from a non JavaThread. (As may still be
+  // the case from FastHashCode). However it is only important for correctness that the
+  // thread is set when called from ObjectSynchronizer::enter from the owning thread,
+  // ObjectSynchronizer::enter_for from any thread, or ObjectSynchronizer::exit.
   assert(LockingMode != LM_LIGHTWEIGHT, "LM_LIGHTWEIGHT cannot use inflate_impl");
   EventJavaMonitorInflate event;
 
@@ -1435,7 +1451,9 @@ ObjectMonitor* ObjectSynchronizer::inflate_impl(oop object, const InflateCause c
     const markWord mark = object->mark_acquire();
 
     // The mark can be in one of the following states:
-    // *  inflated     - Just return it.
+    // *  inflated     - If the ObjectMonitor owner is anonymous and the
+    //                   locking_thread owns the object lock, then we
+    //                   make the locking_thread the ObjectMonitor owner.
     // *  stack-locked - Coerce it to inflated from stack-locked.
     // *  INFLATING    - Busy wait for conversion from stack-locked to
     //                   inflated.
@@ -1446,6 +1464,13 @@ ObjectMonitor* ObjectSynchronizer::inflate_impl(oop object, const InflateCause c
       ObjectMonitor* inf = mark.monitor();
       markWord dmw = inf->header();
       assert(dmw.is_neutral(), "invariant: header=" INTPTR_FORMAT, dmw.value());
+      if (inf->has_anonymous_owner() && locking_thread != nullptr) {
+        assert(LockingMode == LM_LEGACY, "invariant");
+        if (locking_thread->is_lock_owned((address)inf->stack_locker())) {
+          inf->set_stack_locker(nullptr);
+          inf->set_owner_from_anonymous(locking_thread);
+        }
+      }
       return inf;
     }
 
@@ -1522,12 +1547,17 @@ ObjectMonitor* ObjectSynchronizer::inflate_impl(oop object, const InflateCause c
       // Setup monitor fields to proper values -- prepare the monitor
       m->set_header(dmw);
 
-      // Optimization: if the mark.locker stack address is associated
-      // with this thread we could simply set m->_owner = current.
       // Note that a thread can inflate an object
       // that it has stack-locked -- as might happen in wait() -- directly
       // with CAS.  That is, we can avoid the xchg-nullptr .... ST idiom.
-      m->set_owner_from(nullptr, mark.locker());
+      if (locking_thread != nullptr && locking_thread->is_lock_owned((address)mark.locker())) {
+        m->set_owner(locking_thread);
+      } else {
+        // Use ANONYMOUS_OWNER to indicate that the owner is the BasicLock on the stack,
+        // and set the stack locker field in the monitor.
+        m->set_stack_locker(mark.locker());
+        m->set_anonymous_owner();
+      }
       // TODO-FIXME: assert BasicLock->dhw != 0.
 
       // Must preserve store ordering. The monitor state must
@@ -2050,7 +2080,7 @@ void ObjectSynchronizer::log_in_use_monitor_details(outputStream* out, bool log_
         const intptr_t hash = UseObjectMonitorTable ? monitor->hash() : monitor->header().hash();
         ResourceMark rm;
         out->print(INTPTR_FORMAT "  %d%d%d  " INTPTR_FORMAT "  %s", p2i(monitor),
-                   monitor->is_busy(), hash != 0, monitor->owner() != nullptr,
+                   monitor->is_busy(), hash != 0, monitor->has_owner(),
                    p2i(obj), obj == nullptr ? "" : obj->klass()->external_name());
         if (monitor->is_busy()) {
           out->print(" (%s)", monitor->is_busy_to_string(&ss));
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index 5b171560ee1..d3d1f4ee4ce 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -137,7 +137,7 @@ class ObjectSynchronizer : AllStatic {
 
 private:
   // Shared implementation between the different LockingMode.
-  static ObjectMonitor* inflate_impl(oop obj, const InflateCause cause);
+  static ObjectMonitor* inflate_impl(JavaThread* locking_thread, oop obj, const InflateCause cause);
 
 public:
   // This version is only for internal use
@@ -168,10 +168,13 @@ class ObjectSynchronizer : AllStatic {
   template <typename OwnerFilter>
   static void owned_monitors_iterate_filtered(MonitorClosure* closure, OwnerFilter filter);
 
-  // Iterate ObjectMonitors where the owner == thread; this does NOT include
-  // ObjectMonitors where owner is set to a stack lock address in thread.
+  // Iterate ObjectMonitors where the owner is thread; this does NOT include
+  // ObjectMonitors where the owner is anonymous.
   static void owned_monitors_iterate(MonitorClosure* m, JavaThread* thread);
 
+  // Iterate ObjectMonitors where the owner is vthread.
+  static void owned_monitors_iterate(MonitorClosure* m, oop vthread);
+
   // Iterate ObjectMonitors owned by any thread.
   static void owned_monitors_iterate(MonitorClosure* closure);
 
@@ -229,11 +232,15 @@ class ObjectSynchronizer : AllStatic {
 // have to pass through, and we must also be able to deal with
 // asynchronous exceptions. The caller is responsible for checking
 // the thread's pending exception if needed.
+// When using ObjectLocker the top native frames in the stack will
+// not be seen in case we attempt preemption, since we start walking
+// from the last Java anchor, so we disable it with NoPreemptMark.
 class ObjectLocker : public StackObj {
  private:
   JavaThread* _thread;
   Handle      _obj;
   BasicLock   _lock;
+  NoPreemptMark _npm;
  public:
   ObjectLocker(Handle obj, JavaThread* current);
   ~ObjectLocker();
diff --git a/src/hotspot/share/runtime/threadIdentifier.cpp b/src/hotspot/share/runtime/threadIdentifier.cpp
index ab250bbf6c3..d63033e7786 100644
--- a/src/hotspot/share/runtime/threadIdentifier.cpp
+++ b/src/hotspot/share/runtime/threadIdentifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,22 @@
 #include "runtime/atomic.hpp"
 #include "runtime/threadIdentifier.hpp"
 
-static volatile int64_t next_thread_id = 2; // starting at 2, excluding the primordial thread id
+// starting at 3, excluding reserved values defined in ObjectMonitor.hpp
+static const int64_t INITIAL_TID = 3;
+static volatile int64_t next_thread_id = INITIAL_TID;
+
+int64_t ThreadIdentifier::initial() {
+  return INITIAL_TID;
+}
 
 int64_t ThreadIdentifier::unsafe_offset() {
   return reinterpret_cast<int64_t>(&next_thread_id);
 }
 
+int64_t ThreadIdentifier::current() {
+  return Atomic::load(&next_thread_id);
+}
+
 int64_t ThreadIdentifier::next() {
   int64_t next_tid;
   do {
diff --git a/src/hotspot/share/runtime/threadIdentifier.hpp b/src/hotspot/share/runtime/threadIdentifier.hpp
index 44d34d88091..b4803ae22f1 100644
--- a/src/hotspot/share/runtime/threadIdentifier.hpp
+++ b/src/hotspot/share/runtime/threadIdentifier.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,9 @@
 class ThreadIdentifier : AllStatic {
  public:
   static int64_t next();
+  static int64_t current();
   static int64_t unsafe_offset();
+  static int64_t initial();
 };
 
 #endif // SHARE_RUNTIME_THREADIDENTIFIER_HPP
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 76ee237ae5e..29386a0c368 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -166,8 +166,10 @@ static void create_initial_thread(Handle thread_group, JavaThread* thread,
                           string,
                           CHECK);
 
-  JFR_ONLY(assert(JFR_JVM_THREAD_ID(thread) == static_cast<traceid>(java_lang_Thread::thread_id(thread_oop())),
-             "initial tid mismatch");)
+  DEBUG_ONLY(int64_t main_thread_tid = java_lang_Thread::thread_id(thread_oop());)
+  assert(main_thread_tid == ThreadIdentifier::initial(), "");
+  assert(main_thread_tid == thread->lock_id(), "");
+  JFR_ONLY(assert(JFR_JVM_THREAD_ID(thread) == static_cast<traceid>(main_thread_tid), "initial tid mismatch");)
 
   // Set thread status to running since main thread has
   // been started and running.
@@ -535,6 +537,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   main_thread->set_active_handles(JNIHandleBlock::allocate_block());
   MACOS_AARCH64_ONLY(main_thread->init_wx());
 
+  // Set the lock_id now since we will run Java code before the Thread instance
+  // is even created. The same value will be assigned to the Thread instance on init.
+  main_thread->set_lock_id(ThreadIdentifier::next());
+
   if (!Thread::set_as_starting_thread(main_thread)) {
     vm_shutdown_during_initialization(
                                       "Failed necessary internal allocation. Out of swap space");
@@ -586,6 +592,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     return status;
   }
 
+  ObjectMonitor::Initialize2();
+
   JFR_ONLY(Jfr::on_create_vm_1();)
 
   // Should be done after the heap is fully created
@@ -1231,35 +1239,16 @@ GrowableArray<JavaThread*>* Threads::get_pending_threads(ThreadsList * t_list,
 }
 #endif // INCLUDE_JVMTI
 
-JavaThread *Threads::owning_thread_from_monitor_owner(ThreadsList * t_list,
-                                                      address owner) {
-  assert(LockingMode != LM_LIGHTWEIGHT, "Not with new lightweight locking");
-  // null owner means not locked so we can skip the search
-  if (owner == nullptr) return nullptr;
-
-  for (JavaThread* p : *t_list) {
-    // first, see if owner is the address of a Java thread
-    if (owner == (address)p) return p;
-  }
+JavaThread *Threads::owning_thread_from_stacklock(ThreadsList * t_list, address basicLock) {
+  assert(LockingMode == LM_LEGACY, "Not with new lightweight locking");
 
-  // Cannot assert on lack of success here since this function may be
-  // used by code that is trying to report useful problem information
-  // like deadlock detection.
-  if (LockingMode == LM_MONITOR) return nullptr;
-
-  // If we didn't find a matching Java thread and we didn't force use of
-  // heavyweight monitors, then the owner is the stack address of the
-  // Lock Word in the owning Java thread's stack.
-  //
   JavaThread* the_owner = nullptr;
   for (JavaThread* q : *t_list) {
-    if (q->is_lock_owned(owner)) {
+    if (q->is_lock_owned(basicLock)) {
       the_owner = q;
       break;
     }
   }
-
-  // cannot assert on lack of success here; see above comment
   return the_owner;
 }
 
@@ -1280,17 +1269,22 @@ JavaThread* Threads::owning_thread_from_object(ThreadsList * t_list, oop obj) {
 }
 
 JavaThread* Threads::owning_thread_from_monitor(ThreadsList* t_list, ObjectMonitor* monitor) {
-  if (LockingMode == LM_LIGHTWEIGHT) {
-    if (monitor->is_owner_anonymous()) {
+  if (monitor->has_anonymous_owner()) {
+    if (LockingMode == LM_LIGHTWEIGHT) {
       return owning_thread_from_object(t_list, monitor->object());
     } else {
-      Thread* owner = reinterpret_cast<Thread*>(monitor->owner());
-      assert(owner == nullptr || owner->is_Java_thread(), "only JavaThreads own monitors");
-      return reinterpret_cast<JavaThread*>(owner);
+      assert(LockingMode == LM_LEGACY, "invariant");
+      return owning_thread_from_stacklock(t_list, (address)monitor->stack_locker());
     }
   } else {
-    address owner = (address)monitor->owner();
-    return owning_thread_from_monitor_owner(t_list, owner);
+    JavaThread* the_owner = nullptr;
+    for (JavaThread* q : *t_list) {
+      if (monitor->has_owner(q)) {
+        the_owner = q;
+        break;
+      }
+    }
+    return the_owner;
   }
 }
 
@@ -1342,17 +1336,10 @@ void Threads::print_on(outputStream* st, bool print_stacks,
         p->trace_stack();
       } else {
         p->print_stack_on(st);
-        const oop thread_oop = p->threadObj();
-        if (thread_oop != nullptr) {
-          if (p->is_vthread_mounted()) {
-            const oop vt = p->vthread();
-            assert(vt != nullptr, "vthread should not be null when vthread is mounted");
-            // JavaThread._vthread can refer to the carrier thread. Print only if _vthread refers to a virtual thread.
-            if (vt != thread_oop) {
-              st->print_cr("   Mounted virtual thread #" INT64_FORMAT, (int64_t)java_lang_Thread::thread_id(vt));
-              p->print_vthread_stack_on(st);
-            }
-          }
+        if (p->is_vthread_mounted()) {
+          // _lock_id is the thread ID of the mounted virtual thread
+          st->print_cr("   Mounted virtual thread #" INT64_FORMAT, p->lock_id());
+          p->print_vthread_stack_on(st);
         }
       }
     }
diff --git a/src/hotspot/share/runtime/threads.hpp b/src/hotspot/share/runtime/threads.hpp
index 39e307122c8..979b1dffe26 100644
--- a/src/hotspot/share/runtime/threads.hpp
+++ b/src/hotspot/share/runtime/threads.hpp
@@ -134,9 +134,8 @@ class Threads: AllStatic {
   static GrowableArray<JavaThread*>* get_pending_threads(ThreadsList * t_list,
                                                          int count, address monitor);
 
-  // Get owning Java thread from the monitor's owner field.
-  static JavaThread *owning_thread_from_monitor_owner(ThreadsList * t_list,
-                                                      address owner);
+  // Get owning Java thread from the basicLock address.
+  static JavaThread *owning_thread_from_stacklock(ThreadsList * t_list, address basicLock);
 
   static JavaThread* owning_thread_from_object(ThreadsList* t_list, oop obj);
   static JavaThread* owning_thread_from_monitor(ThreadsList* t_list, ObjectMonitor* owner);
diff --git a/src/hotspot/share/runtime/timerTrace.hpp b/src/hotspot/share/runtime/timerTrace.hpp
index 8c7cdc8399b..ae632c0b46d 100644
--- a/src/hotspot/share/runtime/timerTrace.hpp
+++ b/src/hotspot/share/runtime/timerTrace.hpp
@@ -67,6 +67,8 @@ class TraceTime: public StackObj {
             TraceTimerLogPrintFunc ttlpf);
 
   ~TraceTime();
+
+  const char* title() const { return _title; }
 };
 
 
diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp
index d93b380ce92..41a46c86a70 100644
--- a/src/hotspot/share/runtime/vframe.cpp
+++ b/src/hotspot/share/runtime/vframe.cpp
@@ -280,13 +280,14 @@ intptr_t* interpretedVFrame::locals_addr_at(int offset) const {
 }
 
 GrowableArray<MonitorInfo*>* interpretedVFrame::monitors() const {
+  bool heap_frame = stack_chunk() != nullptr;
+  frame f = !heap_frame ? _fr : stack_chunk()->derelativize(_fr);
   GrowableArray<MonitorInfo*>* result = new GrowableArray<MonitorInfo*>(5);
-  if (stack_chunk() == nullptr) { // no monitors in continuations
-    for (BasicObjectLock* current = (fr().previous_monitor_in_interpreter_frame(fr().interpreter_frame_monitor_begin()));
-        current >= fr().interpreter_frame_monitor_end();
-        current = fr().previous_monitor_in_interpreter_frame(current)) {
-      result->push(new MonitorInfo(current->obj(), current->lock(), false, false));
-    }
+  for (BasicObjectLock* current = (f.previous_monitor_in_interpreter_frame(f.interpreter_frame_monitor_begin()));
+      current >= f.interpreter_frame_monitor_end();
+      current = f.previous_monitor_in_interpreter_frame(current)) {
+      oop owner = !heap_frame ? current->obj() : StackValue::create_stack_value_from_oop_location(stack_chunk(), (void*)current->obj_adr())->get_obj()();
+    result->push(new MonitorInfo(owner, current->lock(), false, false));
   }
   return result;
 }
diff --git a/src/hotspot/share/runtime/vframe.inline.hpp b/src/hotspot/share/runtime/vframe.inline.hpp
index 4630e695ce9..e7f9edbc232 100644
--- a/src/hotspot/share/runtime/vframe.inline.hpp
+++ b/src/hotspot/share/runtime/vframe.inline.hpp
@@ -122,6 +122,13 @@ inline vframeStream::vframeStream(JavaThread* thread, bool stop_at_java_call_stu
 
   if (thread->is_vthread_mounted()) {
     _frame = vthread_carrier ? _thread->carrier_last_frame(&_reg_map) : _thread->vthread_last_frame();
+    if (Continuation::is_continuation_enterSpecial(_frame)) {
+      // This can happen when calling async_get_stack_trace() and catching the target
+      // vthread at the JRT_BLOCK_END in freeze_internal() or when posting the Monitor
+      // Waited event after target vthread was preempted. Since all continuation frames
+      // are freezed we get the top frame from the stackChunk instead.
+      _frame = Continuation::last_frame(java_lang_VirtualThread::continuation(_thread->vthread()), &_reg_map);
+    }
   } else {
     _frame = _thread->last_frame();
   }
diff --git a/src/hotspot/share/runtime/vframe_hp.cpp b/src/hotspot/share/runtime/vframe_hp.cpp
index 28b62c60fd9..49ed47835d6 100644
--- a/src/hotspot/share/runtime/vframe_hp.cpp
+++ b/src/hotspot/share/runtime/vframe_hp.cpp
@@ -235,7 +235,7 @@ StackValue *compiledVFrame::create_stack_value(ScopeValue *sv) const {
 }
 
 BasicLock* compiledVFrame::resolve_monitor_lock(Location location) const {
-  return StackValue::resolve_monitor_lock(&_fr, location);
+  return StackValue::resolve_monitor_lock(stack_chunk() == nullptr ? _fr : stack_chunk()->derelativize(_fr), location);
 }
 
 
@@ -284,6 +284,7 @@ GrowableArray<MonitorInfo*>* compiledVFrame::monitors() const {
 
   // Replace the original values with any stores that have been
   // performed through compiledVFrame::update_monitors.
+  if (thread() == nullptr) return result; // Unmounted continuations have no thread so nothing to do.
   GrowableArrayView<jvmtiDeferredLocalVariableSet*>* list = JvmtiDeferredUpdates::deferred_locals(thread());
   if (list != nullptr ) {
     // In real life this never happens or is typically a single element search
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index eede52f00d5..50d85944485 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -114,7 +114,8 @@
   template(GTestStopSafepoint)                    \
   template(JFROldObject)                          \
   template(JvmtiPostObjectFree)                   \
-  template(RendezvousGCThreads)
+  template(RendezvousGCThreads)                   \
+  template(ReinitializeMDO)
 
 class Thread;
 class outputStream;
diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index af9911e0fdc..1f5d63a917e 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -275,13 +275,13 @@ void VM_ThreadDump::doit_epilogue() {
   }
 }
 
-// Hash table of void* to a list of ObjectMonitor* owned by the JavaThread.
+// Hash table of int64_t to a list of ObjectMonitor* owned by the JavaThread.
 // The JavaThread's owner key is either a JavaThread* or a stack lock
-// address in the JavaThread so we use "void*".
+// address in the JavaThread so we use "int64_t".
 //
 class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
  private:
-  static unsigned int ptr_hash(void* const& s1) {
+  static unsigned int ptr_hash(int64_t const& s1) {
     // 2654435761 = 2^32 * Phi (golden ratio)
     return (unsigned int)(((uint32_t)(uintptr_t)s1) * 2654435761u);
   }
@@ -294,24 +294,24 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
 
   // ResourceHashtable SIZE is specified at compile time so we
   // use 1031 which is the first prime after 1024.
-  typedef ResourceHashtable<void*, ObjectMonitorLinkedList*, 1031, AnyObj::C_HEAP, mtThread,
+  typedef ResourceHashtable<int64_t, ObjectMonitorLinkedList*, 1031, AnyObj::C_HEAP, mtThread,
                             &ObjectMonitorsDump::ptr_hash> PtrTable;
   PtrTable* _ptrs;
   size_t _key_count;
   size_t _om_count;
 
-  void add_list(void* key, ObjectMonitorLinkedList* list) {
+  void add_list(int64_t key, ObjectMonitorLinkedList* list) {
     _ptrs->put(key, list);
     _key_count++;
   }
 
-  ObjectMonitorLinkedList* get_list(void* key) {
+  ObjectMonitorLinkedList* get_list(int64_t key) {
     ObjectMonitorLinkedList** listpp = _ptrs->get(key);
     return (listpp == nullptr) ? nullptr : *listpp;
   }
 
   void add(ObjectMonitor* monitor) {
-    void* key = monitor->owner();
+    int64_t key = monitor->owner();
 
     ObjectMonitorLinkedList* list = get_list(key);
     if (list == nullptr) {
@@ -335,7 +335,7 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
   ~ObjectMonitorsDump() {
     class CleanupObjectMonitorsDump: StackObj {
      public:
-      bool do_entry(void*& key, ObjectMonitorLinkedList*& list) {
+      bool do_entry(int64_t& key, ObjectMonitorLinkedList*& list) {
         list->clear();  // clear the LinkListNodes
         delete list;    // then delete the LinkedList
         return true;
@@ -350,7 +350,7 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
   void do_monitor(ObjectMonitor* monitor) override {
     assert(monitor->has_owner(), "Expects only owned monitors");
 
-    if (monitor->is_owner_anonymous()) {
+    if (monitor->has_anonymous_owner()) {
       // There's no need to collect anonymous owned monitors
       // because the caller of this code is only interested
       // in JNI owned monitors.
@@ -368,7 +368,8 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
 
   // Implements the ObjectMonitorsView interface
   void visit(MonitorClosure* closure, JavaThread* thread) override {
-    ObjectMonitorLinkedList* list = get_list(thread);
+    int64_t key = ObjectMonitor::owner_from(thread);
+    ObjectMonitorLinkedList* list = get_list(key);
     LinkedListIterator<ObjectMonitor*> iter(list != nullptr ? list->head() : nullptr);
     while (!iter.is_empty()) {
       ObjectMonitor* monitor = *iter.next();
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 3060e225427..bc941534242 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -665,6 +665,7 @@
   nonstatic_field(JavaThread,                  _vframe_array_head,                            vframeArray*)                          \
   nonstatic_field(JavaThread,                  _vframe_array_last,                            vframeArray*)                          \
   nonstatic_field(JavaThread,                  _active_handles,                               JNIHandleBlock*)                       \
+  nonstatic_field(JavaThread,                  _lock_id,                                      int64_t)                               \
   volatile_nonstatic_field(JavaThread,         _terminated,                                   JavaThread::TerminatedTypes)           \
   nonstatic_field(Thread,                      _resource_area,                                ResourceArea*)                         \
   nonstatic_field(CompilerThread,              _env,                                          ciEnv*)                                \
@@ -785,7 +786,8 @@
                                                                                                                                      \
   volatile_nonstatic_field(ObjectMonitor,      _metadata,                                     uintptr_t)                             \
   unchecked_nonstatic_field(ObjectMonitor,     _object,                                       sizeof(void *)) /* NOTE: no type */    \
-  unchecked_nonstatic_field(ObjectMonitor,     _owner,                                        sizeof(void *)) /* NOTE: no type */    \
+  volatile_nonstatic_field(ObjectMonitor,      _owner,                                        int64_t)                               \
+  volatile_nonstatic_field(ObjectMonitor,      _stack_locker,                                 BasicLock*)                            \
   volatile_nonstatic_field(ObjectMonitor,      _next_om,                                      ObjectMonitor*)                        \
   volatile_nonstatic_field(BasicLock,          _metadata,                                     uintptr_t)                             \
   nonstatic_field(ObjectMonitor,               _contentions,                                  int)                                   \
@@ -2004,8 +2006,6 @@
   declare_constant(BytesPerWord)                                          \
   declare_constant(BytesPerLong)                                          \
                                                                           \
-  declare_constant(LogKlassAlignmentInBytes)                              \
-                                                                          \
   declare_constant(HeapWordSize)                                          \
   declare_constant(LogHeapWordSize)                                       \
                                                                           \
@@ -2510,6 +2510,7 @@
   declare_constant(markWord::lock_shift)                                  \
   declare_constant(markWord::age_shift)                                   \
   declare_constant(markWord::hash_shift)                                  \
+  LP64_ONLY(declare_constant(markWord::klass_shift))                      \
                                                                           \
   declare_constant(markWord::lock_mask)                                   \
   declare_constant(markWord::lock_mask_in_place)                          \
@@ -2533,7 +2534,9 @@
   declare_constant(InvocationCounter::count_shift)                        \
                                                                           \
   /* ObjectMonitor constants */                                           \
+  declare_constant(ObjectMonitor::NO_OWNER)                               \
   declare_constant(ObjectMonitor::ANONYMOUS_OWNER)                        \
+  declare_constant(ObjectMonitor::DEFLATER_MARKER)                        \
 
 //--------------------------------------------------------------------------------
 //
diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index 90f5930cce0..8cf5c31b0b3 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -628,15 +628,16 @@ bool AttachOperation::read_request(RequestReader* reader) {
     buffer_size = (name_length_max + 1) + arg_count_max * (arg_length_max + 1);
     min_str_count = 1 /*name*/ + arg_count_max;
     break;
-  case ATTACH_API_V2: // <ver>0<size>0<cmd>0<arg>0<arg>0<arg>0
+  case ATTACH_API_V2: // <ver>0<size>0<cmd>0(<arg>0)* (any number of arguments)
     if (AttachListener::get_supported_version() < 2) {
-        log_error(attach)("Failed to read request: v2 is unsupported ot disabled");
+        log_error(attach)("Failed to read request: v2 is unsupported or disabled");
         return false;
     }
 
     // read size of the data
     buffer_size = reader->read_uint();
     if (buffer_size < 0) {
+      log_error(attach)("Failed to read request: negative request size (%d)", buffer_size);
       return false;
     }
     log_debug(attach)("v2 request, data size = %d", buffer_size);
@@ -646,7 +647,7 @@ bool AttachOperation::read_request(RequestReader* reader) {
       log_error(attach)("Failed to read request: too big");
       return false;
     }
-    // Must contain exact 'buffer_size' bytes.
+    // Must contain exactly 'buffer_size' bytes.
     min_read_size = buffer_size;
     break;
   default:
diff --git a/src/hotspot/share/services/diagnosticFramework.cpp b/src/hotspot/share/services/diagnosticFramework.cpp
index 73aa80a950f..16f074c9cb5 100644
--- a/src/hotspot/share/services/diagnosticFramework.cpp
+++ b/src/hotspot/share/services/diagnosticFramework.cpp
@@ -424,7 +424,7 @@ bool DCmd::reorder_help_cmd(CmdLine line, stringStream &updated_line) {
   args.print("%s", line.args_addr());
   char* rest = args.as_string();
   char* token = strtok_r(rest, " ", &rest);
-  while (token != NULL) {
+  while (token != nullptr) {
     if (strcmp(token, "-h") == 0 || strcmp(token, "--help") == 0 ||
         strcmp(token, "-help") == 0) {
       updated_line.print("%s", "help ");
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index 10e1a804ad2..91bcce382f0 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -1875,9 +1875,12 @@ void ThreadDumper::dump_stack_refs(AbstractDumpWriter * writer) {
         // native frame
         blk.set_frame_number(depth);
         if (is_top_frame) {
-          // JNI locals for the top frame.
-          assert(_java_thread != nullptr, "impossible for unmounted vthread");
-          _java_thread->active_handles()->oops_do(&blk);
+          // JNI locals for the top frame if mounted
+          assert(_java_thread != nullptr || jvf->method()->is_synchronized()
+                 || jvf->method()->is_object_wait0(), "impossible for unmounted vthread");
+          if (_java_thread != nullptr) {
+            _java_thread->active_handles()->oops_do(&blk);
+          }
         } else {
           if (last_entry_frame != nullptr) {
             // JNI locals for the entry frame
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index a1ad0a910f6..8cb8bf19bba 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -464,23 +464,14 @@ DeadlockCycle* ThreadService::find_deadlocks_at_safepoint(ThreadsList * t_list,
       } else if (waitingToLockMonitor != nullptr) {
         if (waitingToLockMonitor->has_owner()) {
           currentThread = Threads::owning_thread_from_monitor(t_list, waitingToLockMonitor);
-          if (currentThread == nullptr) {
-            // This function is called at a safepoint so the JavaThread
-            // that owns waitingToLockMonitor should be findable, but
-            // if it is not findable, then the previous currentThread is
-            // blocked permanently. We record this as a deadlock.
-            num_deadlocks++;
-
-            // add this cycle to the deadlocks list
-            if (deadlocks == nullptr) {
-              deadlocks = cycle;
-            } else {
-              last->set_next(cycle);
-            }
-            last = cycle;
-            cycle = new DeadlockCycle();
-            break;
-          }
+          // If currentThread is null we would like to know if the owner
+          // is an unmounted vthread (no JavaThread*), because if it's not,
+          // it would mean the previous currentThread is blocked permanently
+          // and we should record this as a deadlock. Since there is currently
+          // no fast way to determine if the owner is indeed an unmounted
+          // vthread we never record this as a deadlock. Note: unless there
+          // is a bug in the VM, or a thread exits without releasing monitors
+          // acquired through JNI, null should imply an unmounted vthread owner.
         }
       } else {
         if (concurrent_locks) {
@@ -1053,8 +1044,8 @@ void DeadlockCycle::print_on_with(ThreadsList * t_list, outputStream* st) const
         // that owns waitingToLockMonitor should be findable, but
         // if it is not findable, then the previous currentThread is
         // blocked permanently.
-        st->print_cr("%s UNKNOWN_owner_addr=" PTR_FORMAT, owner_desc,
-                  p2i(waitingToLockMonitor->owner()));
+        st->print_cr("%s UNKNOWN_owner_addr=" INT64_FORMAT, owner_desc,
+                     waitingToLockMonitor->owner());
         continue;
       }
     } else {
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index 5656655275a..74491e39ea9 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -491,7 +491,7 @@ inline void ConcurrentHashTable<CONFIG, MT>::
   Node* ndel_stack[StackBufferSize];
   InternalTable* table = get_table();
   assert(start_idx < stop_idx, "Must be");
-  assert(stop_idx <= _table->_size, "Must be");
+  assert(stop_idx <= _table->_size, "stop_idx %zu larger than table size %zu", stop_idx, _table->_size);
   // Here manual do critical section since we don't want to take the cost of
   // locking the bucket if there is nothing to delete. But we can have
   // concurrent single deletes. The _invisible_epoch can only be used by the
@@ -1185,7 +1185,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   do_scan_for_range(FUNC& scan_f, size_t start_idx, size_t stop_idx, InternalTable* table)
 {
   assert(start_idx < stop_idx, "Must be");
-  assert(stop_idx <= table->_size, "Must be");
+  assert(stop_idx <= table->_size, "stop_idx %zu larger than table size %zu", stop_idx, table->_size);
 
   for (size_t bucket_it = start_idx; bucket_it < stop_idx; ++bucket_it) {
     Bucket* bucket = table->get_bucket(bucket_it);
diff --git a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
index 3b28328d7dd..237d12baa6d 100644
--- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,11 @@
 #define _USE_MATH_DEFINES
 # include <math.h>
 
+// Only 64-bit Windows is supported
+#ifndef _LP64
+#error unsupported platform
+#endif
+
 // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
 // When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
 // system header files.  On 32-bit architectures, there is no problem.
@@ -61,17 +66,11 @@
 // pointer when it extracts the argument, then we may have a problem.
 //
 // Solution: For 64-bit architectures, redefine NULL as 64-bit constant 0.
-#ifdef _LP64
 #undef NULL
 // 64-bit Windows uses a P64 data model (not LP64, although we define _LP64)
 // Since longs are 32-bit we cannot use 0L here.  Use the Visual C++ specific
 // 64-bit integer-suffix (LL) instead.
 #define NULL 0LL
-#else
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
 
 // NULL vs NULL_WORD:
 // On Linux NULL is defined as a special type '__null'. Assigning __null to
@@ -79,11 +78,7 @@
 // pointer is stored as integer value.
 #define NULL_WORD NULL
 
-#ifdef _WIN64
 typedef int64_t ssize_t;
-#else
-typedef int32_t ssize_t;
-#endif
 
 // Non-standard stdlib-like stuff:
 inline int strcasecmp(const char *s1, const char *s2) { return _stricmp(s1,s2); }
@@ -120,13 +115,8 @@ inline int g_isfinite(jdouble f)                 { return _finite(f); }
 #endif
 
 #ifndef SSIZE_MAX
-#ifdef _LP64
 #define SSIZE_MIN LLONG_MIN
 #define SSIZE_MAX LLONG_MAX
-#else
-#define SSIZE_MIN INT_MIN
-#define SSIZE_MAX INT_MAX
-#endif
 #endif // SSIZE_MAX missing
 
 #endif // SHARE_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 0df77689a04..23db59f766a 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -717,10 +717,6 @@ void VMError::report(outputStream* st, bool _verbose) {
   address lastpc = nullptr;
 
   BEGIN
-  if (MemTracker::enabled() && NmtVirtualMemory_lock != nullptr && NmtVirtualMemory_lock->owned_by_self()) {
-    // Manually unlock to avoid reentrancy due to mallocs in detailed mode.
-    NmtVirtualMemory_lock->unlock();
-  }
 
   STEP("printing fatal error message")
     st->print_cr("#");
diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
index a07a927e635..14f4e87448b 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import jdk.internal.misc.Blocker;
 
 import static sun.nio.ch.EPoll.EPOLLIN;
 import static sun.nio.ch.EPoll.EPOLL_CTL_ADD;
@@ -105,36 +104,71 @@ protected int doSelect(Consumer<SelectionKey> action, long timeout)
         int numEntries;
         processUpdateQueue();
         processDeregisterQueue();
-        try {
-            begin(blocking);
 
-            do {
-                long startTime = timedPoll ? System.nanoTime() : 0;
-                boolean attempted = Blocker.begin(blocking);
-                try {
+        if (Thread.currentThread().isVirtual()) {
+            numEntries = (timedPoll)
+                    ? timedPoll(TimeUnit.MILLISECONDS.toNanos(to))
+                    : untimedPoll(blocking);
+        } else {
+            try {
+                begin(blocking);
+                do {
+                    long startTime = timedPoll ? System.nanoTime() : 0;
                     numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, to);
-                } finally {
-                    Blocker.end(attempted);
-                }
-                if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
-                    // timed poll interrupted so need to adjust timeout
-                    long adjust = System.nanoTime() - startTime;
-                    to -= (int) TimeUnit.NANOSECONDS.toMillis(adjust);
-                    if (to <= 0) {
-                        // timeout expired so no retry
-                        numEntries = 0;
+                    if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
+                        // timed poll interrupted so need to adjust timeout
+                        long adjust = System.nanoTime() - startTime;
+                        to -= (int) TimeUnit.NANOSECONDS.toMillis(adjust);
+                        if (to <= 0) {
+                            // timeout expired so no retry
+                            numEntries = 0;
+                        }
                     }
-                }
-            } while (numEntries == IOStatus.INTERRUPTED);
-            assert IOStatus.check(numEntries);
-
-        } finally {
-            end(blocking);
+                } while (numEntries == IOStatus.INTERRUPTED);
+            } finally {
+                end(blocking);
+            }
         }
+        assert IOStatus.check(numEntries);
+
         processDeregisterQueue();
         return processEvents(numEntries, action);
     }
 
+    /**
+     * If blocking, parks the current virtual thread until a file descriptor is polled
+     * or the thread is interrupted.
+     */
+    private int untimedPoll(boolean block) throws IOException {
+        int numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0);
+        if (block) {
+            while (numEntries == 0 && !Thread.currentThread().isInterrupted()) {
+                Poller.pollSelector(epfd, 0);
+                numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0);
+            }
+        }
+        return numEntries;
+    }
+
+    /**
+     * Parks the current virtual thread until a file descriptor is polled, or the thread
+     * is interrupted, for up to the specified waiting time.
+     */
+    private int timedPoll(long nanos) throws IOException {
+        long startNanos = System.nanoTime();
+        int numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0);
+        while (numEntries == 0 && !Thread.currentThread().isInterrupted()) {
+            long remainingNanos = nanos - (System.nanoTime() - startNanos);
+            if (remainingNanos <= 0) {
+                // timeout
+                break;
+            }
+            Poller.pollSelector(epfd, remainingNanos);
+            numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0);
+        }
+        return numEntries;
+    }
+
     /**
      * Process changes to the interest ops.
      */
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
index 6abc9e31879..b1a781d7144 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import jdk.internal.misc.Blocker;
 
 import static sun.nio.ch.KQueue.EVFILT_READ;
 import static sun.nio.ch.KQueue.EVFILT_WRITE;
@@ -109,36 +108,71 @@ protected int doSelect(Consumer<SelectionKey> action, long timeout)
         int numEntries;
         processUpdateQueue();
         processDeregisterQueue();
-        try {
-            begin(blocking);
 
-            do {
-                long startTime = timedPoll ? System.nanoTime() : 0;
-                boolean attempted = Blocker.begin(blocking);
-                try {
+        if (Thread.currentThread().isVirtual()) {
+            numEntries = (timedPoll)
+                    ? timedPoll(TimeUnit.MILLISECONDS.toNanos(to))
+                    : untimedPoll(blocking);
+        } else {
+            try {
+                begin(blocking);
+                do {
+                    long startTime = timedPoll ? System.nanoTime() : 0;
                     numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, to);
-                } finally {
-                    Blocker.end(attempted);
-                }
-                if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
-                    // timed poll interrupted so need to adjust timeout
-                    long adjust = System.nanoTime() - startTime;
-                    to -= TimeUnit.NANOSECONDS.toMillis(adjust);
-                    if (to <= 0) {
-                        // timeout expired so no retry
-                        numEntries = 0;
+                    if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
+                        // timed poll interrupted so need to adjust timeout
+                        long adjust = System.nanoTime() - startTime;
+                        to -= TimeUnit.NANOSECONDS.toMillis(adjust);
+                        if (to <= 0) {
+                            // timeout expired so no retry
+                            numEntries = 0;
+                        }
                     }
-                }
-            } while (numEntries == IOStatus.INTERRUPTED);
-            assert IOStatus.check(numEntries);
-
-        } finally {
-            end(blocking);
+                } while (numEntries == IOStatus.INTERRUPTED);
+            } finally {
+                end(blocking);
+            }
         }
+        assert IOStatus.check(numEntries);
+
         processDeregisterQueue();
         return processEvents(numEntries, action);
     }
 
+    /**
+     * If blocking, parks the current virtual thread until a file descriptor is polled
+     * or the thread is interrupted.
+     */
+    private int untimedPoll(boolean block) throws IOException {
+        int numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0);
+        if (block) {
+            while (numEntries == 0 && !Thread.currentThread().isInterrupted()) {
+                Poller.pollSelector(kqfd, 0);
+                numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0);
+            }
+        }
+        return numEntries;
+    }
+
+    /**
+     * Parks the current virtual thread until a file descriptor is polled, or the thread
+     * is interrupted, for up to the specified waiting time.
+     */
+    private int timedPoll(long nanos) throws IOException {
+        long startNanos = System.nanoTime();
+        int numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0);
+        while (numEntries == 0 && !Thread.currentThread().isInterrupted()) {
+            long remainingNanos = nanos - (System.nanoTime() - startNanos);
+            if (remainingNanos <= 0) {
+                // timeout
+                break;
+            }
+            Poller.pollSelector(kqfd, remainingNanos);
+            numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0);
+        }
+        return numEntries;
+    }
+
     /**
      * Process changes to the interest ops.
      */
diff --git a/src/java.base/macosx/native/libjava/java_props_macosx.c b/src/java.base/macosx/native/libjava/java_props_macosx.c
index f50daac13cb..07bc2be9d54 100644
--- a/src/java.base/macosx/native/libjava/java_props_macosx.c
+++ b/src/java.base/macosx/native/libjava/java_props_macosx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -222,54 +222,35 @@ char *setupMacOSXLocale(int cat) {
     }
 }
 
-// 10.9 SDK does not include the NSOperatingSystemVersion struct.
-// For now, create our own
-typedef struct {
-        NSInteger majorVersion;
-        NSInteger minorVersion;
-        NSInteger patchVersion;
-} OSVerStruct;
-
 void setOSNameAndVersion(java_props_t *sprops) {
     // Hardcode os_name, and fill in os_version
     sprops->os_name = strdup("Mac OS X");
 
     NSString *nsVerStr = NULL;
     char* osVersionCStr = NULL;
-    // Mac OS 10.9 includes the [NSProcessInfo operatingSystemVersion] function,
-    // but it's not in the 10.9 SDK.  So, call it via NSInvocation.
-    if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) {
-        OSVerStruct osVer;
-        NSMethodSignature *sig = [[NSProcessInfo processInfo] methodSignatureForSelector:
-                @selector(operatingSystemVersion)];
-        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:sig];
-        invoke.selector = @selector(operatingSystemVersion);
-        [invoke invokeWithTarget:[NSProcessInfo processInfo]];
-        [invoke getReturnValue:&osVer];
-
-        // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
-        // or explicitly requesting version compatibility
-        if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
-                (getenv("SYSTEM_VERSION_COMPAT") != NULL)) {
-            if (osVer.patchVersion == 0) { // Omit trailing ".0"
-                nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
-                        (long)osVer.majorVersion, (long)osVer.minorVersion];
-            } else {
-                nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
-                        (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
-            }
+    NSOperatingSystemVersion osVer = [[NSProcessInfo processInfo] operatingSystemVersion];
+    // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
+    // or explicitly requesting version compatibility
+    if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
+            (getenv("SYSTEM_VERSION_COMPAT") != NULL)) {
+        if (osVer.patchVersion == 0) { // Omit trailing ".0"
+            nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
+                    (long)osVer.majorVersion, (long)osVer.minorVersion];
         } else {
-            // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
-            // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
-            // If not found, fallback below to the SystemVersion.plist
-            NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
-                             @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
-            if (version != NULL) {
-                nsVerStr = [version objectForKey : @"ProductVersion"];
-            }
+            nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
+                    (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
+        }
+    } else {
+        // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
+        // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
+        // If not found, fallback below to the SystemVersion.plist
+        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
+                         @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
+        if (version != NULL) {
+            nsVerStr = [version objectForKey : @"ProductVersion"];
         }
     }
-    // Fallback if running on pre-10.9 Mac OS
+    // Fallback to reading the SystemVersion.plist
     if (nsVerStr == NULL) {
         NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
                                  @"/System/Library/CoreServices/SystemVersion.plist"];
diff --git a/src/java.base/macosx/native/libjli/java_md_macosx.m b/src/java.base/macosx/native/libjli/java_md_macosx.m
index 354efc69769..c836ae903e5 100644
--- a/src/java.base/macosx/native/libjli/java_md_macosx.m
+++ b/src/java.base/macosx/native/libjli/java_md_macosx.m
@@ -415,6 +415,8 @@ static void MacOSXStartup(int argc, char *argv[]) {
 {
     char libjava[MAXPATHLEN];
 
+    JLI_TraceLauncher("Attempt to get JDK installation root from launcher executable path\n");
+
     if (GetApplicationHome(path, pathsize)) {
         /* Is the JDK co-located with the application? */
         if (JLI_IsStaticallyLinked()) {
@@ -429,18 +431,6 @@ static void MacOSXStartup(int argc, char *argv[]) {
                 return JNI_TRUE;
             }
         }
-        /* ensure storage for path + /jre + NULL */
-        if ((JLI_StrLen(path) + 4 + 1) > (size_t) pathsize) {
-            JLI_TraceLauncher("Insufficient space to store JRE path\n");
-            return JNI_FALSE;
-        }
-        /* Does the app ship a private JRE in <apphome>/jre directory? */
-        JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path);
-        if (access(libjava, F_OK) == 0) {
-            JLI_StrCat(path, "/jre");
-            JLI_TraceLauncher("JRE path is %s\n", path);
-            return JNI_TRUE;
-        }
     }
 
     /* try to find ourselves instead */
diff --git a/src/java.base/share/classes/java/io/ByteArrayOutputStream.java b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
index 8f5ff41957e..020cd1f878a 100644
--- a/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
+++ b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
@@ -159,16 +159,8 @@ public void writeBytes(byte[] b) {
      * @throws  NullPointerException if {@code out} is {@code null}.
      * @throws  IOException if an I/O error occurs.
      */
-    public void writeTo(OutputStream out) throws IOException {
-        if (Thread.currentThread().isVirtual()) {
-            byte[] bytes;
-            synchronized (this) {
-                bytes = Arrays.copyOf(buf, count);
-            }
-            out.write(bytes);
-        } else synchronized (this) {
-            out.write(buf, 0, count);
-        }
+    public synchronized void writeTo(OutputStream out) throws IOException {
+        out.write(buf, 0, count);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index 61c15bdd15c..b8eda9dcf83 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -556,9 +556,6 @@ public boolean isAbsolute() {
      * @return  The absolute pathname string denoting the same file or
      *          directory as this abstract pathname
      *
-     * @throws  SecurityException
-     *          If a required system property value cannot be accessed.
-     *
      * @see     java.io.File#isAbsolute()
      */
     public String getAbsolutePath() {
@@ -572,9 +569,6 @@ public String getAbsolutePath() {
      * @return  The absolute abstract pathname denoting the same file or
      *          directory as this abstract pathname
      *
-     * @throws  SecurityException
-     *          If a required system property value cannot be accessed.
-     *
      * @since 1.2
      */
     public File getAbsoluteFile() {
@@ -614,12 +608,6 @@ public File getAbsoluteFile() {
      *          construction of the canonical pathname may require
      *          filesystem queries
      *
-     * @throws  SecurityException
-     *          If a required system property value cannot be accessed, or
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead} method denies
-     *          read access to the file
-     *
      * @since   1.1
      * @see     Path#toRealPath
      */
@@ -642,12 +630,6 @@ public String getCanonicalPath() throws IOException {
      *          construction of the canonical pathname may require
      *          filesystem queries
      *
-     * @throws  SecurityException
-     *          If a required system property value cannot be accessed, or
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead} method denies
-     *          read access to the file
-     *
      * @since 1.2
      * @see     Path#toRealPath
      */
@@ -736,8 +718,6 @@ public URL toURL() throws MalformedURLException {
      * @return  An absolute, hierarchical URI with a scheme equal to
      *          {@code "file"}, a path representing this abstract pathname,
      *          and undefined authority, query, and fragment components
-     * @throws SecurityException If a required system property value cannot
-     * be accessed.
      *
      * @see #File(java.net.URI)
      * @see java.net.URI
@@ -769,11 +749,6 @@ public URI toURI() {
      * @return  {@code true} if and only if the file specified by this
      *          abstract pathname exists <em>and</em> can be read by the
      *          application; {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
      */
     public boolean canRead() {
         @SuppressWarnings("removal")
@@ -798,11 +773,6 @@ public boolean canRead() {
      *          contains a file denoted by this abstract pathname <em>and</em>
      *          the application is allowed to write to the file;
      *          {@code false} otherwise.
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
      */
     public boolean canWrite() {
         @SuppressWarnings("removal")
@@ -822,11 +792,6 @@ public boolean canWrite() {
      *
      * @return  {@code true} if and only if the file or directory denoted
      *          by this abstract pathname exists; {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file or directory
      */
     public boolean exists() {
         @SuppressWarnings("removal")
@@ -853,11 +818,6 @@ public boolean exists() {
      * @return {@code true} if and only if the file denoted by this
      *          abstract pathname exists <em>and</em> is a directory;
      *          {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
      */
     public boolean isDirectory() {
         @SuppressWarnings("removal")
@@ -886,11 +846,6 @@ public boolean isDirectory() {
      * @return  {@code true} if and only if the file denoted by this
      *          abstract pathname exists <em>and</em> is a normal file;
      *          {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
      */
     public boolean isFile() {
         @SuppressWarnings("removal")
@@ -923,11 +878,6 @@ public boolean isFile() {
      *          abstract pathname is hidden according to the conventions of the
      *          underlying platform
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
-     *
      * @since 1.2
      */
     public boolean isHidden() {
@@ -968,11 +918,6 @@ public boolean isHidden() {
      *          file does not exist or if an I/O error occurs.  The value may
      *          be negative indicating the number of milliseconds before the
      *          epoch
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
      */
     public long lastModified() {
         @SuppressWarnings("removal")
@@ -1000,11 +945,6 @@ public long lastModified() {
      *          pathname, or {@code 0L} if the file does not exist.  Some
      *          operating systems may return {@code 0L} for pathnames
      *          denoting system-dependent entities such as devices or pipes.
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method denies read access to the file
      */
     public long length() {
         @SuppressWarnings("removal")
@@ -1040,11 +980,6 @@ public long length() {
      * @throws  IOException
      *          If an I/O error occurred
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.2
      */
     public boolean createNewFile() throws IOException {
@@ -1070,11 +1005,6 @@ public boolean createNewFile() throws IOException {
      *
      * @return  {@code true} if and only if the file or directory is
      *          successfully deleted; {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkDelete} method denies
-     *          delete access to the file
      */
     public boolean delete() {
         @SuppressWarnings("removal")
@@ -1108,11 +1038,6 @@ public boolean delete() {
      * {@link java.nio.channels.FileLock FileLock}
      * facility should be used instead.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkDelete} method denies
-     *          delete access to the file
-     *
      * @see #delete
      *
      * @since 1.2
@@ -1155,11 +1080,6 @@ public void deleteOnExit() {
      *          empty if the directory is empty.  Returns {@code null} if
      *          this abstract pathname does not denote a directory, or if an
      *          I/O error occurs.
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
      */
     public String[] list() {
         return normalizedList();
@@ -1175,11 +1095,6 @@ public String[] list() {
      *          empty if the directory is empty.  Returns {@code null} if
      *          this abstract pathname does not denote a directory, or if an
      *          I/O error occurs.
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
      */
     private final String[] normalizedList() {
         @SuppressWarnings("removal")
@@ -1223,11 +1138,6 @@ private final String[] normalizedList() {
      *          Returns {@code null} if this abstract pathname does not denote
      *          a directory, or if an I/O error occurs.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
-     *
      * @see java.nio.file.Files#newDirectoryStream(Path,String)
      */
     public String[] list(FilenameFilter filter) {
@@ -1275,11 +1185,6 @@ public String[] list(FilenameFilter filter) {
      *          {@code null} if this abstract pathname does not denote a
      *          directory, or if an I/O error occurs.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
-     *
      * @since  1.2
      */
     public File[] listFiles() {
@@ -1315,11 +1220,6 @@ public File[] listFiles() {
      *          {@code null} if this abstract pathname does not denote a
      *          directory, or if an I/O error occurs.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
-     *
      * @since  1.2
      * @see java.nio.file.Files#newDirectoryStream(Path,String)
      */
@@ -1353,11 +1253,6 @@ public File[] listFiles(FilenameFilter filter) {
      *          {@code null} if this abstract pathname does not denote a
      *          directory, or if an I/O error occurs.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkRead(String)} method denies read access to
-     *          the directory
-     *
      * @since  1.2
      * @see java.nio.file.Files#newDirectoryStream(Path,java.nio.file.DirectoryStream.Filter)
      */
@@ -1378,11 +1273,6 @@ public File[] listFiles(FileFilter filter) {
      *
      * @return  {@code true} if and only if the directory was
      *          created; {@code false} otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method does not permit the named directory to be created
      */
     public boolean mkdir() {
         @SuppressWarnings("removal")
@@ -1405,16 +1295,6 @@ public boolean mkdir() {
      * @return  {@code true} if and only if the directory was created,
      *          along with all necessary parent directories; {@code false}
      *          otherwise
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkRead(java.lang.String)}
-     *          method does not permit verification of the existence of the
-     *          named directory and all necessary parent directories; or if
-     *          the {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method does not permit the named directory and all necessary
-     *          parent directories to be created
      */
     public boolean mkdirs() {
         if (exists()) {
@@ -1458,11 +1338,6 @@ public boolean mkdirs() {
      * @return  {@code true} if and only if the renaming succeeded;
      *          {@code false} otherwise
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to either the old or new pathnames
-     *
      * @throws  NullPointerException
      *          If parameter {@code dest} is {@code null}
      */
@@ -1501,11 +1376,6 @@ public boolean renameTo(File dest) {
      *
      * @throws  IllegalArgumentException  If the argument is negative
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the named file
-     *
      * @since 1.2
      */
     public boolean setLastModified(long time) {
@@ -1533,11 +1403,6 @@ public boolean setLastModified(long time) {
      * @return {@code true} if and only if the operation succeeded;
      *          {@code false} otherwise
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the named file
-     *
      * @since 1.2
      */
     public boolean setReadOnly() {
@@ -1577,11 +1442,6 @@ public boolean setReadOnly() {
      *          operation will fail if the user does not have permission to change
      *          the access permissions of this abstract pathname.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the named file
-     *
      * @since 1.6
      */
     public boolean setWritable(boolean writable, boolean ownerOnly) {
@@ -1617,11 +1477,6 @@ public boolean setWritable(boolean writable, boolean ownerOnly) {
      *          operation will fail if the user does not have permission to
      *          change the access permissions of this abstract pathname.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.6
      */
     public boolean setWritable(boolean writable) {
@@ -1659,11 +1514,6 @@ public boolean setWritable(boolean writable) {
      *          fails, or the value of the {@code readable} parameter if
      *          setting the read permission is not supported.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.6
      */
     public boolean setReadable(boolean readable, boolean ownerOnly) {
@@ -1705,11 +1555,6 @@ public boolean setReadable(boolean readable, boolean ownerOnly) {
      *          fails, or the value of the {@code readable} parameter if
      *          setting the read permission is not supported.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.6
      */
     public boolean setReadable(boolean readable) {
@@ -1747,11 +1592,6 @@ public boolean setReadable(boolean readable) {
      *          fails, or the value of the {@code executable} parameter if
      *          setting the execute permission is not supported.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.6
      */
     public boolean setExecutable(boolean executable, boolean ownerOnly) {
@@ -1793,11 +1633,6 @@ public boolean setExecutable(boolean executable, boolean ownerOnly) {
      *          fails, or the value of the {@code executable} parameter if
      *          setting the execute permission is not supported.
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method denies write access to the file
-     *
      * @since 1.6
      */
     public boolean setExecutable(boolean executable) {
@@ -1814,11 +1649,6 @@ public boolean setExecutable(boolean executable) {
      * @return  {@code true} if and only if the abstract pathname exists
      *          <em>and</em> the application is allowed to execute the file
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkExec(java.lang.String)}
-     *          method denies execute access to the file
-     *
      * @since 1.6
      */
     public boolean canExecute() {
@@ -1850,12 +1680,6 @@ public boolean canExecute() {
      * machine will begin with one of the roots returned by this method.
      * There is no guarantee that a root directory can be accessed.
      *
-     * <p> Unlike most methods in this class, this method does not throw
-     * security exceptions.  If a security manager exists and its {@link
-     * SecurityManager#checkRead(String)} method denies read access to a
-     * particular root directory, then that directory will not appear in the
-     * result.
-     *
      * @implNote
      * Windows platforms, for example, have a root directory
      * for each active drive; UNIX platforms have a single root directory,
@@ -1898,12 +1722,6 @@ public static File[] listRoots() {
      *          abstract pathname does not name a partition or if the size
      *          cannot be obtained
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("getFileSystemAttributes")}
-     *          or its {@link SecurityManager#checkRead(String)} method denies
-     *          read access to the file named by this abstract pathname
-     *
      * @since  1.6
      * @see FileStore#getTotalSpace
      */
@@ -1942,12 +1760,6 @@ public long getTotalSpace() {
      *          equal to the total file system size returned by
      *          {@link #getTotalSpace}.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("getFileSystemAttributes")}
-     *          or its {@link SecurityManager#checkRead(String)} method denies
-     *          read access to the file named by this abstract pathname
-     *
      * @since  1.6
      * @see FileStore#getUnallocatedSpace
      */
@@ -1989,12 +1801,6 @@ public long getFreeSpace() {
      *          is not available, this method will be equivalent to a call to
      *          {@link #getFreeSpace}.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("getFileSystemAttributes")}
-     *          or its {@link SecurityManager#checkRead(String)} method denies
-     *          read access to the file named by this abstract pathname
-     *
      * @since  1.6
      * @see FileStore#getUsableSpace
      */
@@ -2176,11 +1982,6 @@ static File generateFile(String prefix, String suffix, File dir)
      * @throws  IOException
      *          If a file could not be created
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method does not allow a file to be created
-     *
      * @since 1.2
      */
     public static File createTempFile(String prefix, String suffix,
@@ -2250,11 +2051,6 @@ public static File createTempFile(String prefix, String suffix,
      *
      * @throws  IOException  If a file could not be created
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *          method does not allow a file to be created
-     *
      * @since 1.2
      * @see java.nio.file.Files#createTempDirectory(String,FileAttribute[])
      */
diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java
index 4210a0f56b6..e429faec09b 100644
--- a/src/java.base/share/classes/java/io/FileInputStream.java
+++ b/src/java.base/share/classes/java/io/FileInputStream.java
@@ -95,11 +95,6 @@ public class FileInputStream extends InputStream
      * object is created to represent this file
      * connection.
      * <p>
-     * First, if there is a security
-     * manager, its {@code checkRead} method
-     * is called with the {@code name} argument
-     * as its argument.
-     * <p>
      * If the named file does not exist, is a directory rather than a regular
      * file, or for some other reason cannot be opened for reading then a
      * {@code FileNotFoundException} is thrown.
@@ -109,10 +104,6 @@ public class FileInputStream extends InputStream
      *             is a directory rather than a regular file,
      *             or for some other reason cannot be opened for
      *             reading.
-     * @throws     SecurityException      if a security manager exists and its
-     *             {@code checkRead} method denies read access
-     *             to the file.
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
      */
     public FileInputStream(String name) throws FileNotFoundException {
         this(name != null ? new File(name) : null);
@@ -126,11 +117,6 @@ public FileInputStream(String name) throws FileNotFoundException {
      * A new {@code FileDescriptor} object
      * is created to represent this file connection.
      * <p>
-     * First, if there is a security manager,
-     * its {@code checkRead} method  is called
-     * with the path represented by the {@code file}
-     * argument as its argument.
-     * <p>
      * If the named file does not exist, is a directory rather than a regular
      * file, or for some other reason cannot be opened for reading then a
      * {@code FileNotFoundException} is thrown.
@@ -140,10 +126,7 @@ public FileInputStream(String name) throws FileNotFoundException {
      *             is a directory rather than a regular file,
      *             or for some other reason cannot be opened for
      *             reading.
-     * @throws     SecurityException      if a security manager exists and its
-     *             {@code checkRead} method denies read access to the file.
      * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
      */
     @SuppressWarnings("this-escape")
     public FileInputStream(File file) throws FileNotFoundException {
@@ -171,11 +154,6 @@ public FileInputStream(File file) throws FileNotFoundException {
      * {@code fdObj}, which represents an existing connection to an
      * actual file in the file system.
      * <p>
-     * If there is a security manager, its {@code checkRead} method is
-     * called with the file descriptor {@code fdObj} as its argument to
-     * see if it's ok to read the file descriptor. If read access is denied
-     * to the file descriptor a {@code SecurityException} is thrown.
-     * <p>
      * If {@code fdObj} is null then a {@code NullPointerException}
      * is thrown.
      * <p>
@@ -185,10 +163,6 @@ public FileInputStream(File file) throws FileNotFoundException {
      * I/O on the stream, an {@code IOException} is thrown.
      *
      * @param      fdObj   the file descriptor to be opened for reading.
-     * @throws     SecurityException      if a security manager exists and its
-     *             {@code checkRead} method denies read access to the
-     *             file descriptor.
-     * @see        SecurityManager#checkRead(java.io.FileDescriptor)
      */
     @SuppressWarnings("this-escape")
     public FileInputStream(FileDescriptor fdObj) {
diff --git a/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java
index ff15e831b95..557bea0c3fc 100644
--- a/src/java.base/share/classes/java/io/FileOutputStream.java
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java
@@ -103,9 +103,6 @@ public class FileOutputStream extends OutputStream
      * A new {@code FileDescriptor} object is
      * created to represent this file connection.
      * <p>
-     * First, if there is a security manager, its {@code checkWrite}
-     * method is called with {@code name} as its argument.
-     * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
      * reason then a {@code FileNotFoundException} is thrown.
@@ -118,10 +115,6 @@ public class FileOutputStream extends OutputStream
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkWrite} method denies write access
-     *               to the file.
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      */
     public FileOutputStream(String name) throws FileNotFoundException {
         this(name != null ? new File(name) : null, false);
@@ -137,9 +130,6 @@ public FileOutputStream(String name) throws FileNotFoundException {
      * A new {@code FileDescriptor} object is created to represent this
      * file connection.
      * <p>
-     * First, if there is a security manager, its {@code checkWrite}
-     * method is called with {@code name} as its argument.
-     * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
      * reason then a {@code FileNotFoundException} is thrown.
@@ -150,10 +140,6 @@ public FileOutputStream(String name) throws FileNotFoundException {
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason.
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkWrite} method denies write access
-     *               to the file.
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      * @since     1.1
      */
     public FileOutputStream(String name, boolean append)
@@ -171,10 +157,6 @@ public FileOutputStream(String name, boolean append)
      * A new {@code FileDescriptor} object is
      * created to represent this file connection.
      * <p>
-     * First, if there is a security manager, its {@code checkWrite}
-     * method is called with the path represented by the {@code file}
-     * argument as its argument.
-     * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
      * reason then a {@code FileNotFoundException} is thrown.
@@ -183,12 +165,7 @@ public FileOutputStream(String name, boolean append)
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkWrite} method denies write access
-     *               to the file.
      * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      */
     public FileOutputStream(File file) throws FileNotFoundException {
         this(file, false);
@@ -205,10 +182,6 @@ public FileOutputStream(File file) throws FileNotFoundException {
      * A new {@code FileDescriptor} object is created to represent this
      * file connection.
      * <p>
-     * First, if there is a security manager, its {@code checkWrite}
-     * method is called with the path represented by the {@code file}
-     * argument as its argument.
-     * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
      * reason then a {@code FileNotFoundException} is thrown.
@@ -219,12 +192,7 @@ public FileOutputStream(File file) throws FileNotFoundException {
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkWrite} method denies write access
-     *               to the file.
      * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      * @since 1.4
      */
     @SuppressWarnings("this-escape")
@@ -256,10 +224,6 @@ public FileOutputStream(File file, boolean append)
      * descriptor, which represents an existing connection to an actual
      * file in the file system.
      * <p>
-     * First, if there is a security manager, its {@code checkWrite}
-     * method is called with the file descriptor {@code fdObj}
-     * argument as its argument.
-     * <p>
      * If {@code fdObj} is null then a {@code NullPointerException}
      * is thrown.
      * <p>
@@ -269,10 +233,6 @@ public FileOutputStream(File file, boolean append)
      * I/O on the stream, an {@code IOException} is thrown.
      *
      * @param      fdObj   the file descriptor to be opened for writing
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkWrite} method denies
-     *               write access to the file descriptor
-     * @see        java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
      */
     @SuppressWarnings("this-escape")
     public FileOutputStream(FileDescriptor fdObj) {
diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index 808c4293143..b11e0dd25be 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,39 +61,15 @@
  * (recursively) all files and subdirectories contained in the current
  * directory.
  * <P>
- * The actions to be granted are passed to the constructor in a string containing
+ * The actions are passed to the constructor in a string containing
  * a list of one or more comma-separated keywords. The possible keywords are
- * "read", "write", "execute", "delete", and "readlink". Their meaning is
- * defined as follows:
- *
- * <DL>
- *    <DT> read <DD> read permission
- *    <DT> write <DD> write permission
- *    <DT> execute
- *    <DD> execute permission. Allows {@code Runtime.exec} to
- *         be called. Corresponds to {@code SecurityManager.checkExec}.
- *    <DT> delete
- *    <DD> delete permission. Allows {@code File.delete} to
- *         be called. Corresponds to {@code SecurityManager.checkDelete}.
- *    <DT> readlink
- *    <DD> read link permission. Allows the target of a
- *         <a href="../nio/file/package-summary.html#links">symbolic link</a>
- *         to be read by invoking the {@link java.nio.file.Files#readSymbolicLink
- *         readSymbolicLink } method.
- * </DL>
+ * "read", "write", "execute", "delete", and "readlink".
  * <P>
  * The actions string is converted to lowercase before processing.
- * <P>
- * Be careful when granting FilePermissions. Think about the implications
- * of granting read and especially write access to various files and
- * directories. The {@literal "<<ALL FILES>>"} permission with write action is
- * especially dangerous. This grants permission to write to the entire
- * file system. One thing this effectively allows is replacement of the
- * system binary, including the JVM runtime environment.
- * <P>
- * Please note: Code can always read a file from the same
- * directory it's in (or a subdirectory of that directory); it does not
- * need explicit permission to do so.
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.Permission
  * @see java.security.Permissions
diff --git a/src/java.base/share/classes/java/io/ObjectInputFilter.java b/src/java.base/share/classes/java/io/ObjectInputFilter.java
index 879820761c1..9a04e1f58e3 100644
--- a/src/java.base/share/classes/java/io/ObjectInputFilter.java
+++ b/src/java.base/share/classes/java/io/ObjectInputFilter.java
@@ -728,8 +728,6 @@ public static ObjectInputFilter getSerialFilter() {
          * Set the static JVM-wide filter if it has not already been configured or set.
          *
          * @param filter the deserialization filter to set as the JVM-wide filter; not null
-         * @throws SecurityException if there is security manager and the
-         *       {@code SerializablePermission("serialFilter")} is not granted
          * @throws IllegalStateException if the filter has already been set or the initialization
          *       of the filter from the system property {@code jdk.serialFilter} or
          *       the security property {@code jdk.serialFilter} fails.
@@ -829,8 +827,6 @@ static BinaryOperator<ObjectInputFilter> getSerialFilterFactorySingleton() {
          * @throws IllegalStateException if the builtin deserialization filter factory
          *         has already been replaced or any instance of {@link ObjectInputStream}
          *         has been created.
-         * @throws SecurityException if there is security manager and the
-         *       {@code SerializablePermission("serialFilter")} is not granted
          * @since 17
          */
         public static void setSerialFilterFactory(BinaryOperator<ObjectInputFilter> filterFactory) {
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index 983b80d2bc6..60d8cadf6a3 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -374,17 +374,9 @@ private static class Logging {
      * When the filter factory {@code apply} method is invoked it may throw a runtime exception
      * preventing the {@code ObjectInputStream} from being constructed.
      *
-     * <p>If a security manager is installed, this constructor will check for
-     * the "enableSubclassImplementation" SerializablePermission when invoked
-     * directly or indirectly by the constructor of a subclass which overrides
-     * the ObjectInputStream.readFields or ObjectInputStream.readUnshared
-     * methods.
-     *
      * @param   in input stream to read from
      * @throws  StreamCorruptedException if the stream header is incorrect
      * @throws  IOException if an I/O error occurs while reading stream header
-     * @throws  SecurityException if untrusted subclass illegally overrides
-     *          security-sensitive methods
      * @throws  IllegalStateException if the initialization of {@link ObjectInputFilter.Config}
      *          fails due to invalid serial filter or serial filter factory properties.
      * @throws  NullPointerException if {@code in} is {@code null}
@@ -419,21 +411,11 @@ public ObjectInputStream(InputStream in) throws IOException {
      * When the filter factory {@code apply} method is invoked it may throw a runtime exception
      * preventing the {@code ObjectInputStream} from being constructed.
      *
-     * <p>If there is a security manager installed, this method first calls the
-     * security manager's {@code checkPermission} method with the
-     * {@code SerializablePermission("enableSubclassImplementation")}
-     * permission to ensure it's ok to enable subclassing.
-     *
-     * @throws  SecurityException if a security manager exists and its
-     *          {@code checkPermission} method denies enabling
-     *          subclassing.
      * @throws  IOException if an I/O error occurs while creating this stream
      * @throws  IllegalStateException if the initialization of {@link ObjectInputFilter.Config}
      *      fails due to invalid serial filter or serial filter factory properties.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
      */
-    protected ObjectInputStream() throws IOException, SecurityException {
+    protected ObjectInputStream() throws IOException {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -599,12 +581,6 @@ protected Object readObjectOverride()
      * each object (regular or class) read to reconstruct the root object.
      * See {@link #setObjectInputFilter(ObjectInputFilter) setObjectInputFilter} for details.
      *
-     * <p>ObjectInputStream subclasses which override this method can only be
-     * constructed in security contexts possessing the
-     * "enableSubclassImplementation" SerializablePermission; any attempt to
-     * instantiate such a subclass without this permission will cause a
-     * SecurityException to be thrown.
-     *
      * @return  reference to deserialized object
      * @throws  ClassNotFoundException if class of an object to deserialize
      *          cannot be found
@@ -923,26 +899,11 @@ protected Object resolveObject(Object obj) throws IOException {
      * enabled, the {@link #resolveObject} method is called for every object being
      * deserialized.
      *
-     * <p>If object replacement is currently not enabled, and
-     * {@code enable} is true, and there is a security manager installed,
-     * this method first calls the security manager's
-     * {@code checkPermission} method with the
-     * {@code SerializablePermission("enableSubstitution")} permission to
-     * ensure that the caller is permitted to enable the stream to do replacement
-     * of objects read from the stream.
-     *
      * @param   enable true for enabling use of {@code resolveObject} for
      *          every object being deserialized
      * @return  the previous setting before this method was invoked
-     * @throws  SecurityException if a security manager exists and its
-     *          {@code checkPermission} method denies enabling the stream
-     *          to do replacement of objects read from the stream.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
      */
-    protected boolean enableResolveObject(boolean enable)
-        throws SecurityException
-    {
+    protected boolean enableResolveObject(boolean enable) {
         if (enable == enableResolve) {
             return enable;
         }
@@ -1341,8 +1302,6 @@ public final ObjectInputFilter getObjectInputFilter() {
      * is increased before reading an object.
      *
      * @param filter the filter, may be null
-     * @throws SecurityException if there is security manager and the
-     *       {@code SerializablePermission("serialFilter")} is not granted
      * @throws IllegalStateException if an object has been read,
      *       if the filter factory returns {@code null} when the
      *       {@linkplain #getObjectInputFilter() current filter} is non-null, or
diff --git a/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java
index bde069a1774..429c91ab673 100644
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java
@@ -237,16 +237,8 @@ protected Boolean computeValue(Class<?> type) {
      * ensure that constructors for receiving ObjectInputStreams will not block
      * when reading the header.
      *
-     * <p>If a security manager is installed, this constructor will check for
-     * the "enableSubclassImplementation" SerializablePermission when invoked
-     * directly or indirectly by the constructor of a subclass which overrides
-     * the ObjectOutputStream.putFields or ObjectOutputStream.writeUnshared
-     * methods.
-     *
      * @param   out output stream to write to
      * @throws  IOException if an I/O error occurs while writing stream header
-     * @throws  SecurityException if untrusted subclass illegally overrides
-     *          security-sensitive methods
      * @throws  NullPointerException if {@code out} is {@code null}
      * @since   1.4
      * @see     ObjectOutputStream#ObjectOutputStream()
@@ -274,19 +266,9 @@ public ObjectOutputStream(OutputStream out) throws IOException {
      * ObjectOutputStream to not have to allocate private data just used by
      * this implementation of ObjectOutputStream.
      *
-     * <p>If there is a security manager installed, this method first calls the
-     * security manager's {@code checkPermission} method with a
-     * {@code SerializablePermission("enableSubclassImplementation")}
-     * permission to ensure it's ok to enable subclassing.
-     *
-     * @throws  SecurityException if a security manager exists and its
-     *          {@code checkPermission} method denies enabling
-     *          subclassing.
      * @throws  IOException if an I/O error occurs while creating this stream
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
      */
-    protected ObjectOutputStream() throws IOException, SecurityException {
+    protected ObjectOutputStream() throws IOException {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -414,12 +396,6 @@ protected void writeObjectOverride(Object obj) throws IOException {
      * writeUnshared, and not to any transitively referenced sub-objects in the
      * object graph to be serialized.
      *
-     * <p>ObjectOutputStream subclasses which override this method can only be
-     * constructed in security contexts possessing the
-     * "enableSubclassImplementation" SerializablePermission; any attempt to
-     * instantiate such a subclass without this permission will cause a
-     * SecurityException to be thrown.
-     *
      * @param   obj object to write to stream
      * @throws  NotSerializableException if an object in the graph to be
      *          serialized does not implement the Serializable interface
@@ -611,26 +587,11 @@ protected Object replaceObject(Object obj) throws IOException {
      * enabled, the {@link #replaceObject} method is called for every object being
      * serialized.
      *
-     * <p>If object replacement is currently not enabled, and
-     * {@code enable} is true, and there is a security manager installed,
-     * this method first calls the security manager's
-     * {@code checkPermission} method with the
-     * {@code SerializablePermission("enableSubstitution")} permission to
-     * ensure that the caller is permitted to enable the stream to do replacement
-     * of objects written to the stream.
-     *
      * @param   enable true for enabling use of {@code replaceObject} for
      *          every object being serialized
      * @return  the previous setting before this method was invoked
-     * @throws  SecurityException if a security manager exists and its
-     *          {@code checkPermission} method denies enabling the stream
-     *          to do replacement of objects written to the stream.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
      */
-    protected boolean enableReplaceObject(boolean enable)
-        throws SecurityException
-    {
+    protected boolean enableReplaceObject(boolean enable) {
         if (enable == enableReplace) {
             return enable;
         }
diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 35e2716dbd3..3096f2356f5 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -249,10 +249,6 @@ public PrintStream(OutputStream out, boolean autoFlush, Charset charset) {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
      * @see Charset#defaultCharset()
      *
      * @since  1.5
@@ -284,11 +280,6 @@ public PrintStream(String fileName) throws FileNotFoundException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      *
@@ -320,11 +311,6 @@ public PrintStream(String fileName, String csn)
      * @throws  IOException
      *          if an I/O error occurs while opening or creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @since  10
      */
     public PrintStream(String fileName, Charset charset) throws IOException {
@@ -351,10 +337,6 @@ public PrintStream(String fileName, Charset charset) throws IOException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
      * @see Charset#defaultCharset()
      *
      * @since  1.5
@@ -386,11 +368,6 @@ public PrintStream(File file) throws FileNotFoundException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      *
@@ -423,11 +400,6 @@ public PrintStream(File file, String csn)
      * @throws  IOException
      *          if an I/O error occurs while opening or creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
-     *
      * @since  10
      */
     public PrintStream(File file, Charset charset) throws IOException {
diff --git a/src/java.base/share/classes/java/io/PrintWriter.java b/src/java.base/share/classes/java/io/PrintWriter.java
index 2ed9315ba6a..55baa2e0a57 100644
--- a/src/java.base/share/classes/java/io/PrintWriter.java
+++ b/src/java.base/share/classes/java/io/PrintWriter.java
@@ -195,10 +195,6 @@ public PrintWriter(OutputStream out, boolean autoFlush, Charset charset) {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
      * @see Charset#defaultCharset()
      *
      * @since  1.5
@@ -247,11 +243,6 @@ private PrintWriter(Charset charset, File file)
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      *
@@ -282,11 +273,6 @@ public PrintWriter(String fileName, String csn)
      * @throws  IOException
      *          if an I/O error occurs while opening or creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @since  10
      */
     public PrintWriter(String fileName, Charset charset) throws IOException {
@@ -313,10 +299,6 @@ public PrintWriter(String fileName, Charset charset) throws IOException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
      * @see Charset#defaultCharset()
      *
      * @since  1.5
@@ -348,11 +330,6 @@ public PrintWriter(File file) throws FileNotFoundException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      *
@@ -383,11 +360,6 @@ public PrintWriter(File file, String csn)
      * @throws  IOException
      *          if an I/O error occurs while opening or creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())}
-     *          denies write access to the file
-     *
      * @since  10
      */
     public PrintWriter(File file, Charset charset) throws IOException {
diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java
index cf8ae43dc21..1487764ac44 100644
--- a/src/java.base/share/classes/java/io/RandomAccessFile.java
+++ b/src/java.base/share/classes/java/io/RandomAccessFile.java
@@ -114,15 +114,6 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * specified for the <a
      * href="#mode">{@code RandomAccessFile(File,String)}</a> constructor.
      *
-     * <p>
-     * If there is a security manager, its {@code checkRead} method
-     * is called with the {@code pathname} argument
-     * as its argument to see if read access to the file is allowed.
-     * If the mode allows writing, the security manager's
-     * {@code checkWrite} method
-     * is also called with the {@code pathname} argument
-     * as its argument to see if write access to the file is allowed.
-     *
      * @param      pathname   the system-dependent pathname string
      * @param      mode       the access <a href="#mode">mode</a>
      * @throws     IllegalArgumentException  if the mode argument is not equal
@@ -135,13 +126,6 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      *             existing, writable regular file and a new regular file of
      *             that pathname cannot be created, or if some other error
      *             occurs while opening or creating the file
-     * @throws     SecurityException   if a security manager exists and its
-     *             {@code checkRead} method denies read access to the file
-     *             or the mode is {@code "rw"} and the security manager's
-     *             {@code checkWrite} method denies write access to the file
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      */
     public RandomAccessFile(String pathname, String mode)
         throws FileNotFoundException
@@ -205,13 +189,6 @@ public RandomAccessFile(String pathname, String mode)
      * updates to both the file's content and its metadata to be written, which
      * generally requires at least one more low-level I/O operation.
      *
-     * <p>If there is a security manager, its {@code checkRead} method is
-     * called with the pathname of the {@code file} argument as its
-     * argument to see if read access to the file is allowed.  If the mode
-     * allows writing, the security manager's {@code checkWrite} method is
-     * also called with the pathname of the {@code file} argument to see if
-     * write access to the file is allowed.
-     *
      * @param      file   the file object
      * @param      mode   the access mode, as described
      *                    <a href="#mode">above</a>
@@ -225,12 +202,6 @@ public RandomAccessFile(String pathname, String mode)
      *             an existing, writable regular file and a new regular file of
      *             that pathname cannot be created, or if some other error
      *             occurs while opening or creating the file
-     * @throws      SecurityException  if a security manager exists and its
-     *             {@code checkRead} method denies read access to the file
-     *             or the mode is {@code "rw"} and the security manager's
-     *             {@code checkWrite} method denies write access to the file
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      * @see        java.nio.channels.FileChannel#force(boolean)
      */
     @SuppressWarnings("this-escape")
diff --git a/src/java.base/share/classes/java/io/SerializablePermission.java b/src/java.base/share/classes/java/io/SerializablePermission.java
index 914b5b13dc3..1e617e173a7 100644
--- a/src/java.base/share/classes/java/io/SerializablePermission.java
+++ b/src/java.base/share/classes/java/io/SerializablePermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, 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
@@ -36,55 +36,9 @@
  * no actions list; you either have the named permission
  * or you don't.
  *
- * <P>
- * The target name is the name of the Serializable permission (see below).
- *
- * <P>
- * The following table lists the standard {@code SerializablePermission} target names,
- * and for each provides a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">Permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- *
- * <tr>
- *   <th scope="row">enableSubclassImplementation</th>
- *   <td>Subclass implementation of ObjectOutputStream or ObjectInputStream
- * to override the default serialization or deserialization, respectively,
- * of objects</td>
- *   <td>Code can use this to serialize or
- * deserialize classes in a purposefully malfeasant manner. For example,
- * during serialization, malicious code can use this to
- * purposefully store confidential private field data in a way easily accessible
- * to attackers. Or, during deserialization it could, for example, deserialize
- * a class with all its private fields zeroed out.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">enableSubstitution</th>
- *   <td>Substitution of one object for another during
- * serialization or deserialization</td>
- *   <td>This is dangerous because malicious code
- * can replace the actual object with one which has incorrect or
- * malignant data.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">serialFilter</th>
- *   <td>Setting a filter for ObjectInputStreams.</td>
- *   <td>Code could remove a configured filter and remove protections
- *       already established.</td>
- * </tr>
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
@@ -92,7 +46,6 @@
  * @see java.security.PermissionCollection
  * @see java.lang.SecurityManager
  *
- *
  * @author Joe Fialli
  * @since 1.2
  */
diff --git a/src/java.base/share/classes/java/lang/Boolean.java b/src/java.base/share/classes/java/lang/Boolean.java
index 31507f60e37..f5c643881a8 100644
--- a/src/java.base/share/classes/java/lang/Boolean.java
+++ b/src/java.base/share/classes/java/lang/Boolean.java
@@ -271,8 +271,6 @@ public boolean equals(Object obj) {
      *
      * @param   name   the system property name.
      * @return  the {@code boolean} value of the system property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     java.lang.System#getProperty(java.lang.String)
      * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
      */
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 2edf0a9169e..bb091235646 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -530,11 +530,6 @@ private static Class<?> forName(String className, Class<?> caller)
      *            by this method fails
      * @throws    ClassNotFoundException if the class cannot be located by
      *            the specified class loader
-     * @throws    SecurityException
-     *            if a security manager is present, and the {@code loader} is
-     *            {@code null}, and the caller's class loader is not
-     *            {@code null}, and the caller does not have the
-     *            {@link RuntimePermission}{@code ("getClassLoader")}
      *
      * @see       java.lang.Class#forName(String)
      * @see       java.lang.ClassLoader
@@ -610,8 +605,6 @@ private static native Class<?> forName0(String name, boolean initialize,
      * a binary name.  This method returns {@code null} on failure rather than
      * throwing a {@link ClassNotFoundException}, as is done by
      * the {@link #forName(String, boolean, ClassLoader)} method.
-     * The security check is a stack-based permission check if the caller
-     * loads a class in another module.
      *
      * @param  module   A module
      * @param  name     The {@linkplain ClassLoader##binary-name binary name}
@@ -623,16 +616,6 @@ private static native Class<?> forName0(String name, boolean initialize,
      *
      * @throws LinkageError if the linkage fails
      *
-     * @throws SecurityException
-     *         <ul>
-     *         <li> if the caller is not the specified module and
-     *         {@code RuntimePermission("getClassLoader")} permission is denied; or</li>
-     *         <li> access to the module content is denied. For example,
-     *         permission check will be performed when a class loader calls
-     *         {@link ModuleReader#open(String)} to read the bytes of a class file
-     *         in a module.</li>
-     *         </ul>
-     *
      * @jls 12.2 Loading of Classes and Interfaces
      * @jls 12.3 Linking of Classes and Interfaces
      * @since 9
@@ -756,13 +739,6 @@ public static Class<?> forPrimitiveName(String primitiveName) {
      *          or if the instantiation fails for some other reason.
      * @throws  ExceptionInInitializerError if the initialization
      *          provoked by this method fails.
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and
-     *          the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class.
      */
     @SuppressWarnings("removal")
     @CallerSensitive
@@ -1057,15 +1033,7 @@ public String getName() {
      *
      * @return  the class loader that loaded the class or interface
      *          represented by this {@code Class} object.
-     * @throws  SecurityException
-     *          if a security manager is present, and the caller's class loader
-     *          is not {@code null} and is not the same as or an ancestor of the
-     *          class loader for the class whose class loader is requested,
-     *          and the caller does not have the
-     *          {@link RuntimePermission}{@code ("getClassLoader")}
      * @see java.lang.ClassLoader
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
      */
     @CallerSensitive
     @ForceInline // to ensure Reflection.getCallerClass optimization
@@ -1541,30 +1509,10 @@ void setSigners(Object[] signers) {
      * @return the immediately enclosing method of the underlying class, if
      *     that class is a local or anonymous class; otherwise {@code null}.
      *
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of the enclosing class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the methods within the enclosing class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the enclosing class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of the enclosing class
-     *
-     *         </ul>
      * @since 1.5
      */
     @CallerSensitive
-    public Method getEnclosingMethod() throws SecurityException {
+    public Method getEnclosingMethod() {
         EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
 
         if (enclosingInfo == null)
@@ -1697,30 +1645,11 @@ private static Class<?> toClass(Type o) {
      *
      * @return the immediately enclosing constructor of the underlying class, if
      *     that class is a local or anonymous class; otherwise {@code null}.
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of the enclosing class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the constructors within the enclosing class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the enclosing class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of the enclosing class
-     *
-     *         </ul>
+     *
      * @since 1.5
      */
     @CallerSensitive
-    public Constructor<?> getEnclosingConstructor() throws SecurityException {
+    public Constructor<?> getEnclosingConstructor() {
         EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
 
         if (enclosingInfo == null)
@@ -1777,16 +1706,10 @@ public Constructor<?> getEnclosingConstructor() throws SecurityException {
      * type, or void, then this method returns null.
      *
      * @return the declaring class for this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and the caller's
-     *         class loader is not the same as or an ancestor of the class
-     *         loader for the declaring class and invocation of {@link
-     *         SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *         denies access to the package of the declaring class
      * @since 1.1
      */
     @CallerSensitive
-    public Class<?> getDeclaringClass() throws SecurityException {
+    public Class<?> getDeclaringClass() {
         final Class<?> candidate = getDeclaringClass0();
 
         if (candidate != null) {
@@ -1808,16 +1731,10 @@ public Class<?> getDeclaringClass() throws SecurityException {
      * class.  If the underlying class is a top level class this
      * method returns {@code null}.
      * @return the immediately enclosing class of the underlying class
-     * @throws     SecurityException
-     *             If a security manager, <i>s</i>, is present and the caller's
-     *             class loader is not the same as or an ancestor of the class
-     *             loader for the enclosing class and invocation of {@link
-     *             SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *             denies access to the package of the enclosing class
      * @since 1.5
      */
     @CallerSensitive
-    public Class<?> getEnclosingClass() throws SecurityException {
+    public Class<?> getEnclosingClass() {
         // There are five kinds of classes (or interfaces):
         // a) Top level classes
         // b) Nested classes (static member classes)
@@ -2072,14 +1989,6 @@ private boolean hasEnclosingMethodInfo() {
      *
      * @return the array of {@code Class} objects representing the public
      *         members of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
      * @since 1.1
      */
     @SuppressWarnings("removal")
@@ -2140,20 +2049,13 @@ public Class<?>[] run() {
      *
      * @return the array of {@code Field} objects representing the
      *         public fields
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
      *
      * @since 1.1
      * @jls 8.2 Class Members
      * @jls 8.3 Field Declarations
      */
     @CallerSensitive
-    public Field[] getFields() throws SecurityException {
+    public Field[] getFields() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2231,20 +2133,13 @@ public Field[] getFields() throws SecurityException {
      *
      * @return the array of {@code Method} objects representing the
      *         public methods of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
      * @since 1.1
      */
     @CallerSensitive
-    public Method[] getMethods() throws SecurityException {
+    public Method[] getMethods() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2274,19 +2169,12 @@ public Method[] getMethods() throws SecurityException {
      *
      * @return the array of {@code Constructor} objects representing the
      *         public constructors of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
      *
      * @see #getDeclaredConstructors()
      * @since 1.1
      */
     @CallerSensitive
-    public Constructor<?>[] getConstructors() throws SecurityException {
+    public Constructor<?>[] getConstructors() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2326,21 +2214,13 @@ public Constructor<?>[] getConstructors() throws SecurityException {
      * @throws NoSuchFieldException if a field with the specified name is
      *         not found.
      * @throws NullPointerException if {@code name} is {@code null}
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
      *
      * @since 1.1
      * @jls 8.2 Class Members
      * @jls 8.3 Field Declarations
      */
     @CallerSensitive
-    public Field getField(String name)
-        throws NoSuchFieldException, SecurityException {
+    public Field getField(String name) throws NoSuchFieldException {
         Objects.requireNonNull(name);
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
@@ -2437,13 +2317,6 @@ public Field getField(String name)
      *         or if the name is {@value ConstantDescs#INIT_NAME} or
      *         {@value ConstantDescs#CLASS_INIT_NAME}.
      * @throws NullPointerException if {@code name} is {@code null}
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
@@ -2451,7 +2324,7 @@ public Field getField(String name)
      */
     @CallerSensitive
     public Method getMethod(String name, Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
+            throws NoSuchMethodException {
         Objects.requireNonNull(name);
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
@@ -2486,21 +2359,13 @@ public Method getMethod(String name, Class<?>... parameterTypes)
      * @throws NoSuchMethodException if a matching constructor is not found,
      *         including when this {@code Class} object represents
      *         an interface, a primitive type, an array class, or void.
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @see #getDeclaredConstructor(Class<?>[])
+     *
+     * @see #getDeclaredConstructor(Class[])
      * @since 1.1
      */
     @CallerSensitive
     public Constructor<T> getConstructor(Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException
-    {
+            throws NoSuchMethodException {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2523,32 +2388,12 @@ public Constructor<T> getConstructor(Class<?>... parameterTypes)
      *
      * @return the array of {@code Class} objects representing all the
      *         declared members of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of this class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the declared classes within this class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class
-     *
-     *         </ul>
      *
      * @since 1.1
      * @jls 8.5 Member Class and Interface Declarations
      */
     @CallerSensitive
-    public Class<?>[] getDeclaredClasses() throws SecurityException {
+    public Class<?>[] getDeclaredClasses() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2575,33 +2420,13 @@ public Class<?>[] getDeclaredClasses() throws SecurityException {
      *
      * @return  the array of {@code Field} objects representing all the
      *          declared fields of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared fields within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @since 1.1
      * @jls 8.2 Class Members
      * @jls 8.3 Field Declarations
      */
     @CallerSensitive
-    public Field[] getDeclaredFields() throws SecurityException {
+    public Field[] getDeclaredFields() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2638,26 +2463,6 @@ public Field[] getDeclaredFields() throws SecurityException {
      * @return  An array of {@code RecordComponent} objects representing all the
      *          record components of this record class, or {@code null} if this
      *          class is not a record class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared methods within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @jls 8.10 Record Classes
      * @since 16
@@ -2706,26 +2511,6 @@ public RecordComponent[] getRecordComponents() {
      *
      * @return  the array of {@code Method} objects representing all the
      *          declared methods of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared methods within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
@@ -2735,7 +2520,7 @@ public RecordComponent[] getRecordComponents() {
      * @since 1.1
      */
     @CallerSensitive
-    public Method[] getDeclaredMethods() throws SecurityException {
+    public Method[] getDeclaredMethods() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2760,33 +2545,13 @@ public Method[] getDeclaredMethods() throws SecurityException {
      *
      * @return  the array of {@code Constructor} objects representing all the
      *          declared constructors of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared constructors within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @since 1.1
      * @see #getConstructors()
      * @jls 8.8 Constructor Declarations
      */
     @CallerSensitive
-    public Constructor<?>[] getDeclaredConstructors() throws SecurityException {
+    public Constructor<?>[] getDeclaredConstructors() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2811,34 +2576,13 @@ public Constructor<?>[] getDeclaredConstructors() throws SecurityException {
      * @throws  NoSuchFieldException if a field with the specified name is
      *          not found.
      * @throws  NullPointerException if {@code name} is {@code null}
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared field
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @since 1.1
      * @jls 8.2 Class Members
      * @jls 8.3 Field Declarations
      */
     @CallerSensitive
-    public Field getDeclaredField(String name)
-        throws NoSuchFieldException, SecurityException {
+    public Field getDeclaredField(String name) throws NoSuchFieldException {
         Objects.requireNonNull(name);
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
@@ -2877,26 +2621,6 @@ public Field getDeclaredField(String name)
      *          matching the specified name and parameters
      * @throws  NoSuchMethodException if a matching method is not found.
      * @throws  NullPointerException if {@code name} is {@code null}
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared method
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
@@ -2904,7 +2628,7 @@ public Field getDeclaredField(String name)
      */
     @CallerSensitive
     public Method getDeclaredMethod(String name, Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
+            throws NoSuchMethodException {
         Objects.requireNonNull(name);
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
@@ -2975,34 +2699,13 @@ Method findMethod(boolean publicOnly, String name, Class<?>... parameterTypes) {
      * @throws  NoSuchMethodException if a matching constructor is not found,
      *          including when this {@code Class} object represents
      *          an interface, a primitive type, an array class, or void.
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared constructor
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
      *
-     *          </ul>
-     *
-     * @see #getConstructor(Class<?>[])
+     * @see #getConstructor(Class[])
      * @since 1.1
      */
     @CallerSensitive
     public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException
-    {
+            throws NoSuchMethodException {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -3058,10 +2761,9 @@ public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes)
      *
      * @param  name name of the desired resource
      * @return  A {@link java.io.InputStream} object; {@code null} if no
-     *          resource with this name is found, the resource is in a package
+     *          resource with this name is found, or the resource is in a package
      *          that is not {@linkplain Module#isOpen(String, Module) open} to at
-     *          least the caller module, or access to the resource is denied
-     *          by the security manager.
+     *          least the caller module.
      * @throws  NullPointerException If {@code name} is {@code null}
      *
      * @see Module#getResourceAsStream(String)
@@ -3154,11 +2856,10 @@ public InputStream getResourceAsStream(String name) {
      *
      * @param  name name of the desired resource
      * @return A {@link java.net.URL} object; {@code null} if no resource with
-     *         this name is found, the resource cannot be located by a URL, the
+     *         this name is found, the resource cannot be located by a URL, or the
      *         resource is in a package that is not
      *         {@linkplain Module#isOpen(String, Module) open} to at least the caller
-     *         module, or access to the resource is denied by the security
-     *         manager.
+     *         module.
      * @throws NullPointerException If {@code name} is {@code null}
      * @since  1.1
      */
@@ -3224,23 +2925,11 @@ private boolean isOpenToCaller(String name, Class<?> caller) {
     }
 
     /**
-     * Returns the {@code ProtectionDomain} of this class.  If there is a
-     * security manager installed, this method first calls the security
-     * manager's {@code checkPermission} method with a
-     * {@code RuntimePermission("getProtectionDomain")} permission to
-     * ensure it's ok to get the
-     * {@code ProtectionDomain}.
+     * Returns the {@code ProtectionDomain} of this class.
      *
      * @return the ProtectionDomain of this class
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        getting the ProtectionDomain.
-     *
      * @see java.security.ProtectionDomain
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
      * @since 1.2
      */
     public ProtectionDomain getProtectionDomain() {
@@ -4466,13 +4155,6 @@ public AnnotatedType[] getAnnotatedInterfaces() {
      *
      * @return the nest host of this class or interface
      *
-     * @throws SecurityException
-     *         If the returned class is not the current class, and
-     *         if a security manager, <i>s</i>, is present and the caller's
-     *         class loader is not the same as or an ancestor of the class
-     *         loader for the returned class and invocation of {@link
-     *         SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *         denies access to the package of the returned class
      * @since 11
      * @jvms 4.7.28 The {@code NestHost} Attribute
      * @jvms 4.7.29 The {@code NestMembers} Attribute
@@ -4557,14 +4239,6 @@ public boolean isNestmateOf(Class<?> c) {
      * @return an array of all classes and interfaces in the same nest as
      * this class or interface
      *
-     * @throws SecurityException
-     * If any returned class is not the current class, and
-     * if a security manager, <i>s</i>, is present and the caller's
-     * class loader is not the same as or an ancestor of the class
-     * loader for that returned class and invocation of {@link
-     * SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     * denies access to the package of that returned class
-     *
      * @since 11
      * @see #getNestHost()
      * @jvms 4.7.28 The {@code NestHost} Attribute
@@ -4751,15 +4425,8 @@ public Optional<ClassDesc> describeConstable() {
      * cannot be obtained, it is silently ignored, and not included in the result
      * array.
      *
-     * @return an array of {@code Class} objects of the permitted subclasses of this class or interface,
-     *         or {@code null} if this class or interface is not sealed.
-     *
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and the caller's
-     *         class loader is not the same as or an ancestor of the class
-     *         loader for that returned class and invocation of {@link
-     *         SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *         denies access to the package of any class in the returned array.
+     * @return an array of {@code Class} objects of the permitted subclasses of this class
+     *         or interface, or {@code null} if this class or interface is not sealed.
      *
      * @jls 8.1 Class Declarations
      * @jls 9.1 Interface Declarations
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index fafa8895ee6..85fc315c767 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -33,10 +33,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
-import java.security.AccessController;
-import java.security.AccessControlContext;
 import java.security.CodeSource;
-import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
 import java.util.ArrayList;
@@ -67,7 +64,6 @@
 import jdk.internal.reflect.CallerSensitiveAdapter;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.util.StaticProperty;
-import sun.reflect.misc.ReflectUtil;
 import sun.security.util.SecurityConstants;
 
 /**
@@ -93,9 +89,6 @@
  * extend the manner in which the Java virtual machine dynamically loads
  * classes.
  *
- * <p> Class loaders may typically be used by security managers to indicate
- * security domains.
- *
  * <p> In addition to loading classes, a class loader is also responsible for
  * locating resources. A resource is some data (a "{@code .class}" file,
  * configuration data, or an image for example) that is identified with an
@@ -424,11 +417,6 @@ String nameAndId() {
      *
      * @throws IllegalArgumentException if the given name is empty.
      *
-     * @throws SecurityException
-     *         If a security manager exists and its
-     *         {@link SecurityManager#checkCreateClassLoader()}
-     *         method doesn't allow creation of a new class loader.
-     *
      * @since  9
      */
     @SuppressWarnings("this-escape")
@@ -440,10 +428,6 @@ protected ClassLoader(String name, ClassLoader parent) {
      * Creates a new class loader using the specified parent class loader for
      * delegation.
      *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader() checkCreateClassLoader} method
-     * is invoked.  This may result in a security exception.  </p>
-     *
      * @apiNote If the parent is specified as {@code null} (for the
      * bootstrap class loader) then there is no guarantee that all platform
      * classes are visible.
@@ -451,11 +435,6 @@ protected ClassLoader(String name, ClassLoader parent) {
      * @param  parent
      *         The parent class loader
      *
-     * @throws SecurityException
-     *         If a security manager exists and its
-     *         {@code checkCreateClassLoader} method doesn't allow creation
-     *         of a new class loader.
-     *
      * @since  1.2
      */
     @SuppressWarnings("this-escape")
@@ -467,16 +446,6 @@ protected ClassLoader(ClassLoader parent) {
      * Creates a new class loader using the {@code ClassLoader} returned by
      * the method {@link #getSystemClassLoader()
      * getSystemClassLoader()} as the parent class loader.
-     *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader()
-     * checkCreateClassLoader} method is invoked.  This may result in
-     * a security exception.  </p>
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@code checkCreateClassLoader} method doesn't allow creation
-     *          of a new class loader.
      */
     @SuppressWarnings("this-escape")
     protected ClassLoader() {
@@ -688,30 +657,6 @@ protected Object getClassLoadingLock(String className) {
         return lock;
     }
 
-    // Invoked by the VM after loading class with this loader.
-    @SuppressWarnings("removal")
-    private void checkPackageAccess(Class<?> cls, ProtectionDomain pd) {
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            if (ReflectUtil.isNonPublicProxyClass(cls)) {
-                for (Class<?> intf: cls.getInterfaces()) {
-                    checkPackageAccess(intf, pd);
-                }
-                return;
-            }
-
-            final String packageName = cls.getPackageName();
-            if (!packageName.isEmpty()) {
-                AccessController.doPrivileged(new PrivilegedAction<>() {
-                    public Void run() {
-                        sm.checkPackageAccess(packageName);
-                        return null;
-                    }
-                }, new AccessControlContext(new ProtectionDomain[] {pd}));
-            }
-        }
-    }
-
     /**
      * Finds the class with the specified <a href="#binary-name">binary name</a>.
      * This method should be overridden by class loader implementations that
@@ -823,12 +768,10 @@ protected final Class<?> defineClass(byte[] b, int off, int len)
      * Before the {@code Class} can be used it must be resolved.
      *
      * <p> This method assigns a default {@link java.security.ProtectionDomain
-     * ProtectionDomain} to the newly defined class.  The
-     * {@code ProtectionDomain} is effectively granted the same set of
-     * permissions returned when {@link
-     * java.security.Policy#getPermissions(java.security.CodeSource)
-     * Policy.getPolicy().getPermissions(new CodeSource(null, null))}
-     * is invoked.  The default protection domain is created on the first invocation
+     * ProtectionDomain} to the newly defined class. The
+     * {@code getPermissions} method of the {@code ProtectionDomain} always
+     * returns {@code null}.
+     * The default protection domain is created on the first invocation
      * of {@link #defineClass(String, byte[], int, int) defineClass},
      * and re-used on subsequent invocations.
      *
@@ -1342,8 +1285,7 @@ protected final void setSigners(Class<?> c, Object[] signers) {
      *         The resource name
      *
      * @return A URL to the resource; {@code null} if the resource could not be
-     *         found, a URL could not be constructed to locate the resource,
-     *         access to the resource is denied by the security manager, or
+     *         found, a URL could not be constructed to locate the resource, or
      *         there isn't a module of the given name defined to the class
      *         loader.
      *
@@ -1395,9 +1337,8 @@ protected URL findResource(String moduleName, String name) throws IOException {
      *
      * @return  {@code URL} object for reading the resource; {@code null} if
      *          the resource could not be found, a {@code URL} could not be
-     *          constructed to locate the resource, the resource is in a package
-     *          that is not opened unconditionally, or access to the resource is
-     *          denied by the security manager.
+     *          constructed to locate the resource, or the resource is in a package
+     *          that is not opened unconditionally.
      *
      * @throws  NullPointerException If {@code name} is {@code null}
      *
@@ -1457,9 +1398,8 @@ public URL getResource(String name) {
      * @return  An enumeration of {@link java.net.URL URL} objects for the
      *          resource. If no resources could be found, the enumeration will
      *          be empty. Resources for which a {@code URL} cannot be
-     *          constructed, are in a package that is not opened
-     *          unconditionally, or access to the resource is denied by the
-     *          security manager, are not returned in the enumeration.
+     *          constructed, or are in a package that is not opened
+     *          unconditionally, are not returned in the enumeration.
      *
      * @throws  IOException
      *          If I/O errors occur
@@ -1518,9 +1458,8 @@ public Enumeration<URL> getResources(String name) throws IOException {
      *
      * @return  A stream of resource {@link java.net.URL URL} objects. If no
      *          resources could  be found, the stream will be empty. Resources
-     *          for which a {@code URL} cannot be constructed, are in a package
-     *          that is not opened unconditionally, or access to the resource
-     *          is denied by the security manager, will not be in the stream.
+     *          for which a {@code URL} cannot be constructed, or are in a package
+     *          that is not opened unconditionally, will not be in the stream.
      *
      * @throws  NullPointerException If {@code name} is {@code null}
      *
@@ -1558,9 +1497,8 @@ public Stream<URL> resources(String name) {
      *
      * @return  {@code URL} object for reading the resource; {@code null} if
      *          the resource could not be found, a {@code URL} could not be
-     *          constructed to locate the resource, the resource is in a package
-     *          that is not opened unconditionally, or access to the resource is
-     *          denied by the security manager.
+     *          constructed to locate the resource, or the resource is in a package
+     *          that is not opened unconditionally.
      *
      * @since  1.2
      */
@@ -1589,8 +1527,7 @@ protected URL findResource(String name) {
      * @return  An enumeration of {@link java.net.URL URL} objects for
      *          the resource. If no resources could  be found, the enumeration
      *          will be empty. Resources for which a {@code URL} cannot be
-     *          constructed, are in a package that is not opened unconditionally,
-     *          or access to the resource is denied by the security manager,
+     *          constructed, or are in a package that is not opened unconditionally,
      *          are not returned in the enumeration.
      *
      * @throws  IOException
@@ -1676,9 +1613,8 @@ public final boolean isRegisteredAsParallelCapable() {
      *
      * @return  A {@link java.net.URL URL} to the resource; {@code
      *          null} if the resource could not be found, a URL could not be
-     *          constructed to locate the resource, the resource is in a package
-     *          that is not opened unconditionally or access to the resource is
-     *          denied by the security manager.
+     *          constructed to locate the resource, or the resource is in a package
+     *          that is not opened unconditionally.
      *
      * @since  1.1
      */
@@ -1708,8 +1644,7 @@ public static URL getSystemResource(String name) {
      * @return  An enumeration of {@link java.net.URL URL} objects for
      *          the resource. If no resources could  be found, the enumeration
      *          will be empty. Resources for which a {@code URL} cannot be
-     *          constructed, are in a package that is not opened unconditionally,
-     *          or access to the resource is denied by the security manager,
+     *          constructed, or are in a package that is not opened unconditionally,
      *          are not returned in the enumeration.
      *
      * @throws  IOException
@@ -1740,9 +1675,8 @@ public static Enumeration<URL> getSystemResources(String name)
      *         The resource name
      *
      * @return  An input stream for reading the resource; {@code null} if the
-     *          resource could not be found, the resource is in a package that
-     *          is not opened unconditionally, or access to the resource is
-     *          denied by the security manager.
+     *          resource could not be found, or the resource is in a package that
+     *          is not opened unconditionally.
      *
      * @throws  NullPointerException If {@code name} is {@code null}
      *
@@ -1774,9 +1708,8 @@ public InputStream getResourceAsStream(String name) {
      *         The resource name
      *
      * @return  An input stream for reading the resource; {@code null} if the
-     *          resource could not be found, the resource is in a package that
-     *          is not opened unconditionally, or access to the resource is
-     *          denied by the security manager.
+     *          resource could not be found, or the resource is in a package that
+     *          is not opened unconditionally.
      *
      * @since  1.1
      */
@@ -1800,12 +1733,6 @@ public static InputStream getSystemResourceAsStream(String name) {
      *
      * @return  The parent {@code ClassLoader}
      *
-     * @throws  SecurityException
-     *          If a security manager is present, and the caller's class loader
-     *          is not {@code null} and is not an ancestor of this class loader,
-     *          and the caller does not have the
-     *          {@link RuntimePermission}{@code ("getClassLoader")}
-     *
      * @since  1.2
      */
     @CallerSensitive
@@ -1845,13 +1772,6 @@ public final Module getUnnamedModule() {
      *
      * @return  The platform {@code ClassLoader}.
      *
-     * @throws  SecurityException
-     *          If a security manager is present, and the caller's class loader is
-     *          not {@code null}, and the caller's class loader is not the same
-     *          as or an ancestor of the platform class loader,
-     *          and the caller does not have the
-     *          {@link RuntimePermission}{@code ("getClassLoader")}
-     *
      * @since 9
      */
     @CallerSensitive
@@ -1920,12 +1840,6 @@ public static ClassLoader getPlatformClassLoader() {
      *
      * @return  The system {@code ClassLoader}
      *
-     * @throws  SecurityException
-     *          If a security manager is present, and the caller's class loader
-     *          is not {@code null} and is not the same as or an ancestor of the
-     *          system class loader, and the caller does not have the
-     *          {@link RuntimePermission}{@code ("getClassLoader")}
-     *
      * @throws  IllegalStateException
      *          If invoked recursively during the construction of the class
      *          loader specified by the "{@code java.system.class.loader}"
diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
index ed23f7d39c9..8f7b6c6aa42 100644
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -375,9 +375,9 @@ public final class Double extends Number
     public static final double NEGATIVE_INFINITY = -1.0 / 0.0;
 
     /**
-     * A constant holding a Not-a-Number (NaN) value of type
-     * {@code double}. It is equivalent to the value returned by
-     * {@code Double.longBitsToDouble(0x7ff8000000000000L)}.
+     * A constant holding a Not-a-Number (NaN) value of type {@code double}.
+     * It is {@linkplain Double##equivalenceRelation equivalent} to the
+     * value returned by {@code Double.longBitsToDouble(0x7ff8000000000000L)}.
      */
     public static final double NaN = 0.0d / 0.0;
 
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
index 821a05fa00a..85b20e6a2e1 100644
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -93,9 +93,9 @@ public final class Float extends Number
     public static final float NEGATIVE_INFINITY = -1.0f / 0.0f;
 
     /**
-     * A constant holding a Not-a-Number (NaN) value of type
-     * {@code float}.  It is equivalent to the value returned by
-     * {@code Float.intBitsToFloat(0x7fc00000)}.
+     * A constant holding a Not-a-Number (NaN) value of type {@code float}.
+     * It is {@linkplain Double##equivalenceRelation equivalent}
+     * to the value returned by{@code Float.intBitsToFloat(0x7fc00000)}.
      */
     public static final float NaN = 0.0f / 0.0f;
 
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index e666e977c61..8bf573733f2 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -1187,8 +1187,6 @@ public boolean equals(Object obj) {
      *
      * @param   nm   property name.
      * @return  the {@code Integer} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     java.lang.System#getProperty(java.lang.String)
      * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
      */
@@ -1233,8 +1231,6 @@ public static Integer getInteger(String nm) {
      * @param   nm   property name.
      * @param   val   default value.
      * @return  the {@code Integer} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     java.lang.System#getProperty(java.lang.String)
      * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
      */
@@ -1275,8 +1271,6 @@ public static Integer getInteger(String nm, int val) {
      * @param   nm   property name.
      * @param   val   default value.
      * @return  the {@code Integer} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     System#getProperty(java.lang.String)
      * @see     System#getProperty(java.lang.String, java.lang.String)
      */
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 8c083b3ec84..e67b751470e 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -1276,8 +1276,6 @@ public boolean equals(Object obj) {
      *
      * @param   nm   property name.
      * @return  the {@code Long} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     java.lang.System#getProperty(java.lang.String)
      * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
      */
@@ -1321,8 +1319,6 @@ public static Long getLong(String nm) {
      * @param   nm    property name.
      * @param   val   default value.
      * @return  the {@code Long} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     java.lang.System#getProperty(java.lang.String)
      * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
      */
@@ -1370,8 +1366,6 @@ public static Long getLong(String nm, long val) {
      * @param   nm   property name.
      * @param   val   default value.
      * @return  the {@code Long} value of the property.
-     * @throws  SecurityException for the same reasons as
-     *          {@link System#getProperty(String) System.getProperty}
      * @see     System#getProperty(java.lang.String)
      * @see     System#getProperty(java.lang.String, java.lang.String)
      */
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
index 4d4593b3197..a90fbc99260 100644
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.java
@@ -195,15 +195,7 @@ public String getName() {
     /**
      * Returns the {@code ClassLoader} for this module.
      *
-     * <p> If there is a security manager then its {@code checkPermission}
-     * method if first called with a {@code RuntimePermission("getClassLoader")}
-     * permission to check that the caller is allowed to get access to the
-     * class loader. </p>
-     *
      * @return The class loader for this module
-     *
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     public ClassLoader getClassLoader() {
         @SuppressWarnings("removal")
@@ -1689,9 +1681,8 @@ protected Class<?> loadClass(String cn, boolean resolve)
      * with the name "{@code META-INF/MANIFEST.MF}" is never encapsulated
      * because "{@code META-INF}" is not a legal package name. </p>
      *
-     * <p> This method returns {@code null} if the resource is not in this
-     * module, the resource is encapsulated and cannot be located by the caller,
-     * or access to the resource is denied by the security manager. </p>
+     * <p> This method returns {@code null} if the resource is not in this module
+     * or the resource is encapsulated and cannot be located by the caller. </p>
      *
      * @param  name
      *         The resource name
diff --git a/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java
index 80d392470cb..4ee2b02414d 100644
--- a/src/java.base/share/classes/java/lang/ModuleLayer.java
+++ b/src/java.base/share/classes/java/lang/ModuleLayer.java
@@ -359,10 +359,6 @@ public Controller enableNativeAccess(Module target) {
      * @throws LayerInstantiationException
      *         If the layer cannot be created for any of the reasons specified
      *         by the static {@code defineModulesWithOneLoader} method
-     * @throws SecurityException
-     *         If {@code RuntimePermission("createClassLoader")} or
-     *         {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
      *
      * @see #findLoader
      */
@@ -401,10 +397,6 @@ public ModuleLayer defineModulesWithOneLoader(Configuration cf,
      * @throws LayerInstantiationException
      *         If the layer cannot be created for any of the reasons specified
      *         by the static {@code defineModulesWithManyLoaders} method
-     * @throws SecurityException
-     *         If {@code RuntimePermission("createClassLoader")} or
-     *         {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
      *
      * @see #findLoader
      */
@@ -440,9 +432,6 @@ public ModuleLayer defineModulesWithManyLoaders(Configuration cf,
      * @throws LayerInstantiationException
      *         If the layer cannot be created for any of the reasons specified
      *         by the static {@code defineModules} method
-     * @throws SecurityException
-     *         If {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
      */
     public ModuleLayer defineModules(Configuration cf,
                                      Function<String, ClassLoader> clf) {
@@ -490,10 +479,6 @@ public ModuleLayer defineModules(Configuration cf,
      * a module named "{@code java.base}", or a module contains a package named
      * "{@code java}" or a package with a name starting with "{@code java.}". </p>
      *
-     * <p> If there is a security manager then the class loader created by
-     * this method will load classes and resources with privileges that are
-     * restricted by the calling context of this method. </p>
-     *
      * @param  cf
      *         The configuration for the layer
      * @param  parentLayers
@@ -510,10 +495,6 @@ public ModuleLayer defineModules(Configuration cf,
      * @throws LayerInstantiationException
      *         If all modules cannot be defined to the same class loader for any
      *         of the reasons listed above
-     * @throws SecurityException
-     *         If {@code RuntimePermission("createClassLoader")} or
-     *         {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
      *
      * @see #findLoader
      */
@@ -563,10 +544,6 @@ public static Controller defineModulesWithOneLoader(Configuration cf,
      * methods) in the module defined to the class loader before searching
      * the parent class loader. </p>
      *
-     * <p> If there is a security manager then the class loaders created by
-     * this method will load classes and resources with privileges that are
-     * restricted by the calling context of this method. </p>
-     *
      * @param  cf
      *         The configuration for the layer
      * @param  parentLayers
@@ -586,11 +563,6 @@ public static Controller defineModulesWithOneLoader(Configuration cf,
      *         named "{@code java}" or a package with a name starting with
      *         "{@code java.}"
      *
-     * @throws SecurityException
-     *         If {@code RuntimePermission("createClassLoader")} or
-     *         {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
-     *
      * @see #findLoader
      */
     public static Controller defineModulesWithManyLoaders(Configuration cf,
@@ -673,9 +645,6 @@ public static Controller defineModulesWithManyLoaders(Configuration cf,
      *         configuration of the parent layers, including order
      * @throws LayerInstantiationException
      *         If creating the layer fails for any of the reasons listed above
-     * @throws SecurityException
-     *         If {@code RuntimePermission("getClassLoader")} is denied by
-     *         the security manager
      */
     public static Controller defineModules(Configuration cf,
                                            List<ModuleLayer> parentLayers,
@@ -906,11 +875,6 @@ boolean addEnableNativeAccess(String name) {
      * parent} layers are searched in the manner specified by {@link
      * #findModule(String) findModule}.
      *
-     * <p> If there is a security manager then its {@code checkPermission}
-     * method is called with a {@code RuntimePermission("getClassLoader")}
-     * permission to check that the caller is allowed to get access to the
-     * class loader. </p>
-     *
      * @apiNote This method does not return an {@code Optional<ClassLoader>}
      * because `null` must be used to represent the bootstrap class loader.
      *
@@ -921,8 +885,6 @@ boolean addEnableNativeAccess(String name) {
      *
      * @throws IllegalArgumentException if a module of the given name is not
      *         defined in this layer or any parent of this layer
-     *
-     * @throws SecurityException if denied by the security manager
      */
     public ClassLoader findLoader(String name) {
         Optional<Module> om = findModule(name);
diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java
index 7909f053042..aa9c8f31237 100644
--- a/src/java.base/share/classes/java/lang/Object.java
+++ b/src/java.base/share/classes/java/lang/Object.java
@@ -25,7 +25,6 @@
 
 package java.lang;
 
-import jdk.internal.misc.Blocker;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 /**
@@ -374,21 +373,20 @@ public final void wait() throws InterruptedException {
      * @see    #wait(long, int)
      */
     public final void wait(long timeoutMillis) throws InterruptedException {
-        if (!Thread.currentThread().isVirtual()) {
-            wait0(timeoutMillis);
-            return;
+        if (timeoutMillis < 0) {
+            throw new IllegalArgumentException("timeout value is negative");
         }
 
-        // virtual thread waiting
-        boolean attempted = Blocker.begin();
-        try {
+        if (Thread.currentThread() instanceof VirtualThread vthread) {
+            try {
+                wait0(timeoutMillis);
+            } catch (InterruptedException e) {
+                // virtual thread's interrupt status needs to be cleared
+                vthread.getAndClearInterrupt();
+                throw e;
+            }
+        } else {
             wait0(timeoutMillis);
-        } catch (InterruptedException e) {
-            // virtual thread's interrupt status needs to be cleared
-            Thread.currentThread().getAndClearInterrupt();
-            throw e;
-        } finally {
-            Blocker.end(attempted);
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java b/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java
deleted file mode 100644
index a9b40d028f5..00000000000
--- a/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.PrintStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import static java.lang.StackWalker.Option.*;
-import jdk.internal.access.JavaIOPrintStreamAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.misc.InternalLock;
-import jdk.internal.vm.Continuation;
-
-/**
- * Helper class to print the virtual thread stack trace when pinned.
- *
- * The class maintains a ClassValue with the hashes of stack traces that are pinned by
- * code in that Class. This is used to avoid printing the same stack trace many times.
- */
-class PinnedThreadPrinter {
-    private static final JavaIOPrintStreamAccess JIOPSA = SharedSecrets.getJavaIOPrintStreamAccess();
-    private static final StackWalker STACK_WALKER;
-    static {
-        var options = Set.of(SHOW_REFLECT_FRAMES, RETAIN_CLASS_REFERENCE);
-        PrivilegedAction<StackWalker> pa = () ->
-            LiveStackFrame.getStackWalker(options, VirtualThread.continuationScope());
-        @SuppressWarnings("removal")
-        var stackWalker = AccessController.doPrivileged(pa);
-        STACK_WALKER = stackWalker;
-    }
-
-    private static final ClassValue<Hashes> HASHES = new ClassValue<>() {
-        @Override
-        protected Hashes computeValue(Class<?> type) {
-            return new Hashes();
-        }
-    };
-
-    @SuppressWarnings("serial")
-    private static class Hashes extends LinkedHashMap<Integer, Boolean> {
-        boolean add(int hash) {
-            return (putIfAbsent(hash, Boolean.TRUE) == null);
-        }
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Integer, Boolean> oldest) {
-            // limit number of hashes
-            return size() > 8;
-        }
-    }
-
-    /**
-     * Returns a hash of the given stack trace. The hash is based on the class,
-     * method and bytecode index.
-     */
-    private static int hash(List<LiveStackFrame> stack) {
-        int hash = 0;
-        for (LiveStackFrame frame : stack) {
-            hash = (31 * hash) + Objects.hash(frame.getDeclaringClass(),
-                    frame.getMethodName(),
-                    frame.getByteCodeIndex());
-        }
-        return hash;
-    }
-
-    /**
-     * Returns true if the frame is native, a class initializer, or holds monitors.
-     */
-    private static boolean isInterestingFrame(LiveStackFrame f) {
-        return f.isNativeMethod()
-                || "<clinit>".equals(f.getMethodName())
-                || (f.getMonitors().length > 0);
-    }
-
-    /**
-     * Prints the current thread's stack trace.
-     *
-     * @param printAll true to print all stack frames, false to only print the
-     *        frames that are native or holding a monitor
-     */
-    static void printStackTrace(PrintStream out, Continuation.Pinned reason, boolean printAll) {
-        List<LiveStackFrame> stack = STACK_WALKER.walk(s ->
-            s.map(f -> (LiveStackFrame) f)
-                    .filter(f -> f.getDeclaringClass() != PinnedThreadPrinter.class)
-                    .collect(Collectors.toList())
-        );
-        Object lockObj = JIOPSA.lock(out);
-        if (lockObj instanceof InternalLock lock && lock.tryLock()) {
-            try {
-                // find the closest frame that is causing the thread to be pinned
-                stack.stream()
-                    .filter(f -> isInterestingFrame(f))
-                    .map(LiveStackFrame::getDeclaringClass)
-                    .findFirst()
-                    .ifPresentOrElse(klass -> {
-                        // print the stack trace if not already seen
-                        int hash = hash(stack);
-                        if (HASHES.get(klass).add(hash)) {
-                            printStackTrace(out, reason, stack, printAll);
-                        }
-                    }, () -> printStackTrace(out, reason, stack, true));  // not found
-
-            } finally {
-                lock.unlock();
-            }
-        }
-    }
-
-    private static void printStackTrace(PrintStream out,
-                                        Continuation.Pinned reason,
-                                        List<LiveStackFrame> stack,
-                                        boolean printAll) {
-        out.format("%s reason:%s%n", Thread.currentThread(), reason);
-        for (LiveStackFrame frame : stack) {
-            var ste = frame.toStackTraceElement();
-            int monitorCount = frame.getMonitors().length;
-            if (monitorCount > 0) {
-                out.format("    %s <== monitors:%d%n", ste, monitorCount);
-            } else if (printAll || isInterestingFrame(frame)) {
-                out.format("    %s%n", ste);
-            }
-        }
-    }
-}
diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index af6753a236b..3e4837d2e02 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -753,8 +753,7 @@ public boolean isReleasable() {
      *
      * {@code Process} objects returned by {@link ProcessBuilder#start()} and
      * {@link Runtime#exec} implement {@code toHandle} as the equivalent of
-     * {@link ProcessHandle#of(long) ProcessHandle.of(pid)} including the
-     * check for a SecurityManager and {@code RuntimePermission("manageProcess")}.
+     * {@link ProcessHandle#of(long) ProcessHandle.of(pid)}.
      *
      * @implSpec
      * This implementation throws an instance of
@@ -766,8 +765,6 @@ public boolean isReleasable() {
      * @return Returns a ProcessHandle for the Process
      * @throws UnsupportedOperationException if the Process implementation
      *         does not support this operation
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @since 9
      */
     public ProcessHandle toHandle() {
@@ -811,8 +808,6 @@ public ProcessHandle.Info info() {
      *         direct children of the process
      * @throws UnsupportedOperationException if the Process implementation
      *         does not support this operation
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @since 9
      */
     public Stream<ProcessHandle> children() {
@@ -837,8 +832,6 @@ public Stream<ProcessHandle> children() {
      *         are descendants of the process
      * @throws UnsupportedOperationException if the Process implementation
      *         does not support this operation
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @since 9
      */
     public Stream<ProcessHandle> descendants() {
diff --git a/src/java.base/share/classes/java/lang/ProcessBuilder.java b/src/java.base/share/classes/java/lang/ProcessBuilder.java
index e7d5d9debef..9cb5848bdff 100644
--- a/src/java.base/share/classes/java/lang/ProcessBuilder.java
+++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -329,32 +329,16 @@ public List<String> command() {
      *
      * <p>The returned map is typically case-sensitive on all platforms.
      *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkPermission checkPermission} method
-     * is called with a
-     * {@link RuntimePermission}{@code ("getenv.*")} permission.
-     * This may result in a {@link SecurityException} being thrown.
-     *
      * <p>When passing information to a Java subprocess,
      * <a href=System.html#EnvironmentVSSystemProperties>system properties</a>
      * are generally preferred over environment variables.
      *
      * @return this process builder's environment
      *
-     * @throws SecurityException
-     *         if a security manager exists and its
-     *         {@link SecurityManager#checkPermission checkPermission}
-     *         method doesn't allow access to the process environment
-     *
      * @see    Runtime#exec(String[],String[],java.io.File)
      * @see    System#getenv()
      */
     public Map<String,String> environment() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null)
-            security.checkPermission(new RuntimePermission("getenv.*"));
-
         if (environment == null)
             environment = ProcessEnvironment.environment();
 
@@ -1009,12 +993,6 @@ public ProcessBuilder redirectErrorStream(boolean redirectErrorStream) {
      * The minimal set of system dependent environment variables
      * may override the values provided in the environment.
      *
-     * <p>If there is a security manager, its
-     * {@link SecurityManager#checkExec checkExec}
-     * method is called with the first component of this object's
-     * {@code command} array as its argument. This may result in
-     * a {@link SecurityException} being thrown.
-     *
      * <p>Starting an operating system process is highly system-dependent.
      * Among the many things that can go wrong are:
      * <ul>
@@ -1042,29 +1020,6 @@ public ProcessBuilder redirectErrorStream(boolean redirectErrorStream) {
      * @throws IndexOutOfBoundsException
      *         if the command is an empty list (has size {@code 0})
      *
-     * @throws SecurityException
-     *         if a security manager exists and
-     *         <ul>
-     *
-     *         <li>its
-     *         {@link SecurityManager#checkExec checkExec}
-     *         method doesn't allow creation of the subprocess, or
-     *
-     *         <li>the standard input to the subprocess was
-     *         {@linkplain #redirectInput redirected from a file}
-     *         and the security manager's
-     *         {@link SecurityManager#checkRead(String) checkRead} method
-     *         denies read access to the file, or
-     *
-     *         <li>the standard output or standard error of the
-     *         subprocess was
-     *         {@linkplain #redirectOutput redirected to a file}
-     *         and the security manager's
-     *         {@link SecurityManager#checkWrite(String) checkWrite} method
-     *         denies write access to the file
-     *
-     *         </ul>
-     *
      * @throws  UnsupportedOperationException
      *          If the operating system does not support the creation of processes.
      *
@@ -1109,11 +1064,6 @@ private Process start(Redirect[] redirects) throws IOException {
         // Throws IndexOutOfBoundsException if command is empty
         String prog = cmdarray[0];
 
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null)
-            security.checkExec(prog);
-
         String dir = directory == null ? null : directory.toString();
 
         for (String s : cmdarray) {
@@ -1152,24 +1102,13 @@ private Process start(Redirect[] redirects) throws IOException {
             }
             return process;
         } catch (IOException | IllegalArgumentException e) {
-            String exceptionInfo = ": " + e.getMessage();
-            Throwable cause = e;
-            if ((e instanceof IOException) && security != null) {
-                // Can not disclose the fail reason for read-protected files.
-                try {
-                    security.checkRead(prog);
-                } catch (SecurityException se) {
-                    exceptionInfo = "";
-                    cause = se;
-                }
-            }
             // It's much easier for us to create a high-quality error
             // message than the low-level C code which found the problem.
             throw new IOException(
                 "Cannot run program \"" + prog + "\""
                 + (dir == null ? "" : " (in directory \"" + dir + "\")")
-                + exceptionInfo,
-                cause);
+                + ": " + e.getMessage(),
+                e);
         }
     }
 
@@ -1216,12 +1155,6 @@ private Process start(Redirect[] redirects) throws IOException {
      * The minimal set of system dependent environment variables
      * may override the values provided in the environment.
      * <p>
-     * If there is a security manager, its
-     * {@link SecurityManager#checkExec checkExec}
-     * method is called with the first component of each process builder's
-     * {@code command} array as its argument. This may result in
-     * a {@link SecurityException} being thrown.
-     * <p>
      * Starting an operating system process is highly system-dependent.
      * Among the many things that can go wrong are:
      * <ul>
@@ -1272,24 +1205,6 @@ private Process start(Redirect[] redirects) throws IOException {
      *         the builders argument is null
      * @throws IndexOutOfBoundsException
      *         if the command is an empty list (has size {@code 0})
-     * @throws SecurityException
-     *         if a security manager exists and
-     *         <ul>
-     *         <li>its
-     *         {@link SecurityManager#checkExec checkExec}
-     *         method doesn't allow creation of the subprocess, or
-     *         <li>the standard input to the subprocess was
-     *         {@linkplain #redirectInput redirected from a file}
-     *         and the security manager's
-     *         {@link SecurityManager#checkRead(String) checkRead} method
-     *         denies read access to the file, or
-     *         <li>the standard output or standard error of the
-     *         subprocess was
-     *         {@linkplain #redirectOutput redirected to a file}
-     *         and the security manager's
-     *         {@link SecurityManager#checkWrite(String) checkWrite} method
-     *         denies write access to the file
-     *         </ul>
      *
      * @throws  UnsupportedOperationException
      *          If the operating system does not support the creation of processes
diff --git a/src/java.base/share/classes/java/lang/ProcessHandle.java b/src/java.base/share/classes/java/lang/ProcessHandle.java
index 1704a6da37a..51d13457b3f 100644
--- a/src/java.base/share/classes/java/lang/ProcessHandle.java
+++ b/src/java.base/share/classes/java/lang/ProcessHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,9 +66,7 @@
  * can be used to wait for process termination, and possibly trigger dependent
  * actions.
  * <p>
- * The factory methods limit access to ProcessHandles using the
- * SecurityManager checking the {@link RuntimePermission RuntimePermission("manageProcess")}.
- * The ability to control processes is also restricted by the native system,
+ * The ability to control processes may be restricted by the native system,
  * ProcessHandle provides no more access to, or control over, the native process
  * than would be allowed by a native application.
  *
@@ -113,8 +111,6 @@ public interface ProcessHandle extends Comparable<ProcessHandle> {
      * @param pid a native process ID
      * @return an {@code Optional<ProcessHandle>} of the PID for the process;
      *         the {@code Optional} is empty if the process does not exist
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @throws UnsupportedOperationException if the implementation
      *         does not support this operation
      */
@@ -127,8 +123,6 @@ public static Optional<ProcessHandle> of(long pid) {
      * used to destroy the current process, use {@link System#exit System.exit} instead.
      *
      * @return a ProcessHandle for the current process
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @throws UnsupportedOperationException if the implementation
      *         does not support this operation
      */
@@ -143,8 +137,6 @@ public static ProcessHandle current() {
      * @return an {@code Optional<ProcessHandle>} of the parent process;
      *         the {@code Optional} is empty if the child process does not have a parent
      *         or if the parent is not available, possibly due to operating system limitations
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      */
     Optional<ProcessHandle> parent();
 
@@ -159,8 +151,6 @@ public static ProcessHandle current() {
      *
      * @return a sequential Stream of ProcessHandles for processes that are
      *         direct children of the process
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      */
     Stream<ProcessHandle> children();
 
@@ -176,8 +166,6 @@ public static ProcessHandle current() {
      *
      * @return a sequential Stream of ProcessHandles for processes that
      *         are descendants of the process
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      */
     Stream<ProcessHandle> descendants();
 
@@ -190,8 +178,6 @@ public static ProcessHandle current() {
      * </em>
      *
      * @return a Stream of ProcessHandles for all processes
-     * @throws SecurityException if a security manager has been installed and
-     *         it denies RuntimePermission("manageProcess")
      * @throws UnsupportedOperationException if the implementation
      *         does not support this operation
      */
diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
index 7dd6bf6a5e4..a7243b8b6f4 100644
--- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,28 +84,28 @@ final class ProcessHandleImpl implements ProcessHandle {
     /**
      * The thread pool of "process reaper" daemon threads.
      */
-    @SuppressWarnings("removal")
-    private static final Executor processReaperExecutor =
-            AccessController.doPrivileged((PrivilegedAction<Executor>) () -> {
-                // Initialize ThreadLocalRandom now to avoid using the smaller stack
-                // of the processReaper threads.
-                ThreadLocalRandom.current();
-
-                // For a debug build, the stack shadow zone is larger;
-                // Increase the total stack size to avoid potential stack overflow.
-                int debugDelta = "release".equals(System.getProperty("jdk.debug")) ? 0 : (4*4096);
-                final long stackSize = Boolean.getBoolean("jdk.lang.processReaperUseDefaultStackSize")
-                        ? 0 : REAPER_DEFAULT_STACKSIZE + debugDelta;
-
-                ThreadFactory threadFactory = grimReaper -> {
-                    Thread t = InnocuousThread.newSystemThread("process reaper", grimReaper,
-                            stackSize, Thread.MAX_PRIORITY);
-                    privilegedThreadSetDaemon(t, true);
-                    return t;
-                };
-
-                return Executors.newCachedThreadPool(threadFactory);
-            });
+    private static final Executor processReaperExecutor = initReaper();
+
+    private static Executor initReaper() {
+        // Initialize ThreadLocalRandom now to avoid using the smaller stack
+        // of the processReaper threads.
+        ThreadLocalRandom.current();
+
+        // For a debug build, the stack shadow zone is larger;
+        // Increase the total stack size to avoid potential stack overflow.
+        int debugDelta = "release".equals(System.getProperty("jdk.debug")) ? 0 : (4 * 4096);
+        final long stackSize = Boolean.getBoolean("jdk.lang.processReaperUseDefaultStackSize")
+                ? 0 : REAPER_DEFAULT_STACKSIZE + debugDelta;
+
+        ThreadFactory threadFactory = grimReaper -> {
+            Thread t = InnocuousThread.newSystemThread("process reaper", grimReaper,
+                    stackSize, Thread.MAX_PRIORITY);
+            t.setDaemon(true);
+            return t;
+        };
+
+        return Executors.newCachedThreadPool(threadFactory);
+    }
 
     private static class ExitCompletion extends CompletableFuture<Integer> {
         final boolean isReaping;
@@ -115,22 +115,6 @@ private static class ExitCompletion extends CompletableFuture<Integer> {
         }
     }
 
-    @SuppressWarnings("removal")
-    private static void privilegedThreadSetName(Thread thread, String name) {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            thread.setName(name);
-            return null;
-        });
-    }
-
-    @SuppressWarnings("removal")
-    private static void privilegedThreadSetDaemon(Thread thread, boolean on) {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            thread.setDaemon(on);
-            return null;
-        });
-    }
-
     /**
      * Returns a CompletableFuture that completes with process exit status when
      * the process completes.
@@ -158,7 +142,7 @@ static CompletableFuture<Integer> completion(long pid, boolean shouldReap) {
                     public void run() {
                         Thread t = Thread.currentThread();
                         String threadName = t.getName();
-                        privilegedThreadSetName(t, "process reaper (pid " + pid + ")");
+                        t.setName("process reaper (pid " + pid + ")");
                         try {
                             int exitValue = waitForProcessExit0(pid, shouldReap);
                             if (exitValue == NOT_A_CHILD) {
@@ -189,7 +173,7 @@ public void run() {
                             completions.remove(pid, newCompletion);
                         } finally {
                             // Restore thread name
-                            privilegedThreadSetName(t, threadName);
+                            t.setName(threadName);
                         }
                     }
                 });
@@ -255,14 +239,8 @@ private ProcessHandleImpl(long pid, long startTime) {
      * @param  pid the native process identifier
      * @return The ProcessHandle for the pid if the process is alive;
      *         or {@code null} if the process ID does not exist in the native system.
-     * @throws SecurityException if RuntimePermission("manageProcess") is not granted
      */
     static Optional<ProcessHandle> get(long pid) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         long start = isAlive0(pid);
         return (start >= 0)
                 ? Optional.of(new ProcessHandleImpl(pid, start))
@@ -296,14 +274,8 @@ public long pid() {
      * Returns the ProcessHandle for the current native process.
      *
      * @return The ProcessHandle for the OS process.
-     * @throws SecurityException if RuntimePermission("manageProcess") is not granted
      */
     public static ProcessHandleImpl current() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         return current;
     }
 
@@ -319,15 +291,8 @@ public static ProcessHandleImpl current() {
      *
      * @return a ProcessHandle of the parent process; {@code null} is returned
      *         if the child process does not have a parent
-     * @throws SecurityException           if permission is not granted by the
-     *                                     security policy
      */
     public Optional<ProcessHandle> parent() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         long ppid = parent0(pid, startTime);
         if (ppid <= 0) {
             return Optional.empty();
@@ -442,11 +407,6 @@ public Stream<ProcessHandle> children() {
      * @return a stream of ProcessHandles
      */
     static Stream<ProcessHandle> children(long pid) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         int size = 100;
         long[] childpids = null;
         long[] starttimes = null;
@@ -463,11 +423,6 @@ static Stream<ProcessHandle> children(long pid) {
 
     @Override
     public Stream<ProcessHandle> descendants() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         int size = 100;
         long[] pids = null;
         long[] ppids = null;
diff --git a/src/java.base/share/classes/java/lang/Runtime.java b/src/java.base/share/classes/java/lang/Runtime.java
index 19cbfa42e00..2f8f003af7c 100644
--- a/src/java.base/share/classes/java/lang/Runtime.java
+++ b/src/java.base/share/classes/java/lang/Runtime.java
@@ -142,9 +142,9 @@ private Runtime() {}
 
     /**
      * Initiates the {@linkplain ##shutdown shutdown sequence} of the Java Virtual Machine.
-     * Unless the security manager denies exiting, this method initiates the shutdown sequence
-     * (if it is not already initiated) and then blocks indefinitely. This method neither returns
-     * nor throws an exception; that is, it does not complete either normally or abruptly.
+     * This method initiates the shutdown sequence (if it is not already initiated) and
+     * then blocks indefinitely. This method neither returns nor throws an exception; that
+     * is, it does not complete either normally or abruptly.
      *
      * <p> The argument serves as a status code. By convention, a nonzero status code
      * indicates abnormal termination.
@@ -169,13 +169,6 @@ private Runtime() {}
      *         Termination status.  By convention, a nonzero status code
      *         indicates abnormal termination.
      *
-     * @throws SecurityException
-     *         If a security manager is present and its
-     *         {@link SecurityManager#checkExit checkExit} method does not permit
-     *         exiting with the specified status
-     *
-     * @see java.lang.SecurityException
-     * @see java.lang.SecurityManager#checkExit(int)
      * @see #addShutdownHook
      * @see #removeShutdownHook
      * @see #halt(int)
@@ -233,10 +226,6 @@ public void exit(int status) {
      * @throws  IllegalStateException
      *          If the shutdown sequence has already begun
      *
-     * @throws  SecurityException
-     *          If a security manager is present and it denies
-     *          {@link RuntimePermission}{@code ("shutdownHooks")}
-     *
      * @see #removeShutdownHook
      * @see #halt(int)
      * @see #exit(int)
@@ -265,10 +254,6 @@ public void addShutdownHook(Thread hook) {
      * @throws  IllegalStateException
      *          If the shutdown sequence has already begun
      *
-     * @throws  SecurityException
-     *          If a security manager is present and it denies
-     *          {@link RuntimePermission}{@code ("shutdownHooks")}
-     *
      * @see #addShutdownHook
      * @see #exit(int)
      * @since 1.3
@@ -284,8 +269,7 @@ public boolean removeShutdownHook(Thread hook) {
 
     /**
      * Immediately {@linkplain ##termination terminates} the Java Virtual Machine.
-     * If the security manager denies exiting, throws {@link SecurityException}.
-     * Otherwise, termination of the Java Virtual Machine is unconditional and immediate.
+     * Termination of the Java Virtual Machine is unconditional and immediate.
      * This method does not initiate the {@linkplain ##shutdown shutdown sequence}, nor does
      * it wait for the shutdown sequence to finish if it is already in progress. An
      * invocation of this method never returns normally.
@@ -303,11 +287,6 @@ public boolean removeShutdownHook(Thread hook) {
      *         has already been invoked then this status code
      *         will override the status code passed to that method.
      *
-     * @throws SecurityException
-     *         If a security manager is present and its
-     *         {@link SecurityManager#checkExit checkExit} method
-     *         does not permit an exit with the specified status
-     *
      * @see #exit
      * @see #addShutdownHook
      * @see #removeShutdownHook
@@ -341,11 +320,6 @@ public void halt(int status) {
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  IOException
      *          If an I/O error occurs
      *
@@ -392,11 +366,6 @@ public Process exec(String command) throws IOException {
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  IOException
      *          If an I/O error occurs
      *
@@ -457,11 +426,6 @@ public Process exec(String command, String[] envp) throws IOException {
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  IOException
      *          If an I/O error occurs
      *
@@ -505,11 +469,6 @@ public Process exec(String command, String[] envp, File dir)
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  IOException
      *          If an I/O error occurs
      *
@@ -551,11 +510,6 @@ public Process exec(String[] cmdarray) throws IOException {
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  IOException
      *          If an I/O error occurs
      *
@@ -610,12 +564,6 @@ public Process exec(String[] cmdarray, String[] envp) throws IOException {
      * If {@code dir} is {@code null}, the subprocess inherits the
      * current working directory of the current process.
      *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkExec checkExec}
-     * method is invoked with the first component of the array
-     * {@code cmdarray} as its argument. This may result in a
-     * {@link SecurityException} being thrown.
-     *
      * <p>Starting an operating system process is highly system-dependent.
      * Among the many things that can go wrong are:
      * <ul>
@@ -647,11 +595,6 @@ public Process exec(String[] cmdarray, String[] envp) throws IOException {
      *
      * @return  A new {@link Process} object for managing the subprocess
      *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          {@link SecurityManager#checkExec checkExec}
-     *          method doesn't allow creation of the subprocess
-     *
      * @throws  UnsupportedOperationException
      *          If the operating system does not support the creation of processes.
      *
@@ -808,10 +751,6 @@ public void runFinalization() {
      * Otherwise, the filename argument is mapped to a native library image in
      * an implementation-dependent manner.
      * <p>
-     * First, if there is a security manager, its {@code checkLink}
-     * method is called with the {@code filename} as its argument.
-     * This may result in a security exception.
-     * <p>
      * This is similar to the method {@link #loadLibrary(String)}, but it
      * accepts a general file name as an argument rather than just a library
      * name, allowing any file of native code to be loaded.
@@ -820,9 +759,6 @@ public void runFinalization() {
      * convenient means of invoking this method.
      *
      * @param      filename   the file to load.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkLink} method doesn't allow
-     *             loading of the specified dynamic library
      * @throws     UnsatisfiedLinkError  if either the filename is not an
      *             absolute path name, the native library is not statically
      *             linked with the VM, or the library cannot be mapped to
@@ -833,8 +769,6 @@ public void runFinalization() {
      *             does not have native access enabled.
      * @spec jni/index.html Java Native Interface Specification
      * @see        java.lang.Runtime#getRuntime()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
      */
     @CallerSensitive
     @Restricted
@@ -871,10 +805,6 @@ void load0(Class<?> fromClass, String filename) {
      * location and mapped to a native library image in an
      * implementation-dependent manner.
      * <p>
-     * First, if there is a security manager, its {@code checkLink}
-     * method is called with the {@code libname} as its argument.
-     * This may result in a security exception.
-     * <p>
      * The method {@link System#loadLibrary(String)} is the conventional
      * and convenient means of invoking this method. If native
      * methods are to be used in the implementation of a class, a standard
@@ -891,9 +821,6 @@ void load0(Class<?> fromClass, String filename) {
      * name, the second and subsequent calls are ignored.
      *
      * @param      libname   the name of the library.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkLink} method doesn't allow
-     *             loading of the specified dynamic library
      * @throws     UnsatisfiedLinkError if either the libname argument
      *             contains a file path, the native library is not statically
      *             linked with the VM,  or the library cannot be mapped to a
@@ -903,8 +830,6 @@ void load0(Class<?> fromClass, String filename) {
      * @throws     IllegalCallerException if the caller is in a module that
      *             does not have native access enabled.
      * @spec jni/index.html Java Native Interface Specification
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
      */
     @CallerSensitive
     @Restricted
diff --git a/src/java.base/share/classes/java/lang/RuntimePermission.java b/src/java.base/share/classes/java/lang/RuntimePermission.java
index 39996bdd953..dc158be409f 100644
--- a/src/java.base/share/classes/java/lang/RuntimePermission.java
+++ b/src/java.base/share/classes/java/lang/RuntimePermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,361 +26,21 @@
 package java.lang;
 
 import java.security.*;
-import java.lang.module.ModuleFinder;
 
 /**
  * This class is for runtime permissions. A {@code RuntimePermission}
  * contains a name (also referred to as a "target name") but no actions
  * list; you either have the named permission or you don't.
  * <p>
- * The target name is the name of the runtime permission (see below). The
- * naming convention follows the  hierarchical property naming convention.
- * Also, an asterisk may appear at the end of the name, following a ".",
+ * The target name is the name of the runtime permission. The naming convention
+ * follows the hierarchical property naming convention, typically the reverse
+ * domain name notation, to avoid name clashes.
+ * An asterisk may appear at the end of the name, following a ".",
  * or by itself, to signify a wildcard match. For example: "loadLibrary.*"
  * and "*" signify a wildcard match, while "*loadLibrary" and "a*b" do not.
- * <p>
- * The following table lists the standard {@code RuntimePermission}
- * target names, and for each provides a description of what the permission
- * allows and a discussion of the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">permission target name,
- *  what the target allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- *
- * <tr>
- *   <th scope="row">createClassLoader</th>
- *   <td>Creation of a class loader</td>
- *   <td>This is an extremely dangerous permission to grant.
- * Malicious applications that can instantiate their own class
- * loaders could then load their own rogue classes into the system.
- * These newly loaded classes could be placed into any protection
- * domain by the class loader, thereby automatically granting the
- * classes the permissions for that domain.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getClassLoader</th>
- *   <td>Retrieval of a class loader (e.g., the class loader for the calling
- * class)</td>
- *   <td>This would grant an attacker permission to get the
- * class loader for a particular class. This is dangerous because
- * having access to a class's class loader allows the attacker to
- * load other classes available to that class loader. The attacker
- * would typically otherwise not have access to those classes.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setContextClassLoader</th>
- *   <td>Setting of the context class loader used by a thread</td>
- *   <td>The context class loader is used by system code and extensions
- * when they need to lookup resources that might not exist in the system
- * class loader. Granting setContextClassLoader permission would allow
- * code to change which context class loader is used
- * for a particular thread, including system threads.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">enableContextClassLoaderOverride</th>
- *   <td>Subclass implementation of the thread context class loader methods</td>
- *   <td>The context class loader is used by system code and extensions
- * when they need to lookup resources that might not exist in the system
- * class loader. Granting enableContextClassLoaderOverride permission would allow
- * a subclass of Thread to override the methods that are used
- * to get or set the context class loader for a particular thread.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">closeClassLoader</th>
- *   <td>Closing of a ClassLoader</td>
- *   <td>Granting this permission allows code to close any URLClassLoader
- * that it has a reference to.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setSecurityManager</th>
- *   <td>Setting of the security manager (possibly replacing an existing one)
- * </td>
- *   <td>The security manager is a class that allows
- * applications to implement a security policy. Granting the setSecurityManager
- * permission would allow code to change which security manager is used by
- * installing a different, possibly less restrictive security manager,
- * thereby bypassing checks that would have been enforced by the original
- * security manager.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">createSecurityManager</th>
- *   <td>Creation of a new security manager</td>
- *   <td>This gives code access to protected, sensitive methods that may
- * disclose information about other classes or the execution stack.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getenv.{variable name}</th>
- *   <td>Reading of the value of the specified environment variable</td>
- *   <td>This would allow code to read the value, or determine the
- *       existence, of a particular environment variable.  This is
- *       dangerous if the variable contains confidential data.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">exitVM.{exit status}</th>
- *   <td>Halting of the Java Virtual Machine with the specified exit status</td>
- *   <td>This allows an attacker to mount a denial-of-service attack
- * by automatically forcing the virtual machine to halt.
- * Note: The "exitVM.*" permission is automatically granted to all code
- * loaded from the application class path, thus enabling applications
- * to terminate themselves. Also, the "exitVM" permission is equivalent to
- * "exitVM.*".</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">shutdownHooks</th>
- *   <td>Registration and cancellation of virtual-machine shutdown hooks</td>
- *   <td>This allows an attacker to register a malicious shutdown
- * hook that interferes with the clean shutdown of the virtual machine.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setFactory</th>
- *   <td>Setting of the socket factory used by ServerSocket or Socket,
- * or of the stream handler factory used by URL</td>
- *   <td>This allows code to set the actual implementation
- * for the socket, server socket, stream handler, or RMI socket factory.
- * An attacker may set a faulty implementation which mangles the data
- * stream.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setIO</th>
- *   <td>Setting of System.out, System.in, and System.err</td>
- *   <td>This allows changing the value of the standard system streams.
- * An attacker may change System.in to monitor and
- * steal user input, or may set System.err to a "null" OutputStream,
- * which would hide any error messages sent to System.err. </td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">modifyThread</th>
- *   <td>Modification of threads, e.g., via calls to Thread
- * {@code interrupt, setDaemon, setPriority, setName} and
- * {@code setUncaughtExceptionHandler} methods</td>
- * <td>This allows an attacker to modify the behaviour of
- * any thread in the system.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">modifyThreadGroup</th>
- *   <td>modification of thread groups, e.g., via calls to ThreadGroup
- * {@code getParent}, {@code setDaemon}, and {@code setMaxPriority} methods</td>
- *   <td>This allows an attacker to create thread groups and
- * set their run priority.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getProtectionDomain</th>
- *   <td>Retrieval of the ProtectionDomain for a class</td>
- *   <td>This allows code to obtain policy information
- * for a particular code source. While obtaining policy information
- * does not compromise the security of the system, it does give
- * attackers additional information, such as local file names for
- * example, to better aim an attack.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getFileSystemAttributes</th>
- *   <td>Retrieval of file system attributes</td>
- *   <td>This allows code to obtain file system information such as disk usage
- *       or disk space available to the caller.  This is potentially dangerous
- *       because it discloses information about the system hardware
- *       configuration and some information about the caller's privilege to
- *       write files.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">readFileDescriptor</th>
- *   <td>Reading of file descriptors</td>
- *   <td>This would allow code to read the particular file associated
- *       with the file descriptor read. This is dangerous if the file
- *       contains confidential data.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">writeFileDescriptor</th>
- *   <td>Writing to file descriptors</td>
- *   <td>This allows code to write to a particular file associated
- *       with the descriptor. This is dangerous because it may allow
- *       malicious code to plant viruses or at the very least, fill up
- *       your entire disk.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">loadLibrary.{library name}</th>
- *   <td>Dynamic linking of the specified library</td>
- *   <td>It is dangerous to allow an applet permission to load native code
- * libraries, because the Java security architecture is not designed to and
- * does not prevent malicious behavior at the level of native code.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">accessClassInPackage.{package name}</th>
- *   <td>Access to the specified package via a class loader's
- * {@code loadClass} method when that class loader calls
- * the SecurityManager {@code checkPackageAccess} method</td>
- *   <td>This gives code access to classes in packages
- * to which it normally does not have access. Malicious code
- * may use these classes to help in its attempt to compromise
- * security in the system.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">defineClassInPackage.{package name}</th>
- *   <td>Definition of classes in the specified package, via a class
- * loader's {@code defineClass} method when that class loader calls
- * the SecurityManager {@code checkPackageDefinition} method.</td>
- *   <td>This grants code permission to define a class
- * in a particular package. This is dangerous because malicious
- * code with this permission may define rogue classes in
- * trusted packages like {@code java.security} or {@code java.lang},
- * for example.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">defineClass</th>
- *   <td>Define a class with
- * {@link java.lang.invoke.MethodHandles.Lookup#defineClass(byte[])
- * Lookup.defineClass}.</td>
- *   <td>This grants code with a suitably privileged {@code Lookup} object
- * permission to define classes in the same package as the {@code Lookup}'s
- * lookup class. </td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">accessDeclaredMembers</th>
- *   <td>Access to the declared members of a class</td>
- *   <td>This grants code permission to query a class for its public,
- * protected, default (package) access, and private fields and/or
- * methods. Although the code would have
- * access to the private and protected field and method names, it would not
- * have access to the private/protected field data and would not be able
- * to invoke any private methods. Nevertheless, malicious code
- * may use this information to better aim an attack.
- * Additionally, it may invoke any public methods and/or access public fields
- * in the class.  This could be dangerous if
- * the code would normally not be able to invoke those methods and/or
- * access the fields  because
- * it can't cast the object to the class/interface with those methods
- * and fields.</td>
- * </tr>
- * <tr>
- *   <th scope="row">queuePrintJob</th>
- *   <td>Initiation of a print job request</td>
- *   <td>This could print sensitive information to a printer,
- * or simply waste paper.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getStackTrace</th>
- *   <td>Retrieval of the stack trace information of another thread.</td>
- *   <td>This allows retrieval of the stack trace information of
- * another thread.  This might allow malicious code to monitor the
- * execution of threads and discover vulnerabilities in applications.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getStackWalkerWithClassReference</th>
- *   <td>Get a stack walker that can retrieve stack frames with class reference.</td>
- *   <td>This allows retrieval of Class objects from stack walking.
- *   This might allow malicious code to access Class objects on the stack
- *   outside its own context.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setDefaultUncaughtExceptionHandler</th>
- *   <td>Setting the default handler to be used when a thread
- *   terminates abruptly due to an uncaught exception</td>
- *   <td>This allows an attacker to register a malicious
- *   uncaught exception handler that could interfere with termination
- *   of a thread</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">preferences</th>
- *   <td>Represents the permission required to get access to the
- *   java.util.prefs.Preferences implementations user or system root
- *   which in turn allows retrieval or update operations within the
- *   Preferences persistent backing store.) </td>
- *   <td>This permission allows the user to read from or write to the
- *   preferences backing store if the user running the code has
- *   sufficient OS privileges to read/write to that backing store.
- *   The actual backing store may reside within a traditional filesystem
- *   directory or within a registry depending on the platform OS</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">manageProcess</th>
- *   <td>Native process termination and information about processes
- *       {@link ProcessHandle}.</td>
- *   <td>Allows code to identify and terminate processes that it did not create.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">localeServiceProvider</th>
- *   <td>This {@code RuntimePermission} is required to be granted to
- *   classes which subclass and implement
- *   {@code java.util.spi.LocaleServiceProvider}. The permission is
- *   checked during invocation of the abstract base class constructor.
- *   This permission ensures trust in classes which implement this
- *   security-sensitive provider mechanism. </td>
- *   <td>See <a href= "../util/spi/LocaleServiceProvider.html">
- *   {@code java.util.spi.LocaleServiceProvider}</a> for more
- *   information.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">loggerFinder</th>
- *   <td>This {@code RuntimePermission} is required to be granted to
- *   classes which subclass or call methods on
- *   {@code java.lang.System.LoggerFinder}. The permission is
- *   checked during invocation of the abstract base class constructor, as
- *   well as on the invocation of its public methods.
- *   This permission ensures trust in classes which provide loggers
- *   to system classes.</td>
- *   <td>See {@link java.lang.System.LoggerFinder java.lang.System.LoggerFinder}
- *   for more information.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">accessSystemModules</th>
- *   <td>Access system modules in the runtime image.</td>
- *   <td>This grants the permission to access resources in the
- *   {@linkplain ModuleFinder#ofSystem system modules} in the runtime image.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">inetAddressResolverProvider</th>
- *   <td>This {@code RuntimePermission} is required to be granted to
- *   classes which subclass and implement {@code java.net.spi.InetAddressResolverProvider}.
- *   The permission is checked during invocation of the abstract base class constructor.
- *   This permission ensures trust in classes which provide resolvers used by
- *   {@link java.net.InetAddress} hostname and address resolution methods.</td>
- *   <td>See {@link java.net.spi.InetAddressResolverProvider} for more information.</td>
- * </tr>
- *
- * </tbody>
- * </table>
- *
- * @implNote
- * Implementations may define additional target names, but should use naming
- * conventions such as reverse domain name notation to avoid name clashes.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
@@ -388,7 +48,6 @@
  * @see java.security.PermissionCollection
  * @see java.lang.SecurityManager
  *
- *
  * @author Marianne Mueller
  * @author Roland Schemers
  * @since 1.2
diff --git a/src/java.base/share/classes/java/lang/SecurityException.java b/src/java.base/share/classes/java/lang/SecurityException.java
index 4e4f966f76a..2801aa36f0e 100644
--- a/src/java.base/share/classes/java/lang/SecurityException.java
+++ b/src/java.base/share/classes/java/lang/SecurityException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,12 @@
 package java.lang;
 
 /**
- * Thrown by the security manager to indicate a security violation.
+ * Thrown to indicate a security violation.
+ *
+ * <p> This exception was originally specified for use with a SecurityManager when
+ * an operation was denied. This feature no longer exists. This exception may be
+ * deprecated in a future release.
  *
- * @see     java.lang.SecurityManager
  * @since   1.0
  */
 public class SecurityException extends RuntimeException {
diff --git a/src/java.base/share/classes/java/lang/SecurityManager.java b/src/java.base/share/classes/java/lang/SecurityManager.java
index 7e3e4338127..6e6a85aadc7 100644
--- a/src/java.base/share/classes/java/lang/SecurityManager.java
+++ b/src/java.base/share/classes/java/lang/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,332 +25,30 @@
 
 package java.lang;
 
-import java.lang.module.ModuleDescriptor;
-import java.lang.module.ModuleDescriptor.Exports;
-import java.lang.module.ModuleDescriptor.Opens;
 import java.io.FileDescriptor;
-import java.io.File;
-import java.io.FilePermission;
 import java.net.InetAddress;
-import java.net.SocketPermission;
-import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.Security;
-import java.security.SecurityPermission;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.PropertyPermission;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import jdk.internal.module.ModuleLoaderMap;
-import sun.security.util.SecurityConstants;
 
 /**
- * The security manager is a class that allows
- * applications to implement a security policy. It allows an
- * application to determine, before performing a possibly unsafe or
- * sensitive operation, what the operation is and whether
- * it is being attempted in a security context that allows the
- * operation to be performed. The
- * application can allow or disallow the operation.
- * <p>
- * The {@code SecurityManager} class contains many methods with
- * names that begin with the word {@code check}. These methods
- * are called by various methods in the Java libraries before those
- * methods perform certain potentially sensitive operations. The
- * invocation of such a {@code check} method typically looks like this:
- * <blockquote><pre>
- *     SecurityManager security = System.getSecurityManager();
- *     if (security != null) {
- *         security.check<i>XXX</i>(argument, &nbsp;.&nbsp;.&nbsp;.&nbsp;);
- *     }
- * </pre></blockquote>
- * <p>
- * The security manager is thereby given an opportunity to prevent
- * completion of the operation by throwing an exception. A security
- * manager routine simply returns if the operation is permitted, but
- * throws a {@code SecurityException} if the operation is not
- * permitted.
- * <h2><a id="set-security-manager">Setting a Security Manager</a></h2>
- * Environments using a security manager will typically set the security
- * manager at startup. In the JDK implementation, this is done by setting the
- * system property {@systemProperty java.security.manager} on the command line
- * to the class name of the security manager. It can also be set to the empty
- * String ("") or the special token "{@code default}" to use the
- * default {@code java.lang.SecurityManager}. If a class name is specified,
- * it must be {@code java.lang.SecurityManager} or a public subclass and have
- * a public no-arg constructor. The class is loaded by the
- * {@linkplain ClassLoader#getSystemClassLoader() built-in system class loader}
- * if it is not {@code java.lang.SecurityManager}. If the
- * {@code java.security.manager} system property is not set, the default value
- * is {@code null}, which means a security manager will not be set at startup.
- * <p>
- * The Java run-time may also allow, but is not required to allow, the security
- * manager to be set dynamically by invoking the
- * {@link System#setSecurityManager(SecurityManager) setSecurityManager} method.
- * In the JDK implementation, if the Java virtual machine is started with
- * the {@code java.security.manager} system property set to the special token
- * "{@code allow}", then a security manager will not be set at startup but can
- * be set dynamically. If the Java virtual machine is started with the
- * {@code java.security.manager} system property not set or set to the special
- * token "{@code disallow}", then a security manager will not be set at startup
- * and cannot be set dynamically (the
- * {@link System#setSecurityManager(SecurityManager) setSecurityManager}
- * method will throw an {@code UnsupportedOperationException}). Finally, if the
- * {@code java.security.manager} system property is set to the class name of
- * the security manager, or to the empty String ("") or the special token
- * "{@code default}", then a security manager is set at startup (as described
- * previously) and can also be subsequently replaced (or disabled) dynamically
- * (subject to the policy of the currently installed security manager). The
- * following table illustrates the behavior of the JDK implementation for the
- * different settings of the {@code java.security.manager} system property:
- * <table class="striped">
- * <caption style="display:none">property value,
- *  the SecurityManager set at startup,
- *  can dynamically set a SecurityManager
- * </caption>
- * <thead>
- * <tr>
- * <th scope="col">Property Value</th>
- * <th scope="col">The SecurityManager set at startup</th>
- * <th scope="col">System.setSecurityManager run-time behavior</th>
- * </tr>
- * </thead>
- * <tbody>
- *
- * <tr>
- *   <th scope="row">null</th>
- *   <td>None</td>
- *   <td>Throws {@code UnsupportedOperationException}</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">empty String ("")</th>
- *   <td>{@code java.lang.SecurityManager}</td>
- *   <td>Success or throws {@code SecurityException} if not permitted by
- * the currently installed security manager</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">"default"</th>
- *   <td>{@code java.lang.SecurityManager}</td>
- *   <td>Success or throws {@code SecurityException} if not permitted by
- * the currently installed security manager</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">"disallow"</th>
- *   <td>None</td>
- *   <td>Throws {@code UnsupportedOperationException}</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">"allow"</th>
- *   <td>None</td>
- *   <td>Success or throws {@code SecurityException} if not permitted by
- * the currently installed security manager</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">a class name</th>
- *   <td>the named class</td>
- *   <td>Success or throws {@code SecurityException} if not permitted by
- * the currently installed security manager</td>
- * </tr>
- *
- * </tbody>
- * </table>
- * <p>
- * The current security manager is returned by the
- * {@link System#getSecurityManager() getSecurityManager} method.
- * <h2><a id="check-permission">Checking Permissions</a></h2>
- * The special method
- * {@link SecurityManager#checkPermission(java.security.Permission)}
- * determines whether an access request indicated by a specified
- * permission should be granted or denied. The
- * default implementation calls
- *
- * <pre>
- *   AccessController.checkPermission(perm);
- * </pre>
- *
- * <p>
- * If a requested access is allowed,
- * {@code checkPermission} returns quietly. If denied, a
- * {@code SecurityException} is thrown.
- * <p>
- * The default implementation of each of the other
- * {@code check} methods in {@code SecurityManager} is to
- * call the {@code SecurityManager checkPermission} method
- * to determine if the calling thread has permission to perform the requested
- * operation.
- * <p>
- * Note that the {@code checkPermission} method with
- * just a single permission argument always performs security checks
- * within the context of the currently executing thread.
- * Sometimes a security check that should be made within a given context
- * will actually need to be done from within a
- * <i>different</i> context (for example, from within a worker thread).
- * The {@link SecurityManager#getSecurityContext getSecurityContext} method
- * and the {@link SecurityManager#checkPermission(java.security.Permission,
- * java.lang.Object) checkPermission}
- * method that includes a context argument are provided
- * for this situation. The
- * {@code getSecurityContext} method returns a "snapshot"
- * of the current calling context. (The default implementation
- * returns an AccessControlContext object.) A sample call is
- * the following:
- *
- * <pre>
- *   Object context = null;
- *   SecurityManager sm = System.getSecurityManager();
- *   if (sm != null) context = sm.getSecurityContext();
- * </pre>
- *
- * <p>
- * The {@code checkPermission} method
- * that takes a context object in addition to a permission
- * makes access decisions based on that context,
- * rather than on that of the current execution thread.
- * Code within a different context can thus call that method,
- * passing the permission and the
- * previously-saved context object. A sample call, using the
- * SecurityManager {@code sm} obtained as in the previous example,
- * is the following:
- *
- * <pre>
- *   if (sm != null) sm.checkPermission(permission, context);
- * </pre>
- *
- * <p>Permissions fall into these categories: File, Socket, Net,
- * Security, Runtime, Property, AWT, Reflect, and Serializable.
- * The classes managing these various
- * permission categories are {@code java.io.FilePermission},
- * {@code java.net.SocketPermission},
- * {@code java.net.NetPermission},
- * {@code java.security.SecurityPermission},
- * {@code java.lang.RuntimePermission},
- * {@code java.util.PropertyPermission},
- * {@code java.awt.AWTPermission},
- * {@code java.lang.reflect.ReflectPermission}, and
- * {@code java.io.SerializablePermission}.
- *
- * <p>All but the first two (FilePermission and SocketPermission) are
- * subclasses of {@code java.security.BasicPermission}, which itself
- * is an abstract subclass of the
- * top-level class for permissions, which is
- * {@code java.security.Permission}. BasicPermission defines the
- * functionality needed for all permissions that contain a name
- * that follows the hierarchical property naming convention
- * (for example, "exitVM", "setFactory", "queuePrintJob", etc).
- * An asterisk
- * may appear at the end of the name, following a ".", or by itself, to
- * signify a wildcard match. For example: "a.*" or "*" is valid,
- * "*a" or "a*b" is not valid.
- *
- * <p>FilePermission and SocketPermission are subclasses of the
- * top-level class for permissions
- * ({@code java.security.Permission}). Classes like these
- * that have a more complicated name syntax than that used by
- * BasicPermission subclass directly from Permission rather than from
- * BasicPermission. For example,
- * for a {@code java.io.FilePermission} object, the permission name is
- * the path name of a file (or directory).
- *
- * <p>Some of the permission classes have an "actions" list that tells
- * the actions that are permitted for the object.  For example,
- * for a {@code java.io.FilePermission} object, the actions list
- * (such as "read, write") specifies which actions are granted for the
- * specified file (or for files in the specified directory).
- *
- * <p>Other permission classes are for "named" permissions -
- * ones that contain a name but no actions list; you either have the
- * named permission or you don't.
- *
- * <p>Note: There is also a {@code java.security.AllPermission}
- * permission that implies all permissions. It exists to simplify the work
- * of system administrators who might need to perform multiple
- * tasks that require all (or numerous) permissions.
- * <p>
- * See {@extLink security_guide_permissions
- * Permissions in the Java Development Kit (JDK)}
- * for permission-related information.
- * This document includes a table listing the various SecurityManager
- * {@code check} methods and the permission(s) the default
- * implementation of each such method requires.
- * It also contains a table of the methods
- * that require permissions, and for each such method tells
- * which permission it requires.
- *
- * @author  Arthur van Hoff
- * @author  Roland Schemers
- *
- * @see     java.lang.ClassLoader
- * @see     java.lang.SecurityException
- * @see     java.lang.System#getSecurityManager() getSecurityManager
- * @see     java.lang.System#setSecurityManager(java.lang.SecurityManager)
- *  setSecurityManager
- * @see     java.security.AccessController AccessController
- * @see     java.security.AccessControlContext AccessControlContext
- * @see     java.security.AccessControlException AccessControlException
- * @see     java.security.Permission
- * @see     java.security.BasicPermission
- * @see     java.io.FilePermission
- * @see     java.net.SocketPermission
- * @see     java.util.PropertyPermission
- * @see     java.lang.RuntimePermission
- * @see     java.security.Policy Policy
- * @see     java.security.SecurityPermission SecurityPermission
- * @see     java.security.ProtectionDomain
+ * SecurityManager was originally specified to allow an application implement
+ * a security policy. It allowed an application to determine, before performing
+ * a possibly unsafe or security sensitive operation, whether the operation was
+ * being attempted in a security context that allowed the operation.
+ * This feature no longer exists.
  *
  * @since   1.0
- * @deprecated The Security Manager is deprecated and subject to removal in a
- *       future release. There is no replacement for the Security Manager.
- *       See <a href="https://openjdk.org/jeps/411">JEP 411</a> for
- *       discussion and alternatives.
+ * @deprecated There is no replacement for this class.
  */
 @Deprecated(since="17", forRemoval=true)
 public class SecurityManager {
 
-    /*
-     * Have we been initialized. Effective against finalizer attacks.
-     */
-    private boolean initialized = false;
-
     /**
-     * Constructs a new {@code SecurityManager}.
-     *
-     * <p> If there is a security manager already installed, this method first
-     * calls the security manager's {@code checkPermission} method
-     * with the {@code RuntimePermission("createSecurityManager")}
-     * permission to ensure the calling thread has permission to create a new
-     * security manager.
-     * This may result in throwing a {@code SecurityException}.
-     *
-     * @throws     java.lang.SecurityException if a security manager already
-     *             exists and its {@code checkPermission} method
-     *             doesn't allow creation of a new security manager.
-     * @see        java.lang.System#getSecurityManager()
-     * @see        #checkPermission(java.security.Permission) checkPermission
-     * @see java.lang.RuntimePermission
+     * Constructs a new {@code SecurityManager}. Setting a security manager with
+     * {@link System#setSecurityManager(SecurityManager)} is not supported.
      */
-    public SecurityManager() {
-        synchronized(SecurityManager.class) {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                // ask the currently installed security manager if we
-                // can create a new one.
-                sm.checkPermission(new RuntimePermission
-                                   ("createSecurityManager"));
-            }
-            initialized = true;
-        }
-    }
+    public SecurityManager() { }
 
     /**
      * Returns the current execution stack as an array of classes.
@@ -360,31 +58,40 @@ public SecurityManager() {
      * currently executing method, the element at index {@code 1} is
      * the class of that method's caller, and so on.
      *
+     * @apiNote The {@code StackWalker} class can be used as a replacement
+     * for this method.
+     *
      * @return  the execution stack.
      */
-    protected native Class<?>[] getClassContext();
+    protected Class<?>[] getClassContext() {
+        return StackWalkerHolder.STACK_WALKER
+                .walk(s -> s.map(StackWalker.StackFrame::getDeclaringClass)
+                        .skip(1L)
+                        .toArray(Class[]::new));
+    }
+
+    private static class StackWalkerHolder {
+        static final StackWalker STACK_WALKER =
+            StackWalker.getInstance(
+                Set.of(StackWalker.Option.RETAIN_CLASS_REFERENCE,
+                       StackWalker.Option.DROP_METHOD_INFO));
+    }
 
     /**
-     * Creates an object that encapsulates the current execution
-     * environment. The result of this method is used, for example, by the
-     * three-argument {@code checkConnect} method and by the
-     * two-argument {@code checkRead} method.
-     * These methods are needed because a trusted method may be called
-     * on to read a file or open a socket on behalf of another method.
-     * The trusted method needs to determine if the other (possibly
-     * untrusted) method would be allowed to perform the operation on its
-     * own.
-     * <p> The default implementation of this method is to return
-     * an {@code AccessControlContext} object.
+     * Returns an {@code AccessControlContext} where the {@code checkPermission}
+     * method always throws an {@code AccessControlException} and the
+     * {@code getDomainCombiner} method always returns {@code null}.
      *
-     * @return  an implementation-dependent object that encapsulates
-     *          sufficient information about the current execution environment
-     *          to perform some security checks later.
-     * @see     java.lang.SecurityManager#checkConnect(java.lang.String, int,
-     *   java.lang.Object) checkConnect
-     * @see     java.lang.SecurityManager#checkRead(java.lang.String,
-     *   java.lang.Object) checkRead
+     * @return  an {@code AccessControlContext} as specified above
      * @see     java.security.AccessControlContext AccessControlContext
+     * @apiNote This method originally returned a snapshot of the current
+     *       calling context, which included the current thread's access
+     *       control context and any limited privilege scope. This method has
+     *       been changed to always return an innocuous
+     *       {@code AccessControlContext} that fails all permission checks.
+     *       {@linkplain SecurityManager The Security Manager} is no longer
+     *       supported. There is no replacement for the Security Manager or
+     *       this method.
      */
     @SuppressWarnings("removal")
     public Object getSecurityContext() {
@@ -392,1144 +99,289 @@ public Object getSecurityContext() {
     }
 
     /**
-     * Throws a {@code SecurityException} if the requested
-     * access, specified by the given permission, is not permitted based
-     * on the security policy currently in effect.
-     * <p>
-     * This method calls {@code AccessController.checkPermission}
-     * with the given permission.
+     * Throws {@code SecurityException}.
      *
-     * @param     perm   the requested permission.
-     * @throws    SecurityException if access is not permitted based on
-     *            the current security policy.
-     * @throws    NullPointerException if the permission argument is
-     *            {@code null}.
+     * @param     perm   ignored
+     * @throws    SecurityException always
      * @since     1.2
      */
-    @SuppressWarnings("removal")
     public void checkPermission(Permission perm) {
-        java.security.AccessController.checkPermission(perm);
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * specified security context is denied access to the resource
-     * specified by the given permission.
-     * The context must be a security
-     * context returned by a previous call to
-     * {@code getSecurityContext} and the access control
-     * decision is based upon the configured security policy for
-     * that security context.
-     * <p>
-     * If {@code context} is an instance of
-     * {@code AccessControlContext} then the
-     * {@code AccessControlContext.checkPermission} method is
-     * invoked with the specified permission.
-     * <p>
-     * If {@code context} is not an instance of
-     * {@code AccessControlContext} then a
-     * {@code SecurityException} is thrown.
+     * Throws {@code SecurityException}.
      *
-     * @param      perm      the specified permission
-     * @param      context   a system-dependent security context.
-     * @throws     SecurityException  if the specified security context
-     *             is not an instance of {@code AccessControlContext}
-     *             (e.g., is {@code null}), or is denied access to the
-     *             resource specified by the given permission.
-     * @throws     NullPointerException if the permission argument is
-     *             {@code null}.
-     * @see        java.lang.SecurityManager#getSecurityContext()
-     * @see java.security.AccessControlContext#checkPermission(java.security.Permission)
+     * @param      perm      ignored
+     * @param      context   ignored
+     * @throws     SecurityException always
      * @since      1.2
      */
-    @SuppressWarnings("removal")
     public void checkPermission(Permission perm, Object context) {
-        if (context instanceof AccessControlContext) {
-            ((AccessControlContext)context).checkPermission(perm);
-        } else {
-            throw new SecurityException();
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to create a new class loader.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("createClassLoader")}
-     * permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkCreateClassLoader}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @throws    SecurityException if the calling thread does not
-     *             have permission
-     *             to create a new class loader.
-     * @see        java.lang.ClassLoader#ClassLoader()
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @throws    SecurityException always
      */
     public void checkCreateClassLoader() {
-        checkPermission(SecurityConstants.CREATE_CLASSLOADER_PERMISSION);
-    }
-
-    /**
-     * reference to the root thread group, used for the checkAccess
-     * methods.
-     */
-
-    private static ThreadGroup rootGroup = getRootGroup();
-
-    private static ThreadGroup getRootGroup() {
-        ThreadGroup root =  Thread.currentThread().getThreadGroup();
-        while (root.getParent() != null) {
-            root = root.getParent();
-        }
-        return root;
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to modify the thread argument.
-     * <p>
-     * This method is invoked for the current security manager by the
-     * {@code setPriority}, {@code setName}, and
-     * {@code setDaemon} methods of class {@code Thread}.
-     * <p>
-     * If the thread argument is a system thread (belongs to
-     * the thread group with a {@code null} parent) then
-     * this method calls {@code checkPermission} with the
-     * {@code RuntimePermission("modifyThread")} permission.
-     * If the thread argument is <i>not</i> a system thread,
-     * this method just returns silently.
-     * <p>
-     * Applications that want a stricter policy should override this
-     * method. If this method is overridden, the method that overrides
-     * it should additionally check to see if the calling thread has the
-     * {@code RuntimePermission("modifyThread")} permission, and
-     * if so, return silently. This is to ensure that code granted
-     * that permission (such as the JDK itself) is allowed to
-     * manipulate any thread.
-     * <p>
-     * If this method is overridden, then
-     * {@code super.checkAccess} should
-     * be called by the first statement in the overridden method, or the
-     * equivalent security check should be placed in the overridden method.
+     * Throws {@code SecurityException}.
      *
-     * @param      t   the thread to be checked.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to modify the thread.
-     * @throws     NullPointerException if the thread argument is
-     *             {@code null}.
-     * @see        java.lang.Thread#setDaemon(boolean) setDaemon
-     * @see        java.lang.Thread#setName(java.lang.String) setName
-     * @see        java.lang.Thread#setPriority(int) setPriority
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      t   ignored
+     * @throws     SecurityException always
      */
     public void checkAccess(Thread t) {
-        if (t == null) {
-            throw new NullPointerException("thread can't be null");
-        }
-        if (t.getThreadGroup() == rootGroup) {
-            checkPermission(SecurityConstants.MODIFY_THREAD_PERMISSION);
-        } else {
-            // just return
-        }
+        throw new SecurityException();
     }
+
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to modify the thread group argument.
-     * <p>
-     * This method is invoked for the current security manager when a
-     * new child thread or child thread group is created, and by the
-     * {@code setDaemon} and {@code setMaxPriority} methods of class
-     * {@code ThreadGroup}.
-     * <p>
-     * If the thread group argument is the system thread group (
-     * has a {@code null} parent) then
-     * this method calls {@code checkPermission} with the
-     * {@code RuntimePermission("modifyThreadGroup")} permission.
-     * If the thread group argument is <i>not</i> the system thread group,
-     * this method just returns silently.
-     * <p>
-     * Applications that want a stricter policy should override this
-     * method. If this method is overridden, the method that overrides
-     * it should additionally check to see if the calling thread has the
-     * {@code RuntimePermission("modifyThreadGroup")} permission, and
-     * if so, return silently. This is to ensure that code granted
-     * that permission (such as the JDK itself) is allowed to
-     * manipulate any thread.
-     * <p>
-     * If this method is overridden, then
-     * {@code super.checkAccess} should
-     * be called by the first statement in the overridden method, or the
-     * equivalent security check should be placed in the overridden method.
+     * Throws {@code SecurityException}.
      *
-     * @param      g   the thread group to be checked.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to modify the thread group.
-     * @throws     NullPointerException if the thread group argument is
-     *             {@code null}.
-     * @see        java.lang.ThreadGroup#setDaemon(boolean) setDaemon
-     * @see        java.lang.ThreadGroup#setMaxPriority(int) setMaxPriority
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      g   ignored
+     * @throws     SecurityException always
      */
     public void checkAccess(ThreadGroup g) {
-        if (g == null) {
-            throw new NullPointerException("thread group can't be null");
-        }
-        if (g == rootGroup) {
-            checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
-        } else {
-            // just return
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to cause the Java Virtual Machine to
-     * halt with the specified status code.
-     * <p>
-     * This method is invoked for the current security manager by the
-     * {@code exit} method of class {@code Runtime}. A status
-     * of {@code 0} indicates success; other values indicate various
-     * errors.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("exitVM."+status)} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkExit}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      status   the exit status.
-     * @throws    SecurityException if the calling thread does not have
-     *              permission to halt the Java Virtual Machine with
-     *              the specified status.
-     * @see        java.lang.Runtime#exit(int) exit
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      status   ignored
+     * @throws    SecurityException always
      */
     public void checkExit(int status) {
-        checkPermission(new RuntimePermission("exitVM."+status));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to create a subprocess.
-     * <p>
-     * This method is invoked for the current security manager by the
-     * {@code exec} methods of class {@code Runtime}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code FilePermission(cmd,"execute")} permission
-     * if cmd is an absolute path, otherwise it calls
-     * {@code checkPermission} with
-     * <code>FilePermission("&lt;&lt;ALL FILES&gt;&gt;","execute")</code>.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkExec}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      cmd   the specified system command.
-     * @throws     SecurityException if the calling thread does not have
-     *             permission to create a subprocess.
-     * @throws     NullPointerException if the {@code cmd} argument is
-     *             {@code null}.
-     * @see     java.lang.Runtime#exec(java.lang.String)
-     * @see     java.lang.Runtime#exec(java.lang.String, java.lang.String[])
-     * @see     java.lang.Runtime#exec(java.lang.String[])
-     * @see     java.lang.Runtime#exec(java.lang.String[], java.lang.String[])
-     * @see     #checkPermission(java.security.Permission) checkPermission
+     * @param      cmd   ignored
+     * @throws     SecurityException always
      */
     public void checkExec(String cmd) {
-        File f = new File(cmd);
-        if (f.isAbsolute()) {
-            checkPermission(new FilePermission(cmd,
-                SecurityConstants.FILE_EXECUTE_ACTION));
-        } else {
-            checkPermission(new FilePermission("<<ALL FILES>>",
-                SecurityConstants.FILE_EXECUTE_ACTION));
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to dynamic link the library code
-     * specified by the string argument file. The argument is either a
-     * simple library name or a complete filename.
-     * <p>
-     * This method is invoked for the current security manager by
-     * methods {@code load} and {@code loadLibrary} of class
-     * {@code Runtime}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("loadLibrary."+lib)} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkLink}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      lib   the name of the library.
-     * @throws     SecurityException if the calling thread does not have
-     *             permission to dynamically link the library.
-     * @throws     NullPointerException if the {@code lib} argument is
-     *             {@code null}.
-     * @see        java.lang.Runtime#load(java.lang.String)
-     * @see        java.lang.Runtime#loadLibrary(java.lang.String)
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      lib   ignored
+     * @throws     SecurityException always
      */
     public void checkLink(String lib) {
-        if (lib == null) {
-            throw new NullPointerException("library can't be null");
-        }
-        checkPermission(new RuntimePermission("loadLibrary."+lib));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to read from the specified file
-     * descriptor.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("readFileDescriptor")}
-     * permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkRead}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      fd   the system-dependent file descriptor.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to access the specified file descriptor.
-     * @throws     NullPointerException if the file descriptor argument is
-     *             {@code null}.
-     * @see        java.io.FileDescriptor
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      fd   the system-dependent file descriptor
+     * @throws     SecurityException always
      */
     public void checkRead(FileDescriptor fd) {
-        if (fd == null) {
-            throw new NullPointerException("file descriptor can't be null");
-        }
-        checkPermission(new RuntimePermission("readFileDescriptor"));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to read the file specified by the
-     * string argument.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code FilePermission(file,"read")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkRead}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      file   the system-dependent file name.
-     * @throws     SecurityException if the calling thread does not have
-     *             permission to access the specified file.
-     * @throws     NullPointerException if the {@code file} argument is
-     *             {@code null}.
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      file   ignored
+     * @throws     SecurityException always
      */
     public void checkRead(String file) {
-        checkPermission(new FilePermission(file,
-            SecurityConstants.FILE_READ_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * specified security context is not allowed to read the file
-     * specified by the string argument. The context must be a security
-     * context returned by a previous call to
-     * {@code getSecurityContext}.
-     * <p> If {@code context} is an instance of
-     * {@code AccessControlContext} then the
-     * {@code AccessControlContext.checkPermission} method will
-     * be invoked with the {@code FilePermission(file,"read")} permission.
-     * <p> If {@code context} is not an instance of
-     * {@code AccessControlContext} then a
-     * {@code SecurityException} is thrown.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkRead}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      file      the system-dependent filename.
-     * @param      context   a system-dependent security context.
-     * @throws     SecurityException  if the specified security context
-     *             is not an instance of {@code AccessControlContext}
-     *             (e.g., is {@code null}), or does not have permission
-     *             to read the specified file.
-     * @throws     NullPointerException if the {@code file} argument is
-     *             {@code null}.
-     * @see        java.lang.SecurityManager#getSecurityContext()
-     * @see        java.security.AccessControlContext#checkPermission(java.security.Permission)
+     * @param      file      ignored
+     * @param      context   ignored
+     * @throws     SecurityException always
      */
     public void checkRead(String file, Object context) {
-        checkPermission(
-            new FilePermission(file, SecurityConstants.FILE_READ_ACTION),
-            context);
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to write to the specified file
-     * descriptor.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("writeFileDescriptor")}
-     * permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkWrite}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      fd   the system-dependent file descriptor.
-     * @throws    SecurityException  if the calling thread does not have
-     *             permission to access the specified file descriptor.
-     * @throws     NullPointerException if the file descriptor argument is
-     *             {@code null}.
-     * @see        java.io.FileDescriptor
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param     fd   ignored
+     * @throws    SecurityException always
      */
     public void checkWrite(FileDescriptor fd) {
-        if (fd == null) {
-            throw new NullPointerException("file descriptor can't be null");
-        }
-        checkPermission(new RuntimePermission("writeFileDescriptor"));
-
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to write to the file specified by
-     * the string argument.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code FilePermission(file,"write")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkWrite}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      file   the system-dependent filename.
-     * @throws     SecurityException  if the calling thread does not
-     *             have permission to access the specified file.
-     * @throws     NullPointerException if the {@code file} argument is
-     *             {@code null}.
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      file   ignored
+     * @throws     SecurityException always
      */
     public void checkWrite(String file) {
-        checkPermission(new FilePermission(file,
-            SecurityConstants.FILE_WRITE_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to delete the specified file.
-     * <p>
-     * This method is invoked for the current security manager by the
-     * {@code delete} method of class {@code File}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code FilePermission(file,"delete")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkDelete}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      file   the system-dependent filename.
-     * @throws     SecurityException if the calling thread does not
-     *             have permission to delete the file.
-     * @throws     NullPointerException if the {@code file} argument is
-     *             {@code null}.
-     * @see        java.io.File#delete()
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      file   ignored
+     * @throws     SecurityException always
      */
     public void checkDelete(String file) {
-        checkPermission(new FilePermission(file,
-            SecurityConstants.FILE_DELETE_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to open a socket connection to the
-     * specified host and port number.
-     * <p>
-     * A port number of {@code -1} indicates that the calling
-     * method is attempting to determine the IP address of the specified
-     * host name.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code SocketPermission(host+":"+port,"connect")} permission if
-     * the port is not equal to -1. If the port is equal to -1, then
-     * it calls {@code checkPermission} with the
-     * {@code SocketPermission(host,"resolve")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkConnect}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      host   the host name port to connect to.
-     * @param      port   the protocol port to connect to.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to open a socket connection to the specified
-     *               {@code host} and {@code port}.
-     * @throws     NullPointerException if the {@code host} argument is
-     *             {@code null}.
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      host   ignored
+     * @param      port   ignored
+     * @throws     SecurityException always
      */
     public void checkConnect(String host, int port) {
-        if (host == null) {
-            throw new NullPointerException("host can't be null");
-        }
-        if (!host.startsWith("[") && host.indexOf(':') != -1) {
-            host = "[" + host + "]";
-        }
-        if (port == -1) {
-            checkPermission(new SocketPermission(host,
-                SecurityConstants.SOCKET_RESOLVE_ACTION));
-        } else {
-            checkPermission(new SocketPermission(host+":"+port,
-                SecurityConstants.SOCKET_CONNECT_ACTION));
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * specified security context is not allowed to open a socket
-     * connection to the specified host and port number.
-     * <p>
-     * A port number of {@code -1} indicates that the calling
-     * method is attempting to determine the IP address of the specified
-     * host name.
-     * <p> If {@code context} is not an instance of
-     * {@code AccessControlContext} then a
-     * {@code SecurityException} is thrown.
-     * <p>
-     * Otherwise, the port number is checked. If it is not equal
-     * to -1, the {@code context}'s {@code checkPermission}
-     * method is called with a
-     * {@code SocketPermission(host+":"+port,"connect")} permission.
-     * If the port is equal to -1, then
-     * the {@code context}'s {@code checkPermission} method
-     * is called with a
-     * {@code SocketPermission(host,"resolve")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkConnect}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      host      the host name port to connect to.
-     * @param      port      the protocol port to connect to.
-     * @param      context   a system-dependent security context.
-     * @throws     SecurityException if the specified security context
-     *             is not an instance of {@code AccessControlContext}
-     *             (e.g., is {@code null}), or does not have permission
-     *             to open a socket connection to the specified
-     *             {@code host} and {@code port}.
-     * @throws     NullPointerException if the {@code host} argument is
-     *             {@code null}.
-     * @see        java.lang.SecurityManager#getSecurityContext()
-     * @see        java.security.AccessControlContext#checkPermission(java.security.Permission)
+     * @param      host      ignored
+     * @param      port      ignored
+     * @param      context   ignored
+     * @throws     SecurityException always
      */
     public void checkConnect(String host, int port, Object context) {
-        if (host == null) {
-            throw new NullPointerException("host can't be null");
-        }
-        if (!host.startsWith("[") && host.indexOf(':') != -1) {
-            host = "[" + host + "]";
-        }
-        if (port == -1)
-            checkPermission(new SocketPermission(host,
-                SecurityConstants.SOCKET_RESOLVE_ACTION),
-                context);
-        else
-            checkPermission(new SocketPermission(host+":"+port,
-                SecurityConstants.SOCKET_CONNECT_ACTION),
-                context);
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to wait for a connection request on
-     * the specified local port number.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code SocketPermission("localhost:"+port,"listen")}.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkListen}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      port   the local port.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to listen on the specified port.
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      port   ignored
+     * @throws     SecurityException always
      */
     public void checkListen(int port) {
-        checkPermission(new SocketPermission("localhost:"+port,
-            SecurityConstants.SOCKET_LISTEN_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not permitted to accept a socket connection from
-     * the specified host and port number.
-     * <p>
-     * This method is invoked for the current security manager by the
-     * {@code accept} method of class {@code ServerSocket}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code SocketPermission(host+":"+port,"accept")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkAccept}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      host   the host name of the socket connection.
-     * @param      port   the port number of the socket connection.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to accept the connection.
-     * @throws     NullPointerException if the {@code host} argument is
-     *             {@code null}.
-     * @see        java.net.ServerSocket#accept()
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      host   ignored
+     * @param      port   ignored
+     * @throws     SecurityException always
      */
     public void checkAccept(String host, int port) {
-        if (host == null) {
-            throw new NullPointerException("host can't be null");
-        }
-        if (!host.startsWith("[") && host.indexOf(':') != -1) {
-            host = "[" + host + "]";
-        }
-        checkPermission(new SocketPermission(host+":"+port,
-            SecurityConstants.SOCKET_ACCEPT_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to use
-     * (join/leave/send/receive) IP multicast.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * <code>java.net.SocketPermission(maddr.getHostAddress(),
-     * "accept,connect")</code> permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkMulticast}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      maddr  Internet group address to be used.
-     * @throws     SecurityException  if the calling thread is not allowed to
-     *  use (join/leave/send/receive) IP multicast.
-     * @throws     NullPointerException if the address argument is
-     *             {@code null}.
+     * @param      maddr  ignored
+     * @throws     SecurityException always
      * @since      1.1
-     * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkMulticast(InetAddress maddr) {
-        String host = maddr.getHostAddress();
-        if (!host.startsWith("[") && host.indexOf(':') != -1) {
-            host = "[" + host + "]";
-        }
-        checkPermission(new SocketPermission(host,
-            SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to use
-     * (join/leave/send/receive) IP multicast.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * <code>java.net.SocketPermission(maddr.getHostAddress(),
-     * "accept,connect")</code> permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkMulticast}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      maddr  Internet group address to be used.
-     * @param      ttl        value in use, if it is multicast send.
-     * Note: this particular implementation does not use the ttl
-     * parameter.
-     * @throws     SecurityException  if the calling thread is not allowed to
-     *  use (join/leave/send/receive) IP multicast.
-     * @throws     NullPointerException if the address argument is
-     *             {@code null}.
+     * @param      maddr  ignored
+     * @param      ttl    ignored
+     * @throws     SecurityException always
      * @since      1.1
-     * @see        #checkPermission(java.security.Permission) checkPermission
      */
-    @Deprecated(since="1.4", forRemoval=true)
     public void checkMulticast(InetAddress maddr, byte ttl) {
-        String host = maddr.getHostAddress();
-        if (!host.startsWith("[") && host.indexOf(':') != -1) {
-            host = "[" + host + "]";
-        }
-        checkPermission(new SocketPermission(host,
-            SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to access or modify the system
-     * properties.
-     * <p>
-     * This method is used by the {@code getProperties} and
-     * {@code setProperties} methods of class {@code System}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code PropertyPermission("*", "read,write")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkPropertiesAccess}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to access or modify the system properties.
-     * @see        java.lang.System#getProperties()
-     * @see        java.lang.System#setProperties(java.util.Properties)
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @throws     SecurityException always
      */
     public void checkPropertiesAccess() {
-        checkPermission(new PropertyPermission("*",
-            SecurityConstants.PROPERTY_RW_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to access the system property with
-     * the specified {@code key} name.
-     * <p>
-     * This method is used by the {@code getProperty} method of
-     * class {@code System}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code PropertyPermission(key, "read")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkPropertyAccess}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @param      key   a system property key.
-     *
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to access the specified system property.
-     * @throws     NullPointerException if the {@code key} argument is
-     *             {@code null}.
-     * @throws     IllegalArgumentException if {@code key} is empty.
-     *
-     * @see        java.lang.System#getProperty(java.lang.String)
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @param      key  ignored
+     * @throws     SecurityException always
      */
     public void checkPropertyAccess(String key) {
-        checkPermission(new PropertyPermission(key,
-            SecurityConstants.PROPERTY_READ_ACTION));
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to initiate a print job request.
-     * <p>
-     * This method calls
-     * {@code checkPermission} with the
-     * {@code RuntimePermission("queuePrintJob")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkPrintJobAccess}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to initiate a print job request.
+     * @throws     SecurityException always
      * @since   1.1
-     * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkPrintJobAccess() {
-        checkPermission(new RuntimePermission("queuePrintJob"));
-    }
-
-    /*
-     * We have an initial invalid bit (initially false) for the class
-     * variables which tell if the cache is valid.  If the underlying
-     * java.security.Security property changes via setProperty(), the
-     * Security class uses reflection to change the variable and thus
-     * invalidate the cache.
-     *
-     * Locking is handled by synchronization to the
-     * packageAccessLock/packageDefinitionLock objects.  They are only
-     * used in this class.
-     *
-     * Note that cache invalidation as a result of the property change
-     * happens without using these locks, so there may be a delay between
-     * when a thread updates the property and when other threads updates
-     * the cache.
-     */
-    private static boolean packageAccessValid = false;
-    private static String[] packageAccess;
-    private static final Object packageAccessLock = new Object();
-
-    private static boolean packageDefinitionValid = false;
-    private static String[] packageDefinition;
-    private static final Object packageDefinitionLock = new Object();
-
-    private static String[] getPackages(String p) {
-        String packages[] = null;
-        if (p != null && !p.isEmpty()) {
-            java.util.StringTokenizer tok =
-                new java.util.StringTokenizer(p, ",");
-            int n = tok.countTokens();
-            if (n > 0) {
-                packages = new String[n];
-                int i = 0;
-                while (tok.hasMoreElements()) {
-                    String s = tok.nextToken().trim();
-                    packages[i++] = s;
-                }
-            }
-        }
-
-        if (packages == null) {
-            packages = new String[0];
-        }
-        return packages;
-    }
-
-    // The non-exported packages in modules defined to the boot or platform
-    // class loaders. A non-exported package is a package that is not exported
-    // or is only exported to specific modules.
-    private static final Map<String, Boolean> nonExportedPkgs = new ConcurrentHashMap<>();
-    static {
-        addNonExportedPackages(ModuleLayer.boot());
-    }
-
-    /**
-     * Record the non-exported packages of the modules in the given layer
-     */
-    static void addNonExportedPackages(ModuleLayer layer) {
-        Set<String> bootModules = ModuleLoaderMap.bootModules();
-        Set<String> platformModules = ModuleLoaderMap.platformModules();
-        layer.modules().stream()
-                .map(Module::getDescriptor)
-                .filter(md -> bootModules.contains(md.name())
-                        || platformModules.contains(md.name()))
-                .map(SecurityManager::nonExportedPkgs)
-                .flatMap(Set::stream)
-                .forEach(pn -> nonExportedPkgs.put(pn, Boolean.TRUE));
-    }
-
-
-    /**
-     * Called by java.security.Security
-     */
-    static void invalidatePackageAccessCache() {
-        synchronized (packageAccessLock) {
-            packageAccessValid = false;
-        }
-        synchronized (packageDefinitionLock) {
-            packageDefinitionValid = false;
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Returns the non-exported packages of the specified module.
-     */
-    private static Set<String> nonExportedPkgs(ModuleDescriptor md) {
-        // start with all packages in the module
-        Set<String> pkgs = new HashSet<>(md.packages());
-
-        // remove the non-qualified exported packages
-        md.exports().stream()
-                    .filter(p -> !p.isQualified())
-                    .map(Exports::source)
-                    .forEach(pkgs::remove);
-
-        // remove the non-qualified open packages
-        md.opens().stream()
-                  .filter(p -> !p.isQualified())
-                  .map(Opens::source)
-                  .forEach(pkgs::remove);
-
-        return pkgs;
-    }
-
-    /**
-     * Throws a {@code SecurityException} if the calling thread is not allowed
-     * to access the specified package.
-     * <p>
-     * During class loading, this method may be called by the {@code loadClass}
-     * method of class loaders and by the Java Virtual Machine to ensure that
-     * the caller is allowed to access the package of the class that is
-     * being loaded.
-     * <p>
-     * This method checks if the specified package starts with or equals
-     * any of the packages in the {@code package.access} Security Property.
-     * An implementation may also check the package against an additional
-     * list of restricted packages as noted below. If the package is restricted,
-     * {@link #checkPermission(Permission)} is called with a
-     * {@code RuntimePermission("accessClassInPackage."+pkg)} permission.
-     * <p>
-     * If this method is overridden, then {@code super.checkPackageAccess}
-     * should be called as the first line in the overridden method.
-     *
-     * @implNote
-     * This implementation also restricts all non-exported packages of modules
-     * loaded by {@linkplain ClassLoader#getPlatformClassLoader
-     * the platform class loader} or its ancestors. A "non-exported package"
-     * refers to a package that is not exported to all modules. Specifically,
-     * it refers to a package that either is not exported at all by its
-     * containing module or is exported in a qualified fashion by its
-     * containing module.
+     * Throws {@code SecurityException}.
      *
-     * @param      pkg   the package name.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to access the specified package.
-     * @throws     NullPointerException if the package name argument is
-     *             {@code null}.
-     * @see        java.lang.ClassLoader#loadClass(String, boolean) loadClass
-     * @see        java.security.Security#getProperty getProperty
-     * @see        #checkPermission(Permission) checkPermission
+     * @param      pkg   ignored
+     * @throws     SecurityException always
      */
     public void checkPackageAccess(String pkg) {
-        Objects.requireNonNull(pkg, "package name can't be null");
-
-        // check if pkg is not exported to all modules
-        if (nonExportedPkgs.containsKey(pkg)) {
-            checkPermission(
-                new RuntimePermission("accessClassInPackage." + pkg));
-            return;
-        }
-
-        String[] restrictedPkgs;
-        synchronized (packageAccessLock) {
-            /*
-             * Do we need to update our property array?
-             */
-            if (!packageAccessValid) {
-                @SuppressWarnings("removal")
-                String tmpPropertyStr =
-                    AccessController.doPrivileged(
-                        new PrivilegedAction<>() {
-                            public String run() {
-                                return Security.getProperty("package.access");
-                            }
-                        }
-                    );
-                packageAccess = getPackages(tmpPropertyStr);
-                packageAccessValid = true;
-            }
-
-            // Using a snapshot of packageAccess -- don't care if static field
-            // changes afterwards; array contents won't change.
-            restrictedPkgs = packageAccess;
-        }
-
-        /*
-         * Traverse the list of packages, check for any matches.
-         */
-        final int plen = pkg.length();
-        for (String restrictedPkg : restrictedPkgs) {
-            final int rlast = restrictedPkg.length() - 1;
-
-            // Optimizations:
-            //
-            // If rlast >= plen then restrictedPkg is longer than pkg by at
-            // least one char. This means pkg cannot start with restrictedPkg,
-            // since restrictedPkg will be longer than pkg.
-            //
-            // Similarly if rlast != plen, then pkg + "." cannot be the same
-            // as restrictedPkg, since pkg + "." will have a different length
-            // than restrictedPkg.
-            //
-            if (rlast < plen && pkg.startsWith(restrictedPkg) ||
-                // The following test is equivalent to
-                // restrictedPkg.equals(pkg + ".") but is noticeably more
-                // efficient:
-                rlast == plen && restrictedPkg.startsWith(pkg) &&
-                restrictedPkg.charAt(rlast) == '.')
-            {
-                checkPermission(
-                    new RuntimePermission("accessClassInPackage." + pkg));
-                break;  // No need to continue; only need to check this once
-            }
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the calling thread is not
-     * allowed to define classes in the specified package.
-     * <p>
-     * This method is called by the {@code loadClass} method of some
-     * class loaders.
-     * <p>
-     * This method checks if the specified package starts with or equals
-     * any of the packages in the {@code package.definition} Security
-     * Property. An implementation may also check the package against an
-     * additional list of restricted packages as noted below. If the package
-     * is restricted, {@link #checkPermission(Permission)} is called with a
-     * {@code RuntimePermission("defineClassInPackage."+pkg)} permission.
-     * <p>
-     * If this method is overridden, then {@code super.checkPackageDefinition}
-     * should be called as the first line in the overridden method.
-     *
-     * @implNote
-     * This implementation also restricts all non-exported packages of modules
-     * loaded by {@linkplain ClassLoader#getPlatformClassLoader
-     * the platform class loader} or its ancestors. A "non-exported package"
-     * refers to a package that is not exported to all modules. Specifically,
-     * it refers to a package that either is not exported at all by its
-     * containing module or is exported in a qualified fashion by its
-     * containing module.
+     * Throws {@code SecurityException}.
      *
-     * @param      pkg   the package name.
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to define classes in the specified package.
-     * @throws     NullPointerException if the package name argument is
-     *             {@code null}.
-     * @see        java.lang.ClassLoader#loadClass(String, boolean)
-     * @see        java.security.Security#getProperty getProperty
-     * @see        #checkPermission(Permission) checkPermission
+     * @param      pkg   ignored
+     * @throws     SecurityException always
      */
     public void checkPackageDefinition(String pkg) {
-        Objects.requireNonNull(pkg, "package name can't be null");
-
-        // check if pkg is not exported to all modules
-        if (nonExportedPkgs.containsKey(pkg)) {
-            checkPermission(
-                new RuntimePermission("defineClassInPackage." + pkg));
-            return;
-        }
-
-        String[] pkgs;
-        synchronized (packageDefinitionLock) {
-            /*
-             * Do we need to update our property array?
-             */
-            if (!packageDefinitionValid) {
-                @SuppressWarnings("removal")
-                String tmpPropertyStr =
-                    AccessController.doPrivileged(
-                        new PrivilegedAction<>() {
-                            public String run() {
-                                return java.security.Security.getProperty(
-                                    "package.definition");
-                            }
-                        }
-                    );
-                packageDefinition = getPackages(tmpPropertyStr);
-                packageDefinitionValid = true;
-            }
-            // Using a snapshot of packageDefinition -- don't care if static
-            // field changes afterwards; array contents won't change.
-            pkgs = packageDefinition;
-        }
-
-        /*
-         * Traverse the list of packages, check for any matches.
-         */
-        for (String restrictedPkg : pkgs) {
-            if (pkg.startsWith(restrictedPkg) || restrictedPkg.equals(pkg + ".")) {
-                checkPermission(
-                    new RuntimePermission("defineClassInPackage." + pkg));
-                break; // No need to continue; only need to check this once
-            }
-        }
+        throw new SecurityException();
     }
 
     /**
-     * Throws a {@code SecurityException} if the
-     * calling thread is not allowed to set the socket factory used by
-     * {@code ServerSocket} or {@code Socket}, or the stream
-     * handler factory used by {@code URL}.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code RuntimePermission("setFactory")} permission.
-     * <p>
-     * If you override this method, then you should make a call to
-     * {@code super.checkSetFactory}
-     * at the point the overridden method would normally throw an
-     * exception.
+     * Throws {@code SecurityException}.
      *
-     * @throws     SecurityException  if the calling thread does not have
-     *             permission to specify a socket factory or a stream
-     *             handler factory.
-     *
-     * @see        java.net.ServerSocket#setSocketFactory(java.net.SocketImplFactory) setSocketFactory
-     * @see        java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory) setSocketImplFactory
-     * @see        java.net.URL#setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory) setURLStreamHandlerFactory
-     * @see        #checkPermission(java.security.Permission) checkPermission
+     * @throws     SecurityException always
      */
     public void checkSetFactory() {
-        checkPermission(new RuntimePermission("setFactory"));
+        throw new SecurityException();
     }
 
     /**
-     * Determines whether the permission with the specified permission target
-     * name should be granted or denied.
-     *
-     * <p> If the requested permission is allowed, this method returns
-     * quietly. If denied, a SecurityException is raised.
-     *
-     * <p> This method creates a {@code SecurityPermission} object for
-     * the given permission target name and calls {@code checkPermission}
-     * with it.
-     *
-     * <p> See the documentation for
-     * <code>{@link java.security.SecurityPermission}</code> for
-     * a list of possible permission target names.
-     *
-     * <p> If you override this method, then you should make a call to
-     * {@code super.checkSecurityAccess}
-     * at the point the overridden method would normally throw an
-     * exception.
-     *
-     * @param target the target name of the {@code SecurityPermission}.
-     *
-     * @throws    SecurityException if the calling thread does not have
-     * permission for the requested access.
-     * @throws    NullPointerException if {@code target} is null.
-     * @throws    IllegalArgumentException if {@code target} is empty.
+     * Throws {@code SecurityException}.
      *
+     * @param     target ignored
+     * @throws    SecurityException always
      * @since   1.1
-     * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkSecurityAccess(String target) {
-        checkPermission(new SecurityPermission(target));
+        throw new SecurityException();
     }
 
     /**
-     * Returns the thread group into which to instantiate any new
-     * thread being created at the time this is being called.
-     * By default, it returns the thread group of the current
-     * thread. This should be overridden by a specific security
-     * manager to return the appropriate thread group.
-     *
-     * @return  ThreadGroup that new threads are instantiated into
+     * {@return the current Thread's {@code ThreadGroup}}
      * @since   1.1
-     * @see     java.lang.ThreadGroup
      */
     public ThreadGroup getThreadGroup() {
         return Thread.currentThread().getThreadGroup();
     }
-
 }
diff --git a/src/java.base/share/classes/java/lang/StackWalker.java b/src/java.base/share/classes/java/lang/StackWalker.java
index 8a39c465c2b..a6756f3278b 100644
--- a/src/java.base/share/classes/java/lang/StackWalker.java
+++ b/src/java.base/share/classes/java/lang/StackWalker.java
@@ -61,9 +61,6 @@
  *
  * <p> {@code StackWalker} is thread-safe. Multiple threads can share
  * a single {@code StackWalker} object to traverse its own stack.
- * A permission check is performed when a {@code StackWalker} is created,
- * according to the options it requests.
- * No further permission check is done at stack walking time.
  *
  * @apiNote
  * Examples
@@ -354,18 +351,10 @@ public static StackWalker getInstance() {
     /**
      * Returns a {@code StackWalker} instance with the given option specifying
      * the stack frame information it can access.
-     * <p>
-     * If a security manager is present and the given {@code option} is
-     * {@link Option#RETAIN_CLASS_REFERENCE Option.RETAIN_CLASS_REFERENCE},
-     * it calls its {@link SecurityManager#checkPermission checkPermission}
-     * method for {@code RuntimePermission("getStackWalkerWithClassReference")}.
      *
      * @param option {@link Option stack walking option}
      *
      * @return a {@code StackWalker} configured with the given option
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkPermission} method denies access.
      */
     public static StackWalker getInstance(Option option) {
         return getInstance(EnumSet.of(Objects.requireNonNull(option)));
@@ -380,18 +369,9 @@ public static StackWalker getInstance(Option option) {
      * configured to skip all {@linkplain Option#SHOW_HIDDEN_FRAMES hidden frames}
      * and no {@linkplain Option#RETAIN_CLASS_REFERENCE class reference} is retained.
      *
-     * <p>
-     * If a security manager is present and the given {@code options} contains
-     * {@link Option#RETAIN_CLASS_REFERENCE Option.RETAIN_CLASS_REFERENCE},
-     * it calls its {@link SecurityManager#checkPermission checkPermission}
-     * method for {@code RuntimePermission("getStackWalkerWithClassReference")}.
-     *
      * @param options {@link Option stack walking options}
      *
      * @return a {@code StackWalker} configured with the given options
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkPermission} method denies access.
      */
     public static StackWalker getInstance(Set<Option> options) {
         if (options.isEmpty()) {
@@ -413,12 +393,6 @@ public static StackWalker getInstance(Set<Option> options) {
      * and no {@linkplain Option#RETAIN_CLASS_REFERENCE class reference} is retained.
      *
      * <p>
-     * If a security manager is present and the given {@code options} contains
-     * {@link Option#RETAIN_CLASS_REFERENCE Option.RETAIN_CLASS_REFERENCE},
-     * it calls its {@link SecurityManager#checkPermission checkPermission}
-     * method for {@code RuntimePermission("getStackWalkerWithClassReference")}.
-     *
-     * <p>
      * The {@code estimateDepth} specifies the estimate number of stack frames
      * this {@code StackWalker} will traverse that the {@code StackWalker} could
      * use as a hint for the buffer size.
@@ -429,8 +403,6 @@ public static StackWalker getInstance(Set<Option> options) {
      * @return a {@code StackWalker} configured with the given options
      *
      * @throws IllegalArgumentException if {@code estimateDepth <= 0}
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkPermission} method denies access.
      */
     public static StackWalker getInstance(Set<Option> options, int estimateDepth) {
         if (estimateDepth <= 0) {
diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index d0c558ed93a..b635d0dee0f 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -236,17 +236,10 @@ static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
         if (indexCoder < UTF16) {
             if (value) {
                 index -= 4;
-                buf[index] = 't';
-                buf[index + 1] = 'r';
-                buf[index + 2] = 'u';
-                buf[index + 3] = 'e';
+                StringLatin1.putCharsAt(buf, index, 't', 'r', 'u', 'e');
             } else {
                 index -= 5;
-                buf[index] = 'f';
-                buf[index + 1] = 'a';
-                buf[index + 2] = 'l';
-                buf[index + 3] = 's';
-                buf[index + 4] = 'e';
+                StringLatin1.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
             }
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
@@ -254,17 +247,10 @@ static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
         } else {
             if (value) {
                 index -= 4;
-                StringUTF16.putChar(buf, index, 't');
-                StringUTF16.putChar(buf, index + 1, 'r');
-                StringUTF16.putChar(buf, index + 2, 'u');
-                StringUTF16.putChar(buf, index + 3, 'e');
+                StringUTF16.putCharsAt(buf, index, 't', 'r', 'u', 'e');
             } else {
                 index -= 5;
-                StringUTF16.putChar(buf, index, 'f');
-                StringUTF16.putChar(buf, index + 1, 'a');
-                StringUTF16.putChar(buf, index + 2, 'l');
-                StringUTF16.putChar(buf, index + 3, 's');
-                StringUTF16.putChar(buf, index + 4, 'e');
+                StringUTF16.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
             }
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
@@ -638,34 +624,20 @@ static int prepend(int index, byte coder, byte[] buf, boolean value, String pref
         if (coder == String.LATIN1) {
             if (value) {
                 index -= 4;
-                buf[index] = 't';
-                buf[index + 1] = 'r';
-                buf[index + 2] = 'u';
-                buf[index + 3] = 'e';
+                StringLatin1.putCharsAt(buf, index, 't', 'r', 'u', 'e');
             } else {
                 index -= 5;
-                buf[index] = 'f';
-                buf[index + 1] = 'a';
-                buf[index + 2] = 'l';
-                buf[index + 3] = 's';
-                buf[index + 4] = 'e';
+                StringLatin1.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
             }
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
         } else {
             if (value) {
                 index -= 4;
-                StringUTF16.putChar(buf, index, 't');
-                StringUTF16.putChar(buf, index + 1, 'r');
-                StringUTF16.putChar(buf, index + 2, 'u');
-                StringUTF16.putChar(buf, index + 3, 'e');
+                StringUTF16.putCharsAt(buf, index, 't', 'r', 'u', 'e');
             } else {
                 index -= 5;
-                StringUTF16.putChar(buf, index, 'f');
-                StringUTF16.putChar(buf, index + 1, 'a');
-                StringUTF16.putChar(buf, index + 2, 'l');
-                StringUTF16.putChar(buf, index + 3, 's');
-                StringUTF16.putChar(buf, index + 4, 'e');
+                StringUTF16.putCharsAt(buf, index, 'f', 'a', 'l', 's', 'e');
             }
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index c12b8afc21f..7680bcbfa45 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -830,22 +830,22 @@ static Stream<String> lines(byte[] value) {
     static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4) {
         assert index >= 0 && index + 3 < length(val) : "Trusted caller missed bounds check";
         // Don't use the putChar method, Its instrinsic will cause C2 unable to combining values into larger stores.
-        long address  = Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
-        UNSAFE.putByte(val, address    , (byte)(c1));
-        UNSAFE.putByte(val, address + 1, (byte)(c2));
-        UNSAFE.putByte(val, address + 2, (byte)(c3));
-        UNSAFE.putByte(val, address + 3, (byte)(c4));
+        long offset = (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        UNSAFE.putByte(val, offset    , (byte)(c1));
+        UNSAFE.putByte(val, offset + 1, (byte)(c2));
+        UNSAFE.putByte(val, offset + 2, (byte)(c3));
+        UNSAFE.putByte(val, offset + 3, (byte)(c4));
     }
 
     static void putCharsAt(byte[] val, int index, int c1, int c2, int c3, int c4, int c5) {
         assert index >= 0 && index + 4 < length(val) : "Trusted caller missed bounds check";
         // Don't use the putChar method, Its instrinsic will cause C2 unable to combining values into larger stores.
-        long address  = Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
-        UNSAFE.putByte(val, address    , (byte)(c1));
-        UNSAFE.putByte(val, address + 1, (byte)(c2));
-        UNSAFE.putByte(val, address + 2, (byte)(c3));
-        UNSAFE.putByte(val, address + 3, (byte)(c4));
-        UNSAFE.putByte(val, address + 4, (byte)(c5));
+        long offset  = (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        UNSAFE.putByte(val, offset    , (byte)(c1));
+        UNSAFE.putByte(val, offset + 1, (byte)(c2));
+        UNSAFE.putByte(val, offset + 2, (byte)(c3));
+        UNSAFE.putByte(val, offset + 3, (byte)(c4));
+        UNSAFE.putByte(val, offset + 4, (byte)(c5));
     }
 
     public static void putChar(byte[] val, int index, int c) {
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 5b04bca4f44..b5cea4236ad 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -38,19 +38,15 @@
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
-import java.lang.invoke.StringConcatFactory;
 import java.lang.module.ModuleDescriptor;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.net.URI;
 import java.net.URL;
 import java.nio.channels.Channel;
 import java.nio.channels.spi.SelectorProvider;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
-import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.CodeSource;
 import java.security.PrivilegedAction;
@@ -75,7 +71,6 @@
 import jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder;
 import jdk.internal.misc.Blocker;
 import jdk.internal.misc.CarrierThreadLocal;
-import jdk.internal.misc.Unsafe;
 import jdk.internal.util.StaticProperty;
 import jdk.internal.module.ModuleBootstrap;
 import jdk.internal.module.ServicesCatalog;
@@ -94,7 +89,6 @@
 import jdk.internal.vm.ThreadContainer;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
-import sun.nio.fs.DefaultFileSystemProvider;
 import sun.reflect.annotation.AnnotationType;
 import sun.nio.ch.Interruptible;
 import sun.nio.cs.UTF_8;
@@ -193,42 +187,16 @@ private System() {
     private static @Stable InputStream initialIn;
     private static @Stable PrintStream initialErr;
 
-    // indicates if a security manager is possible
-    private static final int NEVER = 1;
-    private static final int MAYBE = 2;
-    private static @Stable int allowSecurityManager;
-
-    // current security manager
-    @SuppressWarnings("removal")
-    private static volatile SecurityManager security;   // read by VM
-
     // `sun.jnu.encoding` if it is not supported. Otherwise null.
     // It is initialized in `initPhase1()` before any charset providers
     // are initialized.
     private static String notSupportedJnuEncoding;
 
-    // return true if a security manager is allowed
-    private static boolean allowSecurityManager() {
-        return (allowSecurityManager != NEVER);
-    }
-
     /**
      * Reassigns the "standard" input stream.
      *
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a {@code RuntimePermission("setIO")} permission
-     *  to see if it's ok to reassign the "standard" input stream.
-     *
      * @param in the new standard input stream.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        reassigning of the standard input stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
      * @since   1.1
      */
     public static void setIn(InputStream in) {
@@ -239,20 +207,8 @@ public static void setIn(InputStream in) {
     /**
      * Reassigns the "standard" output stream.
      *
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a {@code RuntimePermission("setIO")} permission
-     *  to see if it's ok to reassign the "standard" output stream.
-     *
      * @param out the new standard output stream
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        reassigning of the standard output stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
      * @since   1.1
      */
     public static void setOut(PrintStream out) {
@@ -263,20 +219,8 @@ public static void setOut(PrintStream out) {
     /**
      * Reassigns the "standard" error output stream.
      *
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a {@code RuntimePermission("setIO")} permission
-     *  to see if it's ok to reassign the "standard" error output stream.
-     *
      * @param err the new standard error output stream.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        reassigning of the standard error output stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
      * @since   1.1
      */
     public static void setErr(PrintStream err) {
@@ -325,10 +269,6 @@ public static Console console() {
      * @throws  IOException
      *          If an I/O error occurs
      *
-     * @throws  SecurityException
-     *          If a security manager is present and it does not
-     *          permit access to the channel.
-     *
      * @since 1.5
      */
     public static Channel inheritedChannel() throws IOException {
@@ -362,147 +302,37 @@ static URL codeSource(Class<?> clazz) {
     }
 
     /**
-     * Sets the system-wide security manager.
-     *
-     * If there is a security manager already installed, this method first
-     * calls the security manager's {@code checkPermission} method
-     * with a {@code RuntimePermission("setSecurityManager")}
-     * permission to ensure it's ok to replace the existing
-     * security manager.
-     * This may result in throwing a {@code SecurityException}.
-     *
-     * <p> Otherwise, the argument is established as the current
-     * security manager. If the argument is {@code null} and no
-     * security manager has been established, then no action is taken and
-     * the method simply returns.
-     *
-     * @implNote In the JDK implementation, if the Java virtual machine is
-     * started with the system property {@code java.security.manager} not set or set to
-     * the special token "{@code disallow}" then the {@code setSecurityManager}
-     * method cannot be used to set a security manager. See the following
-     * <a href="SecurityManager.html#set-security-manager">section of the
-     * {@code SecurityManager} class specification</a> for more details.
-     *
-     * @param  sm the security manager or {@code null}
-     * @throws SecurityException
-     *         if the security manager has already been set and its {@code
-     *         checkPermission} method doesn't allow it to be replaced
-     * @throws UnsupportedOperationException
-     *         if {@code sm} is non-null and a security manager is not allowed
-     *         to be set dynamically
+     * Throws {@code UnsupportedOperationException}. Setting a security manager
+     * is not supported.
+     *
+     * @param  sm ignored
+     * @throws UnsupportedOperationException always
      * @see #getSecurityManager
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally set
+     *       {@linkplain SecurityManager the system-wide Security Manager}.
+     *       Setting a Security Manager is no longer supported. There is no
+     *       replacement for the Security Manager or this method.
      */
     @Deprecated(since="17", forRemoval=true)
-    @CallerSensitive
     public static void setSecurityManager(@SuppressWarnings("removal") SecurityManager sm) {
-        if (allowSecurityManager()) {
-            var callerClass = Reflection.getCallerClass();
-            if (CallersHolder.callers.putIfAbsent(callerClass, true) == null) {
-                URL url = codeSource(callerClass);
-                final String source;
-                if (url == null) {
-                    source = callerClass.getName();
-                } else {
-                    source = callerClass.getName() + " (" + url + ")";
-                }
-                initialErr.printf("""
-                        WARNING: A terminally deprecated method in java.lang.System has been called
-                        WARNING: System::setSecurityManager has been called by %s
-                        WARNING: Please consider reporting this to the maintainers of %s
-                        WARNING: System::setSecurityManager will be removed in a future release
-                        """, source, callerClass.getName());
-            }
-            implSetSecurityManager(sm);
-        } else {
-            // security manager not allowed
-            if (sm != null) {
-                throw new UnsupportedOperationException(
-                    "The Security Manager is deprecated and will be removed in a future release");
-            }
-        }
-    }
-
-    private static void implSetSecurityManager(@SuppressWarnings("removal") SecurityManager sm) {
-        if (security == null) {
-            // ensure image reader is initialized
-            Object.class.getResource("java/lang/ANY");
-            // ensure the default file system is initialized
-            DefaultFileSystemProvider.theFileSystem();
-        }
-        if (sm != null) {
-            try {
-                // pre-populates the SecurityManager.packageAccess cache
-                // to avoid recursive permission checking issues with custom
-                // SecurityManager implementations
-                sm.checkPackageAccess("java.lang");
-            } catch (Exception e) {
-                // no-op
-            }
-        }
-        setSecurityManager0(sm);
-    }
-
-    @SuppressWarnings("removal")
-    private static synchronized
-    void setSecurityManager0(final SecurityManager s) {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            // ask the currently installed security manager if we
-            // can replace it.
-            sm.checkPermission(new RuntimePermission("setSecurityManager"));
-        }
-
-        if ((s != null) && (s.getClass().getClassLoader() != null)) {
-            // New security manager class is not on bootstrap classpath.
-            // Force policy to get initialized before we install the new
-            // security manager, in order to prevent infinite loops when
-            // trying to initialize the policy (which usually involves
-            // accessing some security and/or system properties, which in turn
-            // calls the installed security manager's checkPermission method
-            // which will loop infinitely if there is a non-system class
-            // (in this case: the new security manager class) on the stack).
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-                public Object run() {
-                    s.getClass().getProtectionDomain().implies
-                        (SecurityConstants.ALL_PERMISSION);
-                    return null;
-                }
-            });
-        }
-
-        security = s;
+        throw new UnsupportedOperationException(
+                 "Setting a Security Manager is not supported");
     }
 
     /**
-     * Gets the system-wide security manager.
+     * Returns {@code null}. Setting a security manager is not supported.
      *
-     * @return  if a security manager has already been established for the
-     *          current application, then that security manager is returned;
-     *          otherwise, {@code null} is returned.
+     * @return  {@code null}
      * @see     #setSecurityManager
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally returned
+     *       {@linkplain SecurityManager the system-wide Security Manager}.
+     *       Setting a Security Manager is no longer supported. There is no
+     *       replacement for the Security Manager or this method.
      */
     @SuppressWarnings("removal")
     @Deprecated(since="17", forRemoval=true)
     public static SecurityManager getSecurityManager() {
-        if (allowSecurityManager()) {
-            return security;
-        } else {
-            return null;
-        }
+        return null;
     }
 
     /**
@@ -690,10 +520,6 @@ public static native void arraycopy(Object src,  int  srcPos,
 
     /**
      * Determines the current system properties.
-     *
-     * First, if there is a security manager, its
-     * {@code checkPropertiesAccess} method is called with no
-     * arguments. This may result in a security exception.
      * <p>
      * The current set of system properties for use by the
      * {@link #getProperty(String)} method is returned as a
@@ -808,10 +634,6 @@ public static native void arraycopy(Object src,  int  srcPos,
      * Multiple paths in a system property value are separated by the path
      * separator character of the platform.
      * <p>
-     * Note that even if the security manager does not permit the
-     * {@code getProperties} operation, it may choose to permit the
-     * {@link #getProperty(String)} operation.
-     * <p>
      * Additional locale-related system properties defined by the
      * {@link Locale##default_locale Default Locale} section in the {@code Locale}
      * class description may also be obtained with this method.
@@ -855,12 +677,7 @@ public static native void arraycopy(Object src,  int  srcPos,
      * </table>
      *
      * @return     the system properties
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow access
-     *             to the system properties.
      * @see        #setProperties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
      * @see        java.util.Properties
      */
     public static Properties getProperties() {
@@ -892,10 +709,6 @@ public static String lineSeparator() {
 
     /**
      * Sets the system properties to the {@code Properties} argument.
-     *
-     * First, if there is a security manager, its
-     * {@code checkPropertiesAccess} method is called with no
-     * arguments. This may result in a security exception.
      * <p>
      * The argument becomes the current set of system properties for use
      * by the {@link #getProperty(String)} method. If the argument is
@@ -908,13 +721,8 @@ public static String lineSeparator() {
      * See {@linkplain #getProperties getProperties} for details.
      *
      * @param      props   the new system properties.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow access
-     *             to the system properties.
      * @see        #getProperties
      * @see        java.util.Properties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
      */
     public static void setProperties(Properties props) {
         @SuppressWarnings("removal")
@@ -933,10 +741,6 @@ public static void setProperties(Properties props) {
 
     /**
      * Gets the system property indicated by the specified key.
-     *
-     * First, if there is a security manager, its
-     * {@code checkPropertyAccess} method is called with the key as
-     * its argument. This may result in a SecurityException.
      * <p>
      * If there is no current set of system properties, a set of system
      * properties is first created and initialized in the same manner as
@@ -951,14 +755,9 @@ public static void setProperties(Properties props) {
      * @return     the string value of the system property,
      *             or {@code null} if there is no property with that key.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPropertyAccess} method doesn't allow
-     *             access to the specified system property.
      * @throws     NullPointerException if {@code key} is {@code null}.
      * @throws     IllegalArgumentException if {@code key} is empty.
      * @see        #setProperty
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see        java.lang.System#getProperties()
      */
     public static String getProperty(String key) {
@@ -974,10 +773,6 @@ public static String getProperty(String key) {
 
     /**
      * Gets the system property indicated by the specified key.
-     *
-     * First, if there is a security manager, its
-     * {@code checkPropertyAccess} method is called with the
-     * {@code key} as its argument.
      * <p>
      * If there is no current set of system properties, a set of system
      * properties is first created and initialized in the same manner as
@@ -988,13 +783,9 @@ public static String getProperty(String key) {
      * @return     the string value of the system property,
      *             or the default value if there is no property with that key.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPropertyAccess} method doesn't allow
-     *             access to the specified system property.
      * @throws     NullPointerException if {@code key} is {@code null}.
      * @throws     IllegalArgumentException if {@code key} is empty.
      * @see        #setProperty
-     * @see        java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see        java.lang.System#getProperties()
      */
     public static String getProperty(String key, String def) {
@@ -1011,13 +802,6 @@ public static String getProperty(String key, String def) {
     /**
      * Sets the system property indicated by the specified key.
      *
-     * First, if a security manager exists, its
-     * {@code SecurityManager.checkPermission} method
-     * is called with a {@code PropertyPermission(key, "write")}
-     * permission. This may result in a SecurityException being thrown.
-     * If no exception is thrown, the specified property is set to the given
-     * value.
-     *
      * @apiNote
      * <strong>Changing a standard system property may have unpredictable results
      * unless otherwise specified</strong>.
@@ -1028,17 +812,12 @@ public static String getProperty(String key, String def) {
      * @return     the previous value of the system property,
      *             or {@code null} if it did not have one.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPermission} method doesn't allow
-     *             setting of the specified property.
      * @throws     NullPointerException if {@code key} or
      *             {@code value} is {@code null}.
      * @throws     IllegalArgumentException if {@code key} is empty.
      * @see        #getProperty
      * @see        java.lang.System#getProperty(java.lang.String)
      * @see        java.lang.System#getProperty(java.lang.String, java.lang.String)
-     * @see        java.util.PropertyPermission
-     * @see        SecurityManager#checkPermission
      * @since      1.2
      */
     public static String setProperty(String key, String value) {
@@ -1056,12 +835,6 @@ public static String setProperty(String key, String value) {
     /**
      * Removes the system property indicated by the specified key.
      *
-     * First, if a security manager exists, its
-     * {@code SecurityManager.checkPermission} method
-     * is called with a {@code PropertyPermission(key, "write")}
-     * permission. This may result in a SecurityException being thrown.
-     * If no exception is thrown, the specified property is removed.
-     *
      * @apiNote
      * <strong>Changing a standard system property may have unpredictable results
      * unless otherwise specified</strong>.
@@ -1071,16 +844,11 @@ public static String setProperty(String key, String value) {
      * @return     the previous string value of the system property,
      *             or {@code null} if there was no property with that key.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkPropertyAccess} method doesn't allow
-     *              access to the specified system property.
      * @throws     NullPointerException if {@code key} is {@code null}.
      * @throws     IllegalArgumentException if {@code key} is empty.
      * @see        #getProperty
      * @see        #setProperty
      * @see        java.util.Properties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
      * @since 1.5
      */
     public static String clearProperty(String key) {
@@ -1108,14 +876,6 @@ private static void checkKey(String key) {
      * environment variable is a system-dependent external named
      * value.
      *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkPermission checkPermission}
-     * method is called with a
-     * {@link RuntimePermission RuntimePermission("getenv."+name)}
-     * permission.  This may result in a {@link SecurityException}
-     * being thrown.  If no exception is thrown the value of the
-     * variable {@code name} is returned.
-     *
      * <p><a id="EnvironmentVSSystemProperties"><i>System
      * properties</i> and <i>environment variables</i></a> are both
      * conceptually mappings between names and values.  Both
@@ -1141,11 +901,6 @@ private static void checkKey(String key) {
      * @return the string value of the variable, or {@code null}
      *         if the variable is not defined in the system environment
      * @throws NullPointerException if {@code name} is {@code null}
-     * @throws SecurityException
-     *         if a security manager exists and its
-     *         {@link SecurityManager#checkPermission checkPermission}
-     *         method doesn't allow access to the environment variable
-     *         {@code name}
      * @see    #getenv()
      * @see    ProcessBuilder#environment()
      */
@@ -1180,21 +935,11 @@ public static String getenv(String name) {
      *
      * <p>The returned map is typically case-sensitive on all platforms.
      *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkPermission checkPermission}
-     * method is called with a
-     * {@link RuntimePermission RuntimePermission("getenv.*")} permission.
-     * This may result in a {@link SecurityException} being thrown.
-     *
      * <p>When passing information to a Java subprocess,
      * <a href=#EnvironmentVSSystemProperties>system properties</a>
      * are generally preferred over environment variables.
      *
      * @return the environment as a map of variable names to values
-     * @throws SecurityException
-     *         if a security manager exists and its
-     *         {@link SecurityManager#checkPermission checkPermission}
-     *         method doesn't allow access to the process environment
      * @see    #getenv(String)
      * @see    ProcessBuilder#environment()
      * @since  1.5
@@ -1614,16 +1359,6 @@ public void log(Level level, ResourceBundle bundle, String format,
      * would make them dependent from a specific implementation of the
      * {@code LoggerFinder} service.
      * <p>
-     * In addition, when a security manager is present, loggers provided to
-     * system classes should not be directly configurable through the logging
-     * backend without requiring permissions.
-     * <br>
-     * It is the responsibility of the provider of
-     * the concrete {@code LoggerFinder} implementation to ensure that
-     * these loggers are not configured by untrusted code without proper
-     * permission checks, as configuration performed on such loggers usually
-     * affects all applications in the same Java Runtime.
-     * <p>
      * <b>Message Levels and Mapping to backend levels</b>
      * <p>
      * A logger finder is responsible for mapping from a {@code
@@ -1656,10 +1391,6 @@ public abstract static class LoggerFinder {
          *   implementation does not perform any heavy initialization in its
          *   constructor, in order to avoid possible risks of deadlock or class
          *   loading cycles during the instantiation of the service provider.
-         *
-         * @throws SecurityException if a security manager is present and its
-         *         {@code checkPermission} method doesn't allow the
-         *         {@code RuntimePermission("loggerFinder")}.
          */
         protected LoggerFinder() {
             this(checkPermission());
@@ -1689,9 +1420,6 @@ private static Void checkPermission() {
          *         module.
          * @throws NullPointerException if {@code name} is {@code null} or
          *        {@code module} is {@code null}.
-         * @throws SecurityException if a security manager is present and its
-         *         {@code checkPermission} method doesn't allow the
-         *         {@code RuntimePermission("loggerFinder")}.
          */
         public abstract Logger getLogger(String name, Module module);
 
@@ -1732,9 +1460,6 @@ private static Void checkPermission() {
          *
          * @throws NullPointerException if {@code name} is {@code null} or
          *         {@code module} is {@code null}.
-         * @throws SecurityException if a security manager is present and its
-         *         {@code checkPermission} method doesn't allow the
-         *         {@code RuntimePermission("loggerFinder")}.
          */
         public Logger getLocalizedLogger(String name, ResourceBundle bundle,
                                          Module module) {
@@ -1749,9 +1474,6 @@ public Logger getLocalizedLogger(String name, ResourceBundle bundle,
          * loaded.
          *
          * @return the {@link LoggerFinder LoggerFinder} instance.
-         * @throws SecurityException if a security manager is present and its
-         *         {@code checkPermission} method doesn't allow the
-         *         {@code RuntimePermission("loggerFinder")}.
          */
         public static LoggerFinder getLoggerFinder() {
             @SuppressWarnings("removal")
@@ -1896,10 +1618,10 @@ public static Logger getLogger(String name, ResourceBundle bundle) {
     }
 
     /**
-     * Initiates the {@linkplain Runtime##shutdown shutdown sequence} of the Java Virtual Machine.
-     * Unless the security manager denies exiting, this method initiates the shutdown sequence
-     * (if it is not already initiated) and then blocks indefinitely. This method neither returns
-     * nor throws an exception; that is, it does not complete either normally or abruptly.
+     * Initiates the {@linkplain Runtime##shutdown shutdown sequence} of the Java Virtual
+     * Machine. This method initiates the shutdown sequence (if it is not already initiated)
+     * and then blocks indefinitely. This method neither returns nor throws an exception;
+     * that is, it does not complete either normally or abruptly.
      * <p>
      * The argument serves as a status code. By convention, a nonzero status code
      * indicates abnormal termination.
@@ -1913,9 +1635,6 @@ public static Logger getLogger(String name, ResourceBundle bundle) {
      * The initiation of the shutdown sequence is logged by {@link Runtime#exit(int)}.
      *
      * @param  status exit status.
-     * @throws SecurityException
-     *         if a security manager exists and its {@code checkExit} method
-     *         doesn't allow exit with the specified status.
      * @see    java.lang.Runtime#exit(int)
      */
     public static void exit(int status) {
@@ -2009,9 +1728,6 @@ public static void runFinalization() {
      * </pre></blockquote>
      *
      * @param      filename   the file to load.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkLink} method doesn't allow
-     *             loading of the specified dynamic library
      * @throws     UnsatisfiedLinkError  if either the filename is not an
      *             absolute path name, the native library is not statically
      *             linked with the VM, or the library cannot be mapped to
@@ -2022,7 +1738,6 @@ public static void runFinalization() {
      *
      * @spec jni/index.html Java Native Interface Specification
      * @see        java.lang.Runtime#load(java.lang.String)
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
      */
     @CallerSensitive
     @Restricted
@@ -2052,9 +1767,6 @@ public static void load(String filename) {
      * </pre></blockquote>
      *
      * @param      libname   the name of the library.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkLink} method doesn't allow
-     *             loading of the specified dynamic library
      * @throws     UnsatisfiedLinkError if either the libname argument
      *             contains a file path, the native library is not statically
      *             linked with the VM,  or the library cannot be mapped to a
@@ -2065,7 +1777,6 @@ public static void load(String filename) {
      *
      * @spec jni/index.html Java Native Interface Specification
      * @see        java.lang.Runtime#loadLibrary(java.lang.String)
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
      */
     @CallerSensitive
     @Restricted
@@ -2334,24 +2045,13 @@ private static int initPhase2(boolean printToStderr, boolean printStackTrace) {
 
     /*
      * Invoked by VM.  Phase 3 is the final system initialization:
-     * 1. eagerly initialize bootstrap method factories that might interact
-     *    negatively with custom security managers and custom class loaders
-     * 2. set security manager
-     * 3. set system class loader
-     * 4. set TCCL
+     * 1. set system class loader
+     * 2. set TCCL
      *
      * This method must be called after the module system initialization.
-     * The security manager and system class loader may be a custom class from
-     * the application classpath or modulepath.
      */
-    @SuppressWarnings("removal")
     private static void initPhase3() {
 
-        // Initialize the StringConcatFactory eagerly to avoid potential
-        // bootstrap circularity issues that could be caused by a custom
-        // SecurityManager
-        Unsafe.getUnsafe().ensureClassInitialized(StringConcatFactory.class);
-
         // Emit a warning if java.io.tmpdir is set via the command line
         // to a directory that doesn't exist
         if (SystemProps.isBadIoTmpdir()) {
@@ -2359,52 +2059,17 @@ private static void initPhase3() {
         }
 
         String smProp = System.getProperty("java.security.manager");
-        boolean needWarning = false;
         if (smProp != null) {
             switch (smProp) {
                 case "disallow":
-                    allowSecurityManager = NEVER;
                     break;
                 case "allow":
-                    allowSecurityManager = MAYBE;
-                    break;
                 case "":
                 case "default":
-                    implSetSecurityManager(new SecurityManager());
-                    allowSecurityManager = MAYBE;
-                    needWarning = true;
-                    break;
                 default:
-                    try {
-                        ClassLoader cl = ClassLoader.getBuiltinAppClassLoader();
-                        Class<?> c = Class.forName(smProp, false, cl);
-                        Constructor<?> ctor = c.getConstructor();
-                        // Must be a public subclass of SecurityManager with
-                        // a public no-arg constructor
-                        if (!SecurityManager.class.isAssignableFrom(c) ||
-                            !Modifier.isPublic(c.getModifiers()) ||
-                            !Modifier.isPublic(ctor.getModifiers())) {
-                            throw new Error("Could not create SecurityManager: "
-                                             + ctor.toString());
-                        }
-                        // custom security manager may be in non-exported package
-                        ctor.setAccessible(true);
-                        SecurityManager sm = (SecurityManager) ctor.newInstance();
-                        implSetSecurityManager(sm);
-                        needWarning = true;
-                    } catch (Exception e) {
-                        throw new InternalError("Could not create SecurityManager", e);
-                    }
-                    allowSecurityManager = MAYBE;
+                    throw new Error("A command line option has attempted to allow or enable the Security Manager."
+                            + " Enabling a Security Manager is not supported.");
             }
-        } else {
-            allowSecurityManager = NEVER;
-        }
-
-        if (needWarning) {
-            System.err.println("""
-                    WARNING: A command line option has enabled the Security Manager
-                    WARNING: The Security Manager is deprecated and will be removed in a future release""");
         }
 
         // Emit a warning if `sun.jnu.encoding` is not supported.
@@ -2468,9 +2133,6 @@ public void blockedOn(Interruptible b) {
             public void registerShutdownHook(int slot, boolean registerShutdownInProgress, Runnable hook) {
                 Shutdown.add(slot, registerShutdownInProgress, hook);
             }
-            public Thread newThreadWithAcc(Runnable target, @SuppressWarnings("removal") AccessControlContext acc) {
-                return new Thread(target, acc);
-            }
             @SuppressWarnings("removal")
             public void invokeFinalize(Object o) throws Throwable {
                 o.finalize();
@@ -2491,14 +2153,6 @@ public Class<?> findBootstrapClassOrNull(String name) {
             public Package definePackage(ClassLoader cl, String name, Module module) {
                 return cl.definePackage(name, module);
             }
-            @SuppressWarnings("removal")
-            public void addNonExportedPackages(ModuleLayer layer) {
-                SecurityManager.addNonExportedPackages(layer);
-            }
-            @SuppressWarnings("removal")
-            public void invalidatePackageAccessCache() {
-                SecurityManager.invalidatePackageAccessCache();
-            }
             public Module defineModule(ClassLoader loader,
                                        ModuleDescriptor descriptor,
                                        URI uri) {
@@ -2791,11 +2445,6 @@ public void copyToSegmentRaw(String string, MemorySegment segment, long offset)
             public boolean bytesCompatible(String string, Charset charset) {
                 return string.bytesCompatible(charset);
             }
-
-            @Override
-            public boolean allowSecurityManager() {
-                return System.allowSecurityManager();
-            }
         });
     }
 }
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 07b3c7c9bd2..7e54d044579 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -27,11 +27,6 @@
 
 import java.lang.ref.Reference;
 import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.time.Duration;
 import java.util.Map;
 import java.util.HashMap;
@@ -43,8 +38,6 @@
 import jdk.internal.misc.TerminatingThreadLocal;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.misc.VM;
-import jdk.internal.reflect.CallerSensitive;
-import jdk.internal.reflect.Reflection;
 import jdk.internal.vm.Continuation;
 import jdk.internal.vm.ScopedValueContainer;
 import jdk.internal.vm.StackableScope;
@@ -54,7 +47,6 @@
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
 import sun.nio.ch.Interruptible;
-import sun.security.util.SecurityConstants;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -162,7 +154,15 @@
  * }
  *
  * <h2><a id="inheritance">Inheritance when creating threads</a></h2>
- * A {@code Thread} inherits its initial values of {@linkplain InheritableThreadLocal
+ * A {@code Thread} created with one of the public constructors inherits the daemon
+ * status and thread priority from the parent thread at the time that the child {@code
+ * Thread} is created. The {@linkplain ThreadGroup thread group} is also inherited when
+ * not provided to the constructor. When using a {@code Thread.Builder} to create a
+ * platform thread, the daemon status, thread priority, and thread group are inherited
+ * when not set on the builder. As with the constructors, inheriting from the parent
+ * thread is done when the child {@code Thread} is created.
+ *
+ * <p> A {@code Thread} inherits its initial values of {@linkplain InheritableThreadLocal
  * inheritable-thread-local} variables (including the context class loader) from
  * the parent thread values at the time that the child {@code Thread} is created.
  * The 5-param {@linkplain Thread#Thread(ThreadGroup, Runnable, String, long, boolean)
@@ -171,17 +171,6 @@
  * {@link Builder#inheritInheritableThreadLocals(boolean) inheritInheritableThreadLocals}
  * method can be used to select if the initial values are inherited.
  *
- * <p> Platform threads inherit the daemon status, thread priority, and when not
- * provided (or not selected by a security manager), the thread group.
- *
- * <p> Creating a platform thread {@linkplain AccessController#getContext() captures} the
- * {@linkplain AccessControlContext caller context} to limit the {@linkplain Permission
- * permissions} of the new thread when it executes code that performs a {@linkplain
- * AccessController#doPrivileged(PrivilegedAction) privileged action}. The captured
- * caller context is the new thread's "Inherited {@link AccessControlContext}". Creating
- * a virtual thread does not capture the caller context; virtual threads have no
- * permissions when executing code that performs a privileged action.
- *
  * <p> Unless otherwise specified, passing a {@code null} argument to a constructor
  * or method in this class will cause a {@link NullPointerException} to be thrown.
  *
@@ -245,10 +234,6 @@ public class Thread implements Runnable {
     // context ClassLoader
     private volatile ClassLoader contextClassLoader;
 
-    // inherited AccessControlContext, this could be moved to FieldHolder
-    @SuppressWarnings("removal")
-    private AccessControlContext inheritedAccessControlContext;
-
     // Additional fields for platform threads.
     // All fields, except task, are accessed directly by the VM.
     private static class FieldHolder {
@@ -636,12 +621,17 @@ public static void onSpinWait() {}
      */
     static final int NO_INHERIT_THREAD_LOCALS = 1 << 2;
 
+    /**
+     * Thread identifier assigned to the primordial thread.
+     */
+    static final long PRIMORDIAL_TID = 3;
+
     /**
      * Helper class to generate thread identifiers. The identifiers start at
-     * 2 as this class cannot be used during early startup to generate the
-     * identifier for the primordial thread. The counter is off-heap and
-     * shared with the VM to allow it assign thread identifiers to non-Java
-     * threads.
+     * {@link Thread#PRIMORDIAL_TID}&nbsp;+1 as this class cannot be used during
+     * early startup to generate the identifier for the primordial thread. The
+     * counter is off-heap and shared with the VM to allow it to assign thread
+     * identifiers to non-Java threads.
      * See Thread initialization.
      */
     private static class ThreadIdentifiers {
@@ -656,21 +646,6 @@ static long next() {
         }
     }
 
-    /**
-     * Returns the context class loader to inherit from the parent thread.
-     * See Thread initialization.
-     */
-    private static ClassLoader contextClassLoader(Thread parent) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null || isCCLOverridden(parent.getClass())) {
-            return parent.getContextClassLoader();
-        } else {
-            // skip call to getContextClassLoader
-            return parent.contextClassLoader;
-        }
-    }
-
     /**
      * Initializes a platform Thread.
      *
@@ -680,12 +655,8 @@ private static ClassLoader contextClassLoader(Thread parent) {
      * @param task the object whose run() method gets called
      * @param stackSize the desired stack size for the new thread, or
      *        zero to indicate that this parameter is to be ignored.
-     * @param acc the AccessControlContext to inherit, or
-     *        AccessController.getContext() if null
      */
-    @SuppressWarnings("removal")
-    Thread(ThreadGroup g, String name, int characteristics, Runnable task,
-           long stackSize, AccessControlContext acc) {
+    Thread(ThreadGroup g, String name, int characteristics, Runnable task, long stackSize) {
 
         Thread parent = currentThread();
         boolean attached = (parent == this);   // primordial or JNI attached
@@ -696,43 +667,21 @@ private static ClassLoader contextClassLoader(Thread parent) {
             }
             this.holder = new FieldHolder(g, task, stackSize, NORM_PRIORITY, false);
         } else {
-            SecurityManager sm = System.getSecurityManager();
             if (g == null) {
-                // the security manager can choose the thread group
-                if (sm != null) {
-                    g = sm.getThreadGroup();
-                }
-
                 // default to current thread's group
-                if (g == null) {
-                    g = parent.getThreadGroup();
-                }
-            }
-
-            // permission checks when creating a child Thread
-            if (sm != null) {
-                sm.checkAccess(g);
-                if (isCCLOverridden(getClass())) {
-                    sm.checkPermission(SecurityConstants.SUBCLASS_IMPLEMENTATION_PERMISSION);
-                }
+                g = parent.getThreadGroup();
             }
-
             int priority = Math.min(parent.getPriority(), g.getMaxPriority());
             this.holder = new FieldHolder(g, task, stackSize, priority, parent.isDaemon());
         }
 
         if (attached && VM.initLevel() < 1) {
-            this.tid = 1;  // primordial thread
+            this.tid = PRIMORDIAL_TID;  // primordial thread
         } else {
             this.tid = ThreadIdentifiers.next();
         }
-        this.name = (name != null) ? name : genThreadName();
 
-        if (acc != null) {
-            this.inheritedAccessControlContext = acc;
-        } else {
-            this.inheritedAccessControlContext = AccessController.getContext();
-        }
+        this.name = (name != null) ? name : genThreadName();
 
         // thread locals
         if (!attached) {
@@ -742,7 +691,7 @@ private static ClassLoader contextClassLoader(Thread parent) {
                     this.inheritableThreadLocals = ThreadLocal.createInheritedMap(parentMap);
                 }
                 if (VM.isBooted()) {
-                    this.contextClassLoader = contextClassLoader(parent);
+                    this.contextClassLoader = parent.getContextClassLoader();
                 }
             } else if (VM.isBooted()) {
                 // default CCL to the system class loader when not inheriting
@@ -765,7 +714,6 @@ private static ClassLoader contextClassLoader(Thread parent) {
     Thread(String name, int characteristics, boolean bound) {
         this.tid = ThreadIdentifiers.next();
         this.name = (name != null) ? name : "";
-        this.inheritedAccessControlContext = Constants.NO_PERMISSIONS_ACC;
 
         // thread locals
         if ((characteristics & NO_INHERIT_THREAD_LOCALS) == 0) {
@@ -774,7 +722,7 @@ private static ClassLoader contextClassLoader(Thread parent) {
             if (parentMap != null && parentMap.size() > 0) {
                 this.inheritableThreadLocals = ThreadLocal.createInheritedMap(parentMap);
             }
-            this.contextClassLoader = contextClassLoader(parent);
+            this.contextClassLoader = parent.getContextClassLoader();
         } else {
             // default CCL to the system class loader when not inheriting
             this.contextClassLoader = ClassLoader.getSystemClassLoader();
@@ -797,18 +745,6 @@ private static ClassLoader contextClassLoader(Thread parent) {
      * Returns a builder for creating a platform {@code Thread} or {@code ThreadFactory}
      * that creates platform threads.
      *
-     * <p> <a id="ofplatform-security"><b>Interaction with security manager when
-     * creating platform threads</b></a>
-     * <p> Creating a platform thread when there is a security manager set will
-     * invoke the security manager's {@link SecurityManager#checkAccess(ThreadGroup)
-     * checkAccess(ThreadGroup)} method with the thread's thread group.
-     * If the thread group has not been set with the {@link
-     * Builder.OfPlatform#group(ThreadGroup) OfPlatform.group} method then the
-     * security manager's {@link SecurityManager#getThreadGroup() getThreadGroup}
-     * method will be invoked first to select the thread group. If the security
-     * manager {@code getThreadGroup} method returns {@code null} then the thread
-     * group of the constructing thread is used.
-     *
      * @apiNote The following are examples using the builder:
      * {@snippet :
      *   // Start a daemon thread to run a task
@@ -938,9 +874,6 @@ public sealed interface Builder
          *
          * @param task the object to run when the thread executes
          * @return a new unstarted Thread
-         * @throws SecurityException if denied by the security manager
-         *         (See <a href="Thread.html#ofplatform-security">Interaction with
-         *         security manager when creating platform threads</a>)
          *
          * @see <a href="Thread.html#inheritance">Inheritance when creating threads</a>
          */
@@ -952,9 +885,6 @@ public sealed interface Builder
          *
          * @param task the object to run when the thread executes
          * @return a new started Thread
-         * @throws SecurityException if denied by the security manager
-         *         (See <a href="Thread.html#ofplatform-security">Interaction with
-         *         security manager when creating platform threads</a>)
          *
          * @see <a href="Thread.html#inheritance">Inheritance when creating threads</a>
          */
@@ -1134,7 +1064,7 @@ private static String checkName(String name) {
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread() {
-        this(null, null, 0, null, 0, null);
+        this(null, null, 0, null, 0);
     }
 
     /**
@@ -1155,16 +1085,7 @@ public Thread() {
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(Runnable task) {
-        this(null, null, 0, task, 0, null);
-    }
-
-    /**
-     * Creates a new Thread that inherits the given AccessControlContext
-     * but thread-local variables are not inherited.
-     * This is not a public constructor.
-     */
-    Thread(Runnable task, @SuppressWarnings("removal") AccessControlContext acc) {
-        this(null, null, 0, task, 0, acc);
+        this(null, null, 0, task, 0);
     }
 
     /**
@@ -1179,25 +1100,17 @@ public Thread(Runnable task) {
      * <pre>{@code Thread.ofPlatform().group(group).unstarted(task); }</pre>
      *
      * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
+     *         the thread group. If {@code null} the group
      *         is set to the current thread's thread group.
      *
      * @param  task
      *         the object whose {@code run} method is invoked when this thread
      *         is started. If {@code null}, this thread's run method is invoked.
      *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     *
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(ThreadGroup group, Runnable task) {
-        this(group, null, 0, task, 0, null);
+        this(group, null, 0, task, 0);
     }
 
     /**
@@ -1214,7 +1127,7 @@ public Thread(ThreadGroup group, Runnable task) {
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(String name) {
-        this(null, checkName(name), 0, null, 0, null);
+        this(null, checkName(name), 0, null, 0);
     }
 
     /**
@@ -1226,24 +1139,16 @@ public Thread(String name) {
      * override the {@link #run()} method.
      *
      * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
+     *         the thread group. If {@code null}, the group
      *         is set to the current thread's thread group.
      *
      * @param  name
      *         the name of the new thread
      *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     *
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(ThreadGroup group, String name) {
-        this(group, checkName(name), 0, null, 0, null);
+        this(group, checkName(name), 0, null, 0);
     }
 
     /**
@@ -1265,7 +1170,7 @@ public Thread(ThreadGroup group, String name) {
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(Runnable task, String name) {
-        this(null, checkName(name), 0, task, 0, null);
+        this(null, checkName(name), 0, task, 0);
     }
 
     /**
@@ -1273,16 +1178,6 @@ public Thread(Runnable task, String name) {
      * as its run object, has the specified {@code name} as its name,
      * and belongs to the thread group referred to by {@code group}.
      *
-     * <p>If there is a security manager, its
-     * {@link SecurityManager#checkAccess(ThreadGroup) checkAccess}
-     * method is invoked with the ThreadGroup as its argument.
-     *
-     * <p>In addition, its {@code checkPermission} method is invoked with
-     * the {@code RuntimePermission("enableContextClassLoaderOverride")}
-     * permission when invoked directly or indirectly by the constructor
-     * of a subclass which overrides the {@code getContextClassLoader}
-     * or {@code setContextClassLoader} methods.
-     *
      * <p>The priority of the newly created thread is the smaller of
      * priority of the thread creating it and the maximum permitted
      * priority of the thread group. The method {@linkplain #setPriority
@@ -1298,11 +1193,7 @@ public Thread(Runnable task, String name) {
      * <pre>{@code Thread.ofPlatform().group(group).name(name).unstarted(task); }</pre>
      *
      * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
+     *         the thread group. If {@code null}, the group
      *         is set to the current thread's thread group.
      *
      * @param  task
@@ -1312,14 +1203,10 @@ public Thread(Runnable task, String name) {
      * @param  name
      *         the name of the new thread
      *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group or cannot override the context class loader methods.
-     *
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(ThreadGroup group, Runnable task, String name) {
-        this(group, checkName(name), 0, task, 0, null);
+        this(group, checkName(name), 0, task, 0);
     }
 
     /**
@@ -1375,11 +1262,7 @@ public Thread(ThreadGroup group, Runnable task, String name) {
      * <pre>{@code Thread.ofPlatform().group(group).name(name).stackSize(stackSize).unstarted(task); }</pre>
      *
      * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
+     *         the thread group. If {@code null}, the group
      *         is set to the current thread's thread group.
      *
      * @param  task
@@ -1393,15 +1276,11 @@ public Thread(ThreadGroup group, Runnable task, String name) {
      *         the desired stack size for the new thread, or zero to indicate
      *         that this parameter is to be ignored.
      *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     *
      * @since 1.4
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
     public Thread(ThreadGroup group, Runnable task, String name, long stackSize) {
-        this(group, checkName(name), 0, task, stackSize, null);
+        this(group, checkName(name), 0, task, stackSize);
     }
 
     /**
@@ -1435,11 +1314,7 @@ public Thread(ThreadGroup group, Runnable task, String name, long stackSize) {
      *      .unstarted(task); }</pre>
      *
      * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
+     *         the thread group. If {@code null}, the group
      *         is set to the current thread's thread group.
      *
      * @param  task
@@ -1458,10 +1333,6 @@ public Thread(ThreadGroup group, Runnable task, String name, long stackSize) {
      *         thread-locals from the constructing thread, otherwise no initial
      *         values are inherited
      *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     *
      * @since 9
      * @see <a href="#inheritance">Inheritance when creating threads</a>
      */
@@ -1469,7 +1340,7 @@ public Thread(ThreadGroup group, Runnable task, String name,
                   long stackSize, boolean inheritInheritableThreadLocals) {
         this(group, checkName(name),
                 (inheritInheritableThreadLocals ? 0 : NO_INHERIT_THREAD_LOCALS),
-                task, stackSize, null);
+                task, stackSize);
     }
 
     /**
@@ -1596,7 +1467,6 @@ final void runWith(Object bindings, Runnable op) {
     void clearReferences() {
         threadLocals = null;
         inheritableThreadLocals = null;
-        inheritedAccessControlContext = null;
         if (uncaughtExceptionHandler != null)
             uncaughtExceptionHandler = null;
         if (nioBlocker != null)
@@ -1663,11 +1533,6 @@ public final void stop() {
     /**
      * Interrupts this thread.
      *
-     * <p> Unless the current thread is interrupting itself, which is
-     * always permitted, the {@link #checkAccess() checkAccess} method
-     * of this thread is invoked, which may cause a {@link
-     * SecurityException} to be thrown.
-     *
      * <p> If this thread is blocked in an invocation of the {@link
      * Object#wait() wait()}, {@link Object#wait(long) wait(long)}, or {@link
      * Object#wait(long, int) wait(long, int)} methods of the {@link Object}
@@ -1696,15 +1561,8 @@ public final void stop() {
      * @implNote In the JDK Reference Implementation, interruption of a thread
      * that is not alive still records that the interrupt request was made and
      * will report it via {@link #interrupted()} and {@link #isInterrupted()}.
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot modify this thread
      */
     public void interrupt() {
-        if (this != Thread.currentThread()) {
-            checkAccess();
-        }
-
         // Setting the interrupt status must be done before reading nioBlocker.
         interrupted = true;
         interrupt0();  // inform VM of interrupt
@@ -1812,14 +1670,10 @@ boolean alive() {
      * @param newPriority the new thread priority
      * @throws  IllegalArgumentException if the priority is not in the
      *          range {@code MIN_PRIORITY} to {@code MAX_PRIORITY}.
-     * @throws  SecurityException
-     *          if {@link #checkAccess} determines that the current
-     *          thread cannot modify this thread
      * @see #setPriority(int)
      * @see ThreadGroup#getMaxPriority()
      */
     public final void setPriority(int newPriority) {
-        checkAccess();
         if (newPriority > MAX_PRIORITY || newPriority < MIN_PRIORITY) {
             throw new IllegalArgumentException();
         }
@@ -1857,10 +1711,6 @@ public final int getPriority() {
 
     /**
      * Changes the name of this thread to be equal to the argument {@code name}.
-     * <p>
-     * First the {@code checkAccess} method of this thread is called
-     * with no arguments. This may result in throwing a
-     * {@code SecurityException}.
      *
      * @implNote In the JDK Reference Implementation, if this thread is the
      * current thread, and it's a platform thread that was not attached to the
@@ -1871,15 +1721,11 @@ public final int getPriority() {
      * purposes.
      *
      * @param      name   the new name for this thread.
-     * @throws     SecurityException  if the current thread cannot modify this
-     *             thread.
      *
      * @spec jni/index.html Java Native Interface Specification
      * @see        #getName
-     * @see        #checkAccess()
      */
     public final synchronized void setName(String name) {
-        checkAccess();
         if (name == null) {
             throw new NullPointerException("name cannot be null");
         }
@@ -1958,10 +1804,6 @@ public static int activeCount() {
      *         an array into which to put the list of threads
      *
      * @return  the number of threads put into the array
-     *
-     * @throws  SecurityException
-     *          if {@link java.lang.ThreadGroup#checkAccess} determines that
-     *          the current thread cannot access its thread group
      */
     public static int enumerate(Thread[] tarray) {
         return currentThread().getThreadGroup().enumerate(tarray);
@@ -2167,12 +2009,8 @@ public static void dumpStack() {
      *          if this is a virtual thread and {@code on} is false
      * @throws  IllegalThreadStateException
      *          if this thread is {@linkplain #isAlive alive}
-     * @throws  SecurityException
-     *          if {@link #checkAccess} determines that the current
-     *          thread cannot modify this thread
      */
     public final void setDaemon(boolean on) {
-        checkAccess();
         if (isVirtual() && !on)
             throw new IllegalArgumentException("'false' not legal for virtual threads");
         if (isAlive())
@@ -2202,31 +2040,16 @@ public final boolean isDaemon() {
     }
 
     /**
-     * Determines if the currently running thread has permission to
-     * modify this thread.
-     * <p>
-     * If there is a security manager, its {@code checkAccess} method
-     * is called with this thread as its argument. This may result in
-     * throwing a {@code SecurityException}.
-     *
-     * @throws  SecurityException  if the current thread is not allowed to
-     *          access this thread.
-     * @see        SecurityManager#checkAccess(Thread)
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * Does nothing.
+     *
+     * @deprecated This method originally determined if the currently running
+     * thread had permission to modify this thread. This method was only useful
+     * in conjunction with {@linkplain SecurityManager the Security Manager},
+     * which is no longer supported. There is no replacement for the Security
+     * Manager or this method.
      */
     @Deprecated(since="17", forRemoval=true)
-    public final void checkAccess() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkAccess(this);
-        }
-    }
+    public final void checkAccess() { }
 
     /**
      * Returns a string representation of this thread. The string representation
@@ -2265,26 +2088,10 @@ public String toString() {
      *          indicating the system class loader (or, failing that, the
      *          bootstrap class loader)
      *
-     * @throws  SecurityException
-     *          if a security manager is present, and the caller's class loader
-     *          is not {@code null} and is not the same as or an ancestor of the
-     *          context class loader, and the caller does not have the
-     *          {@link RuntimePermission}{@code ("getClassLoader")}
-     *
      * @since 1.2
      */
-    @CallerSensitive
     public ClassLoader getContextClassLoader() {
-        ClassLoader cl = this.contextClassLoader;
-        if (cl == null)
-            return null;
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Class<?> caller = Reflection.getCallerClass();
-            ClassLoader.checkClassLoaderPermission(cl, caller);
-        }
-        return cl;
+        return contextClassLoader;
     }
 
     /**
@@ -2293,27 +2100,13 @@ public ClassLoader getContextClassLoader() {
      * <p> The context {@code ClassLoader} may be set by the creator of the thread
      * for use by code running in this thread when loading classes and resources.
      *
-     * <p> If a security manager is present, its {@link
-     * SecurityManager#checkPermission(java.security.Permission) checkPermission}
-     * method is invoked with a {@link RuntimePermission RuntimePermission}{@code
-     * ("setContextClassLoader")} permission to see if setting the context
-     * ClassLoader is permitted.
-     *
      * @param  cl
      *         the context ClassLoader for this Thread, or null  indicating the
      *         system class loader (or, failing that, the bootstrap class loader)
      *
-     * @throws  SecurityException
-     *          if the current thread cannot set the context ClassLoader
-     *
      * @since 1.2
      */
     public void setContextClassLoader(ClassLoader cl) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-        }
         contextClassLoader = cl;
     }
 
@@ -2348,12 +2141,6 @@ public void setContextClassLoader(ClassLoader cl) {
      * represents the bottom of the stack, which is the least recent method
      * invocation in the sequence.
      *
-     * <p>If there is a security manager, and this thread is not
-     * the current thread, then the security manager's
-     * {@code checkPermission} method is called with a
-     * {@code RuntimePermission("getStackTrace")} permission
-     * to see if it's ok to get the stack trace.
-     *
      * <p>Some virtual machines may, under some circumstances, omit one
      * or more stack frames from the stack trace.  In the extreme case,
      * a virtual machine that has no stack trace information concerning
@@ -2363,22 +2150,11 @@ public void setContextClassLoader(ClassLoader cl) {
      * @return an array of {@code StackTraceElement},
      * each represents one stack frame.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        getting the stack trace of thread.
      * @see Throwable#getStackTrace
-     *
      * @since 1.5
      */
     public StackTraceElement[] getStackTrace() {
         if (this != Thread.currentThread()) {
-            // check for getStackTrace permission
-            @SuppressWarnings("removal")
-            SecurityManager security = System.getSecurityManager();
-            if (security != null) {
-                security.checkPermission(SecurityConstants.GET_STACK_TRACE_PERMISSION);
-            }
             // optimization so we do not call into the vm for threads that
             // have not yet started or have terminated
             if (!isAlive()) {
@@ -2428,34 +2204,16 @@ StackTraceElement[] asyncGetStackTrace() {
      * array will be returned in the map value if the virtual machine has
      * no stack trace information about a thread.
      *
-     * <p>If there is a security manager, then the security manager's
-     * {@code checkPermission} method is called with a
-     * {@code RuntimePermission("getStackTrace")} permission as well as
-     * {@code RuntimePermission("modifyThreadGroup")} permission
-     * to see if it is ok to get the stack trace of all threads.
-     *
      * @return a {@code Map} from {@code Thread} to an array of
      * {@code StackTraceElement} that represents the stack trace of
      * the corresponding thread.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        getting the stack trace of thread.
      * @see #getStackTrace
      * @see Throwable#getStackTrace
      *
      * @since 1.5
      */
     public static Map<Thread, StackTraceElement[]> getAllStackTraces() {
-        // check for getStackTrace permission
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPermission(SecurityConstants.GET_STACK_TRACE_PERMISSION);
-            security.checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
-        }
-
         // Get a snapshot of the list of all threads
         Thread[] threads = getThreads();
         StackTraceElement[][] traces = dumpThreads(threads);
@@ -2470,64 +2228,6 @@ public static Map<Thread, StackTraceElement[]> getAllStackTraces() {
         return m;
     }
 
-    /** cache of subclass security audit results */
-    private static class Caches {
-        /** cache of subclass security audit results */
-        static final ClassValue<Boolean> subclassAudits =
-            new ClassValue<>() {
-                @Override
-                protected Boolean computeValue(Class<?> type) {
-                    return auditSubclass(type);
-                }
-            };
-    }
-
-    /**
-     * Verifies that this (possibly subclass) instance can be constructed
-     * without violating security constraints: the subclass must not override
-     * security-sensitive non-final methods, or else the
-     * "enableContextClassLoaderOverride" RuntimePermission is checked.
-     */
-    private static boolean isCCLOverridden(Class<?> cl) {
-        if (cl == Thread.class)
-            return false;
-
-        return Caches.subclassAudits.get(cl);
-    }
-
-    /**
-     * Performs reflective checks on given subclass to verify that it doesn't
-     * override security-sensitive non-final methods.  Returns true if the
-     * subclass overrides any of the methods, false otherwise.
-     */
-    private static boolean auditSubclass(final Class<?> subcl) {
-        @SuppressWarnings("removal")
-        Boolean result = AccessController.doPrivileged(
-            new PrivilegedAction<>() {
-                public Boolean run() {
-                    for (Class<?> cl = subcl;
-                         cl != Thread.class;
-                         cl = cl.getSuperclass())
-                    {
-                        try {
-                            cl.getDeclaredMethod("getContextClassLoader", new Class<?>[0]);
-                            return Boolean.TRUE;
-                        } catch (NoSuchMethodException ex) {
-                        }
-                        try {
-                            Class<?>[] params = {ClassLoader.class};
-                            cl.getDeclaredMethod("setContextClassLoader", params);
-                            return Boolean.TRUE;
-                        } catch (NoSuchMethodException ex) {
-                        }
-                    }
-                    return Boolean.FALSE;
-                }
-            }
-        );
-        return result.booleanValue();
-    }
-
     /**
      * Return an array of all live threads.
      */
@@ -2760,21 +2460,12 @@ public interface UncaughtExceptionHandler {
      * @param ueh the object to use as the default uncaught exception handler.
      * If {@code null} then there is no default handler.
      *
-     * @throws SecurityException if a security manager is present and it denies
-     *         {@link RuntimePermission}{@code ("setDefaultUncaughtExceptionHandler")}
-     *
      * @see #setUncaughtExceptionHandler
      * @see #getUncaughtExceptionHandler
      * @see ThreadGroup#uncaughtException
      * @since 1.5
      */
     public static void setDefaultUncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(
-                new RuntimePermission("setDefaultUncaughtExceptionHandler"));
-        }
         defaultUncaughtExceptionHandler = ueh;
     }
 
@@ -2818,14 +2509,11 @@ public UncaughtExceptionHandler getUncaughtExceptionHandler() {
      * object acts as its handler.
      * @param ueh the object to use as this thread's uncaught exception
      * handler. If {@code null} then this thread has no explicit handler.
-     * @throws  SecurityException  if the current thread is not allowed to
-     *          modify this thread.
      * @see #setDefaultUncaughtExceptionHandler
      * @see ThreadGroup#uncaughtException
      * @since 1.5
      */
     public void setUncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
-        checkAccess();
         uncaughtExceptionHandler(ueh);
     }
 
@@ -2844,32 +2532,16 @@ void dispatchUncaughtException(Throwable e) {
     /**
      * Holder class for constants.
      */
-    @SuppressWarnings("removal")
     private static class Constants {
         // Thread group for virtual threads.
         static final ThreadGroup VTHREAD_GROUP;
 
-        // AccessControlContext that doesn't support any permissions.
-        @SuppressWarnings("removal")
-        static final AccessControlContext NO_PERMISSIONS_ACC;
-
         static {
-            var getThreadGroup  = new PrivilegedAction<ThreadGroup>() {
-                @Override
-                public ThreadGroup run() {
-                    ThreadGroup parent = Thread.currentCarrierThread().getThreadGroup();
-                    for (ThreadGroup p; (p = parent.getParent()) != null; )
-                        parent = p;
-                    return parent;
-                }
-            };
-            @SuppressWarnings("removal")
-            ThreadGroup root = AccessController.doPrivileged(getThreadGroup);
+            ThreadGroup root = Thread.currentCarrierThread().getThreadGroup();
+            for (ThreadGroup p; (p = root.getParent()) != null; ) {
+                root = p;
+            }
             VTHREAD_GROUP = new ThreadGroup(root, "VirtualThreads", MAX_PRIORITY, false);
-
-            NO_PERMISSIONS_ACC = new AccessControlContext(new ProtectionDomain[] {
-                new ProtectionDomain(null, null)
-            });
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/ThreadBuilders.java b/src/java.base/share/classes/java/lang/ThreadBuilders.java
index 234807d4cc2..62c29651d11 100644
--- a/src/java.base/share/classes/java/lang/ThreadBuilders.java
+++ b/src/java.base/share/classes/java/lang/ThreadBuilders.java
@@ -179,7 +179,7 @@ public OfPlatform stackSize(long stackSize) {
         public Thread unstarted(Runnable task) {
             Objects.requireNonNull(task);
             String name = nextThreadName();
-            var thread = new Thread(group, name, characteristics(), task, stackSize, null);
+            var thread = new Thread(group, name, characteristics(), task, stackSize);
             if (daemonChanged)
                 thread.daemon(daemon);
             if (priority != 0)
@@ -353,7 +353,7 @@ String nextThreadName() {
         public Thread newThread(Runnable task) {
             Objects.requireNonNull(task);
             String name = nextThreadName();
-            Thread thread = new Thread(group, name, characteristics(), task, stackSize, null);
+            Thread thread = new Thread(group, name, characteristics(), task, stackSize);
             if (daemonChanged)
                 thread.daemon(daemon);
             if (priority != 0)
diff --git a/src/java.base/share/classes/java/lang/ThreadGroup.java b/src/java.base/share/classes/java/lang/ThreadGroup.java
index 45bd3497f50..87d61cf2f2e 100644
--- a/src/java.base/share/classes/java/lang/ThreadGroup.java
+++ b/src/java.base/share/classes/java/lang/ThreadGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@ private ThreadGroup() {
     }
 
     /**
-     * Creates a ThreadGroup without any permission or other checks.
+     * Creates a ThreadGroup.
      */
     ThreadGroup(ThreadGroup parent, String name, int maxPriority, boolean daemon) {
         this.parent = parent;
@@ -124,26 +124,11 @@ private ThreadGroup() {
         }
     }
 
-    private ThreadGroup(Void unused, ThreadGroup parent, String name) {
-        this(parent, name, parent.maxPriority, parent.daemon);
-    }
-
-    private static Void checkParentAccess(ThreadGroup parent) {
-        parent.checkAccess();
-        return null;
-    }
-
     /**
      * Constructs a new thread group. The parent of this new group is
      * the thread group of the currently running thread.
-     * <p>
-     * The {@code checkAccess} method of the parent thread group is
-     * called with no arguments; this may result in a security exception.
      *
      * @param   name   the name of the new thread group, can be {@code null}
-     * @throws  SecurityException  if the current thread cannot create a
-     *               thread in the specified thread group.
-     * @see     java.lang.ThreadGroup#checkAccess()
      */
     public ThreadGroup(String name) {
         this(Thread.currentThread().getThreadGroup(), name);
@@ -152,19 +137,13 @@ public ThreadGroup(String name) {
     /**
      * Creates a new thread group. The parent of this new group is the
      * specified thread group.
-     * <p>
-     * The {@code checkAccess} method of the parent thread group is
-     * called with no arguments; this may result in a security exception.
      *
      * @param     parent   the parent thread group.
      * @param     name     the name of the new thread group, can be {@code null}
-     * @throws    SecurityException  if the current thread cannot create a
-     *               thread in the specified thread group.
-     * @see     java.lang.ThreadGroup#checkAccess()
      */
     @SuppressWarnings("this-escape")
     public ThreadGroup(ThreadGroup parent, String name) {
-        this(checkParentAccess(parent), parent, name);
+        this(parent, name, parent.maxPriority, parent.daemon);
     }
 
     /**
@@ -178,22 +157,11 @@ public final String getName() {
 
     /**
      * Returns the parent of this thread group.
-     * <p>
-     * First, if the parent is not {@code null}, the
-     * {@code checkAccess} method of the parent thread group is
-     * called with no arguments; this may result in a security exception.
      *
      * @return  the parent of this thread group. The top-level thread group
      *          is the only thread group whose parent is {@code null}.
-     * @throws  SecurityException  if the current thread cannot modify
-     *               this thread group.
-     * @see        java.lang.ThreadGroup#checkAccess()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.RuntimePermission
      */
     public final ThreadGroup getParent() {
-        if (parent != null)
-            parent.checkAccess();
         return parent;
     }
 
@@ -245,15 +213,8 @@ public boolean isDestroyed() {
     /**
      * Sets the daemon status of this thread group.
      * The daemon status is not used for anything.
-     * <p>
-     * First, the {@code checkAccess} method of this thread group is
-     * called with no arguments; this may result in a security exception.
      *
      * @param      daemon the daemon status
-     * @throws     SecurityException  if the current thread cannot modify
-     *               this thread group.
-     * @see        java.lang.SecurityException
-     * @see        java.lang.ThreadGroup#checkAccess()
      *
      * @deprecated This method originally configured whether the thread group is
      *             a <i>daemon thread group</i> that is automatically destroyed
@@ -264,7 +225,6 @@ public boolean isDestroyed() {
      */
     @Deprecated(since="16", forRemoval=true)
     public final void setDaemon(boolean daemon) {
-        checkAccess();
         this.daemon = daemon;
     }
 
@@ -275,9 +235,6 @@ public final void setDaemon(boolean daemon) {
      * Threads in the thread group (or subgroups) that already have a higher
      * priority are not affected by this method.
      * <p>
-     * First, the {@code checkAccess} method of this thread group is
-     * called with no arguments; this may result in a security exception.
-     * <p>
      * If the {@code pri} argument is less than
      * {@link Thread#MIN_PRIORITY} or greater than
      * {@link Thread#MAX_PRIORITY}, the maximum priority of the group
@@ -292,14 +249,9 @@ public final void setDaemon(boolean daemon) {
      * every thread group that belongs to this thread group.
      *
      * @param      pri   the new priority of the thread group.
-     * @throws     SecurityException  if the current thread cannot modify
-     *               this thread group.
      * @see        #getMaxPriority
-     * @see        java.lang.SecurityException
-     * @see        java.lang.ThreadGroup#checkAccess()
      */
     public final void setMaxPriority(int pri) {
-        checkAccess();
         if (pri >= Thread.MIN_PRIORITY && pri <= Thread.MAX_PRIORITY) {
             synchronized (this) {
                 if (parent == null) {
@@ -331,31 +283,16 @@ public final boolean parentOf(ThreadGroup g) {
     }
 
     /**
-     * Determines if the currently running thread has permission to
-     * modify this thread group.
-     * <p>
-     * If there is a security manager, its {@code checkAccess} method
-     * is called with this thread group as its argument. This may result
-     * in throwing a {@code SecurityException}.
-     *
-     * @throws     SecurityException  if the current thread is not allowed to
-     *               access this thread group.
-     * @see        java.lang.SecurityManager#checkAccess(java.lang.ThreadGroup)
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * Does nothing.
+     *
+     * @deprecated This method originally determined if the currently running
+     * thread had permission to modify this thread group. This method was only
+     * useful in conjunction with {@linkplain SecurityManager the Security Manager},
+     * which is no longer supported. There is no replacement for the Security
+     * Manager or this method.
      */
     @Deprecated(since="17", forRemoval=true)
-    public final void checkAccess() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkAccess(this);
-        }
-    }
+    public final void checkAccess() { }
 
     /**
      * Returns an estimate of the number of {@linkplain Thread#isAlive() live}
@@ -400,10 +337,6 @@ public int activeCount() {
      *         an array into which to put the list of threads
      *
      * @return  the number of threads put into the array
-     *
-     * @throws  SecurityException
-     *          if {@linkplain #checkAccess checkAccess} determines that
-     *          the current thread cannot access this thread group
      */
     public int enumerate(Thread[] list) {
         return enumerate(list, true);
@@ -435,14 +368,9 @@ public int enumerate(Thread[] list) {
      *         thread group
      *
      * @return  the number of threads put into the array
-     *
-     * @throws  SecurityException
-     *          if {@linkplain #checkAccess checkAccess} determines that
-     *          the current thread cannot access this thread group
      */
     public int enumerate(Thread[] list, boolean recurse) {
         Objects.requireNonNull(list);
-        checkAccess();
         int n = 0;
         if (list.length > 0) {
             for (Thread thread : Thread.getAllThreads()) {
@@ -494,10 +422,6 @@ public int activeGroupCount() {
      *         an array into which to put the list of thread groups
      *
      * @return  the number of thread groups put into the array
-     *
-     * @throws  SecurityException
-     *          if {@linkplain #checkAccess checkAccess} determines that
-     *          the current thread cannot access this thread group
      */
     public int enumerate(ThreadGroup[] list) {
         return enumerate(list, true);
@@ -528,14 +452,9 @@ public int enumerate(ThreadGroup[] list) {
      *         if {@code true}, recursively enumerate all subgroups
      *
      * @return  the number of thread groups put into the array
-     *
-     * @throws  SecurityException
-     *          if {@linkplain #checkAccess checkAccess} determines that
-     *          the current thread cannot access this thread group
      */
     public int enumerate(ThreadGroup[] list, boolean recurse) {
         Objects.requireNonNull(list);
-        checkAccess();
         return enumerate(list, 0, recurse);
     }
 
@@ -559,16 +478,10 @@ private int enumerate(ThreadGroup[] list, int i, boolean recurse) {
      * Interrupts all {@linkplain Thread#isAlive() live} platform threads in
      * this thread group and its subgroups.
      *
-     * @throws     SecurityException  if the current thread is not allowed
-     *               to access this thread group or any of the threads in
-     *               the thread group.
      * @see        java.lang.Thread#interrupt()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.ThreadGroup#checkAccess()
      * @since      1.2
      */
     public final void interrupt() {
-        checkAccess();
         for (Thread thread : Thread.getAllThreads()) {
             ThreadGroup g = thread.getThreadGroup();
             if (parentOf(g)) {
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index f76a6eec914..1bf4367bed4 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -24,8 +24,6 @@
  */
 package java.lang;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
@@ -41,7 +39,6 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import jdk.internal.event.VirtualThreadEndEvent;
-import jdk.internal.event.VirtualThreadPinnedEvent;
 import jdk.internal.event.VirtualThreadStartEvent;
 import jdk.internal.event.VirtualThreadSubmitFailedEvent;
 import jdk.internal.misc.CarrierThread;
@@ -59,7 +56,6 @@
 import jdk.internal.vm.annotation.JvmtiMountTransition;
 import jdk.internal.vm.annotation.ReservedStackAccess;
 import sun.nio.ch.Interruptible;
-import sun.security.action.GetPropertyAction;
 import static java.util.concurrent.TimeUnit.*;
 
 /**
@@ -70,12 +66,12 @@ final class VirtualThread extends BaseVirtualThread {
     private static final ContinuationScope VTHREAD_SCOPE = new ContinuationScope("VirtualThreads");
     private static final ForkJoinPool DEFAULT_SCHEDULER = createDefaultScheduler();
     private static final ScheduledExecutorService[] DELAYED_TASK_SCHEDULERS = createDelayedTaskSchedulers();
-    private static final int TRACE_PINNING_MODE = tracePinningMode();
 
     private static final long STATE = U.objectFieldOffset(VirtualThread.class, "state");
     private static final long PARK_PERMIT = U.objectFieldOffset(VirtualThread.class, "parkPermit");
     private static final long CARRIER_THREAD = U.objectFieldOffset(VirtualThread.class, "carrierThread");
     private static final long TERMINATION = U.objectFieldOffset(VirtualThread.class, "termination");
+    private static final long ON_WAITING_LIST = U.objectFieldOffset(VirtualThread.class, "onWaitingList");
 
     // scheduler and continuation
     private final Executor scheduler;
@@ -106,6 +102,21 @@ final class VirtualThread extends BaseVirtualThread {
      *  TIMED_PARKED -> UNPARKED        // unparked, may be scheduled to continue
      *  TIMED_PINNED -> RUNNING         // unparked, continue execution on same carrier
      *
+     *   RUNNING -> BLOCKING       // blocking on monitor enter
+     *  BLOCKING -> BLOCKED        // blocked on monitor enter
+     *   BLOCKED -> UNBLOCKED      // unblocked, may be scheduled to continue
+     * UNBLOCKED -> RUNNING        // continue execution after blocked on monitor enter
+     *
+     *   RUNNING -> WAITING        // transitional state during wait on monitor
+     *   WAITING -> WAITED         // waiting on monitor
+     *    WAITED -> BLOCKED        // notified, waiting to be unblocked by monitor owner
+     *    WAITED -> UNBLOCKED      // timed-out/interrupted
+     *
+     *       RUNNING -> TIMED_WAITING   // transition state during timed-waiting on monitor
+     * TIMED_WAITING -> TIMED_WAITED    // timed-waiting on monitor
+     *  TIMED_WAITED -> BLOCKED         // notified, waiting to be unblocked by monitor owner
+     *  TIMED_WAITED -> UNBLOCKED       // timed-out/interrupted
+     *
      *  RUNNING -> YIELDING        // Thread.yield
      * YIELDING -> YIELDED         // cont.yield successful, may be scheduled to continue
      * YIELDING -> RUNNING         // cont.yield failed
@@ -128,18 +139,44 @@ final class VirtualThread extends BaseVirtualThread {
     private static final int YIELDING = 10;
     private static final int YIELDED  = 11;         // unmounted but runnable
 
+    // monitor enter
+    private static final int BLOCKING  = 12;
+    private static final int BLOCKED   = 13;        // unmounted
+    private static final int UNBLOCKED = 14;        // unmounted but runnable
+
+    // monitor wait/timed-wait
+    private static final int WAITING       = 15;
+    private static final int WAIT          = 16;    // waiting in Object.wait
+    private static final int TIMED_WAITING = 17;
+    private static final int TIMED_WAIT    = 18;    // waiting in timed-Object.wait
+
     private static final int TERMINATED = 99;  // final state
 
     // can be suspended from scheduling when unmounted
     private static final int SUSPENDED = 1 << 8;
 
-    // parking permit
+    // parking permit made available by LockSupport.unpark
     private volatile boolean parkPermit;
 
-    // timeout for timed-park, in nanoseconds, only accessed on current/carrier thread
-    private long parkTimeout;
+    // blocking permit made available by unblocker thread when another thread exits monitor
+    private volatile boolean blockPermit;
+
+    // true when on the list of virtual threads waiting to be unblocked
+    private volatile boolean onWaitingList;
+
+    // next virtual thread on the list of virtual threads waiting to be unblocked
+    private volatile VirtualThread next;
 
-    // timer task for timed-park, only accessed on current/carrier thread
+    // notified by Object.notify/notifyAll while waiting in Object.wait
+    private volatile boolean notified;
+
+    // timed-wait support
+    private byte timedWaitSeqNo;
+
+    // timeout for timed-park and timed-wait, only accessed on current/carrier thread
+    private long timeout;
+
+    // timer task for timed-park and timed-wait, only accessed on current/carrier thread
     private Future<?> timeoutTask;
 
     // carrier thread when mounted, accessed by VM
@@ -202,18 +239,6 @@ private static class VThreadContinuation extends Continuation {
         }
         @Override
         protected void onPinned(Continuation.Pinned reason) {
-            if (TRACE_PINNING_MODE > 0) {
-                boolean printAll = (TRACE_PINNING_MODE == 1);
-                VirtualThread vthread = (VirtualThread) Thread.currentThread();
-                int oldState = vthread.state();
-                try {
-                    // avoid printing when in transition states
-                    vthread.setState(RUNNING);
-                    PinnedThreadPrinter.printStackTrace(System.out, reason, printAll);
-                } finally {
-                    vthread.setState(oldState);
-                }
-            }
         }
         private static Runnable wrap(VirtualThread vthread, Runnable task) {
             return new Runnable() {
@@ -245,16 +270,20 @@ private void runContinuation() {
 
         // set state to RUNNING
         int initialState = state();
-        if (initialState == STARTED || initialState == UNPARKED || initialState == YIELDED) {
+        if (initialState == STARTED || initialState == UNPARKED
+                || initialState == UNBLOCKED || initialState == YIELDED) {
             // newly started or continue after parking/blocking/Thread.yield
             if (!compareAndSetState(initialState, RUNNING)) {
                 return;
             }
-            // consume permit when continuing after parking. If continuing after a
-            // timed-park then the timeout task is cancelled.
+            // consume permit when continuing after parking or blocking. If continue
+            // after a timed-park or timed-wait then the timeout task is cancelled.
             if (initialState == UNPARKED) {
                 cancelTimeoutTask();
                 setParkPermit(false);
+            } else if (initialState == UNBLOCKED) {
+                cancelTimeoutTask();
+                blockPermit = false;
             }
         } else {
             // not runnable
@@ -275,8 +304,8 @@ private void runContinuation() {
     }
 
     /**
-     * Cancel timeout task when continuing after a timed-park. The
-     * timeout task may be executing, or may have already completed.
+     * Cancel timeout task when continuing after timed-park or timed-wait.
+     * The timeout task may be executing, or may have already completed.
      */
     private void cancelTimeoutTask() {
         if (timeoutTask != null) {
@@ -511,7 +540,7 @@ private boolean yieldContinuation() {
 
     /**
      * Invoked in the context of the carrier thread after the Continuation yields when
-     * parking or Thread.yield.
+     * parking, blocking on monitor enter, Object.wait, or Thread.yield.
      */
     private void afterYield() {
         assert carrierThread == null;
@@ -530,8 +559,8 @@ private void afterYield() {
                 setState(newState = PARKED);
             } else {
                 // schedule unpark
-                assert parkTimeout > 0;
-                timeoutTask = schedule(this::unpark, parkTimeout, NANOSECONDS);
+                assert timeout > 0;
+                timeoutTask = schedule(this::unpark, timeout, NANOSECONDS);
                 setState(newState = TIMED_PARKED);
             }
 
@@ -556,6 +585,56 @@ private void afterYield() {
             return;
         }
 
+        // blocking on monitorenter
+        if (s == BLOCKING) {
+            setState(BLOCKED);
+
+            // may have been unblocked while blocking
+            if (blockPermit && compareAndSetState(BLOCKED, UNBLOCKED)) {
+                // lazy submit if local queue is empty
+                lazySubmitRunContinuation();
+            }
+            return;
+        }
+
+        // Object.wait
+        if (s == WAITING || s == TIMED_WAITING) {
+            int newState;
+            if (s == WAITING) {
+                setState(newState = WAIT);
+            } else {
+                // For timed-wait, a timeout task is scheduled to execute. The timeout
+                // task will change the thread state to UNBLOCKED and submit the thread
+                // to the scheduler. A sequence number is used to ensure that the timeout
+                // task only unblocks the thread for this timed-wait. We synchronize with
+                // the timeout task to coordinate access to the sequence number and to
+                // ensure the timeout task doesn't execute until the thread has got to
+                // the TIMED_WAIT state.
+                assert timeout > 0;
+                synchronized (timedWaitLock()) {
+                    byte seqNo = ++timedWaitSeqNo;
+                    timeoutTask = schedule(() -> waitTimeoutExpired(seqNo), timeout, MILLISECONDS);
+                    setState(newState = TIMED_WAIT);
+                }
+            }
+
+            // may have been notified while in transition to wait state
+            if (notified && compareAndSetState(newState, BLOCKED)) {
+                // may have even been unblocked already
+                if (blockPermit && compareAndSetState(BLOCKED, UNBLOCKED)) {
+                    submitRunContinuation();
+                }
+                return;
+            }
+
+            // may have been interrupted while in transition to wait state
+            if (interrupted && compareAndSetState(newState, UNBLOCKED)) {
+                submitRunContinuation();
+                return;
+            }
+            return;
+        }
+
         assert false;
     }
 
@@ -695,7 +774,7 @@ void parkNanos(long nanos) {
 
             // park the thread, afterYield will schedule the thread to unpark
             boolean yielded = false;
-            setParkTimeout(nanos);
+            timeout = nanos;
             setState(TIMED_PARKING);
             try {
                 yielded = yieldContinuation();
@@ -727,14 +806,6 @@ void parkNanos(long nanos) {
     private void parkOnCarrierThread(boolean timed, long nanos) {
         assert state() == RUNNING;
 
-        VirtualThreadPinnedEvent event;
-        try {
-            event = new VirtualThreadPinnedEvent();
-            event.begin();
-        } catch (OutOfMemoryError e) {
-            event = null;
-        }
-
         setState(timed ? TIMED_PINNED : PINNED);
         try {
             if (!parkPermit) {
@@ -751,15 +822,18 @@ private void parkOnCarrierThread(boolean timed, long nanos) {
         // consume parking permit
         setParkPermit(false);
 
-        if (event != null) {
-            try {
-                event.commit();
-            } catch (OutOfMemoryError e) {
-                // ignore
-            }
-        }
+        // JFR jdk.VirtualThreadPinned event
+        postPinnedEvent("LockSupport.park");
     }
 
+    /**
+     * Call into VM when pinned to record a JFR jdk.VirtualThreadPinned event.
+     * Recording the event in the VM avoids having JFR event recorded in Java
+     * with the same name, but different ID, to events recorded by the VM.
+     */
+    @Hidden
+    private static native void postPinnedEvent(String op);
+
     /**
      * Re-enables this virtual thread for scheduling. If this virtual thread is parked
      * then its task is scheduled to continue, otherwise its next call to {@code park} or
@@ -796,6 +870,49 @@ void unpark() {
         }
     }
 
+    /**
+     * Invoked by unblocker thread to unblock this virtual thread.
+     */
+    private void unblock() {
+        assert !Thread.currentThread().isVirtual();
+        blockPermit = true;
+        if (state() == BLOCKED && compareAndSetState(BLOCKED, UNBLOCKED)) {
+            submitRunContinuation();
+        }
+    }
+
+    /**
+     * Invoked by timer thread when wait timeout for virtual thread has expired.
+     * If the virtual thread is in timed-wait then this method will unblock the thread
+     * and submit its task so that it continues and attempts to reenter the monitor.
+     * This method does nothing if the thread has been woken by notify or interrupt.
+     */
+    private void waitTimeoutExpired(byte seqNo) {
+        assert !Thread.currentThread().isVirtual();
+        for (;;) {
+            boolean unblocked = false;
+            synchronized (timedWaitLock()) {
+                if (seqNo != timedWaitSeqNo) {
+                    // this timeout task is for a past timed-wait
+                    return;
+                }
+                int s = state();
+                if (s == TIMED_WAIT) {
+                    unblocked = compareAndSetState(TIMED_WAIT, UNBLOCKED);
+                } else if (s != (TIMED_WAIT | SUSPENDED)) {
+                    // notified or interrupted, no longer waiting
+                    return;
+                }
+            }
+            if (unblocked) {
+                submitRunContinuation();
+                return;
+            }
+            // need to retry when thread is suspended in time-wait
+            Thread.yield();
+        }
+    }
+
     /**
      * Attempts to yield the current virtual thread (Thread.yield).
      */
@@ -893,11 +1010,8 @@ void blockedOn(Interruptible b) {
     }
 
     @Override
-    @SuppressWarnings("removal")
     public void interrupt() {
         if (Thread.currentThread() != this) {
-            checkAccess();
-
             // if current thread is a virtual thread then prevent it from being
             // suspended or unmounted when entering or holding interruptLock
             Interruptible blocker;
@@ -926,6 +1040,12 @@ public void interrupt() {
             // make available parking permit, unpark thread if parked
             unpark();
 
+            // if thread is waiting in Object.wait then schedule to try to reenter
+            int s = state();
+            if ((s == WAIT || s == TIMED_WAIT) && compareAndSetState(s, UNBLOCKED)) {
+                submitRunContinuation();
+            }
+
         } else {
             interrupted = true;
             carrierThread.setInterrupt();
@@ -970,6 +1090,7 @@ Thread.State threadState() {
                     return Thread.State.RUNNABLE;
                 }
             case UNPARKED:
+            case UNBLOCKED:
             case YIELDED:
                 // runnable, not mounted
                 return Thread.State.RUNNABLE;
@@ -992,15 +1113,22 @@ Thread.State threadState() {
                 return Thread.State.RUNNABLE;
             case PARKING:
             case TIMED_PARKING:
+            case WAITING:
+            case TIMED_WAITING:
             case YIELDING:
                 // runnable, in transition
                 return Thread.State.RUNNABLE;
             case PARKED:
             case PINNED:
+            case WAIT:
                 return Thread.State.WAITING;
             case TIMED_PARKED:
             case TIMED_PINNED:
+            case TIMED_WAIT:
                 return Thread.State.TIMED_WAITING;
+            case BLOCKING:
+            case BLOCKED:
+                return Thread.State.BLOCKED;
             case TERMINATED:
                 return Thread.State.TERMINATED;
             default:
@@ -1046,13 +1174,13 @@ private StackTraceElement[] tryGetStackTrace() {
             case RUNNING, PINNED, TIMED_PINNED -> {
                 return null;   // mounted
             }
-            case PARKED, TIMED_PARKED -> {
+            case PARKED, TIMED_PARKED, BLOCKED, WAIT, TIMED_WAIT -> {
                 // unmounted, not runnable
             }
-            case UNPARKED, YIELDED -> {
+            case UNPARKED, UNBLOCKED, YIELDED -> {
                 // unmounted, runnable
             }
-            case PARKING, TIMED_PARKING, YIELDING -> {
+            case PARKING, TIMED_PARKING, BLOCKING, YIELDING, WAITING, TIMED_WAITING -> {
                 return null;  // in transition
             }
             default -> throw new InternalError("" + initialState);
@@ -1073,7 +1201,7 @@ private StackTraceElement[] tryGetStackTrace() {
             setState(initialState);
         }
         boolean resubmit = switch (initialState) {
-            case UNPARKED, YIELDED -> {
+            case UNPARKED, UNBLOCKED, YIELDED -> {
                 // resubmit as task may have run while suspended
                 yield true;
             }
@@ -1081,6 +1209,15 @@ private StackTraceElement[] tryGetStackTrace() {
                 // resubmit if unparked while suspended
                 yield parkPermit && compareAndSetState(initialState, UNPARKED);
             }
+            case BLOCKED -> {
+                // resubmit if unblocked while suspended
+                yield blockPermit && compareAndSetState(BLOCKED, UNBLOCKED);
+            }
+            case WAIT, TIMED_WAIT -> {
+                // resubmit if notified or interrupted while waiting (Object.wait)
+                // waitTimeoutExpired will retry if the timed expired when suspended
+                yield (notified || interrupted) && compareAndSetState(initialState, UNBLOCKED);
+            }
             default -> throw new InternalError();
         };
         if (resubmit) {
@@ -1175,6 +1312,14 @@ private Object carrierThreadAccessLock() {
         return interruptLock;
     }
 
+    /**
+     * Returns a lock object for coordinating timed-wait setup and timeout handling.
+     */
+    private Object timedWaitLock() {
+        // use this object for now to avoid the overhead of introducing another lock
+        return runContinuation;
+    }
+
     /**
      * Disallow the current thread be suspended or preempted.
      */
@@ -1205,6 +1350,10 @@ private boolean compareAndSetState(int expectedValue, int newValue) {
         return U.compareAndSetInt(this, STATE, expectedValue, newValue);
     }
 
+    private boolean compareAndSetOnWaitingList(boolean expectedValue, boolean newValue) {
+        return U.compareAndSetBoolean(this, ON_WAITING_LIST, expectedValue, newValue);
+    }
+
     private void setParkPermit(boolean newValue) {
         if (parkPermit != newValue) {
             parkPermit = newValue;
@@ -1219,10 +1368,6 @@ private boolean getAndSetParkPermit(boolean newValue) {
         }
     }
 
-    private void setParkTimeout(long timeout) {
-        parkTimeout = timeout;
-    }
-
     private void setCarrierThread(Thread carrier) {
         // U.putReferenceRelease(this, CARRIER_THREAD, carrier);
         this.carrierThread = carrier;
@@ -1255,47 +1400,37 @@ private void setCarrierThread(Thread carrier) {
 
         // ensure VTHREAD_GROUP is created, may be accessed by JVMTI
         var group = Thread.virtualThreadGroup();
-
-        // ensure VirtualThreadPinnedEvent is loaded/initialized
-        U.ensureClassInitialized(VirtualThreadPinnedEvent.class);
     }
 
     /**
      * Creates the default ForkJoinPool scheduler.
      */
-    @SuppressWarnings("removal")
     private static ForkJoinPool createDefaultScheduler() {
-        ForkJoinWorkerThreadFactory factory = pool -> {
-            PrivilegedAction<ForkJoinWorkerThread> pa = () -> new CarrierThread(pool);
-            return AccessController.doPrivileged(pa);
-        };
-        PrivilegedAction<ForkJoinPool> pa = () -> {
-            int parallelism, maxPoolSize, minRunnable;
-            String parallelismValue = System.getProperty("jdk.virtualThreadScheduler.parallelism");
-            String maxPoolSizeValue = System.getProperty("jdk.virtualThreadScheduler.maxPoolSize");
-            String minRunnableValue = System.getProperty("jdk.virtualThreadScheduler.minRunnable");
-            if (parallelismValue != null) {
-                parallelism = Integer.parseInt(parallelismValue);
-            } else {
-                parallelism = Runtime.getRuntime().availableProcessors();
-            }
-            if (maxPoolSizeValue != null) {
-                maxPoolSize = Integer.parseInt(maxPoolSizeValue);
-                parallelism = Integer.min(parallelism, maxPoolSize);
-            } else {
-                maxPoolSize = Integer.max(parallelism, 256);
-            }
-            if (minRunnableValue != null) {
-                minRunnable = Integer.parseInt(minRunnableValue);
-            } else {
-                minRunnable = Integer.max(parallelism / 2, 1);
-            }
-            Thread.UncaughtExceptionHandler handler = (t, e) -> { };
-            boolean asyncMode = true; // FIFO
-            return new ForkJoinPool(parallelism, factory, handler, asyncMode,
-                         0, maxPoolSize, minRunnable, pool -> true, 30, SECONDS);
-        };
-        return AccessController.doPrivileged(pa);
+        ForkJoinWorkerThreadFactory factory = pool -> new CarrierThread(pool);
+        int parallelism, maxPoolSize, minRunnable;
+        String parallelismValue = System.getProperty("jdk.virtualThreadScheduler.parallelism");
+        String maxPoolSizeValue = System.getProperty("jdk.virtualThreadScheduler.maxPoolSize");
+        String minRunnableValue = System.getProperty("jdk.virtualThreadScheduler.minRunnable");
+        if (parallelismValue != null) {
+            parallelism = Integer.parseInt(parallelismValue);
+        } else {
+            parallelism = Runtime.getRuntime().availableProcessors();
+        }
+        if (maxPoolSizeValue != null) {
+            maxPoolSize = Integer.parseInt(maxPoolSizeValue);
+            parallelism = Integer.min(parallelism, maxPoolSize);
+        } else {
+            maxPoolSize = Integer.max(parallelism, 256);
+        }
+        if (minRunnableValue != null) {
+            minRunnable = Integer.parseInt(minRunnableValue);
+        } else {
+            minRunnable = Integer.max(parallelism / 2, 1);
+        }
+        Thread.UncaughtExceptionHandler handler = (t, e) -> { };
+        boolean asyncMode = true; // FIFO
+        return new ForkJoinPool(parallelism, factory, handler, asyncMode,
+                     0, maxPoolSize, minRunnable, pool -> true, 30, SECONDS);
     }
 
     /**
@@ -1312,7 +1447,7 @@ private static Future<?> schedule(Runnable command, long delay, TimeUnit unit) {
      */
     private static ScheduledExecutorService[] createDelayedTaskSchedulers() {
         String propName = "jdk.virtualThreadScheduler.timerQueues";
-        String propValue = GetPropertyAction.privilegedGetProperty(propName);
+        String propValue = System.getProperty(propName);
         int queueCount;
         if (propValue != null) {
             queueCount = Integer.parseInt(propValue);
@@ -1338,18 +1473,37 @@ private static ScheduledExecutorService[] createDelayedTaskSchedulers() {
     }
 
     /**
-     * Reads the value of the jdk.tracePinnedThreads property to determine if stack
-     * traces should be printed when a carrier thread is pinned when a virtual thread
-     * attempts to park.
+     * Schedule virtual threads that are ready to be scheduled after they blocked on
+     * monitor enter.
      */
-    private static int tracePinningMode() {
-        String propValue = GetPropertyAction.privilegedGetProperty("jdk.tracePinnedThreads");
-        if (propValue != null) {
-            if (propValue.length() == 0 || "full".equalsIgnoreCase(propValue))
-                return 1;
-            if ("short".equalsIgnoreCase(propValue))
-                return 2;
+    private static void unblockVirtualThreads() {
+        while (true) {
+            VirtualThread vthread = takeVirtualThreadListToUnblock();
+            while (vthread != null) {
+                assert vthread.onWaitingList;
+                VirtualThread nextThread = vthread.next;
+
+                // remove from list and unblock
+                vthread.next = null;
+                boolean changed = vthread.compareAndSetOnWaitingList(true, false);
+                assert changed;
+                vthread.unblock();
+
+                vthread = nextThread;
+            }
         }
-        return 0;
+    }
+
+    /**
+     * Retrieves the list of virtual threads that are waiting to be unblocked, waiting
+     * if necessary until a list of one or more threads becomes available.
+     */
+    private static native VirtualThread takeVirtualThreadListToUnblock();
+
+    static {
+        var unblocker = InnocuousThread.newThread("VirtualThread-unblocker",
+                VirtualThread::unblockVirtualThreads);
+        unblocker.setDaemon(true);
+        unblocker.start();
     }
 }
diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index 7ecbe2504f3..cd38bd19227 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -1307,7 +1307,8 @@ MemorySegment reinterpret(long newSize,
      * @param offset  offset in bytes (relative to this segment address) at which this
      *                access operation will occur
      * @param charset the charset used to {@linkplain Charset#newDecoder() decode} the
-     *                string bytes
+     *                string bytes. The {@code charset} must be a
+     *                {@linkplain StandardCharsets standard charset}
      * @return a Java string constructed from the bytes read from the given starting
      *         address up to (but not including) the first {@code '\0'} terminator
      *         character (assuming one is found)
@@ -1375,7 +1376,9 @@ MemorySegment reinterpret(long newSize,
      *                access operation will occur, the final address of this write
      *                operation can be expressed as {@code address() + offset}
      * @param str     the Java string to be written into this segment
-     * @param charset the charset used to {@linkplain Charset#newEncoder() encode} the string bytes
+     * @param charset the charset used to {@linkplain Charset#newEncoder() encode} the
+     *                string bytes. The {@code charset} must be a
+     *                {@linkplain StandardCharsets standard charset}
      * @throws IndexOutOfBoundsException if {@code offset < 0}
      * @throws IndexOutOfBoundsException if {@code offset > byteSize() - (B + N)}, where:
      *         <ul>
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java
index abbab3d7753..0cc6f627543 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -316,9 +316,6 @@ private LambdaMetafactory() {}
      *         handle referencing a method or constructor, or if the linkage
      *         invariants are violated, as defined {@link LambdaMetafactory above}.
      * @throws NullPointerException If any argument is {@code null}.
-     * @throws SecurityException If a security manager is present, and it
-     *         <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-     *         from {@code caller} to the package of {@code implementation}.
      */
     public static CallSite metafactory(MethodHandles.Lookup caller,
                                        String interfaceMethodName,
@@ -467,9 +464,6 @@ public static CallSite metafactory(MethodHandles.Lookup caller,
      *         of {@code args} do not follow the above rules, or if
      *         {@code altInterfaceCount} or {@code altMethodCount} are negative
      *         integers.
-     * @throws SecurityException If a security manager is present, and it
-     *         <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-     *         from {@code caller} to the package of {@code implementation}.
      */
     public static CallSite altMetafactory(MethodHandles.Lookup caller,
                                           String interfaceMethodName,
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
index 9709c881863..dcfa671a17f 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -147,11 +147,6 @@ private MethodHandleProxies() { }  // do not instantiate
      * such as abstract classes with single abstract methods.
      * Future versions of this API may also equip wrapper instances
      * with one or more additional public "marker" interfaces.
-     * <p>
-     * If a security manager is installed, this method is caller sensitive.
-     * During any invocation of the target method handle via the returned wrapper,
-     * the original creator of the wrapper (the caller) will be visible
-     * to context checks requested by the security manager.
      *
      * @param <T> the desired type of the wrapper, a single-method interface
      * @param intfc a class object representing {@code T}
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index b45ff858cd3..b077c730440 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -165,8 +165,6 @@ private static Lookup lookup(Class<?> caller) {
      * <em>Discussion:</em>
      * The lookup class can be changed to any other class {@code C} using an expression of the form
      * {@link Lookup#in publicLookup().in(C.class)}.
-     * A public lookup object is always subject to
-     * <a href="MethodHandles.Lookup.html#secmgr">security manager checks</a>.
      * Also, it cannot access
      * <a href="MethodHandles.Lookup.html#callsens">caller sensitive methods</a>.
      * @return a lookup object which is trusted minimally
@@ -186,9 +184,6 @@ public static Lookup publicLookup() {
      * allowed to do deep reflection on module {@code M2} and package of the target class
      * if and only if all of the following conditions are {@code true}:
      * <ul>
-     * <li>If there is a security manager, its {@code checkPermission} method is
-     * called to check {@code ReflectPermission("suppressAccessChecks")} and
-     * that must return normally.
      * <li>The caller lookup object must have {@linkplain Lookup#hasFullPrivilegeAccess()
      * full privilege access}.  Specifically:
      *   <ul>
@@ -238,7 +233,6 @@ public static Lookup publicLookup() {
      * @return a lookup object for the target class, with private access
      * @throws IllegalArgumentException if {@code targetClass} is a primitive type or void or array class
      * @throws NullPointerException if {@code targetClass} or {@code caller} is {@code null}
-     * @throws SecurityException if denied by the security manager
      * @throws IllegalAccessException if any of the other access checks specified above fails
      * @since 9
      * @see Lookup#dropLookupMode
@@ -459,14 +453,10 @@ public static <T> T classDataAt(Lookup caller, String name, Class<T> type, int i
      * on the target to obtain its symbolic reference, and then called
      * {@link java.lang.invoke.MethodHandleInfo#reflectAs MethodHandleInfo.reflectAs}
      * to resolve the symbolic reference to a member.
-     * <p>
-     * If there is a security manager, its {@code checkPermission} method
-     * is called with a {@code ReflectPermission("suppressAccessChecks")} permission.
      * @param <T> the desired type of the result, either {@link Member} or a subtype
      * @param expected a class object representing the desired result type {@code T}
      * @param target a direct method handle to crack into symbolic reference components
      * @return a reference to the method, constructor, or field object
-     * @throws    SecurityException if the caller is not privileged to call {@code setAccessible}
      * @throws    NullPointerException if either argument is {@code null}
      * @throws    IllegalArgumentException if the target is not a direct method handle
      * @throws    ClassCastException if the member is not of the expected type
@@ -616,10 +606,6 @@ public static <T extends Member> T reflectAs(Class<T> expected, MethodHandle tar
      * the lookup can still succeed.
      * For example, lookups for {@code MethodHandle.invokeExact} and
      * {@code MethodHandle.invoke} will always succeed, regardless of requested type.
-     * <li>If there is a security manager installed, it can forbid the lookup
-     * on various grounds (<a href="MethodHandles.Lookup.html#secmgr">see below</a>).
-     * By contrast, the {@code ldc} instruction on a {@code CONSTANT_MethodHandle}
-     * constant is not subject to security manager checks.
      * <li>If the looked-up method has a
      * <a href="MethodHandle.html#maxarity">very large arity</a>,
      * the method handle creation may fail with an
@@ -1317,74 +1303,6 @@ public static <T extends Member> T reflectAs(Class<T> expected, MethodHandle tar
      * all access modes are dropped.</li>
      * </ul>
      *
-     * <h2><a id="secmgr"></a>Security manager interactions</h2>
-     * Although bytecode instructions can only refer to classes in
-     * a related class loader, this API can search for methods in any
-     * class, as long as a reference to its {@code Class} object is
-     * available.  Such cross-loader references are also possible with the
-     * Core Reflection API, and are impossible to bytecode instructions
-     * such as {@code invokestatic} or {@code getfield}.
-     * There is a {@linkplain java.lang.SecurityManager security manager API}
-     * to allow applications to check such cross-loader references.
-     * These checks apply to both the {@code MethodHandles.Lookup} API
-     * and the Core Reflection API
-     * (as found on {@link java.lang.Class Class}).
-     * <p>
-     * If a security manager is present, member and class lookups are subject to
-     * additional checks.
-     * From one to three calls are made to the security manager.
-     * Any of these calls can refuse access by throwing a
-     * {@link java.lang.SecurityException SecurityException}.
-     * Define {@code smgr} as the security manager,
-     * {@code lookc} as the lookup class of the current lookup object,
-     * {@code refc} as the containing class in which the member
-     * is being sought, and {@code defc} as the class in which the
-     * member is actually defined.
-     * (If a class or other type is being accessed,
-     * the {@code refc} and {@code defc} values are the class itself.)
-     * The value {@code lookc} is defined as <em>not present</em>
-     * if the current lookup object does not have
-     * {@linkplain #hasFullPrivilegeAccess() full privilege access}.
-     * The calls are made according to the following rules:
-     * <ul>
-     * <li><b>Step 1:</b>
-     *     If {@code lookc} is not present, or if its class loader is not
-     *     the same as or an ancestor of the class loader of {@code refc},
-     *     then {@link SecurityManager#checkPackageAccess
-     *     smgr.checkPackageAccess(refcPkg)} is called,
-     *     where {@code refcPkg} is the package of {@code refc}.
-     * <li><b>Step 2a:</b>
-     *     If the retrieved member is not public and
-     *     {@code lookc} is not present, then
-     *     {@link SecurityManager#checkPermission smgr.checkPermission}
-     *     with {@code RuntimePermission("accessDeclaredMembers")} is called.
-     * <li><b>Step 2b:</b>
-     *     If the retrieved class has a {@code null} class loader,
-     *     and {@code lookc} is not present, then
-     *     {@link SecurityManager#checkPermission smgr.checkPermission}
-     *     with {@code RuntimePermission("getClassLoader")} is called.
-     * <li><b>Step 3:</b>
-     *     If the retrieved member is not public,
-     *     and if {@code lookc} is not present,
-     *     and if {@code defc} and {@code refc} are different,
-     *     then {@link SecurityManager#checkPackageAccess
-     *     smgr.checkPackageAccess(defcPkg)} is called,
-     *     where {@code defcPkg} is the package of {@code defc}.
-     * </ul>
-     * Security checks are performed after other access checks have passed.
-     * Therefore, the above rules presuppose a member or class that is public,
-     * or else that is being accessed from a lookup class that has
-     * rights to access the member or class.
-     * <p>
-     * If a security manager is present and the current lookup object does not have
-     * {@linkplain #hasFullPrivilegeAccess() full privilege access}, then
-     * {@link #defineClass(byte[]) defineClass},
-     * {@link #defineHiddenClass(byte[], boolean, ClassOption...) defineHiddenClass},
-     * {@link #defineHiddenClassWithClassData(byte[], Object, boolean, ClassOption...)
-     * defineHiddenClassWithClassData}
-     * calls {@link SecurityManager#checkPermission smgr.checkPermission}
-     * with {@code RuntimePermission("defineClass")}.
-     *
      * <h2><a id="callsens"></a>Caller sensitive methods</h2>
      * A small number of Java methods have a special property called caller sensitivity.
      * A <em>caller-sensitive</em> method can behave differently depending on the
@@ -1825,10 +1743,6 @@ public Lookup dropLookupMode(int modeToDrop) {
          * run at a later time, as detailed in section 12.4 of the <em>The Java Language
          * Specification</em>. </p>
          *
-         * <p> If there is a security manager and this lookup does not have {@linkplain
-         * #hasFullPrivilegeAccess() full privilege access}, its {@code checkPermission} method
-         * is first called to check {@code RuntimePermission("defineClass")}. </p>
-         *
          * @param bytes the class bytes
          * @return the {@code Class} object for the class
          * @throws IllegalAccessException if this lookup does not have {@code PACKAGE} access
@@ -1838,8 +1752,6 @@ public Lookup dropLookupMode(int modeToDrop) {
          * ({@code ACC_MODULE} flag is set in the value of the {@code access_flags} item)
          * @throws VerifyError if the newly created class cannot be verified
          * @throws LinkageError if the newly created class cannot be linked for any other reason
-         * @throws SecurityException if a security manager is present and it
-         *                           <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if {@code bytes} is {@code null}
          * @since 9
          * @see MethodHandles#privateLookupIn
@@ -2097,8 +2009,6 @@ static int optionsToFlag(ClassOption[] options) {
          *
          * @throws IllegalAccessException if this {@code Lookup} does not have
          * {@linkplain #hasFullPrivilegeAccess() full privilege} access
-         * @throws SecurityException if a security manager is present and it
-         * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws ClassFormatError if {@code bytes} is not a {@code ClassFile} structure
          * @throws UnsupportedClassVersionError if {@code bytes} is not of a supported major or minor version
          * @throws IllegalArgumentException if {@code bytes} denotes a class in a different package
@@ -2180,8 +2090,6 @@ public Lookup defineHiddenClass(byte[] bytes, boolean initialize, ClassOption...
          *
          * @throws IllegalAccessException if this {@code Lookup} does not have
          * {@linkplain #hasFullPrivilegeAccess() full privilege} access
-         * @throws SecurityException if a security manager is present and it
-         * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws ClassFormatError if {@code bytes} is not a {@code ClassFile} structure
          * @throws UnsupportedClassVersionError if {@code bytes} is not of a supported major or minor version
          * @throws IllegalArgumentException if {@code bytes} denotes a class in a different package
@@ -2631,8 +2539,6 @@ public String toString() {
          *                                or if the method is not {@code static},
          *                                or if the method's variable arity modifier bit
          *                                is set and {@code asVarargsCollector} fails
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findStatic(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
@@ -2715,8 +2621,6 @@ public MethodHandle findStatic(Class<?> refc, String name, MethodType type) thro
          *                                or if the method is {@code static},
          *                                or if the method's variable arity modifier bit
          *                                is set and {@code asVarargsCollector} fails
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findVirtual(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
@@ -2789,8 +2693,6 @@ private MethodHandle findVirtualForVH(String name, MethodType type) {
          * @throws IllegalAccessException if access checking fails
          *                                or if the method's variable arity modifier bit
          *                                is set and {@code asVarargsCollector} fails
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoSuchMethodException, IllegalAccessException {
@@ -2819,8 +2721,6 @@ public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoSuc
          * @param targetName the {@linkplain ClassLoader##binary-name binary name} of the class
          *                   or the string representing an array class
          * @return the requested class.
-         * @throws SecurityException if a security manager is present and it
-         *                           <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws LinkageError if the linkage fails
          * @throws ClassNotFoundException if the class cannot be loaded by the lookup class' loader.
          * @throws IllegalAccessException if the class is not accessible, using the allowed access
@@ -2856,8 +2756,6 @@ public Class<?> findClass(String targetName) throws ClassNotFoundException, Ille
          *          {@linkplain #accessClass accessible} to this lookup
          * @throws  ExceptionInInitializerError if the class initialization provoked
          *          by this method fails
-         * @throws  SecurityException if a security manager is present and it
-         *          <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @since 15
          * @jvms 5.5 Initialization
          */
@@ -2966,8 +2864,6 @@ private IllegalAccessException makeAccessException(Class<?> targetClass) {
          * @return {@code targetClass} that has been access-checked
          * @throws IllegalAccessException if the class is not accessible from the lookup class
          * and previous lookup class, if present, using the allowed access modes.
-         * @throws SecurityException if a security manager is present and it
-         *                           <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if {@code targetClass} is {@code null}
          * @since 9
          * @see <a href="#cross-module-lookup">Cross-module lookups</a>
@@ -3050,8 +2946,6 @@ static class Listie extends ArrayList {
          *                                or if the method is {@code static},
          *                                or if the method's variable arity modifier bit
          *                                is set and {@code asVarargsCollector} fails
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findSpecial(Class<?> refc, String name, MethodType type,
@@ -3075,8 +2969,6 @@ public MethodHandle findSpecial(Class<?> refc, String name, MethodType type,
          * @return a method handle which can load values from the field
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is {@code static}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          * @see #findVarHandle(Class, String, Class)
          */
@@ -3099,8 +2991,6 @@ public MethodHandle findGetter(Class<?> refc, String name, Class<?> type) throws
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is {@code static}
          *                                or {@code final}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          * @see #findVarHandle(Class, String, Class)
          */
@@ -3172,8 +3062,6 @@ public MethodHandle findSetter(Class<?> refc, String name, Class<?> type) throws
          * @return a VarHandle giving access to non-static fields.
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is {@code static}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          * @since 9
          */
@@ -3198,8 +3086,6 @@ public VarHandle findVarHandle(Class<?> recv, String name, Class<?> type) throws
          * @return a method handle which can load values from the field
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findStaticGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
@@ -3223,8 +3109,6 @@ public MethodHandle findStaticGetter(Class<?> refc, String name, Class<?> type)
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
          *                                or is {@code final}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          */
         public MethodHandle findStaticSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
@@ -3297,8 +3181,6 @@ public MethodHandle findStaticSetter(Class<?> refc, String name, Class<?> type)
          * @return a VarHandle giving access to a static field
          * @throws NoSuchFieldException if the field does not exist
          * @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          * @since 9
          */
@@ -3351,8 +3233,6 @@ public VarHandle findStaticVarHandle(Class<?> decl, String name, Class<?> type)
          * @throws IllegalAccessException if access checking fails
          *                                or if the method's variable arity modifier bit
          *                                is set and {@code asVarargsCollector} fails
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws NullPointerException if any argument is null
          * @see MethodHandle#bindTo
          * @see #findVirtual
@@ -3685,8 +3565,6 @@ public VarHandle unreflectVarHandle(Field f) throws IllegalAccessException {
          * and was created by a lookup object for a different class.
          * @param target a direct method handle to crack into symbolic reference components
          * @return a symbolic reference which can be used to reconstruct this method handle from this lookup object
-         * @throws    SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
          * @throws IllegalArgumentException if the target is not a direct method handle or if access checking fails
          * @throws    NullPointerException if the target is {@code null}
          * @see MethodHandleInfo
@@ -4656,7 +4534,7 @@ public static VarHandle byteBufferViewVarHandle(Class<?> viewArrayClass,
 invoker = invoker.asSpreader(Object[].class, spreadArgCount);
 return invoker;
      * }
-     * This method throws no reflective or security exceptions.
+     * This method throws no reflective exceptions.
      * @param type the desired target type
      * @param leadingArgCount number of fixed arguments, to be passed unchanged to the target
      * @return a method handle suitable for invoking any method handle of the given type
@@ -4702,7 +4580,7 @@ public static MethodHandle spreadInvoker(MethodType type, int leadingArgCount) {
      * on the declared {@code invokeExact} or {@code invoke} method will raise an
      * {@link java.lang.UnsupportedOperationException UnsupportedOperationException}.)</em>
      * <p>
-     * This method throws no reflective or security exceptions.
+     * This method throws no reflective exceptions.
      * @param type the desired target type
      * @return a method handle suitable for invoking any method handle of the given type
      * @throws IllegalArgumentException if the resulting method handle's type would have
@@ -4740,7 +4618,7 @@ public static MethodHandle exactInvoker(MethodType type) {
      * on the declared {@code invokeExact} or {@code invoke} method will raise an
      * {@link java.lang.UnsupportedOperationException UnsupportedOperationException}.)</em>
      * <p>
-     * This method throws no reflective or security exceptions.
+     * This method throws no reflective exceptions.
      * @param type the desired target type
      * @return a method handle suitable for invoking any method handle convertible to the given type
      * @throws IllegalArgumentException if the resulting method handle's type would have
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java
index faf8302206e..a7afea7c939 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodType.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -231,7 +231,7 @@ private static IndexOutOfBoundsException newIndexOutOfBoundsException(Object num
     }
 
     static final ReferencedKeySet<MethodType> internTable =
-        ReferencedKeySet.create(false, true, new Supplier<>() {
+        ReferencedKeySet.create(false, new Supplier<>() {
             @Override
             public Map<ReferenceKey<MethodType>, ReferenceKey<MethodType>> get() {
                 return new ConcurrentHashMap<>(512);
@@ -1178,9 +1178,6 @@ Invokers invokers() {
      * @throws NullPointerException if the string is {@code null}
      * @throws IllegalArgumentException if the string is not a method descriptor
      * @throws TypeNotPresentException if a named type cannot be found
-     * @throws SecurityException if the security manager is present and
-     *         {@code loader} is {@code null} and the caller does not have the
-     *         {@link RuntimePermission}{@code ("getClassLoader")}
      * @jvms 4.3.3 Method Descriptors
      */
     public static MethodType fromMethodDescriptorString(String descriptor, ClassLoader loader)
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index cca16a18580..2f5b8f2407e 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1134,7 +1134,7 @@ public void accept(CodeBuilder cb) {
         };
 
         static final ReferencedKeyMap<MethodType, SoftReference<MethodHandlePair>> CACHE =
-                ReferencedKeyMap.create(true, true,
+                ReferencedKeyMap.create(true,
                         new Supplier<>() {
                             @Override
                             public Map<ReferenceKey<MethodType>, SoftReference<MethodHandlePair>> get() {
diff --git a/src/java.base/share/classes/java/lang/module/Configuration.java b/src/java.base/share/classes/java/lang/module/Configuration.java
index 6cbcd41278e..7959df3ca00 100644
--- a/src/java.base/share/classes/java/lang/module/Configuration.java
+++ b/src/java.base/share/classes/java/lang/module/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -244,8 +244,6 @@ private Configuration(List<Configuration> parents, Resolver resolver) {
      * @throws ResolutionException
      *         If resolution fails any of the consistency checks specified by
      *         the static {@code resolve} method
-     * @throws SecurityException
-     *         If locating a module is denied by the security manager
      */
     public Configuration resolve(ModuleFinder before,
                                  ModuleFinder after,
@@ -287,8 +285,6 @@ public Configuration resolve(ModuleFinder before,
      * @throws ResolutionException
      *         If resolution fails any of the consistency checks specified by
      *         the static {@code resolve} method
-     * @throws SecurityException
-     *         If locating a module is denied by the security manager
      */
     public Configuration resolveAndBind(ModuleFinder before,
                                         ModuleFinder after,
@@ -399,9 +395,6 @@ static Configuration resolveAndBind(ModuleFinder finder,
      *         If the list of parents is empty, or the list has two or more
      *         parents with modules for different target operating systems,
      *         architectures, or versions
-     *
-     * @throws SecurityException
-     *         If locating a module is denied by the security manager
      */
     public static Configuration resolve(ModuleFinder before,
                                         List<Configuration> parents,
@@ -471,8 +464,6 @@ public static Configuration resolve(ModuleFinder before,
      *         If the list of parents is empty, or the list has two or more
      *         parents with modules for different target operating systems,
      *         architectures, or versions
-     * @throws SecurityException
-     *         If locating a module is denied by the security manager
      */
     public static Configuration resolveAndBind(ModuleFinder before,
                                                List<Configuration> parents,
diff --git a/src/java.base/share/classes/java/lang/module/ModuleFinder.java b/src/java.base/share/classes/java/lang/module/ModuleFinder.java
index 04948677493..6b2e9228ad5 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleFinder.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,9 +99,6 @@ public interface ModuleFinder {
      *
      * @throws FindException
      *         If an error occurs finding the module
-     *
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     Optional<ModuleReference> find(String name);
 
@@ -123,9 +120,6 @@ public interface ModuleFinder {
      *
      * @throws FindException
      *         If an error occurs finding all modules
-     *
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     Set<ModuleReference> findAll();
 
@@ -134,16 +128,7 @@ public interface ModuleFinder {
      * system modules are the modules in the Java run-time image.
      * The module finder will always find {@code java.base}.
      *
-     * <p> If there is a security manager set then its {@link
-     * SecurityManager#checkPermission(Permission) checkPermission} method is
-     * invoked to check that the caller has been granted
-     * {@link RuntimePermission RuntimePermission("accessSystemModules")}
-     * to access the system modules. </p>
-     *
      * @return A {@code ModuleFinder} that locates the system modules
-     *
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     @SuppressWarnings("removal")
     static ModuleFinder ofSystem() {
diff --git a/src/java.base/share/classes/java/lang/module/ModuleReader.java b/src/java.base/share/classes/java/lang/module/ModuleReader.java
index e8af9cacd4e..d0f2cce3077 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleReader.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,11 +60,6 @@
  * try-with-resources} statement provides a useful construct to ensure that
  * module readers are closed. </p>
  *
- * <p> A {@code ModuleReader} implementation may require permissions to access
- * resources in the module. Consequently the {@link #find find}, {@link #open
- * open}, {@link #read read}, and {@link #list list} methods may throw {@code
- * SecurityException} if access is denied by the security manager. </p>
- *
  * @implSpec Implementations of {@code ModuleReader} should take great care
  * when translating an abstract resource name to the location of a resource in
  * a packaged module or on the file system. Implementations are advised to
@@ -95,8 +90,6 @@ public interface ModuleReader extends Closeable {
      *
      * @throws IOException
      *         If an I/O error occurs or the module reader is closed
-     * @throws SecurityException
-     *         If denied by the security manager
      *
      * @see ClassLoader#getResource(String)
      */
@@ -122,8 +115,6 @@ public interface ModuleReader extends Closeable {
      *
      * @throws IOException
      *         If an I/O error occurs or the module reader is closed
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     default Optional<InputStream> open(String name) throws IOException {
         Optional<URI> ouri = find(name);
@@ -162,8 +153,6 @@ default Optional<InputStream> open(String name) throws IOException {
      *
      * @throws IOException
      *         If an I/O error occurs or the module reader is closed
-     * @throws SecurityException
-     *         If denied by the security manager
      * @throws OutOfMemoryError
      *         If the resource is larger than {@code Integer.MAX_VALUE},
      *         the maximum capacity of a byte buffer
@@ -209,9 +198,7 @@ default void release(ByteBuffer bb) {
      * when using the stream to list the module contents. If this occurs then
      * the {@code IOException} will be wrapped in an {@link
      * java.io.UncheckedIOException} and thrown from the method that caused the
-     * access to be attempted. {@code SecurityException} may also be thrown
-     * when using the stream to list the module contents and access is denied
-     * by the security manager. </p>
+     * access to be attempted.
      *
      * <p> The returned stream may contain references to one or more open directories
      * in the module. The directories are closed by closing the stream. </p>
@@ -229,8 +216,6 @@ default void release(ByteBuffer bb) {
      *
      * @throws IOException
      *         If an I/O error occurs or the module reader is closed
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     Stream<String> list() throws IOException;
 
diff --git a/src/java.base/share/classes/java/lang/module/ModuleReference.java b/src/java.base/share/classes/java/lang/module/ModuleReference.java
index 15c7d169919..64a15d97dee 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleReference.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,12 +76,6 @@ public final ModuleDescriptor descriptor() {
     /**
      * Returns the location of this module's content, if known.
      *
-     * <p> This URI, when present, can be used as the {@linkplain
-     * java.security.CodeSource#getLocation location} value of a {@link
-     * java.security.CodeSource CodeSource} so that a module's classes can be
-     * granted specific permissions when loaded by a {@link
-     * java.security.SecureClassLoader SecureClassLoader}.
-     *
      * @return The location or an empty {@code Optional} if not known
      */
     public final Optional<URI> location() {
@@ -95,8 +89,6 @@ public final Optional<URI> location() {
      *
      * @throws IOException
      *         If an I/O error occurs
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     public abstract ModuleReader open() throws IOException;
 }
diff --git a/src/java.base/share/classes/java/lang/package-info.java b/src/java.base/share/classes/java/lang/package-info.java
index 9ca4482c819..347590559c6 100644
--- a/src/java.base/share/classes/java/lang/package-info.java
+++ b/src/java.base/share/classes/java/lang/package-info.java
@@ -53,12 +53,10 @@
  * StringBuilder} similarly provide commonly used operations on
  * character strings.
  *
- * <p>Classes {@link ClassLoader}, {@link Process}, {@link
- * ProcessBuilder}, {@link Runtime}, {@link SecurityManager}, and
- * {@link System} provide "system operations" that manage the dynamic
- * loading of classes, creation of external processes, host
- * environment inquiries such as the time of day, and enforcement of
- * security policies.
+ * <p>Classes {@link ClassLoader}, {@link Process}, {@link ProcessBuilder},
+ * {@link Runtime}, and {@link System} provide "system operations" that
+ * manage the dynamic loading of classes, creation of external processes,
+ * and host environment inquiries such as the time of day.
  *
  * <p>Class {@link Throwable} encompasses objects that may be thrown
  * by the {@code throw} statement. Subclasses of {@code Throwable}
diff --git a/src/java.base/share/classes/java/lang/ref/Cleaner.java b/src/java.base/share/classes/java/lang/ref/Cleaner.java
index b9126ad4163..c5a163831c8 100644
--- a/src/java.base/share/classes/java/lang/ref/Cleaner.java
+++ b/src/java.base/share/classes/java/lang/ref/Cleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -163,17 +163,11 @@ private Cleaner() {
      * The {@linkplain java.lang.Thread#getContextClassLoader context class loader}
      * of the thread is set to the
      * {@linkplain ClassLoader#getSystemClassLoader() system class loader}.
-     * The thread has no permissions, enforced only if a
-     * {@linkplain java.lang.System#setSecurityManager(SecurityManager)
-     * {@code SecurityManager} is set}.
      * <p>
      * The cleaner terminates when it is phantom reachable and all of the
      * registered cleaning actions are complete.
      *
      * @return a new {@code Cleaner}
-     *
-     * @throws  SecurityException  if the current thread is not allowed to
-     *               create or start the thread.
      */
     public static Cleaner create() {
         Cleaner cleaner = new Cleaner();
@@ -199,8 +193,6 @@ public static Cleaner create() {
      *
      * @throws  IllegalThreadStateException  if the thread from the thread
      *               factory was {@linkplain Thread.State#NEW not a new thread}.
-     * @throws  SecurityException  if the current thread is not allowed to
-     *               create or start the thread.
      */
     public static Cleaner create(ThreadFactory threadFactory) {
         Objects.requireNonNull(threadFactory, "threadFactory");
diff --git a/src/java.base/share/classes/java/lang/ref/Finalizer.java b/src/java.base/share/classes/java/lang/ref/Finalizer.java
index e5db2300d16..d0c04d7345d 100644
--- a/src/java.base/share/classes/java/lang/ref/Finalizer.java
+++ b/src/java.base/share/classes/java/lang/ref/Finalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ final class Finalizer extends FinalReference<Object> { /* Package-private; must
                                                           same package as the Reference
                                                           class */
 
-    private static ReferenceQueue<Object> queue = new NativeReferenceQueue<>();
+    private static ReferenceQueue<Object> queue = new ReferenceQueue<>();
 
     /** Head of doubly linked list of Finalizers awaiting finalization. */
     private static Finalizer unfinalized = null;
diff --git a/src/java.base/share/classes/java/lang/ref/NativeReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/NativeReferenceQueue.java
deleted file mode 100644
index 1161044f0c2..00000000000
--- a/src/java.base/share/classes/java/lang/ref/NativeReferenceQueue.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-/**
- * An implementation of a ReferenceQueue that uses native monitors.
- * The use of java.util.concurrent.lock locks interacts with various mechanisms,
- * such as virtual threads and ForkJoinPool, that might not be appropriate for some
- * low-level mechanisms, in particular MethodType's weak intern set.
- */
-final class NativeReferenceQueue<T> extends ReferenceQueue<T> {
-    public NativeReferenceQueue() {
-        super(0);
-    }
-
-    private static class Lock { };
-    private final Lock lock = new Lock();
-
-    @Override
-    void signal() {
-        lock.notifyAll();
-    }
-    @Override
-    void await() throws InterruptedException {
-        lock.wait();
-    }
-
-    @Override
-    void await(long timeoutMillis) throws InterruptedException {
-        lock.wait(timeoutMillis);
-    }
-
-    @Override
-    boolean enqueue(Reference<? extends T> r) {
-        synchronized(lock) {
-            return enqueue0(r);
-        }
-    }
-
-    @Override
-    public Reference<? extends T> poll() {
-        if (headIsNull())
-            return null;
-
-        synchronized(lock) {
-            return poll0();
-        }
-    }
-
-    @Override
-    public Reference<? extends T> remove(long timeout)
-            throws IllegalArgumentException, InterruptedException {
-        if (timeout < 0)
-            throw new IllegalArgumentException("Negative timeout value");
-        if (timeout == 0)
-            return remove();
-
-        synchronized(lock) {
-            return remove0(timeout);
-        }
-    }
-
-    @Override
-    public Reference<? extends T> remove() throws InterruptedException {
-        synchronized(lock) {
-            return remove0();
-        }
-    }
-}
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index 88cd2a3190b..13ba76e5dd2 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -330,11 +330,6 @@ public boolean waitForReferenceProcessing()
             public void runFinalization() {
                 Finalizer.runFinalization();
             }
-
-            @Override
-            public <T> ReferenceQueue<T> newNativeReferenceQueue() {
-                return new NativeReferenceQueue<T>();
-            }
         });
     }
 
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index 9cbfb733706..07110a19fa1 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
 
 package java.lang.ref;
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import jdk.internal.misc.VM;
+import jdk.internal.vm.Continuation;
+import jdk.internal.vm.ContinuationSupport;
 
 /**
  * Reference queues, to which registered reference objects are appended by the
@@ -50,8 +49,6 @@
 
 public class ReferenceQueue<T> {
     private static class Null extends ReferenceQueue<Object> {
-        public Null() { super(0); }
-
         @Override
         boolean enqueue(Reference<?> r) {
             return false;
@@ -64,35 +61,16 @@ boolean enqueue(Reference<?> r) {
     private volatile Reference<? extends T> head;
     private long queueLength = 0;
 
-    private final ReentrantLock lock;
-    private final Condition notEmpty;
-
-    void signal() {
-        notEmpty.signalAll();
-    }
-
-    void await() throws InterruptedException {
-        notEmpty.await();
-    }
-
-    void await(long timeoutMillis) throws InterruptedException {
-        notEmpty.await(timeoutMillis, TimeUnit.MILLISECONDS);
-    }
+    private static class Lock { };
+    private final Lock lock = new Lock();
 
     /**
      * Constructs a new reference-object queue.
      */
     public ReferenceQueue() {
-        this.lock = new ReentrantLock();
-        this.notEmpty = lock.newCondition();
     }
 
-    ReferenceQueue(int dummy) {
-        this.lock = null;
-        this.notEmpty = null;
-    }
-
-    final boolean enqueue0(Reference<? extends T> r) { // must hold lock
+    private boolean enqueue0(Reference<? extends T> r) { // must hold lock
         // Check that since getting the lock this reference hasn't already been
         // enqueued (and even then removed)
         ReferenceQueue<?> queue = r.queue;
@@ -111,15 +89,11 @@ final boolean enqueue0(Reference<? extends T> r) { // must hold lock
         if (r instanceof FinalReference) {
             VM.addFinalRefCount(1);
         }
-        signal();
+        lock.notifyAll();
         return true;
     }
 
-    final boolean headIsNull() {
-        return head == null;
-    }
-
-    final Reference<? extends T> poll0() { // must hold lock
+    private Reference<? extends T> poll0() { // must hold lock
         Reference<? extends T> r = head;
         if (r != null) {
             r.queue = NULL;
@@ -142,16 +116,14 @@ final Reference<? extends T> poll0() { // must hold lock
         return null;
     }
 
-    final Reference<? extends T> remove0(long timeout)
-            throws IllegalArgumentException, InterruptedException { // must hold lock
+    private Reference<? extends T> remove0(long timeout) throws InterruptedException { // must hold lock
         Reference<? extends T> r = poll0();
         if (r != null) return r;
         long start = System.nanoTime();
         for (;;) {
-            await(timeout);
+            lock.wait(timeout);
             r = poll0();
             if (r != null) return r;
-
             long end = System.nanoTime();
             timeout -= (end - start) / 1000_000;
             if (timeout <= 0) return null;
@@ -159,23 +131,33 @@ final Reference<? extends T> remove0(long timeout)
         }
     }
 
-    final Reference<? extends T> remove0() throws InterruptedException { // must hold lock
+    private Reference<? extends T> remove0() throws InterruptedException { // must hold lock
         for (;;) {
             var r = poll0();
             if (r != null) return r;
-            await();
+            lock.wait();
         }
     }
 
     boolean enqueue(Reference<? extends T> r) { /* Called only by Reference class */
-        lock.lock();
-        try {
+        synchronized (lock) {
             return enqueue0(r);
-        } finally {
-            lock.unlock();
         }
     }
 
+    private boolean tryDisablePreempt() {
+        if (Thread.currentThread().isVirtual() && ContinuationSupport.isSupported()) {
+            Continuation.pin();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private void enablePreempt() {
+        Continuation.unpin();
+    }
+
     /**
      * Polls this queue to see if a reference object is available.  If one is
      * available without further delay then it is removed from the queue and
@@ -186,13 +168,18 @@ boolean enqueue(Reference<? extends T> r) { /* Called only by Reference class */
      * @see java.lang.ref.Reference#enqueue()
      */
     public Reference<? extends T> poll() {
-        if (headIsNull())
+        if (head == null)
             return null;
-        lock.lock();
+
+        // Prevent a virtual thread from being preempted as this could potentially
+        // deadlock with a carrier that is polling the same reference queue.
+        boolean disabled = tryDisablePreempt();
         try {
-            return poll0();
+            synchronized (lock) {
+                return poll0();
+            }
         } finally {
-            lock.unlock();
+            if (disabled) enablePreempt();
         }
     }
 
@@ -224,11 +211,8 @@ public Reference<? extends T> remove(long timeout) throws InterruptedException {
         if (timeout == 0)
             return remove();
 
-        lock.lock();
-        try {
+        synchronized (lock) {
             return remove0(timeout);
-        } finally {
-            lock.unlock();
         }
     }
 
@@ -241,11 +225,8 @@ public Reference<? extends T> remove(long timeout) throws InterruptedException {
      * @see java.lang.ref.Reference#enqueue()
      */
     public Reference<? extends T> remove() throws InterruptedException {
-        lock.lock();
-        try {
+        synchronized (lock) {
             return remove0();
-        } finally {
-            lock.unlock();
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
index d0b50047031..8ed4485666f 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,17 +94,13 @@ static void checkPermission() {
 
     /**
      * Convenience method to set the {@code accessible} flag for an
-     * array of reflected objects with a single security check (for efficiency).
+     * array of reflected objects.
      *
      * <p> This method may be used to enable access to all reflected objects in
      * the array when access to each reflected object can be enabled as
      * specified by {@link #setAccessible(boolean) setAccessible(boolean)}. </p>
      *
-     * <p>If there is a security manager, its
-     * {@code checkPermission} method is first called with a
-     * {@code ReflectPermission("suppressAccessChecks")} permission.
-     *
-     * <p>A {@code SecurityException} is also thrown if any of the elements of
+     * <p>A {@code SecurityException} is thrown if any of the elements of
      * the input {@code array} is a {@link java.lang.reflect.Constructor}
      * object for the class {@code java.lang.Class} and {@code flag} is true.
      *
@@ -113,11 +109,8 @@ static void checkPermission() {
      *              in each object
      * @throws InaccessibleObjectException if access cannot be enabled for all
      *         objects in the array
-     * @throws SecurityException if the request is denied by the security manager
-     *         or an element in the array is a constructor for {@code
+     * @throws SecurityException if an element in the array is a constructor for {@code
      *         java.lang.Class}
-     * @see SecurityManager#checkPermission
-     * @see ReflectPermission
      */
     @CallerSensitive
     public static void setAccessible(AccessibleObject[] array, boolean flag) {
@@ -194,13 +187,8 @@ public static void setAccessible(AccessibleObject[] array, boolean flag) {
      * control checks to only enable {@linkplain Field#get <em>read</em>} access to
      * these non-modifiable final fields.
      *
-     * <p> If there is a security manager, its
-     * {@code checkPermission} method is first called with a
-     * {@code ReflectPermission("suppressAccessChecks")} permission.
-     *
      * @param flag the new value for the {@code accessible} flag
      * @throws InaccessibleObjectException if access cannot be enabled
-     * @throws SecurityException if the request is denied by the security manager
      *
      * @spec jni/index.html Java Native Interface Specification
      * @see #trySetAccessible
@@ -260,13 +248,8 @@ boolean setAccessible0(boolean flag) {
      * only be set if the member and the declaring class are public, and
      * the class is in a package that is exported unconditionally. </p>
      *
-     * <p> If there is a security manager, its {@code checkPermission} method
-     * is first called with a {@code ReflectPermission("suppressAccessChecks")}
-     * permission. </p>
-     *
      * @return {@code true} if the {@code accessible} flag is set to {@code true};
      *         {@code false} if access cannot be enabled.
-     * @throws SecurityException if the request is denied by the security manager
      *
      * @spec jni/index.html Java Native Interface Specification
      * @since 9
diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java
index 308890c61ad..5eeceb68920 100644
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -169,16 +169,14 @@ Constructor<T> newWithAccessor(ConstructorAccessor accessor) {
     /**
      * {@inheritDoc}
      *
-     * <p> A {@code SecurityException} is also thrown if this object is a
+     * <p> A {@code SecurityException} is thrown if this object is a
      * {@code Constructor} object for the class {@code Class} and {@code flag}
      * is true. </p>
      *
      * @param flag {@inheritDoc}
      *
      * @throws InaccessibleObjectException {@inheritDoc}
-     * @throws SecurityException if the request is denied by the security manager
-     *         or this is a constructor for {@code java.lang.Class}
-     *
+     * @throws SecurityException if this is a constructor for {@code java.lang.Class}
      */
     @Override
     @CallerSensitive
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
index 5d0fe76a99a..f13893310a9 100644
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.java
@@ -166,7 +166,6 @@ Field copy() {
 
     /**
      * @throws InaccessibleObjectException {@inheritDoc}
-     * @throws SecurityException {@inheritDoc}
      */
     @Override
     @CallerSensitive
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index 6a90f91bdde..e60d83de0c8 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -169,7 +169,6 @@ Method copy() {
 
     /**
      * @throws InaccessibleObjectException {@inheritDoc}
-     * @throws SecurityException {@inheritDoc}
      */
     @Override
     @CallerSensitive
diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java
index 372f16926c5..fade83c0b38 100644
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,9 +117,7 @@
  *
  * <li>The {@link java.security.ProtectionDomain} of a proxy class
  * is the same as that of system classes loaded by the bootstrap class
- * loader, such as {@code java.lang.Object}, because the code for a
- * proxy class is generated by trusted system code.  This protection
- * domain will typically be granted {@code java.security.AllPermission}.
+ * loader, such as {@code java.lang.Object}.
  *
  * <li>The {@link Proxy#isProxyClass Proxy.isProxyClass} method can be used
  * to determine if a given class is a proxy class.
@@ -354,21 +352,6 @@ protected Proxy(InvocationHandler h) {
      *          and that implements the specified interfaces
      * @throws  IllegalArgumentException if any of the <a href="#restrictions">
      *          restrictions</a> on the parameters are violated
-     * @throws  SecurityException if a security manager, <em>s</em>, is present
-     *          and any of the following conditions is met:
-     *          <ul>
-     *             <li> the given {@code loader} is {@code null} and
-     *             the caller's class loader is not {@code null} and the
-     *             invocation of {@link SecurityManager#checkPermission
-     *             s.checkPermission} with
-     *             {@code RuntimePermission("getClassLoader")} permission
-     *             denies access.</li>
-     *             <li> for each proxy interface, {@code intf},
-     *             the caller's class loader is not the same as or an
-     *             ancestor of the class loader for {@code intf} and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to {@code intf}.</li>
-     *          </ul>
      * @throws  NullPointerException if the {@code interfaces} array
      *          argument or any of its elements are {@code null}
      *
@@ -989,27 +972,6 @@ private static Module getDynamicModule(ClassLoader loader) {
      *          and that implements the specified interfaces
      * @throws  IllegalArgumentException if any of the <a href="#restrictions">
      *          restrictions</a> on the parameters are violated
-     * @throws  SecurityException if a security manager, <em>s</em>, is present
-     *          and any of the following conditions is met:
-     *          <ul>
-     *          <li> the given {@code loader} is {@code null} and
-     *               the caller's class loader is not {@code null} and the
-     *               invocation of {@link SecurityManager#checkPermission
-     *               s.checkPermission} with
-     *               {@code RuntimePermission("getClassLoader")} permission
-     *               denies access;</li>
-     *          <li> for each proxy interface, {@code intf},
-     *               the caller's class loader is not the same as or an
-     *               ancestor of the class loader for {@code intf} and
-     *               invocation of {@link SecurityManager#checkPackageAccess
-     *               s.checkPackageAccess()} denies access to {@code intf};</li>
-     *          <li> any of the given proxy interfaces is non-public and the
-     *               caller class is not in the same {@linkplain Package runtime package}
-     *               as the non-public interface and the invocation of
-     *               {@link SecurityManager#checkPermission s.checkPermission} with
-     *               {@code ReflectPermission("newProxyInPackage.{package name}")}
-     *               permission denies access.</li>
-     *          </ul>
      * @throws  NullPointerException if the {@code interfaces} array
      *          argument or any of its elements are {@code null}, or
      *          if the invocation handler, {@code h}, is
@@ -1112,12 +1074,6 @@ public static boolean isProxyClass(Class<?> cl) {
      * @return  the invocation handler for the proxy instance
      * @throws  IllegalArgumentException if the argument is not a
      *          proxy instance
-     * @throws  SecurityException if a security manager, <em>s</em>, is present
-     *          and the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the invocation handler
-     *          and invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the invocation
-     *          handler's class.
      */
     @SuppressWarnings("removal")
     @CallerSensitive
diff --git a/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java b/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
index cf184a4ecc4..4910109be32 100644
--- a/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
+++ b/src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,52 +27,14 @@
 
 /**
  * The Permission class for reflective operations.
- * <P>
- * The following table
- * provides a summary description of what the permission allows,
- * and discusses the risks of granting code the permission.
  *
- * <table class="striped">
- * <caption style="display:none">Table shows permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- *
- * <tr>
- *   <th scope="row">suppressAccessChecks</th>
- *   <td>ability to suppress the standard Java language access checks
- *       on fields and methods in a class; allow access not only public members
- *       but also allow access to default (package) access, protected,
- *       and private members.</td>
- *   <td>This is dangerous in that information (possibly confidential) and
- *       methods normally unavailable would be accessible to malicious code.</td>
- * </tr>
- * <tr>
- *   <th scope="row">newProxyInPackage.{package name}</th>
- *   <td>ability to create a proxy instance in the specified package of which
- *       the non-public interface that the proxy class implements.</td>
- *   <td>This gives code access to classes in packages to which it normally
- *       does not have access and the dynamic proxy class is in the system
- *       protection domain. Malicious code may use these classes to
- *       help in its attempt to compromise security in the system.</td>
- * </tr>
- *
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.Permission
  * @see java.security.BasicPermission
  * @see AccessibleObject
- * @see Field#get
- * @see Field#set
- * @see Method#invoke
- * @see Constructor#newInstance
- * @see Proxy#newProxyInstance
  *
  * @since 1.2
  */
diff --git a/src/java.base/share/classes/java/lang/reflect/package-info.java b/src/java.base/share/classes/java/lang/reflect/package-info.java
index a71eb2d9621..34560628378 100644
--- a/src/java.base/share/classes/java/lang/reflect/package-info.java
+++ b/src/java.base/share/classes/java/lang/reflect/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,6 @@
  * members of a target object (based on its runtime class) or the
  * members declared by a given class.
  *
- * <p>{@link AccessibleObject} allows suppression of access checks if
- * the necessary {@link ReflectPermission} is available.
- *
  * <p>{@link Array} provides static methods to dynamically create and
  * access arrays.
  *
diff --git a/src/java.base/share/classes/java/net/Authenticator.java b/src/java.base/share/classes/java/net/Authenticator.java
index c164c598db9..0935366abc1 100644
--- a/src/java.base/share/classes/java/net/Authenticator.java
+++ b/src/java.base/share/classes/java/net/Authenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -107,22 +107,9 @@ private void reset() {
     /**
      * Sets the authenticator that will be used by the networking code
      * when a proxy or an HTTP server asks for authentication.
-     * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("setDefaultAuthenticator")} permission.
-     * This may result in a java.lang.SecurityException.
      *
      * @param   a       The authenticator to be set. If a is {@code null} then
      *                  any previously set authenticator is removed.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        setting the default authenticator.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
      */
     public static synchronized void setDefault(Authenticator a) {
         @SuppressWarnings("removal")
@@ -138,22 +125,9 @@ public static synchronized void setDefault(Authenticator a) {
 
     /**
      * Gets the default authenticator.
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("requestPasswordAuthentication")} permission.
-     * This may result in a java.lang.SecurityException.
-     * Then the default authenticator, if set, is returned.
-     * Otherwise, {@code null} is returned.
      *
      * @return The default authenticator, if set, {@code null} otherwise.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        requesting password authentication.
      * @since 9
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
      */
     public static Authenticator getDefault() {
         @SuppressWarnings("removal")
@@ -169,11 +143,6 @@ public static Authenticator getDefault() {
     /**
      * Ask the authenticator that has been registered with the system
      * for a password.
-     * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("requestPasswordAuthentication")} permission.
-     * This may result in a java.lang.SecurityException.
      *
      * @param addr The InetAddress of the site requesting authorization,
      *             or null if not known.
@@ -184,14 +153,6 @@ public static Authenticator getDefault() {
      * @param scheme The authentication scheme
      *
      * @return The username/password, or null if one can't be gotten.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        the password authentication request.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
      */
     public static PasswordAuthentication requestPasswordAuthentication(
                                             InetAddress addr,
@@ -229,11 +190,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
      * for a password. This is the preferred method for requesting a password
      * because the hostname can be provided in cases where the InetAddress
      * is not available.
-     * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("requestPasswordAuthentication")} permission.
-     * This may result in a java.lang.SecurityException.
      *
      * @param host The hostname of the site requesting authentication.
      * @param addr The InetAddress of the site requesting authentication,
@@ -246,13 +202,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
      *
      * @return The username/password, or null if one can't be gotten.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        the password authentication request.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
      * @since 1.4
      */
     public static PasswordAuthentication requestPasswordAuthentication(
@@ -291,11 +240,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
     /**
      * Ask the authenticator that has been registered with the system
      * for a password.
-     * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("requestPasswordAuthentication")} permission.
-     * This may result in a java.lang.SecurityException.
      *
      * @param host The hostname of the site requesting authentication.
      * @param addr The InetAddress of the site requesting authorization,
@@ -311,14 +255,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
      *
      * @return The username/password, or null if one can't be gotten.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        the password authentication request.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
-     *
      * @since 1.5
      */
     public static PasswordAuthentication requestPasswordAuthentication(
@@ -363,11 +299,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
      * {@code authenticator} is null, the authenticator, if any, that has been
      * registered with the system using {@link #setDefault(java.net.Authenticator)
      * setDefault} is used.
-     * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("requestPasswordAuthentication")} permission.
-     * This may result in a java.lang.SecurityException.
      *
      * @param authenticator the authenticator, or {@code null}.
      * @param host The hostname of the site requesting authentication.
@@ -384,14 +315,6 @@ public static PasswordAuthentication requestPasswordAuthentication(
      *
      * @return The username/password, or {@code null} if one can't be gotten.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        the password authentication request.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.net.NetPermission
-     *
      * @since 9
      */
     public static PasswordAuthentication requestPasswordAuthentication(
diff --git a/src/java.base/share/classes/java/net/ContentHandler.java b/src/java.base/share/classes/java/net/ContentHandler.java
index 356c583f20b..3d9cefdbddd 100644
--- a/src/java.base/share/classes/java/net/ContentHandler.java
+++ b/src/java.base/share/classes/java/net/ContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,10 +67,6 @@
  * If no user-defined content handler is found, then the system
  * tries to load a specific <i>content-type</i> handler from one
  * of the built-in handlers, if one exists.
- * <p>
- * If the loading of the content handler class would be performed by
- * a classloader that is outside of the delegation chain of the caller,
- * the JVM will need the RuntimePermission "getClassLoader".
  *
  * @author  James Gosling
  * @see     java.net.ContentHandler#getContent(java.net.URLConnection)
diff --git a/src/java.base/share/classes/java/net/CookieHandler.java b/src/java.base/share/classes/java/net/CookieHandler.java
index 95b1d46c733..4b5e3ebedd8 100644
--- a/src/java.base/share/classes/java/net/CookieHandler.java
+++ b/src/java.base/share/classes/java/net/CookieHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,9 +70,6 @@ public CookieHandler() {}
      *
      * @return the system-wide cookie handler; A null return means
      *        there is no system-wide cookie handler currently set.
-     * @throws SecurityException
-     *       If a security manager has been installed and it denies
-     * {@link NetPermission}{@code ("getCookieHandler")}
      * @see #setDefault(CookieHandler)
      */
     public static synchronized CookieHandler getDefault() {
@@ -91,9 +88,6 @@ public static synchronized CookieHandler getDefault() {
      *
      * @param cHandler The HTTP cookie handler, or
      *       {@code null} to unset.
-     * @throws SecurityException
-     *       If a security manager has been installed and it denies
-     * {@link NetPermission}{@code ("setCookieHandler")}
      * @see #getDefault()
      */
     public static synchronized void setDefault(CookieHandler cHandler) {
diff --git a/src/java.base/share/classes/java/net/DatagramSocket.java b/src/java.base/share/classes/java/net/DatagramSocket.java
index 655b00bb8b6..2de5f9b8ae6 100644
--- a/src/java.base/share/classes/java/net/DatagramSocket.java
+++ b/src/java.base/share/classes/java/net/DatagramSocket.java
@@ -271,17 +271,8 @@ DatagramSocket delegate() {
      * on the local host machine.  The socket will be bound to the
      * {@link InetAddress#isAnyLocalAddress wildcard} address.
      *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with 0 as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @throws     SocketException  if the socket could not be opened,
      *              or the socket could not be bound.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkListen} method doesn't allow the operation.
-     *
-     * @see SecurityManager#checkListen
      */
     public DatagramSocket() throws SocketException {
         this(new InetSocketAddress(0));
@@ -305,23 +296,14 @@ protected DatagramSocket(DatagramSocketImpl impl) {
      * <p>
      * If the address is {@code null} an unbound socket will be created.
      *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with the port from the socket address
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @param bindaddr local socket address to bind, or {@code null}
      *                 for an unbound socket.
      *
      * @throws     SocketException  if the socket could not be opened,
      *               or the socket could not bind to the specified local port.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkListen} method doesn't allow the operation.
      * @throws     IllegalArgumentException  if bindaddr is a
      *              SocketAddress subclass not supported by this socket.
      *
-     * @see SecurityManager#checkListen
      * @since   1.4
      */
     public DatagramSocket(SocketAddress bindaddr) throws SocketException {
@@ -333,21 +315,11 @@ public DatagramSocket(SocketAddress bindaddr) throws SocketException {
      * on the local host machine.  The socket will be bound to the
      * {@link InetAddress#isAnyLocalAddress wildcard} address.
      *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @param      port local port to use in the bind operation.
      * @throws     SocketException  if the socket could not be opened,
      *               or the socket could not bind to the specified local port.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkListen} method doesn't allow the operation.
      * @throws     IllegalArgumentException  if port is <a href="#PortRange">
      *              out of range.</a>
-     *
-     * @see SecurityManager#checkListen
      */
     public DatagramSocket(int port) throws SocketException {
         this(port, null);
@@ -364,23 +336,13 @@ public DatagramSocket(int port) throws SocketException {
      * address, or is {@code null}, the socket will be bound to the wildcard
      * address.
      *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @param port local port to use in the bind operation.
      * @param laddr local address to bind (can be {@code null})
      *
      * @throws     SocketException  if the socket could not be opened,
      *               or the socket could not bind to the specified local port.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkListen} method doesn't allow the operation.
      * @throws     IllegalArgumentException  if port is <a href="#PortRange">
      *              out of range.</a>
-     *
-     * @see SecurityManager#checkListen
      * @since   1.1
      */
     public DatagramSocket(int port, InetAddress laddr) throws SocketException {
@@ -396,8 +358,6 @@ public DatagramSocket(int port, InetAddress laddr) throws SocketException {
      * @param   addr The address and port to bind to.
      * @throws  SocketException if any error happens during the bind, or if the
      *          socket is already bound or is closed.
-     * @throws  SecurityException  if a security manager exists and its
-     *             {@code checkListen} method doesn't allow the operation.
      * @throws IllegalArgumentException if addr is a SocketAddress subclass
      *         not supported by this socket.
      * @since 1.4
@@ -427,19 +387,6 @@ public void bind(SocketAddress addr) throws SocketException {
      * this socket is unknown - it may or may not be connected to the address
      * that it was previously connected to.
      *
-     * <p> If a security manager has been installed then it is invoked to check
-     * access to the remote address. Specifically, if the given {@code address}
-     * is a {@link InetAddress#isMulticastAddress multicast address},
-     * the security manager's {@link
-     * java.lang.SecurityManager#checkMulticast(InetAddress)
-     * checkMulticast} method is invoked with the given {@code address}.
-     * Otherwise, the security manager's {@link
-     * java.lang.SecurityManager#checkConnect(String,int) checkConnect}
-     * and {@link java.lang.SecurityManager#checkAccept checkAccept} methods
-     * are invoked, with the given {@code address} and {@code port}, to
-     * verify that datagrams are permitted to be sent and received
-     * respectively.
-     *
      * <p> Care should be taken to ensure that a connected datagram socket
      * is not shared with untrusted code. When a socket is connected,
      * {@link #receive receive} and {@link #send send} <b>will not perform
@@ -461,10 +408,6 @@ public void bind(SocketAddress addr) throws SocketException {
      *         if the address is null, or the port is <a href="#PortRange">
      *         out of range.</a>
      *
-     * @throws SecurityException
-     *         if a security manager has been installed and it does
-     *         not permit access to the given remote address
-     *
      * @throws UncheckedIOException
      *         if the port is 0 or connect fails, for example, if the
      *         destination address is non-routable
@@ -503,10 +446,6 @@ public void connect(InetAddress address, int port) {
      *         if {@code addr} is {@code null}, or {@code addr} is a SocketAddress
      *         subclass not supported by this socket
      *
-     * @throws SecurityException
-     *         if a security manager has been installed and it does
-     *         not permit access to the given remote address
-     *
      * @since 1.4
      */
     public void connect(SocketAddress addr) throws SocketException {
@@ -638,25 +577,9 @@ public SocketAddress getLocalSocketAddress() {
      * data to be sent, its length, the IP address of the remote host,
      * and the port number on the remote host.
      *
-     * <p>If there is a security manager, and the socket is not currently
-     * connected to a remote address, this method first performs some
-     * security checks. First, if {@code p.getAddress().isMulticastAddress()}
-     * is true, this method calls the
-     * security manager's {@code checkMulticast} method
-     * with {@code p.getAddress()} as its argument.
-     * If the evaluation of that expression is false,
-     * this method instead calls the security manager's
-     * {@code checkConnect} method with arguments
-     * {@code p.getAddress().getHostAddress()} and
-     * {@code p.getPort()}. Each call to a security manager method
-     * could result in a SecurityException if the operation is not allowed.
-     *
      * @param      p   the {@code DatagramPacket} to be sent.
      *
      * @throws     IOException  if an I/O error occurs, or the socket is closed.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkMulticast} or {@code checkConnect}
-     *             method doesn't allow the send.
      * @throws     PortUnreachableException may be thrown if the socket is connected
      *             to a currently unreachable destination. Note, there is no
      *             guarantee that the exception will be thrown.
@@ -670,8 +593,6 @@ public SocketAddress getLocalSocketAddress() {
      *             range.</a>
      *
      * @see        java.net.DatagramPacket
-     * @see        SecurityManager#checkMulticast(InetAddress)
-     * @see        SecurityManager#checkConnect
      */
     public void send(DatagramPacket p) throws IOException  {
         delegate().send(p);
@@ -704,12 +625,6 @@ public void send(DatagramPacket p) throws IOException  {
      *        {@code SocketException} with the interrupt status set.
      * </ol>
      *
-     * <p> If there is a security manager, and the socket is not currently
-     * connected to a remote address, a packet cannot be received if the
-     * security manager's {@code checkAccept} method does not allow it.
-     * Datagrams that are not permitted by the security manager are silently
-     * discarded.
-     *
      * @param      p   the {@code DatagramPacket} into which to place
      *                 the incoming data.
      * @throws     IOException  if an I/O error occurs, or the socket is closed.
@@ -737,19 +652,11 @@ public void receive(DatagramPacket p) throws IOException {
      * When {@link #disconnect()} is called, the bound address reverts
      * to the wildcard address.
      *
-     * <p>If there is a security manager, its
-     * {@code checkConnect} method is first called
-     * with the host address and {@code -1}
-     * as its arguments to see if the operation is allowed.
-     *
-     * @see SecurityManager#checkConnect
      * @return  the local address to which the socket is bound,
      *          {@code null} if the socket is closed, or
      *          an {@code InetAddress} representing
      *          {@link InetAddress#isAnyLocalAddress wildcard}
-     *          address if either the socket is not bound, or
-     *          the security manager {@code checkConnect}
-     *          method does not allow the operation
+     *          address if the socket is not bound
      * @since   1.1
      */
     public InetAddress getLocalAddress() {
@@ -1155,19 +1062,11 @@ public DatagramChannel getChannel() {
      * Passing {@code null} to the method is a no-op unless the factory
      * was already set.
      *
-     * <p>If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @param      fac   the desired factory.
      * @throws     IOException  if an I/O error occurs when setting the
      *              datagram socket factory.
      * @throws     SocketException  if the factory is already defined.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow the operation.
      * @see       java.net.DatagramSocketImplFactory#createDatagramSocketImpl()
-     * @see       SecurityManager#checkSetFactory
      * @since 1.3
      *
      * @deprecated Use {@link DatagramChannel}, or subclass {@code DatagramSocket}
@@ -1214,12 +1113,6 @@ public DatagramChannel getChannel() {
      *
      * @throws IOException if an I/O error occurs, or if the socket is closed.
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @throws NullPointerException if name is {@code null}
      *
      * @since 9
@@ -1246,12 +1139,6 @@ public <T> DatagramSocket setOption(SocketOption<T> name, T value)
      *
      * @throws NullPointerException if name is {@code null}
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @since 9
      */
     public <T> T getOption(SocketOption<T> name) throws IOException {
@@ -1301,10 +1188,6 @@ public Set<SocketOption<?>> supportedOptions() {
      * in several different networks. However, if the socket is already a
      * member of the group, an {@link IOException} will be thrown.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkMulticast} method with the {@code mcastaddr}
-     * argument as its argument.
-     *
      * @apiNote The default interface for sending outgoing multicast datagrams
      * can be configured with {@link #setOption(SocketOption, Object)}
      * with {@link StandardSocketOptions#IP_MULTICAST_IF}.
@@ -1315,11 +1198,8 @@ public Set<SocketOption<?>> supportedOptions() {
      * @throws IOException if there is an error joining, or when the address
      *         is not a multicast address, or the platform does not support
      *         multicasting, or the socket is closed
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkMulticast} method doesn't allow the join.
      * @throws IllegalArgumentException if mcastaddr is {@code null} or is a
      *         SocketAddress subclass not supported by this socket
-     * @see    SecurityManager#checkMulticast(InetAddress)
      * @see    DatagramChannel#join(InetAddress, NetworkInterface)
      * @see    StandardSocketOptions#IP_MULTICAST_IF
      * @since  17
@@ -1332,10 +1212,6 @@ public void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
     /**
      * Leave a multicast group on a specified local interface.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkMulticast} method with the
-     * {@code mcastaddr} argument as its argument.
-     *
      * @apiNote
      * The {@code mcastaddr} and {@code netIf} arguments should identify
      * a multicast group that was previously {@linkplain
@@ -1359,11 +1235,8 @@ public void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
      *         may fail with a {@code SocketException}.
      * @throws IOException if there is an error leaving or when the address
      *         is not a multicast address, or the socket is closed.
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkMulticast} method doesn't allow the operation.
      * @throws IllegalArgumentException if mcastaddr is {@code null} or is a
      *         SocketAddress subclass not supported by this socket.
-     * @see    SecurityManager#checkMulticast(InetAddress)
      * @see    #joinGroup(SocketAddress, NetworkInterface)
      * @see    StandardSocketOptions#IP_MULTICAST_IF
      * @since  17
diff --git a/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java
index 625fd30424e..65c6f8445b2 100644
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.java
@@ -50,18 +50,6 @@
  * <a href="doc-files/net-properties.html#Proxies">Proxy settings</a> as well as
  * <a href="doc-files/net-properties.html#MiscHTTP"> various other settings</a>.
  * </P>
- * <p>
- * <b>Security permissions</b>
- * <p>
- * If a security manager is installed, and if a method is called which results in an
- * attempt to open a connection, the caller must possess either:
- * <ul><li>a "connect" {@link SocketPermission} to the host/port combination of the
- * destination URL or</li>
- * <li>a {@link URLPermission} that permits this request.</li>
- * </ul><p>
- * If automatic redirection is enabled, and this request is redirected to another
- * destination, then the caller must also have permission to connect to the
- * redirected host/URL.
  *
  * @see     java.net.HttpURLConnection#disconnect()
  * @since 1.1
@@ -374,18 +362,9 @@ protected HttpURLConnection (URL u) {
     /**
      * Sets whether HTTP redirects  (requests with response code 3xx) should
      * be automatically followed by this class.  True by default.
-     * <p>
-     * If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * @param set a {@code boolean} indicating whether or not
      * to follow HTTP redirects.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't
-     *             allow the operation.
-     * @see        SecurityManager#checkSetFactory
      * @see #getFollowRedirects()
      */
     public static void setFollowRedirects(boolean set) {
@@ -460,9 +439,6 @@ public boolean getInstanceFollowRedirects() {
      * @param method the HTTP method
      * @throws    ProtocolException if the method cannot be reset or if
      *              the requested method isn't valid for HTTP.
-     * @throws    SecurityException if a security manager is set and the
-     *              method is "TRACE", but the "allowHttpTrace"
-     *              NetPermission is not granted.
      * @see #getRequestMethod()
      */
     public void setRequestMethod(String method) throws ProtocolException {
diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 5ed8c73c919..746ce04e8a2 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -180,12 +180,8 @@
  * The InetAddress class has a cache to store successful as well as
  * unsuccessful host name resolutions.
  *
- * <p> By default, when a security manager is installed, in order to
- * protect against DNS spoofing attacks,
- * the result of positive host name resolutions are
- * cached forever. When a security manager is not installed, the default
- * behavior is to cache entries for a finite (implementation dependent)
- * period of time. The result of unsuccessful host
+ * <p> The default behavior is to cache entries for a finite (implementation
+ * dependent) period of time. The result of unsuccessful host
  * name resolution is cached for a very short period of time (10
  * seconds) to improve performance.
  *
@@ -736,19 +732,9 @@ public boolean isReachable(NetworkInterface netif, int ttl,
      * is required, call
      * {@link #getCanonicalHostName() getCanonicalHostName}.
      *
-     * <p>If there is a security manager, its
-     * {@code checkConnect} method is first called
-     * with the hostname and {@code -1}
-     * as its arguments to see if the operation is allowed.
-     * If the operation is not allowed, it will return
-     * the textual representation of the IP address.
-     *
-     * @return  the host name for this IP address, or if the operation
-     *    is not allowed by the security check, the textual
-     *    representation of the IP address.
+     * @return  the host name for this IP address
      *
      * @see InetAddress#getCanonicalHostName
-     * @see SecurityManager#checkConnect
      */
     public String getHostName() {
         return getHostName(true);
@@ -761,21 +747,11 @@ public String getHostName() {
      * this is package private so SocketPermission can make calls into
      * here without a security check.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkConnect} method
-     * with the hostname and {@code -1}
-     * as its arguments to see if the calling code is allowed to know
-     * the hostname for this IP address, i.e., to connect to the host.
-     * If the operation is not allowed, it will return
-     * the textual representation of the IP address.
-     *
      * @return  the host name for this IP address, or if the operation
      *    is not allowed by the security check, the textual
      *    representation of the IP address.
      *
      * @param check make security check if true
-     *
-     * @see SecurityManager#checkConnect
      */
     String getHostName(boolean check) {
         if (holder().getHostName() == null) {
@@ -795,22 +771,11 @@ String getHostName(boolean check) {
      * domain name, this method returns the {@linkplain #getHostAddress() textual representation}
      * of the IP address.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkConnect} method
-     * with the hostname and {@code -1}
-     * as its arguments to see if the calling code is allowed to know
-     * the hostname for this IP address, i.e., to connect to the host.
-     * If the operation is not allowed, it will return
-     * the textual representation of the IP address.
-     *
      * @return  the fully qualified domain name for this IP address.
-     *          If either the operation is not allowed by the security check
-     *          or the system-wide resolver wasn't able to determine the
+     *          If the system-wide resolver wasn't able to determine the
      *          fully qualified domain name for the IP address, the textual
      *          representation of the IP address is returned instead.
      *
-     * @see SecurityManager#checkConnect
-     *
      * @since 1.4
      */
     public String getCanonicalHostName() {
@@ -824,14 +789,6 @@ public String getCanonicalHostName() {
     /**
      * Returns the fully qualified domain name for the given address.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkConnect} method
-     * with the hostname and {@code -1}
-     * as its arguments to see if the calling code is allowed to know
-     * the hostname for the given IP address, i.e., to connect to the host.
-     * If the operation is not allowed, it will return
-     * the textual representation of the IP address.
-     *
      * @param check make security check if true
      *
      * @return  the fully qualified domain name for the given IP address.
@@ -839,8 +796,6 @@ public String getCanonicalHostName() {
      *          or the system-wide resolver wasn't able to determine the
      *          fully qualified domain name for the IP address, the textual
      *          representation of the IP address is returned instead.
-     *
-     * @see SecurityManager#checkConnect
      */
     private static String getHostFromNameService(InetAddress addr, boolean check) {
         String host;
@@ -1557,18 +1512,11 @@ public static InetAddress getByAddress(String host, byte[] addr)
      * section&nbsp;2 and <a href="http://www.ietf.org/rfc/rfc2373.txt">RFC&nbsp;2373</a>
      * section&nbsp;2.5.3.
      *
-     * <p> If there is a security manager, and {@code host} is not {@code null}
-     * or {@code host.length() } is not equal to zero, the security manager's
-     * {@code checkConnect} method is called with the hostname and {@code -1}
-     * as its arguments to determine if the operation is allowed.
-     *
      * @param      host   the specified host, or {@code null}.
      * @return     an IP address for the given host name.
      * @throws     UnknownHostException  if no IP address for the
      *               {@code host} could be found, or if a scope_id was specified
      *               for a global IPv6 address.
-     * @throws     SecurityException if a security manager exists
-     *             and its checkConnect method doesn't allow the operation
      *
      * @spec https://www.rfc-editor.org/info/rfc2373 RFC 2373: IP Version 6 Addressing Architecture
      * @spec https://www.rfc-editor.org/info/rfc3330 RFC 3330: Special-Use IPv4 Addresses
@@ -1601,23 +1549,15 @@ public static InetAddress getByName(String host)
      * section&nbsp;2 and <a href="http://www.ietf.org/rfc/rfc2373.txt">RFC&nbsp;2373</a>
      * section&nbsp;2.5.3. </p>
      *
-     * <p> If there is a security manager, and {@code host} is not {@code null}
-     * or {@code host.length() } is not equal to zero, the security manager's
-     * {@code checkConnect} method is called with the hostname and {@code -1}
-     * as its arguments to determine if the operation is allowed.
-     *
      * @param      host   the name of the host, or {@code null}.
      * @return     an array of all the IP addresses for a given host name.
      *
      * @throws     UnknownHostException  if no IP address for the
      *               {@code host} could be found, or if a scope_id was specified
      *               for a global IPv6 address.
-     * @throws     SecurityException  if a security manager exists and its
-     *               {@code checkConnect} method doesn't allow the operation.
      *
      * @spec https://www.rfc-editor.org/info/rfc2373 RFC 2373: IP Version 6 Addressing Architecture
      * @spec https://www.rfc-editor.org/info/rfc3330 RFC 3330: Special-Use IPv4 Addresses
-     * @see SecurityManager#checkConnect
      */
     public static InetAddress[] getAllByName(String host)
         throws UnknownHostException {
@@ -1874,19 +1814,11 @@ private static final class CachedLocalHost {
      * <P>Note: The resolved address may be cached for a short period of time.
      * </P>
      *
-     * <p>If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the local host name and {@code -1}
-     * as its arguments to see if the operation is allowed.
-     * If the operation is not allowed, an InetAddress representing
-     * the loopback address is returned.
-     *
      * @return     the address of the local host.
      *
      * @throws     UnknownHostException  if the local host name could not
      *             be resolved into an address.
      *
-     * @see SecurityManager#checkConnect
      * @see java.net.InetAddress#getByName(java.lang.String)
      */
     public static InetAddress getLocalHost() throws UnknownHostException {
diff --git a/src/java.base/share/classes/java/net/InetSocketAddress.java b/src/java.base/share/classes/java/net/InetSocketAddress.java
index 5acfbcfa37c..5978d6ae9b5 100644
--- a/src/java.base/share/classes/java/net/InetSocketAddress.java
+++ b/src/java.base/share/classes/java/net/InetSocketAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -204,10 +204,6 @@ public InetSocketAddress(InetAddress addr, int port) {
      * <p>
      * An attempt will be made to resolve the hostname into an InetAddress.
      * If that attempt fails, the address will be flagged as <I>unresolved</I>.
-     * <p>
-     * If there is a security manager, its {@code checkConnect} method
-     * is called with the host name as its argument to check the permission
-     * to resolve it. This could result in a SecurityException.
      * <P>
      * A valid port value is between 0 and 65535.
      * A port number of {@code zero} will let the system pick up an
@@ -217,9 +213,6 @@ public InetSocketAddress(InetAddress addr, int port) {
      * @param   port    The port number
      * @throws IllegalArgumentException if the port parameter is outside the range
      * of valid port values, or if the hostname parameter is {@code null}.
-     * @throws SecurityException if a security manager is present and
-     *                           permission to resolve the host name is
-     *                           denied.
      * @see     #isUnresolved()
      */
     public InetSocketAddress(String hostname, int port) {
diff --git a/src/java.base/share/classes/java/net/MulticastSocket.java b/src/java.base/share/classes/java/net/MulticastSocket.java
index 46757a6b407..367aaf3a9ea 100644
--- a/src/java.base/share/classes/java/net/MulticastSocket.java
+++ b/src/java.base/share/classes/java/net/MulticastSocket.java
@@ -131,19 +131,12 @@ final MulticastSocket delegate() {
      * {@link InetAddress#isAnyLocalAddress wildcard} address.
      *
      * <p>
-     * If there is a security manager, its {@code checkListen} method is first
-     * called with 0 as its argument to ensure the operation is allowed. This
-     * could result in a SecurityException.
-     * <p>
      * When the socket is created the
      * {@link DatagramSocket#setReuseAddress(boolean)} method is called to
      * enable the SO_REUSEADDR socket option.
      *
      * @throws    IOException if an I/O exception occurs while creating the
      * MulticastSocket
-     * @throws    SecurityException if a security manager exists and its
-     * {@code checkListen} method doesn't allow the operation.
-     * @see SecurityManager#checkListen
      * @see java.net.DatagramSocket#setReuseAddress(boolean)
      * @see java.net.DatagramSocketImpl#setOption(SocketOption, Object)
      */
@@ -156,11 +149,6 @@ public MulticastSocket() throws IOException {
      * on the local host machine. The socket will be bound to the
      * {@link InetAddress#isAnyLocalAddress wildcard} address.
      *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
      * <p>
      * When the socket is created the
      * {@link DatagramSocket#setReuseAddress(boolean)} method is
@@ -169,12 +157,9 @@ public MulticastSocket() throws IOException {
      * @param     port port to use
      * @throws    IOException if an I/O exception occurs
      *            while creating the MulticastSocket
-     * @throws    SecurityException  if a security manager exists and its
-     *            {@code checkListen} method doesn't allow the operation.
      * @throws    IllegalArgumentException  if port is  <a href="DatagramSocket.html#PortRange">
      *            out of range.</a>
      *
-     * @see       SecurityManager#checkListen
      * @see       java.net.DatagramSocket#setReuseAddress(boolean)
      */
     public MulticastSocket(int port) throws IOException {
@@ -186,11 +171,6 @@ public MulticastSocket(int port) throws IOException {
      * socket address.
      * <p>
      * If the address is {@code null} an unbound socket will be created.
-     *
-     * <p>If there is a security manager,
-     * its {@code checkListen} method is first called
-     * with the SocketAddress port as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
      * <p>
      * When the socket is created the
      * {@link DatagramSocket#setReuseAddress(boolean)} method is
@@ -200,9 +180,6 @@ public MulticastSocket(int port) throws IOException {
      *           an unbound socket.
      * @throws   IOException if an I/O exception occurs
      *           while creating the MulticastSocket
-     * @throws   SecurityException  if a security manager exists and its
-     *           {@code checkListen} method doesn't allow the operation.
-     * @see      SecurityManager#checkListen
      * @see      java.net.DatagramSocket#setReuseAddress(boolean)
      *
      * @since 1.4
@@ -299,10 +276,6 @@ public int getTimeToLive() throws IOException {
      * Joins a multicast group. Its behavior may be affected by
      * {@code setInterface} or {@code setNetworkInterface}.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkMulticast} method with the
-     * {@code mcastaddr} argument as its argument.
-     *
      * @apiNote
      * Calling this method is equivalent to calling
      * {@link #joinGroup(SocketAddress, NetworkInterface)
@@ -312,12 +285,9 @@ public int getTimeToLive() throws IOException {
      * @throws     IOException if there is an error joining,
      *             or when the address is not a multicast address,
      *             or the platform does not support multicasting, or the socket is closed.
-     * @throws     SecurityException if a security manager exists and its
-     *             {@code checkMulticast} method doesn't allow the join.
      * @deprecated This method does not accept the network interface on
      *             which to join the multicast group. Use
      *             {@link #joinGroup(SocketAddress, NetworkInterface)} instead.
-     * @see        SecurityManager#checkMulticast(InetAddress)
      */
     @Deprecated(since="14")
     public void joinGroup(InetAddress mcastaddr) throws IOException {
@@ -328,10 +298,6 @@ public void joinGroup(InetAddress mcastaddr) throws IOException {
      * Leave a multicast group. Its behavior may be affected by
      * {@code setInterface} or {@code setNetworkInterface}.
      *
-     * <p>If there is a security manager, this method first
-     * calls its {@code checkMulticast} method with the
-     * {@code mcastaddr} argument as its argument.
-     *
      * @apiNote
      * Calling this method is equivalent to calling
      * {@link #leaveGroup(SocketAddress, NetworkInterface)
@@ -340,12 +306,9 @@ public void joinGroup(InetAddress mcastaddr) throws IOException {
      * @param      mcastaddr is the multicast address to leave
      * @throws     IOException if there is an error leaving
      *             or when the address is not a multicast address, or the socket is closed.
-     * @throws     SecurityException if a security manager exists and its
-     *             {@code checkMulticast} method doesn't allow the operation.
      * @deprecated This method does not accept the network interface on which
      *             to leave the multicast group. Use
      *             {@link #leaveGroup(SocketAddress, NetworkInterface)} instead.
-     * @see        SecurityManager#checkMulticast(InetAddress)
      */
     @Deprecated(since="14")
     public void leaveGroup(InetAddress mcastaddr) throws IOException {
@@ -355,9 +318,7 @@ public void leaveGroup(InetAddress mcastaddr) throws IOException {
     /**
      * {@inheritDoc}
      * @throws IOException {@inheritDoc}
-     * @throws SecurityException {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @see    SecurityManager#checkMulticast(InetAddress)
      * @see    DatagramChannel#join(InetAddress, NetworkInterface)
      * @see    StandardSocketOptions#IP_MULTICAST_IF
      * @see    #setNetworkInterface(NetworkInterface)
@@ -374,9 +335,7 @@ public void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
      * {@inheritDoc}
      * @apiNote {@inheritDoc}
      * @throws IOException {@inheritDoc}
-     * @throws SecurityException {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @see    SecurityManager#checkMulticast(InetAddress)
      * @see    #joinGroup(SocketAddress, NetworkInterface)
      * @since 1.4
      */
@@ -517,18 +476,6 @@ public boolean getLoopbackMode() throws SocketException {
      * </B> alter the default TTL for the socket. Its behavior may be
      * affected by {@code setInterface}.
      *
-     * <p>If there is a security manager, this method first performs some
-     * security checks. First, if {@code p.getAddress().isMulticastAddress()}
-     * is true, this method calls the
-     * security manager's {@code checkMulticast} method
-     * with {@code p.getAddress()} and {@code ttl} as its arguments.
-     * If the evaluation of that expression is false,
-     * this method instead calls the security manager's
-     * {@code checkConnect} method with arguments
-     * {@code p.getAddress().getHostAddress()} and
-     * {@code p.getPort()}. Each call to a security manager method
-     * could result in a SecurityException if the operation is not allowed.
-     *
      * @param p is the packet to be sent. The packet should contain
      * the destination multicast ip address and the data to be sent.
      * One does not need to be the member of the group to send
@@ -537,9 +484,6 @@ public boolean getLoopbackMode() throws SocketException {
      * default ttl is 1.
      *
      * @throws     IOException  if an I/O error occurs, or the socket is closed.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkMulticast} or {@code checkConnect}
-     *             method doesn't allow the send.
      * @throws     PortUnreachableException may be thrown if the socket is connected
      *             to a currently unreachable destination. Note, there is no
      *             guarantee that the exception will be thrown.
@@ -559,8 +503,6 @@ public boolean getLoopbackMode() throws SocketException {
      *
      * @see DatagramSocket#send
      * @see DatagramSocket#receive
-     * @see SecurityManager#checkMulticast(java.net.InetAddress, byte)
-     * @see SecurityManager#checkConnect
      */
     @Deprecated(forRemoval = true, since = "1.4")
     public void send(DatagramPacket p, byte ttl)
diff --git a/src/java.base/share/classes/java/net/NetPermission.java b/src/java.base/share/classes/java/net/NetPermission.java
index 23055e5b8d2..7c52ba5ae7c 100644
--- a/src/java.base/share/classes/java/net/NetPermission.java
+++ b/src/java.base/share/classes/java/net/NetPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@
 package java.net;
 
 import java.security.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
 
 /**
  * This class is for various network permissions.
@@ -36,150 +33,16 @@
  * no actions list; you either have the named permission
  * or you don't.
  * <P>
- * The target name is the name of the network permission (see below). The naming
- * convention follows the  hierarchical property naming convention.
- * Also, an asterisk
- * may appear at the end of the name, following a ".", or by itself, to
- * signify a wildcard match. For example: "foo.*" and "*" signify a wildcard
+ * The target name is the name of the network permission. The naming convention
+ * follows the hierarchical property naming convention, typically the reverse
+ * domain name notation, to avoid name clashes.
+ * An asterisk may appear at the end of the name, following a ".", or by itself,
+ * to signify a wildcard match. For example: "foo.*" and "*" signify a wildcard
  * match, while "*foo" and "a*b" do not.
- * <P>
- * The following table lists the standard NetPermission target names,
- * and for each provides a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">Permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- * <tr>
- *   <th scope="row">allowHttpTrace</th>
- *   <td>The ability to use the HTTP TRACE method in HttpURLConnection.</td>
- *   <td>Malicious code using HTTP TRACE could get access to security sensitive
- *   information in the HTTP headers (such as cookies) that it might not
- *   otherwise have access to.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">accessUnixDomainSocket</th>
- *   <td>The ability to accept, bind, connect or get the local address
- *   of a <i>Unix Domain</i> socket.
- *   </td>
- *   <td>Malicious code could connect to local processes using Unix domain sockets
- *    or impersonate local processes, by binding to the same pathnames (assuming they
- *    have the required Operating System permissions.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getCookieHandler</th>
- *   <td>The ability to get the cookie handler that processes highly
- *   security sensitive cookie information for an Http session.</td>
- *   <td>Malicious code can get a cookie handler to obtain access to
- *   highly security sensitive cookie information. Some web servers
- *   use cookies to save user private information such as access
- *   control information, or to track user browsing habit.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">getNetworkInformation</th>
- *   <td>The ability to retrieve all information about local network interfaces.</td>
- *   <td>Malicious code can read information about network hardware such as
- *   MAC addresses, which could be used to construct local IPv6 addresses.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getProxySelector</th>
- *   <td>The ability to get the proxy selector used to make decisions
- *   on which proxies to use when making network connections.</td>
- *   <td>Malicious code can get a ProxySelector to discover proxy
- *   hosts and ports on internal networks, which could then become
- *   targets for attack.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getResponseCache</th>
- *   <td>The ability to get the response cache that provides
- *   access to a local response cache.</td>
- *   <td>Malicious code getting access to the local response cache
- *   could access security sensitive information.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">requestPasswordAuthentication</th>
- *   <td>The ability
- *   to ask the authenticator registered with the system for
- *   a password</td>
- *   <td>Malicious code may steal this password.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setCookieHandler</th>
- *   <td>The ability to set the cookie handler that processes highly
- *   security sensitive cookie information for an Http session.</td>
- *   <td>Malicious code can set a cookie handler to obtain access to
- *   highly security sensitive cookie information. Some web servers
- *   use cookies to save user private information such as access
- *   control information, or to track user browsing habit.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">setDefaultAuthenticator</th>
- *   <td>The ability to set the
- *   way authentication information is retrieved when
- *   a proxy or HTTP server asks for authentication</td>
- *   <td>Malicious
- *   code can set an authenticator that monitors and steals user
- *   authentication input as it retrieves the input from the user.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setProxySelector</th>
- *   <td>The ability to set the proxy selector used to make decisions
- *   on which proxies to use when making network connections.</td>
- *   <td>Malicious code can set a ProxySelector that directs network
- *   traffic to an arbitrary network host.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setResponseCache</th>
- *   <td>The ability to set the response cache that provides access to
- *   a local response cache.</td>
- *   <td>Malicious code getting access to the local response cache
- *   could access security sensitive information, or create false
- *   entries in the response cache.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">setSocketImpl</th>
- *   <td>The ability to create a sub-class of Socket or ServerSocket with a
- *   user specified SocketImpl.</td>
- *   <td>Malicious user-defined SocketImpls can change the behavior of
- *   Socket and ServerSocket in surprising ways, by virtue of their
- *   ability to access the protected fields of SocketImpl.</td>
- *   </tr>
- *
- * <tr>
- *   <th scope="row">specifyStreamHandler</th>
- *   <td>The ability
- *   to specify a stream handler when constructing a URL</td>
- *   <td>Malicious code may create a URL with resources that it would
- *   normally not have access to (like file:/foo/fum/), specifying a
- *   stream handler that gets the actual bytes from someplace it does
- *   have access to. Thus it might be able to trick the system into
- *   creating a ProtectionDomain/CodeSource for a class even though
- *   that class really didn't come from that location.</td>
- * </tr>
- * </tbody>
- * </table>
  *
- * @implNote
- * Implementations may define additional target names, but should use naming
- * conventions such as reverse domain name notation to avoid name clashes.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
diff --git a/src/java.base/share/classes/java/net/NetworkInterface.java b/src/java.base/share/classes/java/net/NetworkInterface.java
index 90e52527b63..1c5edd1c23f 100644
--- a/src/java.base/share/classes/java/net/NetworkInterface.java
+++ b/src/java.base/share/classes/java/net/NetworkInterface.java
@@ -120,13 +120,6 @@ public String getName() {
     /**
      * Get an Enumeration with all, or a subset, of the InetAddresses bound to
      * this network interface.
-     * <p>
-     * If there is a security manager, its {@code checkConnect}
-     * method is called for each InetAddress. Only InetAddresses where
-     * the {@code checkConnect} doesn't throw a SecurityException
-     * will be returned in the Enumeration. However, if the caller has the
-     * {@link NetPermission}("getNetworkInformation") permission, then all
-     * InetAddresses are returned.
      *
      * @implNote
      * The returned enumeration contains all, or a subset, of the InetAddresses that were
@@ -144,13 +137,6 @@ public Enumeration<InetAddress> getInetAddresses() {
     /**
      * Get a Stream of all, or a subset, of the InetAddresses bound to this
      * network interface.
-     * <p>
-     * If there is a security manager, its {@code checkConnect}
-     * method is called for each InetAddress. Only InetAddresses where
-     * the {@code checkConnect} doesn't throw a SecurityException will be
-     * returned in the Stream. However, if the caller has the
-     * {@link NetPermission}("getNetworkInformation") permission, then all
-     * InetAddresses are returned.
      *
      * @implNote
      * The stream contains all, or a subset, of the InetAddresses that were
@@ -193,11 +179,6 @@ private InetAddress[] getCheckedInetAddresses() {
     /**
      * Get a List of all, or a subset, of the {@code InterfaceAddresses}
      * of this network interface.
-     * <p>
-     * If there is a security manager, its {@code checkConnect}
-     * method is called with the InetAddress for each InterfaceAddress.
-     * Only InterfaceAddresses where the {@code checkConnect} doesn't throw
-     * a SecurityException will be returned in the List.
      *
      * @return a {@code List} object with all, or a subset, of the
      *         InterfaceAddress of this network interface
@@ -567,13 +548,9 @@ public boolean supportsMulticast() throws SocketException {
     /**
      * Returns the hardware address (usually MAC) of the interface if it
      * has one and if it can be accessed given the current privileges.
-     * If a security manager is set, then the caller must have
-     * the permission {@link NetPermission}("getNetworkInformation").
      *
      * @return  a byte array containing the address, or {@code null} if
-     *          the address doesn't exist, is not accessible or a security
-     *          manager is set and the caller does not have the permission
-     *          NetPermission("getNetworkInformation")
+     *          the address doesn't exist or is not accessible
      *
      * @throws          SocketException if an I/O error occurs.
      * @since 1.6
diff --git a/src/java.base/share/classes/java/net/ProxySelector.java b/src/java.base/share/classes/java/net/ProxySelector.java
index 40e11ef54e5..ee1f9ef3710 100644
--- a/src/java.base/share/classes/java/net/ProxySelector.java
+++ b/src/java.base/share/classes/java/net/ProxySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,9 +89,6 @@ public ProxySelector() {}
     /**
      * Gets the system-wide proxy selector.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link NetPermission}{@code ("getProxySelector")}
      * @see     #setDefault(ProxySelector)
      * @return  the system-wide {@code ProxySelector}
      * @since   1.5
@@ -113,10 +110,6 @@ public static ProxySelector getDefault() {
      * @param ps The HTTP proxy selector, or
      *          {@code null} to unset the proxy selector.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link NetPermission}{@code ("setProxySelector")}
-     *
      * @see #getDefault()
      * @since 1.5
      */
diff --git a/src/java.base/share/classes/java/net/ResponseCache.java b/src/java.base/share/classes/java/net/ResponseCache.java
index ef00dca80f8..292c1b7610d 100644
--- a/src/java.base/share/classes/java/net/ResponseCache.java
+++ b/src/java.base/share/classes/java/net/ResponseCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,10 +79,6 @@ public ResponseCache() {}
     /**
      * Gets the system-wide response cache.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     * {@link NetPermission}{@code ("getResponseCache")}
-     *
      * @see #setDefault(ResponseCache)
      * @return the system-wide {@code ResponseCache}
      * @since 1.5
@@ -104,10 +100,6 @@ public static synchronized ResponseCache getDefault() {
      * @param responseCache The response cache, or
      *          {@code null} to unset the cache.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     * {@link NetPermission}{@code ("setResponseCache")}
-     *
      * @see #getDefault()
      * @since 1.5
      */
diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java
index bb0fae2b88d..c6560fee35a 100644
--- a/src/java.base/share/classes/java/net/ServerSocket.java
+++ b/src/java.base/share/classes/java/net/ServerSocket.java
@@ -103,9 +103,6 @@ private ServerSocket(Void unused, SocketImpl impl) {
      *
      * @throws     NullPointerException if impl is {@code null}.
      *
-     * @throws     SecurityException if a security manager is set and
-     *             its {@code checkPermission} method doesn't allow
-     *             {@code NetPermission("setSocketImpl")}.
      * @since 12
      */
     protected ServerSocket(SocketImpl impl) {
@@ -145,26 +142,14 @@ public ServerSocket() throws IOException {
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl} method
      * is called to create the actual socket implementation. Otherwise a system-default
      * socket implementation is created.
-     * <p>
-     * If there is a security manager,
-     * its {@code checkListen} method is called
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      *
      * @param      port  the port number, or {@code 0} to use a port
      *                   number that is automatically allocated.
      *
      * @throws     IOException  if an I/O error occurs when opening the socket.
-     * @throws     SecurityException
-     * if a security manager exists and its {@code checkListen}
-     * method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
-     *
-     * @see        SecurityManager#checkListen
      */
     public ServerSocket(int port) throws IOException {
         this(port, 50, null);
@@ -188,12 +173,6 @@ public ServerSocket(int port) throws IOException {
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl} method
      * is called to create the actual socket implementation. Otherwise a system-default
      * socket implementation is created.
-     * <p>
-     * If there is a security manager,
-     * its {@code checkListen} method is called
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * The {@code backlog} argument is the requested maximum number of
      * pending connections on the socket. Its exact semantics are implementation
@@ -208,14 +187,9 @@ public ServerSocket(int port) throws IOException {
      *                      connections.
      *
      * @throws     IOException  if an I/O error occurs when opening the socket.
-     * @throws     SecurityException
-     * if a security manager exists and its {@code checkListen}
-     * method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
-     *
-     * @see        SecurityManager#checkListen
      */
     public ServerSocket(int port, int backlog) throws IOException {
         this(port, backlog, null);
@@ -234,12 +208,6 @@ public ServerSocket(int port, int backlog) throws IOException {
      * This port number can then be retrieved by calling
      * {@link #getLocalPort getLocalPort}.
      *
-     * <P>If there is a security manager, this method
-     * calls its {@code checkListen} method
-     * with the {@code port} argument
-     * as its argument to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * The {@code backlog} argument is the requested maximum number of
      * pending connections on the socket. Its exact semantics are implementation
      * specific. In particular, an implementation may impose a maximum length
@@ -253,15 +221,10 @@ public ServerSocket(int port, int backlog) throws IOException {
      *                connections.
      * @param bindAddr the local InetAddress the server will bind to
      *
-     * @throws  SecurityException if a security manager exists and
-     * its {@code checkListen} method doesn't allow the operation.
-     *
      * @throws  IOException if an I/O error occurs when opening the socket.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
-     *
-     * @see SecurityManager#checkListen
      * @since   1.1
      */
     @SuppressWarnings("this-escape")
@@ -330,8 +293,6 @@ private SocketImpl getImpl() throws SocketException {
      * @param   endpoint        The IP address and port number to bind to.
      * @throws  IOException if the bind operation fails, the socket
      *                      is already bound or the socket is closed.
-     * @throws  SecurityException       if a {@code SecurityManager} is present and
-     * its {@code checkListen} method doesn't allow the operation.
      * @throws  IllegalArgumentException if endpoint is a
      *          SocketAddress subclass not supported by this socket
      * @since 1.4
@@ -359,8 +320,6 @@ public void bind(SocketAddress endpoint) throws IOException {
      *                          incoming connections.
      * @throws  IOException if the bind operation fails, the socket
      *                      is already bound or the socket is closed.
-     * @throws  SecurityException       if a {@code SecurityManager} is present and
-     * its {@code checkListen} method doesn't allow the operation.
      * @throws  IllegalArgumentException if endpoint is a
      *          SocketAddress subclass not supported by this socket
      * @since 1.4
@@ -397,17 +356,9 @@ public void bind(SocketAddress endpoint, int backlog) throws IOException {
      * If the socket was bound prior to being {@link #close closed},
      * then this method will continue to return the local address
      * after the socket is closed.
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * the {@link InetAddress#getLoopbackAddress loopback} address is returned.
      *
      * @return  the address to which this socket is bound,
-     *          or the loopback address if denied by the security manager,
      *          or {@code null} if the socket is unbound.
-     *
-     * @see SecurityManager#checkConnect
      */
     public InetAddress getInetAddress() {
         if (!isBound())
@@ -458,23 +409,13 @@ public int getLocalPort() {
      * If the socket was bound prior to being {@link #close closed},
      * then this method will continue to return the address of the endpoint
      * after the socket is closed.
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link InetAddress#getLoopbackAddress loopback} address and the local
-     * port to which the socket is bound is returned.
      *
      * @return a {@code SocketAddress} representing the local endpoint of
-     *         this socket, or a {@code SocketAddress} representing the
-     *         loopback address if denied by the security manager,
-     *         or {@code null} if the socket is not bound yet.
+     *         this socket, or {@code null} if the socket is not bound yet.
      *
      * @see #getInetAddress()
      * @see #getLocalPort()
      * @see #bind(SocketAddress)
-     * @see SecurityManager#checkConnect
      * @since 1.4
      */
     public SocketAddress getLocalSocketAddress() {
@@ -503,14 +444,6 @@ public SocketAddress getLocalSocketAddress() {
      *        {@code SocketException} with the interrupt status set.
      * </ol>
      *
-     * <p> A new Socket {@code s} is created and, if there
-     * is a security manager,
-     * the security manager's {@code checkAccept} method is called
-     * with {@code s.getInetAddress().getHostAddress()} and
-     * {@code s.getPort()}
-     * as its arguments to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @implNote
      * An instance of this class using a system-default {@code SocketImpl}
      * accepts sockets with a {@code SocketImpl} of the same type, regardless
@@ -519,8 +452,6 @@ public SocketAddress getLocalSocketAddress() {
      *
      * @throws     IOException  if an I/O error occurs when waiting for a
      *               connection, the socket is not bound or the socket is closed.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkAccept} method doesn't allow the operation.
      * @throws     SocketTimeoutException if a timeout was previously set with setSoTimeout and
      *             the timeout has been reached.
      * @throws     java.nio.channels.IllegalBlockingModeException
@@ -529,7 +460,6 @@ public SocketAddress getLocalSocketAddress() {
      *             accepted
      *
      * @return the new Socket
-     * @see SecurityManager#checkAccept
      */
     public Socket accept() throws IOException {
         if (isClosed())
@@ -681,10 +611,8 @@ private void customImplAccept(SocketImpl si) throws IOException {
 
     /**
      * Accepts a new connection so that the given SocketImpl is connected to
-     * the peer. The SocketImpl and connection are closed if the connection is
-     * denied by the security manager.
+     * the peer.
      * @throws IOException if an I/O error occurs
-     * @throws SecurityException if the security manager's checkAccept method fails
      */
     private void implAccept(SocketImpl si) throws IOException {
         assert !(si instanceof DelegatingSocketImpl);
@@ -904,14 +832,6 @@ public boolean getReuseAddress() throws SocketException {
     /**
      * Returns the implementation address and implementation port of
      * this socket as a {@code String}.
-     * <p>
-     * If there is a security manager set, and this socket is
-     * {@linkplain #isBound bound}, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * an {@code InetAddress} representing the
-     * {@link InetAddress#getLoopbackAddress loopback} address is returned as
-     * the implementation address.
      *
      * @return  a string representation of this socket.
      */
@@ -943,20 +863,12 @@ public String toString() {
      * <p>
      * Passing {@code null} to the method is a no-op unless the factory
      * was already set.
-     * <p>
-     * If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * @param      fac   the desired factory.
      * @throws     IOException  if an I/O error occurs when setting the
      *               socket factory.
      * @throws     SocketException  if the factory has already been defined.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow the operation.
      * @see        java.net.SocketImplFactory#createSocketImpl()
-     * @see        SecurityManager#checkSetFactory
      * @deprecated Use a {@link javax.net.ServerSocketFactory} and subclass {@code ServerSocket}
      *    directly.
      *    <br> This method provided a way in early JDK releases to replace the
@@ -1112,12 +1024,6 @@ public void setPerformancePreferences(int connectionTime,
      *
      * @throws NullPointerException if name is {@code null}
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @since 9
      */
     public <T> ServerSocket setOption(SocketOption<T> name, T value)
@@ -1145,12 +1051,6 @@ public <T> ServerSocket setOption(SocketOption<T> name, T value)
      *
      * @throws NullPointerException if name is {@code null}
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @since 9
      */
     public <T> T getOption(SocketOption<T> name) throws IOException {
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index 5fe6d1e0bb3..9825457aac1 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -185,10 +185,6 @@ public Socket() {
      * Creates an unconnected socket, specifying the type of proxy, if any,
      * that should be used regardless of any other settings.
      * <P>
-     * If there is a security manager, its {@code checkConnect} method
-     * is called with the proxy host address and port number
-     * as its arguments. This could result in a SecurityException.
-     * <P>
      * Examples:
      * <UL> <LI>{@code Socket s = new Socket(Proxy.NO_PROXY);} will create
      * a plain socket ignoring any other proxy configuration.</LI>
@@ -201,9 +197,6 @@ public Socket() {
      *              of proxying should be used.
      * @throws IllegalArgumentException if the proxy is of an invalid type
      *          or {@code null}.
-     * @throws SecurityException if a security manager is present and
-     *                           permission to connect to the proxy is
-     *                           denied.
      * @see java.net.ProxySelector
      * @see java.net.Proxy
      *
@@ -263,9 +256,6 @@ public Socket(Proxy proxy) {
      * @throws    SocketException if there is an error in the underlying protocol,
      * such as a TCP error.
      *
-     * @throws SecurityException if {@code impl} is non-null and a security manager is set
-     * and its {@code checkPermission} method doesn't allow {@code NetPermission("setSocketImpl")}.
-     *
      * @since   1.1
      */
     protected Socket(SocketImpl impl) throws SocketException {
@@ -298,11 +288,6 @@ private static Void checkPermission(SocketImpl impl) {
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl}
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
-     * <p>
-     * If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the host address and {@code port}
-     * as its arguments. This could result in a SecurityException.
      *
      * @param      host   the host name, or {@code null} for the loopback address.
      * @param      port   the port number.
@@ -311,12 +296,9 @@ private static Void checkPermission(SocketImpl impl) {
      * the host could not be determined.
      *
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
-     * @see        SecurityManager#checkConnect
      */
     @SuppressWarnings("this-escape")
     public Socket(String host, int port)
@@ -336,22 +318,14 @@ public Socket(String host, int port)
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl}
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
-     * <p>
-     * If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the host address and {@code port}
-     * as its arguments. This could result in a SecurityException.
      *
      * @param      address   the IP address.
      * @param      port      the port number.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
      * @throws     NullPointerException if {@code address} is null.
-     * @see        SecurityManager#checkConnect
      */
     @SuppressWarnings("this-escape")
     public Socket(InetAddress address, int port) throws IOException {
@@ -372,11 +346,6 @@ public Socket(InetAddress address, int port) throws IOException {
      * <p>
      * A local port number of {@code zero} will let the system pick up a
      * free port in the {@code bind} operation.</p>
-     * <p>
-     * If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the host address and {@code port}
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host the name of the remote host, or {@code null} for the loopback address.
      * @param port the remote port
@@ -385,14 +354,9 @@ public Socket(InetAddress address, int port) throws IOException {
      * @param localPort the local port the socket is bound to, or
      *        {@code zero} for a system selected free port.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the connection
-     *             to the destination, or if its {@code checkListen} method
-     *             doesn't allow the bind to the local port.
      * @throws     IllegalArgumentException if the port parameter or localPort
      *             parameter is outside the specified range of valid port values,
      *             which is between 0 and 65535, inclusive.
-     * @see        SecurityManager#checkConnect
      * @since   1.1
      */
     @SuppressWarnings("this-escape")
@@ -414,11 +378,6 @@ public Socket(String host, int port, InetAddress localAddr,
      * <p>
      * A local port number of {@code zero} will let the system pick up a
      * free port in the {@code bind} operation.</p>
-     * <p>
-     * If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the host address and {@code port}
-     * as its arguments. This could result in a SecurityException.
      *
      * @param address the remote address
      * @param port the remote port
@@ -427,15 +386,10 @@ public Socket(String host, int port, InetAddress localAddr,
      * @param localPort the local port the socket is bound to or
      *        {@code zero} for a system selected free port.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the connection
-     *             to the destination, or if its {@code checkListen} method
-     *             doesn't allow the bind to the local port.
      * @throws     IllegalArgumentException if the port parameter or localPort
      *             parameter is outside the specified range of valid port values,
      *             which is between 0 and 65535, inclusive.
      * @throws     NullPointerException if {@code address} is null.
-     * @see        SecurityManager#checkConnect
      * @since   1.1
      */
     @SuppressWarnings("this-escape")
@@ -465,11 +419,6 @@ public Socket(InetAddress address, int port, InetAddress localAddr,
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
      * <p>
-     * If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with the host address and {@code port}
-     * as its arguments. This could result in a SecurityException.
-     * <p>
      * If a UDP socket is used, TCP/IP related socket options will not apply.
      *
      * @param      host     the host name, or {@code null} for the loopback address.
@@ -477,12 +426,9 @@ public Socket(InetAddress address, int port, InetAddress localAddr,
      * @param      stream   a {@code boolean} indicating whether this is
      *                      a stream socket or a datagram socket.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
-     * @see        SecurityManager#checkConnect
      * @deprecated Use {@link DatagramSocket} instead for UDP transport.
      */
     @Deprecated(forRemoval = true, since = "1.1")
@@ -506,11 +452,6 @@ public Socket(String host, int port, boolean stream) throws IOException {
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl}
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
-     *
-     * <p>If there is a security manager, its
-     * {@code checkConnect} method is called
-     * with {@code host.getHostAddress()} and {@code port}
-     * as its arguments. This could result in a SecurityException.
      * <p>
      * If UDP socket is used, TCP/IP related socket options will not apply.
      *
@@ -519,13 +460,10 @@ public Socket(String host, int port, boolean stream) throws IOException {
      * @param      stream    if {@code true}, create a stream socket;
      *                       otherwise, create a datagram socket.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkConnect} method doesn't allow the operation.
      * @throws     IllegalArgumentException if the port parameter is outside
      *             the specified range of valid port values, which is between
      *             0 and 65535, inclusive.
      * @throws     NullPointerException if {@code host} is null.
-     * @see        SecurityManager#checkConnect
      * @deprecated Use {@link DatagramSocket} instead for UDP transport.
      */
     @Deprecated(forRemoval = true, since = "1.1")
@@ -783,9 +721,6 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
      *          is already bound or the socket is closed.
      * @throws  IllegalArgumentException if bindpoint is a
      *          SocketAddress subclass not supported by this socket
-     * @throws  SecurityException  if a security manager exists and its
-     *          {@code checkListen} method doesn't allow the bind
-     *          to the local port.
      *
      * @since   1.4
      * @see #isBound
@@ -848,18 +783,10 @@ public InetAddress getInetAddress() {
 
     /**
      * Gets the local address to which the socket is bound.
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * the {@link InetAddress#getLoopbackAddress loopback} address is returned.
      *
-     * @return the local address to which the socket is bound,
-     *         the loopback address if denied by the security manager, or
+     * @return the local address to which the socket is bound, or
      *         the wildcard address if the socket is closed or not bound yet.
      * @since   1.1
-     *
-     * @see SecurityManager#checkConnect
      */
     public InetAddress getLocalAddress() {
         // This is for backward compatibility
@@ -957,23 +884,13 @@ public SocketAddress getRemoteSocketAddress() {
      * {@code InetSocketAddress}'s address is the
      * {@link InetAddress#isAnyLocalAddress wildcard} address
      * and its port is the local port that it was bound to.
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link InetAddress#getLoopbackAddress loopback} address and the local
-     * port to which this socket is bound is returned.
      *
      * @return a {@code SocketAddress} representing the local endpoint of
-     *         this socket, or a {@code SocketAddress} representing the
-     *         loopback address if denied by the security manager, or
-     *         {@code null} if the socket is not bound yet.
+     *         this socket, or {@code null} if the socket is not bound yet.
      *
      * @see #getLocalAddress()
      * @see #getLocalPort()
      * @see #bind(SocketAddress)
-     * @see SecurityManager#checkConnect
      * @since 1.4
      */
     public SocketAddress getLocalSocketAddress() {
@@ -1915,19 +1832,12 @@ static SocketImplFactory socketImplFactory() {
      * <p>
      * Passing {@code null} to the method is a no-op unless the factory
      * was already set.
-     * <p>If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * @param      fac   the desired factory.
      * @throws     IOException  if an I/O error occurs when setting the
      *               socket factory.
      * @throws     SocketException  if the factory is already defined.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow the operation.
      * @see        java.net.SocketImplFactory#createSocketImpl()
-     * @see        SecurityManager#checkSetFactory
      * @deprecated Use a {@link javax.net.SocketFactory} and subclass {@code Socket}
      *    directly.
      *    <br> This method provided a way in early JDK releases to replace the
@@ -2018,12 +1928,6 @@ public void setPerformancePreferences(int connectionTime,
      *
      * @throws NullPointerException if name is {@code null}
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @since 9
      */
     public <T> Socket setOption(SocketOption<T> name, T value) throws IOException {
@@ -2049,12 +1953,6 @@ public <T> Socket setOption(SocketOption<T> name, T value) throws IOException {
      *
      * @throws NullPointerException if name is {@code null}
      *
-     * @throws SecurityException if a security manager is set and if the socket
-     *         option requires a security permission and if the caller does
-     *         not have the required permission.
-     *         {@link java.net.StandardSocketOptions StandardSocketOptions}
-     *         do not require any security permission.
-     *
      * @since 9
      */
     public <T> T getOption(SocketOption<T> name) throws IOException {
diff --git a/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java
index ba1e7b8436c..0a2b586f7c1 100644
--- a/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/src/java.base/share/classes/java/net/SocketPermission.java
@@ -111,30 +111,10 @@
  * The action "resolve" refers to host/ip name service lookups.
  * <P>
  * The actions string is converted to lowercase before processing.
- * <p>As an example of the creation and meaning of SocketPermissions,
- * note that if the following permission:
  *
- * <pre>
- *   p1 = new SocketPermission("foo.example.com:7777", "connect,accept");
- * </pre>
- *
- * is granted to some code, it allows that code to connect to port 7777 on
- * {@code foo.example.com}, and to accept connections on that port.
- *
- * <p>Similarly, if the following permission:
- *
- * <pre>
- *   p2 = new SocketPermission("localhost:1024-", "accept,connect,listen");
- * </pre>
- *
- * is granted to some code, it allows that code to
- * accept connections on, connect to, or listen on any port between
- * 1024 and 65535 on the local host.
- *
- * <p>Note: Granting code permission to accept or make connections to remote
- * hosts may be dangerous because malevolent code can then more easily
- * transfer and share confidential data among parties who may not
- * otherwise have access to the data.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @spec https://www.rfc-editor.org/info/rfc2732
  *      RFC 2732: Format for Literal IPv6 Addresses in URL's
diff --git a/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java
index cc9829c3102..418651bc7c2 100644
--- a/src/java.base/share/classes/java/net/URL.java
+++ b/src/java.base/share/classes/java/net/URL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -459,12 +459,6 @@ public URL(String protocol, String host, String file)
      *     {@link java.net.URL#URL(java.lang.String, java.lang.String, int,
      *                      java.lang.String)}
      *
-     * <p>If the handler is not null and there is a security manager,
-     * the security manager's {@code checkPermission}
-     * method is called with a
-     * {@code NetPermission("specifyStreamHandler")} permission.
-     * This may result in a SecurityException.
-     *
      * No validation of the inputs is performed by this constructor.
      *
      * @param      protocol   the name of the protocol to use.
@@ -476,18 +470,12 @@ public URL(String protocol, String host, String file)
      *                    is a negative number other than -1,
      *                    or if the underlying stream handler implementation
      *                    rejects, or is known to reject, the {@code URL}
-     * @throws     SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        specifying a stream handler explicitly.
      * @see        java.lang.System#getProperty(java.lang.String)
      * @see        java.net.URL#setURLStreamHandlerFactory(
      *                  java.net.URLStreamHandlerFactory)
      * @see        java.net.URLStreamHandler
      * @see        java.net.URLStreamHandlerFactory#createURLStreamHandler(
      *                  java.lang.String)
-     * @see        SecurityManager#checkPermission
-     * @see        java.net.NetPermission
      * @deprecated
      * Use {@link #of(URI, URLStreamHandler)} to construct an instance of URL
      * associated with a custom protocol handler.
@@ -673,10 +661,6 @@ public URL(URL context, String spec) throws MalformedURLException {
      *               underlying stream handler's {@linkplain
      *               URLStreamHandler#parseURL(URL, String, int, int)
      *               parseURL method} throws {@code IllegalArgumentException}
-     * @throws     SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        specifying a stream handler.
      * @see        java.net.URL#URL(java.lang.String, java.lang.String,
      *                  int, java.lang.String)
      * @see        java.net.URLStreamHandler
@@ -847,11 +831,6 @@ public URL(URL context, String spec, URLStreamHandler handler)
      *          URLStreamHandler#parseURL(URL, String, int, int)
      *          parseURL method} throws {@code IllegalArgumentException}
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        specifying a stream handler
-     *
      * @see java.net.URI#toURL()
      *
      * @since 20
@@ -1272,9 +1251,6 @@ public URLConnection openConnection() throws java.io.IOException {
      *             Proxy.NO_PROXY should be specified.
      * @return     a {@code URLConnection} to the URL.
      * @throws     IOException  if an I/O exception occurs.
-     * @throws     SecurityException if a security manager is present
-     *             and the caller doesn't have permission to connect
-     *             to the proxy.
      * @throws     IllegalArgumentException will be thrown if proxy is null,
      *             or proxy has the wrong type
      * @throws     UnsupportedOperationException if the subclass that
@@ -1371,20 +1347,11 @@ public final Object getContent(Class<?>[] classes)
      *<p> The {@code URLStreamHandlerFactory} instance is used to
      *construct a stream protocol handler from a protocol name.
      *
-     * <p> If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
-     *
      * @param      fac   the desired factory.
      * @throws     Error  if the application has already set a factory.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow
-     *             the operation.
      * @see        java.net.URL#URL(java.lang.String, java.lang.String,
      *             int, java.lang.String)
      * @see        java.net.URLStreamHandlerFactory
-     * @see        SecurityManager#checkSetFactory
      */
     public static void setURLStreamHandlerFactory(URLStreamHandlerFactory fac) {
         synchronized (streamHandlerLock) {
diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 3f530ec4618..4d43d358a64 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,13 +68,6 @@
  * This class loader supports the loading of classes and resources from the
  * contents of a <a href="../util/jar/JarFile.html#multirelease">multi-release</a>
  * JAR file that is referred to by a given URL.
- * <p>
- * The AccessControlContext of the thread that created the instance of
- * URLClassLoader will be used when subsequently loading classes and
- * resources.
- * <p>
- * The classes that are loaded are by default granted permission only to
- * access the URLs specified when the URLClassLoader was created.
  *
  * @author  David Connelly
  * @since   1.2
@@ -96,18 +89,10 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
      * the URL is assumed to refer to a JAR file which will be downloaded and
      * opened as needed.
      *
-     * <p>If there is a security manager, this method first
-     * calls the security manager's {@code checkCreateClassLoader} method
-     * to ensure creation of a class loader is allowed.
-     *
      * @param      urls the URLs from which to load classes and resources
      * @param      parent the parent class loader for delegation
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkCreateClassLoader} method doesn't allow
-     *             creation of a class loader.
      * @throws     NullPointerException if {@code urls} or any of its
      *             elements is {@code null}.
-     * @see SecurityManager#checkCreateClassLoader
      */
     @SuppressWarnings("removal")
     public URLClassLoader(URL[] urls, ClassLoader parent) {
@@ -132,18 +117,10 @@ public URLClassLoader(URL[] urls, ClassLoader parent) {
      * assumed to refer to a JAR file which will be downloaded and opened
      * as needed.
      *
-     * <p>If there is a security manager, this method first
-     * calls the security manager's {@code checkCreateClassLoader} method
-     * to ensure creation of a class loader is allowed.
-     *
      * @param      urls the URLs from which to load classes and resources
      *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkCreateClassLoader} method doesn't allow
-     *             creation of a class loader.
      * @throws     NullPointerException if {@code urls} or any of its
      *             elements is {@code null}.
-     * @see SecurityManager#checkCreateClassLoader
      */
     @SuppressWarnings("removal")
     public URLClassLoader(URL[] urls) {
@@ -165,20 +142,12 @@ public URLClassLoader(URL[] urls) {
      * factory argument will be used as the stream handler factory to
      * obtain protocol handlers when creating new jar URLs.
      *
-     * <p>If there is a security manager, this method first
-     * calls the security manager's {@code checkCreateClassLoader} method
-     * to ensure creation of a class loader is allowed.
-     *
      * @param  urls the URLs from which to load classes and resources
      * @param  parent the parent class loader for delegation
      * @param  factory the URLStreamHandlerFactory to use when creating URLs
      *
-     * @throws SecurityException  if a security manager exists and its
-     *         {@code checkCreateClassLoader} method doesn't allow
-     *         creation of a class loader.
      * @throws NullPointerException if {@code urls} or any of its
      *         elements is {@code null}.
-     * @see SecurityManager#checkCreateClassLoader
      */
     @SuppressWarnings("removal")
     public URLClassLoader(URL[] urls, ClassLoader parent,
@@ -205,10 +174,6 @@ public URLClassLoader(URL[] urls, ClassLoader parent,
      * @throws NullPointerException if {@code urls} or any of its
      *         elements is {@code null}.
      *
-     * @throws SecurityException if a security manager exists and its
-     *         {@link SecurityManager#checkCreateClassLoader()} method doesn't
-     *         allow creation of a class loader.
-     *
      * @since 9
      */
     @SuppressWarnings("removal")
@@ -236,10 +201,6 @@ public URLClassLoader(String name,
      * @throws NullPointerException if {@code urls} or any of its
      *         elements is {@code null}.
      *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkCreateClassLoader} method doesn't allow
-     *         creation of a class loader.
-     *
      * @since 9
      */
     @SuppressWarnings("removal")
@@ -335,9 +296,6 @@ public InputStream getResourceAsStream(String name) {
     * is caught, then the second and following exceptions are added
     * as suppressed exceptions of the first one caught, which is then re-thrown.
     *
-    * @throws    SecurityException if a security manager is set, and it denies
-    *   {@link RuntimePermission}{@code ("closeClassLoader")}
-    *
     * @since 1.7
     */
     public void close() throws IOException {
@@ -689,24 +647,24 @@ public boolean hasMoreElements() {
      * The implementation of this method first calls super.getPermissions
      * and then adds permissions based on the URL of the codesource.
      * <p>
-     * If the protocol of this URL is "jar", then the permission granted
+     * If the protocol of this URL is "jar", then the permission returned
      * is based on the permission that is required by the URL of the Jar
      * file.
      * <p>
      * If the protocol is "file" and there is an authority component, then
      * permission to connect to and accept connections from that authority
-     * may be granted. If the protocol is "file"
+     * may be returned. If the protocol is "file"
      * and the path specifies a file, then permission to read that
-     * file is granted. If protocol is "file" and the path is
-     * a directory, permission is granted to read all files
+     * file is returned. If protocol is "file" and the path is
+     * a directory, then permission is returned to read all files
      * and (recursively) all files and subdirectories contained in
      * that directory.
      * <p>
      * If the protocol is not "file", then permission
-     * to connect to and accept connections from the URL's host is granted.
+     * to connect to and accept connections from the URL's host is returned.
      * @param codesource the codesource
      * @throws    NullPointerException if {@code codesource} is {@code null}.
-     * @return the permissions granted to the codesource
+     * @return the permissions for the codesource
      */
     @SuppressWarnings("removal")
     protected PermissionCollection getPermissions(CodeSource codesource)
@@ -778,11 +736,7 @@ public Void run() throws SecurityException {
 
     /**
      * Creates a new instance of URLClassLoader for the specified
-     * URLs and parent class loader. If a security manager is
-     * installed, the {@code loadClass} method of the URLClassLoader
-     * returned by this method will invoke the
-     * {@code SecurityManager.checkPackageAccess} method before
-     * loading the class.
+     * URLs and parent class loader.
      *
      * @param urls the URLs to search for classes and resources
      * @param parent the parent class loader for delegation
@@ -808,11 +762,7 @@ public URLClassLoader run() {
 
     /**
      * Creates a new instance of URLClassLoader for the specified
-     * URLs and default parent class loader. If a security manager is
-     * installed, the {@code loadClass} method of the URLClassLoader
-     * returned by this method will invoke the
-     * {@code SecurityManager.checkPackageAccess} before
-     * loading the class.
+     * URLs and default parent class loader.
      *
      * @param urls the URLs to search for classes and resources
      * @throws     NullPointerException if {@code urls} or any of its
diff --git a/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java
index aa95ca0e204..168e4df29df 100644
--- a/src/java.base/share/classes/java/net/URLConnection.java
+++ b/src/java.base/share/classes/java/net/URLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -322,16 +322,8 @@ public String getContentTypeFor(String fileName) {
 
     /**
      * Sets the FileNameMap.
-     * <p>
-     * If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * @param map the FileNameMap to be set
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow the operation.
-     * @see        SecurityManager#checkSetFactory
      * @see #getFileNameMap()
      * @since 1.2
      */
@@ -1283,19 +1275,11 @@ public static String getDefaultRequestProperty(String key) {
      * <p>
      * The {@code ContentHandlerFactory} instance is used to
      * construct a content handler from a content type.
-     * <p>
-     * If there is a security manager, this method first calls
-     * the security manager's {@code checkSetFactory} method
-     * to ensure the operation is allowed.
-     * This could result in a SecurityException.
      *
      * @param      fac   the desired factory.
      * @throws     Error  if the factory has already been defined.
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkSetFactory} method doesn't allow the operation.
      * @see        java.net.ContentHandlerFactory
      * @see        java.net.URLConnection#getContent()
-     * @see        SecurityManager#checkSetFactory
      */
     public static synchronized void setContentHandlerFactory(ContentHandlerFactory fac) {
         if (factory != null) {
diff --git a/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java
index ac55ec37777..d48f784ff84 100644
--- a/src/java.base/share/classes/java/net/URLPermission.java
+++ b/src/java.base/share/classes/java/net/URLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,12 +142,11 @@
  * method names to upper-case and header names to the form defines in RFC2616 (lower case
  * with initial letter of each word capitalized). Either list can contain a wild-card '*'
  * character which signifies all request methods or headers respectively.
- * <p>
- * Note. Depending on the context of use, some request methods and headers may be permitted
- * at all times, and others may not be permitted at any time. For example, the
- * HTTP protocol handler might disallow certain headers such as Content-Length
- * from being set by application code, regardless of whether the security policy
- * in force, permits it.
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  *
  * @spec https://www.rfc-editor.org/info/rfc2296
  *      RFC 2296: HTTP Remote Variant Selection Algorithm -- RVSA/1.0
diff --git a/src/java.base/share/classes/java/net/spi/InetAddressResolverProvider.java b/src/java.base/share/classes/java/net/spi/InetAddressResolverProvider.java
index d72b25be408..5b032591089 100644
--- a/src/java.base/share/classes/java/net/spi/InetAddressResolverProvider.java
+++ b/src/java.base/share/classes/java/net/spi/InetAddressResolverProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,9 +110,6 @@ public abstract class InetAddressResolverProvider {
     /**
      * Creates a new instance of {@code InetAddressResolverProvider}.
      *
-     * @throws SecurityException if a security manager is present and its
-     *                           {@code checkPermission} method doesn't allow the
-     *                           {@code RuntimePermission("inetAddressResolverProvider")}.
      * @implNote It is recommended that an {@code InetAddressResolverProvider} service
      * implementation initialization should be as simple as possible, in order to avoid
      * possible risks of deadlock or class loading cycles during the instantiation of the
diff --git a/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java b/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java
index c8aa85cbc6d..202f3e654fa 100644
--- a/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java
+++ b/src/java.base/share/classes/java/net/spi/URLStreamHandlerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,6 @@ private URLStreamHandlerProvider(Void ignore) { }
 
     /**
      * Initializes a new URL stream handler provider.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("setFactory")}.
      */
     protected URLStreamHandlerProvider() {
         this(checkPermission());
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
index 5668d305cb8..15af714accf 100644
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
@@ -240,14 +240,6 @@ protected AsynchronousFileChannel() {
      *          specific exception</a>)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an
-     *          unspecified permission required by the implementation.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      */
     public static AsynchronousFileChannel open(Path file,
                                                Set<? extends OpenOption> options,
@@ -301,14 +293,6 @@ public static AsynchronousFileChannel open(Path file,
      *          specific exception</a>)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an
-     *          unspecified permission required by the implementation.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      */
     public static AsynchronousFileChannel open(Path file, OpenOption... options)
         throws IOException
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
index b1548bf004d..192b1f7958b 100644
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,7 +188,6 @@ public static AsynchronousServerSocketChannel open()
      *
      * @throws  AlreadyBoundException               {@inheritDoc}
      * @throws  UnsupportedAddressTypeException     {@inheritDoc}
-     * @throws  SecurityException                   {@inheritDoc}
      * @throws  ClosedChannelException              {@inheritDoc}
      * @throws  IOException                         {@inheritDoc}
      */
@@ -225,9 +224,6 @@ public final AsynchronousServerSocketChannel bind(SocketAddress local)
      *          If the socket is already bound
      * @throws  UnsupportedAddressTypeException
      *          If the type of the given address is not supported
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          SecurityManager#checkListen checkListen} method denies the operation
      * @throws  ClosedChannelException
      *          If the channel is closed
      * @throws  IOException
@@ -265,14 +261,6 @@ public abstract <T> AsynchronousServerSocketChannel setOption(SocketOption<T> na
      * connection is accepted immediately (see <a
      * href="AsynchronousChannelGroup.html#threading">Threading</a>).
      *
-     * <p> If a security manager has been installed then it verifies that the
-     * address and port number of the connection's remote endpoint are permitted
-     * by the security manager's {@link SecurityManager#checkAccept checkAccept}
-     * method. The permission check is performed with privileges that are restricted
-     * by the calling context of this method. If the permission check fails then
-     * the connection is closed and the operation completes with a {@link
-     * SecurityException}.
-     *
      * @param   <A>
      *          The type of the attachment
      * @param   attachment
@@ -312,18 +300,9 @@ public abstract <A> void accept(A attachment,
 
     /**
      * {@inheritDoc}
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link java.net.InetAddress#getLoopbackAddress loopback} address and the
-     * local port of the channel's socket is returned.
      *
-     * @return  The {@code SocketAddress} that the socket is bound to, or the
-     *          {@code SocketAddress} representing the loopback address if
-     *          denied by the security manager, or {@code null} if the
-     *          channel's socket is not bound
+     * @return  The {@code SocketAddress} that the socket is bound to; {@code null}
+     *          if the channel's socket is not bound
      *
      * @throws  ClosedChannelException     {@inheritDoc}
      * @throws  IOException                {@inheritDoc}
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
index a525e812d33..736327a1825 100644
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,10 +205,6 @@ public static AsynchronousSocketChannel open()
      * @throws  UnsupportedAddressTypeException     {@inheritDoc}
      * @throws  ClosedChannelException              {@inheritDoc}
      * @throws  IOException                         {@inheritDoc}
-     * @throws  SecurityException
-     *          If a security manager has been installed and its
-     *          {@link SecurityManager#checkListen checkListen} method denies
-     *          the operation
      */
     @Override
     public abstract AsynchronousSocketChannel bind(SocketAddress local)
@@ -295,12 +291,6 @@ public abstract <T> AsynchronousSocketChannel setOption(SocketOption<T> name, T
      * established. If the connection cannot be established then the channel is
      * closed.
      *
-     * <p> This method performs exactly the same security checks as the {@link
-     * java.net.Socket} class.  That is, if a security manager has been
-     * installed then this method verifies that its {@link
-     * java.lang.SecurityManager#checkConnect checkConnect} method permits
-     * connecting to the address and port number of the given remote endpoint.
-     *
      * @param   <A>
      *          The type of the attachment
      * @param   remote
@@ -320,9 +310,6 @@ public abstract <T> AsynchronousSocketChannel setOption(SocketOption<T> name, T
      *          If a connection operation is already in progress on this channel
      * @throws  ShutdownChannelGroupException
      *          If the channel group has terminated
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote endpoint
      *
      * @see #getRemoteAddress
      */
@@ -353,9 +340,6 @@ public abstract <A> void connect(SocketAddress remote,
      *          If this channel is already connected
      * @throws  ConnectionPendingException
      *          If a connection operation is already in progress on this channel
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote endpoint
      */
     public abstract Future<Void> connect(SocketAddress remote);
 
@@ -674,18 +658,9 @@ public abstract <A> void write(ByteBuffer[] srcs,
 
     /**
      * {@inheritDoc}
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link java.net.InetAddress#getLoopbackAddress loopback} address and the
-     * local port of the channel's socket is returned.
-     *
-     * @return  The {@code SocketAddress} that the socket is bound to, or the
-     *          {@code SocketAddress} representing the loopback address if
-     *          denied by the security manager, or {@code null} if the
-     *          channel's socket is not bound
+     *
+     * @return  The {@code SocketAddress} that the socket is bound to; {@code null}
+     *          if the channel's socket is not bound
      *
      * @throws  ClosedChannelException     {@inheritDoc}
      * @throws  IOException                {@inheritDoc}
diff --git a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
index 1b0e7c0f35a..392d9add37f 100644
--- a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,11 +44,10 @@
  * connected. A datagram channel need not be connected in order for the {@link #send
  * send} and {@link #receive receive} methods to be used.  A datagram channel may be
  * connected, by invoking its {@link #connect connect} method, in order to
- * avoid the overhead of the security checks are otherwise performed as part of
- * every send and receive operation.  A datagram channel must be connected in
- * order to use the {@link #read(java.nio.ByteBuffer) read} and {@link
- * #write(java.nio.ByteBuffer) write} methods, since those methods do not
- * accept or return socket addresses.
+ * avoid the overhead of checks performed as part of every send and receive operation.
+ * A datagram channel must be connected in order to use the {@link
+ * #read(java.nio.ByteBuffer) read} and {@link #write(java.nio.ByteBuffer) write}
+ * methods, since those methods do not accept or return socket addresses.
  *
  * <p> Once connected, a datagram channel remains connected until it is
  * disconnected or closed.  Whether or not a datagram channel is connected may
@@ -220,10 +219,6 @@ public final int validOps() {
      * @throws  UnsupportedAddressTypeException     {@inheritDoc}
      * @throws  ClosedChannelException              {@inheritDoc}
      * @throws  IOException                         {@inheritDoc}
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          SecurityManager#checkListen checkListen} method denies the
-     *          operation
      *
      * @since 1.7
      */
@@ -268,18 +263,6 @@ public abstract <T> DatagramChannel setOption(SocketOption<T> name, T value)
      * this method, may be discarded.  The channel's socket remains connected
      * until it is explicitly disconnected or until it is closed.
      *
-     * <p> This method performs exactly the same security checks as the {@link
-     * java.net.DatagramSocket#connect connect} method of the {@link
-     * java.net.DatagramSocket} class.  That is, if a security manager has been
-     * installed then this method verifies that its {@link
-     * java.lang.SecurityManager#checkAccept checkAccept} and {@link
-     * java.lang.SecurityManager#checkConnect checkConnect} methods permit
-     * datagrams to be received from and sent to, respectively, the given
-     * remote address. Once connected, no further security checks are performed
-     * for datagrams received from, or sent to, the given remote address. Care
-     * should be taken to ensure that a connected datagram channel is not shared
-     * with untrusted code.
-     *
      * <p> This method may be invoked at any time.  If another thread has
      * already initiated a read or write operation upon this channel, then an
      * invocation of this method will block until any such operation is
@@ -315,12 +298,6 @@ public abstract <T> DatagramChannel setOption(SocketOption<T> name, T value)
      * @throws  UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not
-     *          permit access to the given remote address, or if unbound,
-     *          the security manager {@link SecurityManager#checkListen checkListen}
-     *          method denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -331,8 +308,7 @@ public abstract DatagramChannel connect(SocketAddress remote)
      * Disconnects this channel's socket.
      *
      * <p> The channel's socket is configured so that it can receive datagrams
-     * from, and sends datagrams to, any remote address so long as the security
-     * manager, if installed, permits it.
+     * from, and sends datagrams to, any remote address.
      *
      * <p> This method may be invoked at any time.  If another thread has
      * already initiated a read or write operation upon this channel, then an
@@ -384,17 +360,6 @@ public abstract DatagramChannel connect(SocketAddress remote)
      * are fewer bytes remaining in the buffer than are required to hold the
      * datagram then the remainder of the datagram is silently discarded.
      *
-     * <p> This method performs exactly the same security checks as the {@link
-     * java.net.DatagramSocket#receive receive} method of the {@link
-     * java.net.DatagramSocket} class.  That is, if the socket is not connected
-     * to a specific remote address and a security manager has been installed
-     * then for each datagram received this method verifies that the source's
-     * address and port number are permitted by the security manager's {@link
-     * java.lang.SecurityManager#checkAccept checkAccept} method. Datagrams
-     * that are not permitted by the security manager are silently discarded.
-     * The overhead of this security check can be avoided by first connecting
-     * the socket via the {@link #connect connect} method.
-     *
      * <p> This method may be invoked at any time.  If another thread has
      * already initiated a read operation upon this channel, however, then an
      * invocation of this method will block until the first operation is
@@ -426,11 +391,6 @@ public abstract DatagramChannel connect(SocketAddress remote)
      *          closing the channel and setting the current thread's
      *          interrupt status
      *
-     * @throws  SecurityException
-     *          If unbound, and a security manager has been installed and
-     *          its {@link SecurityManager#checkListen checkListen} method
-     *          denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -448,16 +408,6 @@ public abstract DatagramChannel connect(SocketAddress remote)
      * <p> The datagram is transferred from the byte buffer as if by a regular
      * {@link WritableByteChannel#write(java.nio.ByteBuffer) write} operation.
      *
-     * <p> This method performs exactly the same security checks as the {@link
-     * java.net.DatagramSocket#send send} method of the {@link
-     * java.net.DatagramSocket} class.  That is, if the socket is not connected
-     * to a specific remote address and a security manager has been installed
-     * then for each datagram sent this method verifies that the target address
-     * and port number are permitted by the security manager's {@link
-     * java.lang.SecurityManager#checkConnect checkConnect} method.  The
-     * overhead of this security check can be avoided by first connecting the
-     * socket via the {@link #connect connect} method.
-     *
      * <p> This method may be invoked at any time.  If another thread has
      * already initiated a write operation upon this channel, however, then an
      * invocation of this method will block until the first operation is
@@ -501,12 +451,6 @@ public abstract DatagramChannel connect(SocketAddress remote)
      * @throws  UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not permit
-     *          datagrams to be sent to the given address, or if unbound, and
-     *          the security manager's {@link SecurityManager#checkListen checkListen}
-     *          method denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -651,18 +595,9 @@ public final long write(ByteBuffer[] srcs) throws IOException {
      * datagrams sent via this channel instead of the wildcard address.
      * When {@link #disconnect} is called, the bound address reverts
      * to the wildcard address.
-     * <p>
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link java.net.InetAddress#getLoopbackAddress loopback} address and the
-     * local port of the channel's socket is returned.
-     *
-     * @return  The {@code SocketAddress} that the socket is bound to, or the
-     *          {@code SocketAddress} representing the loopback address if
-     *          denied by the security manager, or {@code null} if the
-     *          channel's socket is not bound
+     *
+     * @return  The {@code SocketAddress} that the socket is bound to; {@code null}
+     *          if the channel's socket is not bound
      *
      * @throws  ClosedChannelException     {@inheritDoc}
      * @throws  IOException                {@inheritDoc}
diff --git a/src/java.base/share/classes/java/nio/channels/FileChannel.java b/src/java.base/share/classes/java/nio/channels/FileChannel.java
index 57c40220215..6e78eefcca6 100644
--- a/src/java.base/share/classes/java/nio/channels/FileChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/FileChannel.java
@@ -289,14 +289,6 @@ protected FileChannel() { }
      *          specific exception</a>)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an
-     *          unspecified permission required by the implementation.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      *
      * @since   1.7
      */
@@ -345,14 +337,6 @@ public static FileChannel open(Path path,
      *          specific exception</a>)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an
-     *          unspecified permission required by the implementation.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      *
      * @since   1.7
      */
diff --git a/src/java.base/share/classes/java/nio/channels/MulticastChannel.java b/src/java.base/share/classes/java/nio/channels/MulticastChannel.java
index fc92f4f85fc..9317a2763ae 100644
--- a/src/java.base/share/classes/java/nio/channels/MulticastChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/MulticastChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -182,10 +182,6 @@ public interface MulticastChannel
      *          If this channel is closed
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is set, and its
-     *          {@link SecurityManager#checkMulticast(InetAddress) checkMulticast}
-     *          method denies access to the multicast group
      */
     MembershipKey join(InetAddress group, NetworkInterface interf)
         throws IOException;
@@ -231,10 +227,6 @@ MembershipKey join(InetAddress group, NetworkInterface interf)
      *          If this channel is closed
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is set, and its
-     *          {@link SecurityManager#checkMulticast(InetAddress) checkMulticast}
-     *          method denies access to the multicast group
      */
     MembershipKey join(InetAddress group, NetworkInterface interf, InetAddress source)
         throws IOException;
diff --git a/src/java.base/share/classes/java/nio/channels/NetworkChannel.java b/src/java.base/share/classes/java/nio/channels/NetworkChannel.java
index 65a7c22764e..c1858a8714e 100644
--- a/src/java.base/share/classes/java/nio/channels/NetworkChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/NetworkChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,10 +77,6 @@ public interface NetworkChannel
      *          If the channel is closed
      * @throws  IOException
      *          If some other I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission. An implementation of this interface should specify
-     *          any required permissions.
      *
      * @see #getLocalAddress
      */
diff --git a/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java b/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
index 7e9983147b2..b2ee728cf7f 100644
--- a/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,9 +212,6 @@ public final int validOps() {
      * @throws  UnsupportedAddressTypeException     {@inheritDoc}
      * @throws  ClosedChannelException              {@inheritDoc}
      * @throws  IOException                         {@inheritDoc}
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies the
-     *          operation
      *
      * @since 1.7
      */
@@ -275,12 +272,6 @@ public final ServerSocketChannel bind(SocketAddress local)
      *          If this channel is closed
      * @throws  IOException
      *          If some other I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          SecurityManager#checkListen checkListen} method denies
-     *          the operation for an <i>Internet protocol</i> socket address,
-     *          or for a <i>Unix domain</i> socket address if it denies
-     *          {@link NetPermission}{@code("accessUnixDomainSocket")}.
      *
      * @since 1.7
      */
@@ -322,16 +313,6 @@ public abstract <T> ServerSocketChannel setOption(SocketOption<T> name, T value)
      * <p> The socket channel returned by this method, if any, will be in
      * blocking mode regardless of the blocking mode of this channel.
      *
-     * <p> If bound to an <i>Internet protocol</i> socket address, this method
-     * performs exactly the same security checks as the {@link
-     * java.net.ServerSocket#accept accept} method of the {@link java.net.ServerSocket}
-     * class.  That is, if a security manager has been installed then for each
-     * new connection this method verifies that the address and port number
-     * of the connection's remote endpoint are permitted by the security
-     * manager's {@link java.lang.SecurityManager#checkAccept checkAccept}
-     * method. If bound to a <i>Unix Domain</i> socket address, this method checks
-     * {@link NetPermission}{@code ("accessUnixDomainSocket")}.
-     *
      * @return  The socket channel for the new connection,
      *          or {@code null} if this channel is in non-blocking mode
      *          and no connection is available to be accepted
@@ -352,14 +333,6 @@ public abstract <T> ServerSocketChannel setOption(SocketOption<T> name, T value)
      * @throws  NotYetBoundException
      *          If this channel's socket has not yet been bound
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and this
-     *          channel is bound to an {@link InetSocketAddress}
-     *          and the security manager denies access to the remote endpoint
-     *          of the new connection, or if this channel is bound to a
-     *          {@link UnixDomainSocketAddress} and the security manager
-     *          denies {@link NetPermission}{@code ("accessUnixDomainSocket")}
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -368,24 +341,11 @@ public abstract <T> ServerSocketChannel setOption(SocketOption<T> name, T value)
     /**
      * {@inheritDoc}
      *
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link java.net.InetAddress#getLoopbackAddress loopback} address and the
-     * local port of the channel's socket is returned.
-     *
      * <p> Where the channel is bound to a <i>Unix Domain</i> socket address, the socket
-     * address is a {@link UnixDomainSocketAddress}. If there is a security manager
-     * set, its {@link SecurityManager#checkPermission(java.security.Permission)
-     * checkPermission} method is called with {@link NetPermission}{@code
-     * ("accessUnixDomainSocket")}. If the operation is not allowed an unnamed
-     * {@link UnixDomainSocketAddress} is returned.
-     *
-     * @return  The {@code SocketAddress} that the socket is bound to, or the
-     *          {@code SocketAddress} representing the loopback address or empty
-     *          path if denied by the security manager, or {@code null} if the
-     *          channel's socket is not bound
+     * address is a {@link UnixDomainSocketAddress}.
+     *
+     * @return  The {@code SocketAddress} that the socket is bound to or {@code null}
+     *          if the channel's socket is not bound
      *
      * @throws  ClosedChannelException     {@inheritDoc}
      * @throws  IOException                {@inheritDoc}
diff --git a/src/java.base/share/classes/java/nio/channels/SocketChannel.java b/src/java.base/share/classes/java/nio/channels/SocketChannel.java
index 0e035210fd3..26878ab4006 100644
--- a/src/java.base/share/classes/java/nio/channels/SocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/SocketChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -259,10 +259,6 @@ public static SocketChannel open(ProtocolFamily family) throws IOException {
      * @throws  UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote endpoint
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      *
@@ -355,12 +351,6 @@ public final int validOps() {
      * @throws  UnsupportedAddressTypeException     {@inheritDoc}
      * @throws  ClosedChannelException              {@inheritDoc}
      * @throws  IOException                         {@inheritDoc}
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          SecurityManager#checkListen checkListen} method denies
-     *          the operation for an <i>Internet protocol</i> socket address,
-     *          or for a <i>Unix domain</i> socket address if it denies
-     *          {@link NetPermission}{@code("accessUnixDomainSocket")}.
      *
      * @since 1.7
      */
@@ -463,19 +453,6 @@ public abstract <T> SocketChannel setOption(SocketOption<T> name, T value)
      * method will block until the connection is established or an I/O error
      * occurs.
      *
-     * <p> For channels to <i>Internet protocol</i> sockets, this method performs
-     * exactly the same security checks as the {@link java.net.Socket} class.
-     * That is, if a security manager has been
-     * installed then this method verifies that its {@link
-     * java.lang.SecurityManager#checkConnect checkConnect} method permits
-     * connecting to the address and port number of the given remote endpoint.
-     *
-     * <p> For channels to <i>Unix Domain</i> sockets, this method checks
-     * {@link java.net.NetPermission NetPermission}{@code
-     * ("accessUnixDomainSocket")} with the security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission)
-     * checkPermission} method.
-     *
      * <p> This method may be invoked at any time.  If a read or write
      * operation upon this channel is invoked while an invocation of this
      * method is in progress then that operation will first block until this
@@ -516,10 +493,6 @@ public abstract <T> SocketChannel setOption(SocketOption<T> name, T value)
      * @throws  UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote endpoint
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -663,24 +636,11 @@ public final long write(ByteBuffer[] srcs) throws IOException {
     /**
      * {@inheritDoc}
      *
-     * If there is a security manager set, its {@code checkConnect} method is
-     * called with the local address and {@code -1} as its arguments to see
-     * if the operation is allowed. If the operation is not allowed,
-     * a {@code SocketAddress} representing the
-     * {@link java.net.InetAddress#getLoopbackAddress loopback} address and the
-     * local port of the channel's socket is returned.
-     *
      * <p> Where the channel is bound to a Unix Domain socket address, the socket
-     * address is a {@link UnixDomainSocketAddress}. If there is a security manager
-     * set, its {@link SecurityManager#checkPermission(java.security.Permission)
-     * checkPermission} method is called with {@link NetPermission}{@code
-     * ("accessUnixDomainSocket")}. If the operation is not allowed an unnamed
-     * {@link UnixDomainSocketAddress} is returned.
-     *
-     * @return  The {@code SocketAddress} that the socket is bound to, or the
-     *          {@code SocketAddress} representing the loopback address or empty
-     *          path if denied by the security manager, or {@code null} if the
-     *          channel's socket is not bound
+     * address is a {@link UnixDomainSocketAddress}.
+     *
+     * @return  The {@code SocketAddress} that the socket is bound to; {@code null}
+     *          if the channel's socket is not bound
      *
      * @throws  ClosedChannelException     {@inheritDoc}
      * @throws  IOException                {@inheritDoc}
diff --git a/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
index 5e31917ae42..e35e0ee687f 100644
--- a/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,24 +51,11 @@
  */
 
 public abstract class AsynchronousChannelProvider {
-    private static Void checkPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("asynchronousChannelProvider"));
-        return null;
-    }
-    private AsynchronousChannelProvider(Void ignore) { }
 
     /**
      * Initializes a new instance of this class.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("asynchronousChannelProvider")}
      */
     protected AsynchronousChannelProvider() {
-        this(checkPermission());
     }
 
     // lazy initialization of default provider
diff --git a/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java b/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
index 767353b787b..bfb23d048f6 100644
--- a/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,24 +72,10 @@
 
 public abstract class SelectorProvider {
 
-    private static Void checkPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("selectorProvider"));
-        return null;
-    }
-    private SelectorProvider(Void ignore) { }
-
     /**
      * Initializes a new instance of this class.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("selectorProvider")}
      */
     protected SelectorProvider() {
-        this(checkPermission());
     }
 
     private static class Holder {
@@ -315,10 +301,6 @@ public abstract SocketChannel openSocketChannel()
      * @throws  IOException
      *          If an I/O error occurs
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("inheritedChannel")}
-     *
      * @since 1.5
      */
     public Channel inheritedChannel() throws IOException {
diff --git a/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java b/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
index 114558d9392..4522f07d227 100644
--- a/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
+++ b/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
@@ -82,24 +82,10 @@
 
 public abstract class CharsetProvider {
 
-    private static Void checkPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("charsetProvider"));
-        return null;
-    }
-    private CharsetProvider(Void ignore) { }
-
     /**
      * Initializes a new charset provider.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("charsetProvider")}
      */
     protected CharsetProvider() {
-        this(checkPermission());
     }
 
     /**
diff --git a/src/java.base/share/classes/java/nio/file/AccessDeniedException.java b/src/java.base/share/classes/java/nio/file/AccessDeniedException.java
index 10f0fda3955..018e9679cc3 100644
--- a/src/java.base/share/classes/java/nio/file/AccessDeniedException.java
+++ b/src/java.base/share/classes/java/nio/file/AccessDeniedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,6 @@
  * Checked exception thrown when a file system operation is denied, typically
  * due to a file permission or other access check.
  *
- * <p> This exception is not related to the {@link
- * java.security.AccessControlException AccessControlException} or {@link
- * SecurityException} thrown by access controllers or security managers when
- * access to a file is denied.
- *
  * @since 1.7
  */
 
diff --git a/src/java.base/share/classes/java/nio/file/FileSystem.java b/src/java.base/share/classes/java/nio/file/FileSystem.java
index 7fab17166ad..cfc6ade6641 100644
--- a/src/java.base/share/classes/java/nio/file/FileSystem.java
+++ b/src/java.base/share/classes/java/nio/file/FileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,22 +172,15 @@ protected FileSystem() {
      *
      * <p> A file system provides access to a file store that may be composed
      * of a number of distinct file hierarchies, each with its own top-level
-     * root directory. Unless denied by the security manager, each element in
-     * the returned iterator corresponds to the root directory of a distinct
-     * file hierarchy. The order of the elements is not defined. The file
-     * hierarchies may change during the lifetime of the Java virtual machine.
+     * root directory. Each element in the returned iterator corresponds to the
+     * root directory of a distinct file hierarchy. The order of the elements is
+     * not defined. The file hierarchies may change during the lifetime of the
+     * ava virtual machine.
      * For example, in some implementations, the insertion of removable media
      * may result in the creation of a new file hierarchy with its own
      * top-level directory. There is no guarantee that a root directory
      * can be accessed.
      *
-     * <p> When a security manager is installed, it is invoked to check access
-     * to the each root directory. If denied, the root directory is not returned
-     * by the iterator. In the case of the default provider, the {@link
-     * SecurityManager#checkRead(String)} method is invoked to check read access
-     * to each root directory. It is system dependent if the permission checks
-     * are done when the iterator is obtained or during iteration.
-     *
      * @return  An object to iterate over the root directories
      */
     public abstract Iterable<Path> getRootDirectories();
@@ -201,16 +194,6 @@ protected FileSystem() {
      * Java virtual machine. When an I/O error occurs, perhaps because a file
      * store is not accessible, then it is not returned by the iterator.
      *
-     * <p> In the case of the default provider, and a security manager is
-     * installed, the security manager is invoked to check {@link
-     * RuntimePermission}{@code ("getFileStoreAttributes")}. If denied, then
-     * no file stores are returned by the iterator. In addition, the security
-     * manager's {@link SecurityManager#checkRead(String)} method is invoked to
-     * check read access to the file store's <em>top-most</em> directory. If
-     * denied, the file store is not returned by the iterator. It is system
-     * dependent if the permission checks are done when the iterator is obtained
-     * or during iteration.
-     *
      * <p> <b>Usage Example:</b>
      * Suppose we want to print the space usage for all file stores:
      * {@snippet lang=java :
diff --git a/src/java.base/share/classes/java/nio/file/FileSystems.java b/src/java.base/share/classes/java/nio/file/FileSystems.java
index 6a691502551..ddf1033c7ee 100644
--- a/src/java.base/share/classes/java/nio/file/FileSystems.java
+++ b/src/java.base/share/classes/java/nio/file/FileSystems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -206,11 +206,6 @@ public static FileSystem getDefault() {
      * exception if invoked after the file system is closed (and before a new
      * instance is created by the {@link #newFileSystem newFileSystem} method).
      *
-     * <p> If a security manager is installed then a provider implementation
-     * may require to check a permission before returning a reference to an
-     * existing file system. In the case of the {@link FileSystems#getDefault
-     * default} file system, no permission check is required.
-     *
      * @param   uri  the URI to locate the file system
      *
      * @return  the reference to the file system
@@ -221,9 +216,6 @@ public static FileSystem getDefault() {
      *          if the file system, identified by the URI, does not exist
      * @throws  ProviderNotFoundException
      *          if a provider supporting the URI scheme is not installed
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission
      */
     public static FileSystem getFileSystem(URI uri) {
         String scheme = uri.getScheme();
@@ -278,9 +270,6 @@ public static FileSystem getFileSystem(URI uri) {
      *          if a provider supporting the URI scheme is not installed
      * @throws  IOException
      *          if an I/O error occurs creating the file system
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission required by the file system provider implementation
      */
     public static FileSystem newFileSystem(URI uri, Map<String,?> env)
         throws IOException
@@ -323,9 +312,6 @@ public static FileSystem newFileSystem(URI uri, Map<String,?> env)
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          an I/O error occurs creating the file system
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission required by the file system provider implementation
      */
     public static FileSystem newFileSystem(URI uri, Map<String,?> env, ClassLoader loader)
         throws IOException
@@ -389,9 +375,6 @@ public static FileSystem newFileSystem(URI uri, Map<String,?> env, ClassLoader l
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission
      */
     public static FileSystem newFileSystem(Path path,
                                            ClassLoader loader)
@@ -428,9 +411,6 @@ public static FileSystem newFileSystem(Path path,
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission
      *
      * @since 13
      */
@@ -465,9 +445,6 @@ public static FileSystem newFileSystem(Path path, Map<String,?> env)
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission
      *
      * @since 13
      */
@@ -510,9 +487,6 @@ public static FileSystem newFileSystem(Path path) throws IOException {
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission
      *
      * @since 13
      */
diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java
index c1eba232359..9599193d5d7 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -149,10 +149,6 @@ private static Runnable asUncheckedRunnable(Closeable c) {
      *          if an unsupported option is specified
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public static InputStream newInputStream(Path path, OpenOption... options)
         throws IOException
@@ -214,13 +210,6 @@ public static InputStream newInputStream(Path path, OpenOption... options)
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      */
     public static OutputStream newOutputStream(Path path, OpenOption... options)
         throws IOException
@@ -359,16 +348,6 @@ public static OutputStream newOutputStream(Path path, OpenOption... options)
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the path if the file is
-     *          opened for reading. The {@link SecurityManager#checkWrite(String)
-     *          checkWrite} method is invoked to check write access to the path
-     *          if the file is opened for writing. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @see java.nio.channels.FileChannel#open(Path,Set,FileAttribute[])
      */
@@ -406,16 +385,6 @@ public static SeekableByteChannel newByteChannel(Path path,
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the path if the file is
-     *          opened for reading. The {@link SecurityManager#checkWrite(String)
-     *          checkWrite} method is invoked to check write access to the path
-     *          if the file is opened for writing. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @see java.nio.channels.FileChannel#open(Path,OpenOption[])
      */
@@ -471,10 +440,6 @@ private AcceptAllFilter() { }
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      */
     public static DirectoryStream<Path> newDirectoryStream(Path dir)
         throws IOException
@@ -526,10 +491,6 @@ public static DirectoryStream<Path> newDirectoryStream(Path dir)
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      */
     public static DirectoryStream<Path> newDirectoryStream(Path dir, String glob)
         throws IOException
@@ -602,10 +563,6 @@ public boolean accept(Path entry)  {
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      */
     public static DirectoryStream<Path> newDirectoryStream(Path dir,
                                                            DirectoryStream.Filter<? super Path> filter)
@@ -647,10 +604,6 @@ public static DirectoryStream<Path> newDirectoryStream(Path dir,
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs or the parent directory does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the new file.
      */
     public static Path createFile(Path path, FileAttribute<?>... attrs)
         throws IOException
@@ -689,10 +642,6 @@ public static Path createFile(Path path, FileAttribute<?>... attrs)
      *          that name already exists <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs or the parent directory does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the new directory.
      */
     public static Path createDirectory(Path dir, FileAttribute<?>... attrs)
         throws IOException
@@ -733,17 +682,6 @@ public static Path createDirectory(Path dir, FileAttribute<?>... attrs)
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          in the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked prior to attempting to create a directory and
-     *          its {@link SecurityManager#checkRead(String) checkRead} is
-     *          invoked for each parent directory that is checked. If {@code
-     *          dir} is not an absolute path then its {@link Path#toAbsolutePath
-     *          toAbsolutePath} may need to be invoked to get its absolute path.
-     *          This may invoke the security manager's {@link
-     *          SecurityManager#checkPropertyAccess(String) checkPropertyAccess}
-     *          method to check access to the system property {@code user.dir}
      */
     public static Path createDirectories(Path dir, FileAttribute<?>... attrs)
         throws IOException
@@ -865,10 +803,6 @@ private static void createAndCheckIsDirectory(Path dir,
      *          when creating the directory
      * @throws  IOException
      *          if an I/O error occurs or {@code dir} does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
      */
     public static Path createTempFile(Path dir,
                                       String prefix,
@@ -911,10 +845,6 @@ public static Path createTempFile(Path dir,
      * @throws  IOException
      *          if an I/O error occurs or the temporary-file directory does not
      *          exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file.
      */
     public static Path createTempFile(String prefix,
                                       String suffix,
@@ -963,11 +893,6 @@ public static Path createTempFile(String prefix,
      *          when creating the directory
      * @throws  IOException
      *          if an I/O error occurs or {@code dir} does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access when creating the
-     *          directory.
      */
     public static Path createTempDirectory(Path dir,
                                            String prefix,
@@ -1005,11 +930,6 @@ public static Path createTempDirectory(Path dir,
      * @throws  IOException
      *          if an I/O error occurs or the temporary-file directory does not
      *          exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access when creating the
-     *          directory.
      */
     public static Path createTempDirectory(String prefix,
                                            FileAttribute<?>... attrs)
@@ -1057,11 +977,6 @@ public static Path createTempDirectory(String prefix,
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it denies {@link LinkPermission}{@code ("symbolic")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the path of the symbolic link.
      */
     public static Path createSymbolicLink(Path link, Path target,
                                           FileAttribute<?>... attrs)
@@ -1102,12 +1017,6 @@ public static Path createSymbolicLink(Path link, Path target,
      *          that name already exists <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it denies {@link LinkPermission}{@code ("hard")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to either the link or the
-     *          existing file.
      */
     public static Path createLink(Path link, Path existing) throws IOException {
         provider(link).createLink(link, existing);
@@ -1144,10 +1053,6 @@ public static Path createLink(Path link, Path existing) throws IOException {
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String)} method
-     *          is invoked to check delete access to the file
      */
     public static void delete(Path path) throws IOException {
         provider(path).delete(path);
@@ -1183,10 +1088,6 @@ public static void delete(Path path) throws IOException {
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String)} method
-     *          is invoked to check delete access to the file.
      */
     public static boolean deleteIfExists(Path path) throws IOException {
         return provider(path).deleteIfExists(path);
@@ -1287,14 +1188,6 @@ public static boolean deleteIfExists(Path path) throws IOException {
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the source file, the
-     *          {@link SecurityManager#checkWrite(String) checkWrite} is invoked
-     *          to check write access to the target file. If a symbolic link is
-     *          copied the security manager is invoked to check {@link
-     *          LinkPermission}{@code ("symbolic")}.
      */
     public static Path copy(Path source, Path target, CopyOption... options)
         throws IOException
@@ -1422,11 +1315,6 @@ public static Path copy(Path source, Path target, CopyOption... options)
      *          the file cannot be moved as an atomic file system operation.
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to both the source and
-     *          target file.
      */
     public static Path move(Path source, Path target, CopyOption... options)
         throws IOException
@@ -1465,10 +1353,6 @@ public static Path move(Path source, Path target, CopyOption... options)
      *          is not a symbolic link <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it checks that {@code FilePermission} has been
-     *          granted with the "{@code readlink}" action to read the link.
      */
     public static Path readSymbolicLink(Path link) throws IOException {
         return provider(link).readSymbolicLink(link);
@@ -1492,12 +1376,6 @@ public static Path readSymbolicLink(Path link) throws IOException {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file, and in
-     *          addition it checks
-     *          {@link RuntimePermission}{@code ("getFileStoreAttributes")}
      */
     public static FileStore getFileStore(Path path) throws IOException {
         return provider(path).getFileStore(path);
@@ -1535,11 +1413,6 @@ public static FileStore getFileStore(Path path) throws IOException {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to both files when the
-     *          two paths are not equal
      *
      * @see java.nio.file.attribute.BasicFileAttributes#fileKey
      */
@@ -1591,11 +1464,6 @@ public static boolean isSameFile(Path path, Path path2) throws IOException {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to both files when the
-     *          two paths are not equal
      *
      * @since 12
      */
@@ -1644,10 +1512,6 @@ public static long mismatch(Path path, Path path2) throws IOException {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public static boolean isHidden(Path path) throws IOException {
         return provider(path).isHidden(path);
@@ -1729,9 +1593,6 @@ private static List<FileTypeDetector> loadInstalledDetectors() {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission required by a file type detector implementation.
      *
      * @spec https://www.rfc-editor.org/info/rfc2045
      *      RFC 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
@@ -1850,12 +1711,6 @@ public static <V extends FileAttributeView> V getFileAttributeView(Path path,
      *          if an attributes of the given type are not supported
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file. If this
-     *          method is invoked to read security sensitive attributes then the
-     *          security manager may be invoked to check for additional permissions.
      */
     public static <A extends BasicFileAttributes> A readAttributes(Path path,
                                                                    Class<A> type,
@@ -1919,12 +1774,6 @@ public static <A extends BasicFileAttributes> A readAttributes(Path path,
      *          type
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file. If this method is invoked
-     *          to set security sensitive attributes then the security manager
-     *          may be invoked to check for additional permissions.
      */
     public static Path setAttribute(Path path, String attribute, Object value,
                                     LinkOption... options)
@@ -1980,12 +1829,6 @@ public static Path setAttribute(Path path, String attribute, Object value,
      *          if the attribute name is not specified or is not recognized
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file. If this method is invoked
-     *          to read security sensitive attributes then the security manager
-     *          may be invoked to check for additional permissions.
      */
     public static Object getAttribute(Path path, String attribute,
                                       LinkOption... options)
@@ -2084,12 +1927,6 @@ public static Object getAttribute(Path path, String attribute,
      *          specified
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file. If this method is invoked
-     *          to read security sensitive attributes then the security manager
-     *          may be invoked to check for additional permissions.
      */
     public static Map<String,Object> readAttributes(Path path, String attributes,
                                                     LinkOption... options)
@@ -2125,12 +1962,6 @@ public static Map<String,Object> readAttributes(Path path, String attributes,
      *          PosixFileAttributeView}
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     public static Set<PosixFilePermission> getPosixFilePermissions(Path path,
                                                                    LinkOption... options)
@@ -2163,12 +1994,6 @@ public static Set<PosixFilePermission> getPosixFilePermissions(Path path,
      *          PosixFilePermission}
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     public static Path setPosixFilePermissions(Path path,
                                                Set<PosixFilePermission> perms)
@@ -2201,12 +2026,6 @@ public static Path setPosixFilePermissions(Path path,
      *          FileOwnerAttributeView}
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     public static UserPrincipal getOwner(Path path, LinkOption... options) throws IOException {
         FileOwnerAttributeView view =
@@ -2245,12 +2064,6 @@ public static UserPrincipal getOwner(Path path, LinkOption... options) throws IO
      *          FileOwnerAttributeView}
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      *
      * @see FileSystem#getUserPrincipalLookupService
      * @see java.nio.file.attribute.UserPrincipalLookupService
@@ -2280,11 +2093,6 @@ public static Path setOwner(Path path, UserPrincipal owner)
      * @return  {@code true} if the file is a symbolic link; {@code false} if
      *          the file does not exist, is not a symbolic link, or it cannot
      *          be determined if the file is a symbolic link or not.
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file.
      */
     public static boolean isSymbolicLink(Path path) {
         try {
@@ -2319,11 +2127,6 @@ public static boolean isSymbolicLink(Path path) {
      * @return  {@code true} if the file is a directory; {@code false} if
      *          the file does not exist, is not a directory, or it cannot
      *          be determined if the file is a directory or not.
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file.
      */
     public static boolean isDirectory(Path path, LinkOption... options) {
         try {
@@ -2358,11 +2161,6 @@ public static boolean isDirectory(Path path, LinkOption... options) {
      * @return  {@code true} if the file is a regular file; {@code false} if
      *          the file does not exist, is not a regular file, or it
      *          cannot be determined if the file is a regular file or not.
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file.
      */
     public static boolean isRegularFile(Path path, LinkOption... options) {
         try {
@@ -2395,10 +2193,6 @@ public static boolean isRegularFile(Path path, LinkOption... options) {
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file.
      *
      * @see BasicFileAttributes#lastModifiedTime
      */
@@ -2434,10 +2228,6 @@ public static FileTime getLastModifiedTime(Path path, LinkOption... options)
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkWrite(String)
-     *          checkWrite} method denies write access to the file.
      *
      * @see BasicFileAttributeView#setTimes
      */
@@ -2463,10 +2253,6 @@ public static Path setLastModifiedTime(Path path, FileTime time)
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file.
      *
      * @see BasicFileAttributes#size
      */
@@ -2514,11 +2300,6 @@ private static boolean followLinks(LinkOption... options) {
      * @return  {@code true} if the file exists; {@code false} if the file does
      *          not exist or its existence cannot be determined.
      *
-     * @throws  SecurityException
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} is invoked to check
-     *          read access to the file.
-     *
      * @see #notExists
      * @see FileSystemProvider#checkAccess
      */
@@ -2551,11 +2332,6 @@ public static boolean exists(Path path, LinkOption... options) {
      *
      * @return  {@code true} if the file does not exist; {@code false} if the
      *          file exists or its existence cannot be determined
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} is invoked to check
-     *          read access to the file.
      */
     public static boolean notExists(Path path, LinkOption... options) {
         try {
@@ -2609,11 +2385,6 @@ private static boolean isAccessible(Path path, AccessMode... modes) {
      *          if the file does not exist, read access would be denied because
      *          the Java virtual machine has insufficient privileges, or access
      *          cannot be determined
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          is invoked to check read access to the file.
      */
     public static boolean isReadable(Path path) {
         FileSystemProvider provider = provider(path);
@@ -2644,11 +2415,6 @@ public static boolean isReadable(Path path) {
      *          if the file does not exist, write access would be denied because
      *          the Java virtual machine has insufficient privileges, or access
      *          cannot be determined
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          is invoked to check write access to the file.
      */
     public static boolean isWritable(Path path) {
         FileSystemProvider provider = provider(path);
@@ -2683,11 +2449,6 @@ public static boolean isWritable(Path path) {
      *          if the file does not exist, execute access would be denied because
      *          the Java virtual machine has insufficient privileges, or access
      *          cannot be determined
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkExec(String)
-     *          checkExec} is invoked to check execute access to the file.
      */
     public static boolean isExecutable(Path path) {
         FileSystemProvider provider = provider(path);
@@ -2754,20 +2515,15 @@ public static boolean isExecutable(Path path) {
      *
      * <p> The {@code maxDepth} parameter is the maximum number of levels of
      * directories to visit. A value of {@code 0} means that only the starting
-     * file is visited, unless denied by the security manager. A value of
-     * {@link Integer#MAX_VALUE MAX_VALUE} may be used to indicate that all
-     * levels should be visited. The {@code visitFile} method is invoked for all
-     * files, including directories, encountered at {@code maxDepth}, unless the
-     * basic file attributes cannot be read, in which case the {@code
+     * file is visited. A value of {@link Integer#MAX_VALUE MAX_VALUE} may be used
+     * to indicate that all levels should be visited. The {@code visitFile} method
+     * is invoked for all files, including directories, encountered at {@code maxDepth},
+     * unless the basic file attributes cannot be read, in which case the {@code
      * visitFileFailed} method is invoked.
      *
      * <p> If a visitor returns a result of {@code null} then {@code
      * NullPointerException} is thrown.
      *
-     * <p> When a security manager is installed and it denies access to a file
-     * (or directory), then it is ignored and the visitor is not invoked for
-     * that file (or directory).
-     *
      * @param   start
      *          the starting file
      * @param   options
@@ -2781,11 +2537,6 @@ public static boolean isExecutable(Path path) {
      *
      * @throws  IllegalArgumentException
      *          if the {@code maxDepth} parameter is negative
-     * @throws  SecurityException
-     *          If the security manager denies access to the starting file.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String) checkRead} method is invoked
-     *          to check read access to the directory.
      * @throws  IOException
      *          if an I/O error is thrown by a visitor method
      */
@@ -2867,11 +2618,6 @@ public static Path walkFileTree(Path start,
      *
      * @return  the starting file
      *
-     * @throws  SecurityException
-     *          If the security manager denies access to the starting file.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String) checkRead} method is invoked
-     *          to check read access to the directory.
      * @throws  IOException
      *          if an I/O error is thrown by a visitor method
      */
@@ -2907,10 +2653,6 @@ public static Path walkFileTree(Path start, FileVisitor<? super Path> visitor)
      *
      * @throws  IOException
      *          if an I/O error occurs opening the file
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @see #readAllLines
      */
@@ -2943,10 +2685,6 @@ public static BufferedReader newBufferedReader(Path path, Charset cs)
      *
      * @throws  IOException
      *          if an I/O error occurs opening the file
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @since 1.8
      */
@@ -2994,13 +2732,6 @@ public static BufferedReader newBufferedReader(Path path) throws IOException {
      *          If a file of that name already exists and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @see #write(Path,Iterable,Charset,OpenOption[])
      */
@@ -3044,13 +2775,6 @@ public static BufferedWriter newBufferedWriter(Path path, Charset cs,
      *          If a file of that name already exists and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 1.8
      */
@@ -3117,13 +2841,6 @@ public static BufferedWriter newBufferedWriter(Path path, OpenOption... options)
      *          <i>(optional specific exception)</i>
      * @throws  UnsupportedOperationException
      *          if {@code options} contains a copy option that is not supported
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. Where the
-     *          {@code REPLACE_EXISTING} option is specified, the security
-     *          manager's {@link SecurityManager#checkDelete(String) checkDelete}
-     *          method is invoked to check that an existing file can be deleted.
      */
     public static long copy(InputStream in, Path target, CopyOption... options)
         throws IOException
@@ -3204,10 +2921,6 @@ public static long copy(InputStream in, Path target, CopyOption... options)
      *
      * @throws  IOException
      *          if an I/O error occurs when reading or writing
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public static long copy(Path source, OutputStream out) throws IOException {
         // ensure not null before opening file
@@ -3283,10 +2996,6 @@ private static byte[] read(InputStream source, int initialSize) throws IOExcepti
      * @throws  OutOfMemoryError
      *          if an array of the required size cannot be allocated, for
      *          example the file is larger that {@code 2GB}
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public static byte[] readAllBytes(Path path) throws IOException {
         try (SeekableByteChannel sbc = Files.newByteChannel(path);
@@ -3318,10 +3027,6 @@ public static byte[] readAllBytes(Path path) throws IOException {
      *          unmappable byte sequence is read
      * @throws  OutOfMemoryError
      *          if the file is extremely large, for example larger than {@code 2GB}
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @since 11
      */
@@ -3356,10 +3061,6 @@ public static String readString(Path path) throws IOException {
      *          unmappable byte sequence is read
      * @throws  OutOfMemoryError
      *          if the file is extremely large, for example larger than {@code 2GB}
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @since 11
      */
@@ -3405,10 +3106,6 @@ public static String readString(Path path, Charset cs) throws IOException {
      * @throws  IOException
      *          if an I/O error occurs reading from the file or a malformed or
      *          unmappable byte sequence is read
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @see #newBufferedReader
      */
@@ -3446,10 +3143,6 @@ public static List<String> readAllLines(Path path, Charset cs) throws IOExceptio
      * @throws  IOException
      *          if an I/O error occurs reading from the file or a malformed or
      *          unmappable byte sequence is read
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @since 1.8
      */
@@ -3499,13 +3192,6 @@ public static List<String> readAllLines(Path path) throws IOException {
      *          If a file of that name already exists and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      */
     public static Path write(Path path, byte[] bytes, OpenOption... options)
         throws IOException
@@ -3567,13 +3253,6 @@ public static Path write(Path path, byte[] bytes, OpenOption... options)
      *          If a file of that name already exists and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      */
     public static Path write(Path path, Iterable<? extends CharSequence> lines,
                              Charset cs, OpenOption... options)
@@ -3619,13 +3298,6 @@ public static Path write(Path path, Iterable<? extends CharSequence> lines,
      *          text cannot be encoded as {@code UTF-8}
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 1.8
      */
@@ -3662,13 +3334,6 @@ public static Path write(Path path,
      *          text cannot be encoded using UTF-8
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 11
      */
@@ -3714,13 +3379,6 @@ public static Path writeString(Path path, CharSequence csq, OpenOption... option
      *          text cannot be encoded using the specified charset
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      *
      * @since 11
      */
@@ -3784,10 +3442,6 @@ public static Path writeString(Path path, CharSequence csq, Charset cs, OpenOpti
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs when opening the directory
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      *
      * @see     #newDirectoryStream(Path)
      * @since   1.8
@@ -3875,12 +3529,8 @@ public Path next() {
      *
      * <p> The {@code maxDepth} parameter is the maximum number of levels of
      * directories to visit. A value of {@code 0} means that only the starting
-     * file is visited, unless denied by the security manager. A value of
-     * {@link Integer#MAX_VALUE MAX_VALUE} may be used to indicate that all
-     * levels should be visited.
-     *
-     * <p> When a security manager is installed and it denies access to a file
-     * (or directory), then it is ignored and not included in the stream.
+     * file is visited. A value of {@link Integer#MAX_VALUE MAX_VALUE} may be used
+     * to indicate that all levels should be visited.
      *
      * <p> The returned stream contains references to one or more open directories.
      * The directories are closed by closing the stream.
@@ -3906,11 +3556,6 @@ public Path next() {
      *
      * @throws  IllegalArgumentException
      *          if the {@code maxDepth} parameter is negative
-     * @throws  SecurityException
-     *          If the security manager denies access to the starting file.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String) checkRead} method is invoked
-     *          to check read access to the directory.
      * @throws  IOException
      *          if an I/O error is thrown when accessing the starting file.
      * @since   1.8
@@ -3964,11 +3609,6 @@ public static Stream<Path> walk(Path start,
      *
      * @return  the {@link Stream} of {@link Path}
      *
-     * @throws  SecurityException
-     *          If the security manager denies access to the starting file.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String) checkRead} method is invoked
-     *          to check read access to the directory.
      * @throws  IOException
      *          if an I/O error is thrown when accessing the starting file.
      *
@@ -4022,11 +3662,6 @@ public static Stream<Path> walk(Path start, FileVisitOption... options) throws I
      *
      * @throws  IllegalArgumentException
      *          if the {@code maxDepth} parameter is negative
-     * @throws  SecurityException
-     *          If the security manager denies access to the starting file.
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String) checkRead} method is invoked
-     *          to check read access to the directory.
      * @throws  IOException
      *          if an I/O error is thrown when accessing the starting file.
      *
@@ -4117,10 +3752,6 @@ public static Stream<Path> find(Path start,
      *
      * @throws  IOException
      *          if an I/O error occurs opening the file
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @see     #readAllLines(Path, Charset)
      * @see     #newBufferedReader(Path, Charset)
@@ -4222,10 +3853,6 @@ private static Stream<String> createBufferedReaderLinesStream(BufferedReader br)
      *
      * @throws  IOException
      *          if an I/O error occurs opening the file
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      *
      * @since 1.8
      */
diff --git a/src/java.base/share/classes/java/nio/file/LinkPermission.java b/src/java.base/share/classes/java/nio/file/LinkPermission.java
index 81921f059cb..e53b6aebc1f 100644
--- a/src/java.base/share/classes/java/nio/file/LinkPermission.java
+++ b/src/java.base/share/classes/java/nio/file/LinkPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,41 +30,11 @@
 /**
  * The {@code Permission} class for link creation operations.
  *
- * <p> The following table provides a summary description of what the permission
- * allows, and discusses the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">Table shows permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- * <tr>
- *   <th scope="row">hard</th>
- *   <td> Ability to add an existing file to a directory. This is sometimes
- *   known as creating a link, or hard link. </td>
- *   <td> Extreme care should be taken when granting this permission. It allows
- *   linking to any file or directory in the file system thus allowing the
- *   attacker access to all files. </td>
- * </tr>
- * <tr>
- *   <th scope="row">symbolic</th>
- *   <td> Ability to create symbolic links. </td>
- *   <td> Extreme care should be taken when granting this permission. It allows
- *   linking to any file or directory in the file system thus allowing the
- *   attacker to access to all files. </td>
- * </tr>
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.7
- *
- * @see Files#createLink
- * @see Files#createSymbolicLink
  */
 public final class LinkPermission extends BasicPermission {
     @java.io.Serial
diff --git a/src/java.base/share/classes/java/nio/file/Path.java b/src/java.base/share/classes/java/nio/file/Path.java
index a461152803b..827dd56a6a4 100644
--- a/src/java.base/share/classes/java/nio/file/Path.java
+++ b/src/java.base/share/classes/java/nio/file/Path.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,9 +188,6 @@ public static Path of(String first, String... more) {
      *          The file system, identified by the URI, does not exist and
      *          cannot be created automatically, or the provider identified by
      *          the URI's scheme component is not installed
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission to access the file system
      *
      * @since 11
      */
@@ -747,11 +744,6 @@ default Path resolveSibling(String other) {
      *          file system is constructed to access the contents of a file as
      *          a file system, and the URI of the enclosing file system cannot be
      *          obtained
-     *
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, the {@link #toAbsolutePath toAbsolutePath} method
-     *          throws a security exception.
      */
     URI toUri();
 
@@ -769,12 +761,6 @@ default Path resolveSibling(String other) {
      *
      * @throws  java.io.IOError
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager
-     *          is installed, and this path is not absolute, then the security
-     *          manager's {@link SecurityManager#checkPropertyAccess(String)
-     *          checkPropertyAccess} method is invoked to check access to the
-     *          system property {@code user.dir}
      */
     Path toAbsolutePath();
 
@@ -814,13 +800,6 @@ default Path resolveSibling(String other) {
      *
      * @throws  IOException
      *          if the file does not exist or an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file, and where
-     *          this path is not absolute, its {@link SecurityManager#checkPropertyAccess(String)
-     *          checkPropertyAccess} method is invoked to check access to the
-     *          system property {@code user.dir}
      */
     Path toRealPath(LinkOption... options) throws IOException;
 
@@ -913,10 +892,6 @@ default File toFile() {
      *          and the file is not a directory  <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     @Override
     WatchKey register(WatchService watcher,
@@ -969,10 +944,6 @@ WatchKey register(WatchService watcher,
      *          and the file is not a directory  <i>(optional specific exception)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     @Override
     default WatchKey register(WatchService watcher,
diff --git a/src/java.base/share/classes/java/nio/file/Paths.java b/src/java.base/share/classes/java/nio/file/Paths.java
index 216fef4ae99..03d1a2b1259 100644
--- a/src/java.base/share/classes/java/nio/file/Paths.java
+++ b/src/java.base/share/classes/java/nio/file/Paths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,9 +88,6 @@ public static Path get(String first, String... more) {
      *          The file system, identified by the URI, does not exist and
      *          cannot be created automatically, or the provider identified by
      *          the URI's scheme component is not installed
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission to access the file system
      *
      * @see Path#of(URI)
      */
diff --git a/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java b/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
index 445a80b8e37..4348c60f5e2 100644
--- a/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
+++ b/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,6 @@
  * newDirectoryStream} method will be a {@code SecureDirectoryStream} and must
  * be cast to that type in order to invoke the methods defined by this interface.
  *
- * <p> In the case of the default {@link java.nio.file.spi.FileSystemProvider
- * provider}, and a security manager is set, then the permission checks are
- * performed using the path obtained by resolving the given relative path
- * against the <i>original path</i> of the directory (irrespective of if the
- * directory is moved since it was opened).
  * @param <T> The type of element returned by the iterator
  *
  * @since   1.7
@@ -90,10 +85,6 @@ public interface SecureDirectoryStream<T>
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      */
     SecureDirectoryStream<T> newDirectoryStream(T path, LinkOption... options)
         throws IOException;
@@ -138,13 +129,6 @@ SecureDirectoryStream<T> newDirectoryStream(T path, LinkOption... options)
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the path if the file
-     *          is opened for reading. The {@link SecurityManager#checkWrite(String)
-     *          checkWrite} method is invoked to check write access to the path
-     *          if the file is opened for writing.
      */
     SeekableByteChannel newByteChannel(T path,
                                        Set<? extends OpenOption> options,
@@ -171,10 +155,6 @@ SeekableByteChannel newByteChannel(T path,
      *          if the file does not exist <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String) checkDelete}
-     *          method is invoked to check delete access to the file
      */
     void deleteFile(T path) throws IOException;
 
@@ -199,10 +179,6 @@ SeekableByteChannel newByteChannel(T path,
      *          not empty <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String) checkDelete}
-     *          method is invoked to check delete access to the directory
      */
     void deleteDirectory(T path) throws IOException;
 
@@ -238,11 +214,6 @@ SeekableByteChannel newByteChannel(T path,
      *          if the file cannot be moved as an atomic file system operation
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to both the source and
-     *          target file.
      */
     void move(T srcpath, SecureDirectoryStream<T> targetdir, T targetpath)
         throws IOException;
diff --git a/src/java.base/share/classes/java/nio/file/Watchable.java b/src/java.base/share/classes/java/nio/file/Watchable.java
index c65d4f90c15..d4c383a37ab 100644
--- a/src/java.base/share/classes/java/nio/file/Watchable.java
+++ b/src/java.base/share/classes/java/nio/file/Watchable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,10 +81,6 @@ public interface Watchable {
      *          if the watch service is closed
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission required to monitor this object. Implementations of
-     *          this interface should specify the permission checks.
      */
     WatchKey register(WatchService watcher,
                       WatchEvent.Kind<?>[] events,
@@ -118,10 +114,6 @@ WatchKey register(WatchService watcher,
      *          if the watch service is closed
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          if a security manager is installed and it denies an unspecified
-     *          permission required to monitor this object. Implementations of
-     *          this interface should specify the permission checks.
      */
     WatchKey register(WatchService watcher, WatchEvent.Kind<?>... events)
         throws IOException;
diff --git a/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
index f76a21430f1..6984a8c4d77 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -170,11 +170,6 @@ public interface AclFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     List<AclEntry> getAcl() throws IOException;
 
@@ -206,11 +201,6 @@ public interface AclFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs or the ACL is invalid
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, it denies {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     void setAcl(List<AclEntry> acl) throws IOException;
 }
diff --git a/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
index d38fd338294..e356d0013f9 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,10 +121,6 @@ public interface BasicFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file
      */
     BasicFileAttributes readAttributes() throws IOException;
 
@@ -169,10 +165,6 @@ public interface BasicFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, its  {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file
      *
      * @see java.nio.file.Files#setLastModifiedTime
      */
diff --git a/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
index 0c600fbda0a..9265a294407 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,6 @@ public interface DosFileAttributeView
 
     /**
      * @throws  IOException                             {@inheritDoc}
-     * @throws  SecurityException                       {@inheritDoc}
      */
     @Override
     DosFileAttributes readAttributes() throws IOException;
@@ -115,10 +114,6 @@ public interface DosFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default, and a security manager is installed,
-     *          its  {@link SecurityManager#checkWrite(String) checkWrite} method
-     *          is invoked to check write access to the file
      */
     void setReadOnly(boolean value) throws IOException;
 
@@ -135,10 +130,6 @@ public interface DosFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default, and a security manager is installed,
-     *          its  {@link SecurityManager#checkWrite(String) checkWrite} method
-     *          is invoked to check write access to the file
      */
     void setHidden(boolean value) throws IOException;
 
@@ -155,10 +146,6 @@ public interface DosFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default, and a security manager is installed,
-     *          its  {@link SecurityManager#checkWrite(String) checkWrite} method
-     *          is invoked to check write access to the file
      */
     void setSystem(boolean value) throws IOException;
 
@@ -175,10 +162,6 @@ public interface DosFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default, and a security manager is installed,
-     *          its  {@link SecurityManager#checkWrite(String) checkWrite} method
-     *          is invoked to check write access to the file
      */
     void setArchive(boolean value) throws IOException;
 }
diff --git a/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
index 82d0d1bce6f..00554ae4327 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,12 +66,6 @@ public interface FileOwnerAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserInformation")} or its
-     *          {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     UserPrincipal getOwner() throws IOException;
 
@@ -90,12 +84,6 @@ public interface FileOwnerAttributeView
      *          if an I/O error occurs, or the {@code owner} parameter is a
      *          group and this implementation does not support setting the owner
      *          to a group
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserInformation")} or its
-     *          {@link SecurityManager#checkWrite(String) checkWrite} method
-     *          denies write access to the file.
      */
     void setOwner(UserPrincipal owner) throws IOException;
 }
diff --git a/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
index 80d088c3b3c..18cbee2a096 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,12 +152,6 @@ public interface PosixFileAttributeView
 
     /**
      * @throws  IOException                {@inheritDoc}
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     @Override
     PosixFileAttributes readAttributes() throws IOException;
@@ -173,12 +167,6 @@ public interface PosixFileAttributeView
      *          PosixFilePermission}
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     void setPermissions(Set<PosixFilePermission> perms) throws IOException;
 
@@ -190,12 +178,6 @@ public interface PosixFileAttributeView
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it denies
-     *          {@link RuntimePermission}{@code ("accessUserInformation")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     void setGroup(GroupPrincipal group) throws IOException;
 }
diff --git a/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java b/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
index 215a6fb1dff..882611e00ad 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,12 +47,6 @@
  * intended for use where the size of an attribute value is larger than {@link
  * Integer#MAX_VALUE}.
  *
- * <p> User-defined attributes may be used in some implementations to store
- * security related attributes so consequently, in the case of the default
- * provider at least, all methods that access user-defined attributes require the
- * {@code RuntimePermission("accessUserDefinedAttributes")} permission when a
- * security manager is installed.
- *
  * <p> The {@link java.nio.file.FileStore#supportsFileAttributeView
  * supportsFileAttributeView} method may be used to test if a specific {@link
  * java.nio.file.FileStore FileStore} supports the storage of user-defined
@@ -86,12 +80,6 @@ public interface UserDefinedFileAttributeView
      *
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserDefinedAttributes")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     List<String> list() throws IOException;
 
@@ -107,12 +95,6 @@ public interface UserDefinedFileAttributeView
      *          If the size of the attribute is larger than {@link Integer#MAX_VALUE}
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserDefinedAttributes")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      */
     int size(String name) throws IOException;
 
@@ -153,12 +135,6 @@ public interface UserDefinedFileAttributeView
      * @throws  IOException
      *          If an I/O error occurs or there is insufficient space in the
      *          destination buffer for the attribute value
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserDefinedAttributes")}
-     *          or its {@link SecurityManager#checkRead(String) checkRead} method
-     *          denies read access to the file.
      *
      * @see #size
      */
@@ -203,12 +179,6 @@ public interface UserDefinedFileAttributeView
      *
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserDefinedAttributes")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     int write(String name, ByteBuffer src) throws IOException;
 
@@ -220,12 +190,6 @@ public interface UserDefinedFileAttributeView
      *
      * @throws  IOException
      *          If an I/O error occurs or the attribute does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, and it denies {@link
-     *          RuntimePermission}{@code ("accessUserDefinedAttributes")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file.
      */
     void delete(String name) throws IOException;
 }
diff --git a/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java b/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
index 64e26604bd8..34ff6b44103 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,10 +70,6 @@ protected UserPrincipalLookupService() {
      *          the principal does not exist
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it checks
-     *          {@link RuntimePermission}{@code ("lookupUserInformation")}
      */
     public abstract UserPrincipal lookupPrincipalByName(String name)
         throws IOException;
@@ -96,10 +92,6 @@ public abstract UserPrincipal lookupPrincipalByName(String name)
      *          the principal does not exist or is not a group
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, it checks
-     *          {@link RuntimePermission}{@code ("lookupUserInformation")}
      */
     public abstract GroupPrincipal lookupPrincipalByGroupName(String group)
         throws IOException;
diff --git a/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java b/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
index 17caff30b03..0f91e9b5f89 100644
--- a/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
+++ b/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,16 +118,7 @@ public abstract class FileSystemProvider {
     private static volatile List<FileSystemProvider> installedProviders;
 
     // used to avoid recursive loading of installed providers
-    private static boolean loadingProviders  = false;
-
-    private static Void checkPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("fileSystemProvider"));
-        return null;
-    }
-    private FileSystemProvider(Void ignore) { }
+    private static boolean loadingProviders;
 
     /**
      * Initializes a new instance of this class.
@@ -136,13 +127,8 @@ private FileSystemProvider(Void ignore) { }
      * with the default provider but care needs to be taken to avoid circular
      * loading of other installed providers. If circular loading of installed
      * providers is detected then an unspecified error is thrown.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("fileSystemProvider")}
      */
     protected FileSystemProvider() {
-        this(checkPermission());
     }
 
     // loads all installed providers
@@ -256,9 +242,6 @@ public List<FileSystemProvider> run() {
      *          by the provider, or a property value is invalid
      * @throws  IOException
      *          An I/O error occurs creating the file system
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission required by the file system provider implementation
      * @throws  FileSystemAlreadyExistsException
      *          If the file system has already been created
      */
@@ -286,11 +269,6 @@ public abstract FileSystem newFileSystem(URI uri, Map<String,?> env)
      * closed (and before a new instance is created by the {@link #newFileSystem
      * newFileSystem} method).
      *
-     * <p> If a security manager is installed then a provider implementation
-     * may require to check a permission before returning a reference to an
-     * existing file system. In the case of the {@link FileSystems#getDefault
-     * default} file system, no permission check is required.
-     *
      * @param   uri
      *          URI reference
      *
@@ -300,9 +278,6 @@ public abstract FileSystem newFileSystem(URI uri, Map<String,?> env)
      *          If the pre-conditions for the {@code uri} parameter aren't met
      * @throws  FileSystemNotFoundException
      *          If the file system does not exist
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission.
      */
     public abstract FileSystem getFileSystem(URI uri);
 
@@ -317,11 +292,6 @@ public abstract FileSystem newFileSystem(URI uri, Map<String,?> env)
      * fragment components. The resulting {@code Path} is associated with the
      * default {@link FileSystems#getDefault default} {@code FileSystem}.
      *
-     * <p> If a security manager is installed then a provider implementation
-     * may require to check a permission. In the case of the {@link
-     * FileSystems#getDefault default} file system, no permission check is
-     * required.
-     *
      * @param   uri
      *          The URI to convert
      *
@@ -333,9 +303,6 @@ public abstract FileSystem newFileSystem(URI uri, Map<String,?> env)
      * @throws  FileSystemNotFoundException
      *          The file system, identified by the URI, does not exist and
      *          cannot be created automatically
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission.
      */
     public abstract Path getPath(URI uri);
 
@@ -370,9 +337,6 @@ public abstract FileSystem newFileSystem(URI uri, Map<String,?> env)
      *          by the provider, or a property value is invalid
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          If a security manager is installed and it denies an unspecified
-     *          permission.
      */
     public FileSystem newFileSystem(Path path, Map<String,?> env)
         throws IOException
@@ -403,10 +367,6 @@ public FileSystem newFileSystem(Path path, Map<String,?> env)
      *          if an unsupported option is specified
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public InputStream newInputStream(Path path, OpenOption... options)
         throws IOException
@@ -455,13 +415,6 @@ public InputStream newInputStream(Path path, OpenOption... options)
      *          If a file of that name already exists and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the file. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      */
     public OutputStream newOutputStream(Path path, OpenOption... options)
         throws IOException
@@ -518,12 +471,6 @@ public OutputStream newOutputStream(Path path, OpenOption... options)
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default file system, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      */
     public FileChannel newFileChannel(Path path,
                                       Set<? extends OpenOption> options,
@@ -571,12 +518,6 @@ public FileChannel newFileChannel(Path path,
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default file system, the {@link
-     *          SecurityManager#checkRead(String)} method is invoked to check
-     *          read access if the file is opened for reading. The {@link
-     *          SecurityManager#checkWrite(String)} method is invoked to check
-     *          write access if the file is opened for writing
      */
     public AsynchronousFileChannel newAsynchronousFileChannel(Path path,
                                                               Set<? extends OpenOption> options,
@@ -614,16 +555,6 @@ public AsynchronousFileChannel newAsynchronousFileChannel(Path path,
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the path if the file is
-     *          opened for reading. The {@link SecurityManager#checkWrite(String)
-     *          checkWrite} method is invoked to check write access to the path
-     *          if the file is opened for writing. The {@link
-     *          SecurityManager#checkDelete(String) checkDelete} method is
-     *          invoked to check delete access if the file is opened with the
-     *          {@code DELETE_ON_CLOSE} option.
      */
     public abstract SeekableByteChannel newByteChannel(Path path,
         Set<? extends OpenOption> options, FileAttribute<?>... attrs) throws IOException;
@@ -647,10 +578,6 @@ public abstract SeekableByteChannel newByteChannel(Path path,
      *          a directory <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the directory.
      */
     public abstract DirectoryStream<Path> newDirectoryStream(Path dir,
          DirectoryStream.Filter<? super Path> filter) throws IOException;
@@ -673,10 +600,6 @@ public abstract DirectoryStream<Path> newDirectoryStream(Path dir,
      *          that name already exists <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs or the parent directory does not exist
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to the new directory.
      */
     public abstract void createDirectory(Path dir, FileAttribute<?>... attrs)
         throws IOException;
@@ -705,11 +628,6 @@ public abstract void createDirectory(Path dir, FileAttribute<?>... attrs)
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it denies {@link LinkPermission}{@code ("symbolic")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the path of the symbolic link.
      */
     public void createSymbolicLink(Path link, Path target, FileAttribute<?>... attrs)
         throws IOException
@@ -738,12 +656,6 @@ public void createSymbolicLink(Path link, Path target, FileAttribute<?>... attrs
      *          that name already exists <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it denies {@link LinkPermission}{@code ("hard")}
-     *          or its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to either the  link or the
-     *          existing file.
      */
     public void createLink(Path link, Path existing) throws IOException {
         throw new UnsupportedOperationException();
@@ -764,10 +676,6 @@ public void createLink(Path link, Path existing) throws IOException {
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String)} method
-     *          is invoked to check delete access to the file
      */
     public abstract void delete(Path path) throws IOException;
 
@@ -792,10 +700,6 @@ public void createLink(Path link, Path existing) throws IOException {
      *          exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkDelete(String)} method
-     *          is invoked to check delete access to the file
      */
     public boolean deleteIfExists(Path path) throws IOException {
         try {
@@ -825,10 +729,6 @@ public boolean deleteIfExists(Path path) throws IOException {
      *          is not a symbolic link <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager
-     *          is installed, it checks that {@code FilePermission} has been
-     *          granted with the "{@code readlink}" action to read the link.
      */
     public Path readSymbolicLink(Path link) throws IOException {
         throw new UnsupportedOperationException();
@@ -859,14 +759,6 @@ public Path readSymbolicLink(Path link) throws IOException {
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the source file, the
-     *          {@link SecurityManager#checkWrite(String) checkWrite} is invoked
-     *          to check write access to the target file. If a symbolic link is
-     *          copied the security manager is invoked to check {@link
-     *          LinkPermission}{@code ("symbolic")}.
      */
     public abstract void copy(Path source, Path target, CopyOption... options)
         throws IOException;
@@ -898,11 +790,6 @@ public abstract void copy(Path source, Path target, CopyOption... options)
      *          the file cannot be moved as an atomic file system operation.
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method is invoked to check write access to both the source and
-     *          target file.
      */
     public abstract void move(Path source, Path target, CopyOption... options)
         throws IOException;
@@ -920,10 +807,6 @@ public abstract void move(Path source, Path target, CopyOption... options)
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to both files.
      */
     public abstract boolean isSameFile(Path path, Path path2)
         throws IOException;
@@ -942,10 +825,6 @@ public abstract boolean isSameFile(Path path, Path path2)
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file.
      */
     public abstract boolean isHidden(Path path) throws IOException;
 
@@ -961,12 +840,6 @@ public abstract boolean isSameFile(Path path, Path path2)
      *
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file, and in
-     *          addition it checks
-     *          {@link RuntimePermission}{@code ("getFileStoreAttributes")}
      */
     public abstract FileStore getFileStore(Path path) throws IOException;
 
@@ -1039,14 +912,6 @@ public abstract boolean isSameFile(Path path, Path path2)
      *          privileges or other reasons. <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, the {@link SecurityManager#checkRead(String) checkRead}
-     *          is invoked when checking read access to the file or only the
-     *          existence of the file, the {@link SecurityManager#checkWrite(String)
-     *          checkWrite} is invoked when checking write access to the file,
-     *          and {@link SecurityManager#checkExec(String) checkExec} is invoked
-     *          when checking execute access.
      */
     public abstract void checkAccess(Path path, AccessMode... modes)
         throws IOException;
@@ -1092,10 +957,6 @@ public abstract void checkAccess(Path path, AccessMode... modes)
      *          if an attributes of the given type are not supported
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file
      */
     public abstract <A extends BasicFileAttributes> A
         readAttributes(Path path, Class<A> type, LinkOption... options) throws IOException;
@@ -1122,12 +983,6 @@ public abstract void checkAccess(Path path, AccessMode... modes)
      *          specified
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method denies read access to the file. If this method is invoked
-     *          to read security sensitive attributes then the security manager
-     *          may be invoked to check for additional permissions.
      */
     public abstract Map<String,Object> readAttributes(Path path, String attributes,
                                                       LinkOption... options)
@@ -1158,12 +1013,6 @@ public abstract Map<String,Object> readAttributes(Path path, String attributes,
      *          type
      * @throws  IOException
      *          If an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, and a security manager is
-     *          installed, its {@link SecurityManager#checkWrite(String) checkWrite}
-     *          method denies write access to the file. If this method is invoked
-     *          to set security sensitive attributes then the security manager
-     *          may be invoked to check for additional permissions.
      */
     public abstract void setAttribute(Path path, String attribute,
                                       Object value, LinkOption... options)
@@ -1189,11 +1038,6 @@ public abstract void setAttribute(Path path, String attribute,
      * @return  {@code true} if the file exists; {@code false} if the file does
      *          not exist or its existence cannot be determined.
      *
-     * @throws  SecurityException
-     *          In the case of the default provider, the {@link
-     *          SecurityManager#checkRead(String)} is invoked to check
-     *          read access to the file.
-     *
      * @since 20
      */
     public boolean exists(Path path, LinkOption... options) {
@@ -1252,12 +1096,6 @@ public boolean exists(Path path, LinkOption... options) {
      *          if an attributes of the given type are not supported
      * @throws  IOException
      *          if an I/O error occurs
-     * @throws  SecurityException
-     *          In the case of the default provider, a security manager is
-     *          installed, its {@link SecurityManager#checkRead(String) checkRead}
-     *          method is invoked to check read access to the file. If this
-     *          method is invoked to read security sensitive attributes then the
-     *          security manager may be invoked to check for additional permissions.
      *
      * @since 20
      */
diff --git a/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java b/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
index 7b235654979..6115ef3dd4a 100644
--- a/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
+++ b/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,24 +49,10 @@
 
 public abstract class FileTypeDetector {
 
-    private static Void checkPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("fileTypeDetector"));
-        return null;
-    }
-    private FileTypeDetector(Void ignore) { }
-
     /**
      * Initializes a new instance of this class.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("fileTypeDetector")}
      */
     protected FileTypeDetector() {
-        this(checkPermission());
     }
 
     /**
@@ -92,13 +78,6 @@ protected FileTypeDetector() {
      *
      * @throws  IOException
      *          An I/O error occurs
-     * @throws  SecurityException
-     *          If the implementation requires to access the file, and a
-     *          security manager is installed, and it denies an unspecified
-     *          permission required by a file system provider implementation.
-     *          If the file reference is associated with the default file system
-     *          provider then the {@link SecurityManager#checkRead(String)} method
-     *          is invoked to check read access to the file.
      *
      * @spec https://www.rfc-editor.org/info/rfc2045
      *      RFC 2045: Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies
diff --git a/src/java.base/share/classes/java/security/AccessControlContext.java b/src/java.base/share/classes/java/security/AccessControlContext.java
index 6c75d890f07..6c73e6339fb 100644
--- a/src/java.base/share/classes/java/security/AccessControlContext.java
+++ b/src/java.base/share/classes/java/security/AccessControlContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,58 +28,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import sun.security.util.Debug;
-import sun.security.util.FilePermCompat;
-import sun.security.util.SecurityConstants;
-
-
 /**
- * An {@code AccessControlContext} is used to make system resource access
- * decisions based on the context it encapsulates.
- *
- * <p>More specifically, it encapsulates a context and
- * has a single method, {@code checkPermission},
- * that is equivalent to the {@code checkPermission} method
- * in the {@code AccessController} class, with one difference:
- * The {@code checkPermission} method makes access decisions based on the
- * context it encapsulates,
- * rather than that of the current execution thread.
- *
- * <p>Thus, the purpose of {@code AccessControlContext} is for those
- * situations where a security check that should be made within a given context
- * actually needs to be done from within a
- * <i>different</i> context (for example, from within a worker thread).
- *
- * <p> An {@code AccessControlContext} is created by calling the
- * {@code AccessController.getContext} method.
- * The {@code getContext} method takes a "snapshot"
- * of the current calling context, and places
- * it in an {@code AccessControlContext} object, which it returns.
- * A sample call is the following:
- *
- * <pre>
- *   AccessControlContext acc = AccessController.getContext()
- * </pre>
- *
- * <p>
- * Code within a different context can subsequently call the
- * {@code checkPermission} method on the
- * previously-saved {@code AccessControlContext} object. A sample call is the
- * following:
- *
- * <pre>
- *   acc.checkPermission(permission)
- * </pre>
- *
- * @see AccessController
+ * {@code AccessControlContext} was used with the Security Manager for access
+ * control decisions based on context that it encapsulated. This feature no
+ * longer exists.
  *
  * @author Roland Schemers
  * @since 1.2
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated This class was only useful in conjunction with the {@linkplain
+ *       SecurityManager the Security Manager}, which is no longer supported.
+ *       There is no replacement for the Security Manager or this class.
  */
 
 @Deprecated(since="17", forRemoval=true)
@@ -98,32 +56,6 @@ public final class AccessControlContext {
     @SuppressWarnings("removal")
     private DomainCombiner combiner = null;
 
-    // limited privilege scope
-    private Permission[] permissions;
-    private AccessControlContext parent;
-    private boolean isWrapped;
-
-    // is constrained by limited privilege scope?
-    private boolean isLimited;
-    private ProtectionDomain[] limitedContext;
-
-    private static boolean debugInit = false;
-    private static Debug debug = null;
-
-    @SuppressWarnings("removal")
-    static Debug getDebug()
-    {
-        if (debugInit)
-            return debug;
-        else {
-            if (Policy.isSet()) {
-                debug = Debug.getInstance("access");
-                debugInit = true;
-            }
-            return debug;
-        }
-    }
-
     /**
      * Create an {@code AccessControlContext} with the given array of
      * {@code ProtectionDomain} objects.
@@ -148,7 +80,7 @@ public AccessControlContext(ProtectionDomain[] context)
         } else {
             List<ProtectionDomain> v = new ArrayList<>(context.length);
             for (int i =0; i< context.length; i++) {
-                if ((context[i] != null) &&  (!v.contains(context[i])))
+                if ((context[i] != null) && (!v.contains(context[i])))
                     v.add(context[i]);
             }
             if (!v.isEmpty()) {
@@ -174,177 +106,12 @@ public AccessControlContext(ProtectionDomain[] context)
      * @throws    NullPointerException if the provided
      *          {@code context} is {@code null}.
      *
-     * @throws    SecurityException if a security manager is installed and the
-     *          caller does not have the "createAccessControlContext"
-     *          {@link SecurityPermission}
      * @since 1.3
      */
     public AccessControlContext(AccessControlContext acc,
                                 @SuppressWarnings("removal") DomainCombiner combiner) {
-
-        this(acc, combiner, false);
-    }
-
-    /**
-     * package private to allow calls from {@code ProtectionDomain} without
-     * performing the security check for
-     * {@linkplain SecurityConstants#CREATE_ACC_PERMISSION} permission
-     */
-    AccessControlContext(AccessControlContext acc,
-                        @SuppressWarnings("removal") DomainCombiner combiner,
-                        boolean preauthorized) {
-        if (!preauthorized) {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                sm.checkPermission(SecurityConstants.CREATE_ACC_PERMISSION);
-                this.isAuthorized = true;
-            }
-        } else {
-            this.isAuthorized = true;
-        }
-
         this.context = acc.context;
-
-        // we do not need to run the combine method on the
-        // provided ACC.  it was already "combined" when the
-        // context was originally retrieved.
-        //
-        // at this point in time, we simply throw away the old
-        // combiner and use the newly provided one.
-        this.combiner = combiner;
-    }
-
-    /**
-     * package private for {@code AccessController}
-     *
-     * This "argument wrapper" context will be passed as the actual context
-     * parameter on an internal doPrivileged() call used in the implementation.
-     */
-    AccessControlContext(ProtectionDomain caller, @SuppressWarnings("removal") DomainCombiner combiner,
-        AccessControlContext parent, AccessControlContext context,
-        Permission[] perms)
-    {
-        /*
-         * Combine the domains from the doPrivileged() context into our
-         * wrapper context, if necessary.
-         */
-        ProtectionDomain[] callerPDs = null;
-        if (caller != null) {
-             callerPDs = new ProtectionDomain[] { caller };
-        }
-        if (context != null) {
-            if (combiner != null) {
-                this.context = combiner.combine(callerPDs, context.context);
-            } else {
-                this.context = combine(callerPDs, context.context);
-            }
-        } else {
-            /*
-             * Call combiner even if there is seemingly nothing to combine.
-             */
-            if (combiner != null) {
-                this.context = combiner.combine(callerPDs, null);
-            } else {
-                this.context = combine(callerPDs, null);
-            }
-        }
         this.combiner = combiner;
-
-        Permission[] tmp = null;
-        if (perms != null) {
-            tmp = new Permission[perms.length];
-            for (int i=0; i < perms.length; i++) {
-                if (perms[i] == null) {
-                    throw new NullPointerException("permission can't be null");
-                }
-
-                /*
-                 * An AllPermission argument is equivalent to calling
-                 * doPrivileged() without any limit permissions.
-                 */
-                if (perms[i].getClass() == AllPermission.class) {
-                    parent = null;
-                }
-                // Add altPath into permission for compatibility.
-                tmp[i] = FilePermCompat.newPermPlusAltPath(perms[i]);
-            }
-        }
-
-        /*
-         * For a doPrivileged() with limited privilege scope, initialize
-         * the relevant fields.
-         *
-         * The limitedContext field contains the union of all domains which
-         * are enclosed by this limited privilege scope. In other words,
-         * it contains all of the domains which could potentially be checked
-         * if none of the limiting permissions implied a requested permission.
-         */
-        if (parent != null) {
-            this.limitedContext = combine(parent.context, parent.limitedContext);
-            this.isLimited = true;
-            this.isWrapped = true;
-            this.permissions = tmp;
-            this.parent = parent;
-            this.privilegedContext = context; // used in checkPermission2()
-        }
-        this.isAuthorized = true;
-    }
-
-
-    /**
-     * package private constructor for {@code AccessController.getContext()}
-     */
-
-    AccessControlContext(ProtectionDomain[] context,
-                         boolean isPrivileged)
-    {
-        this.context = context;
-        this.isPrivileged = isPrivileged;
-        this.isAuthorized = true;
-    }
-
-    /**
-     * Constructor for {@code JavaSecurityAccess.doIntersectionPrivilege()}
-     */
-    AccessControlContext(ProtectionDomain[] context,
-                         AccessControlContext privilegedContext)
-    {
-        this.context = context;
-        this.privilegedContext = privilegedContext;
-        this.isPrivileged = true;
-    }
-
-    /**
-     * Returns this context's context.
-     */
-    ProtectionDomain[] getContext() {
-        return context;
-    }
-
-    /**
-     * Returns {@code true} if this context is privileged.
-     */
-    boolean isPrivileged()
-    {
-        return isPrivileged;
-    }
-
-    /**
-     * get the assigned combiner from the privileged or inherited context
-     */
-    @SuppressWarnings("removal")
-    DomainCombiner getAssignedCombiner() {
-        AccessControlContext acc;
-        if (isPrivileged) {
-            acc = privilegedContext;
-        } else {
-            acc = AccessController.getInheritedAccessControlContext();
-        }
-        if (acc != null) {
-            return acc.combiner;
-        }
-        return null;
     }
 
     /**
@@ -355,404 +122,26 @@ DomainCombiner getAssignedCombiner() {
      *          {@code AccessControlContext}, or {@code null}
      *          if there is none.
      *
-     * @throws    SecurityException if a security manager is installed and
-     *          the caller does not have the "getDomainCombiner"
-     *          {@link SecurityPermission}
      * @since 1.3
      */
     @SuppressWarnings("removal")
     public DomainCombiner getDomainCombiner() {
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(SecurityConstants.GET_COMBINER_PERMISSION);
-        }
-        return getCombiner();
-    }
-
-    /**
-     * package private for {@code AccessController}
-     */
-    @SuppressWarnings("removal")
-    DomainCombiner getCombiner() {
         return combiner;
     }
 
-    boolean isAuthorized() {
-        return isAuthorized;
-    }
-
     /**
-     * Determines whether the access request indicated by the
-     * specified permission should be allowed or denied, based on
-     * the security policy currently in effect, and the context in
-     * this object. The request is allowed only if every
-     * {@code ProtectionDomain} in the context implies the permission.
-     * Otherwise the request is denied.
-     *
-     * <p>
-     * This method quietly returns if the access request
-     * is permitted, or throws a suitable {@code AccessControlException}
-     * otherwise.
+     * Throws {@code AccessControlException}.
      *
-     * @param perm the requested permission.
-     *
-     * @throws    AccessControlException if the specified permission
-     * is not permitted, based on the current security policy and the
-     * context encapsulated by this object.
-     * @throws    NullPointerException if the permission to check for is
-     * {@code null}.
+     * @param perm ignored
+     * @throws    AccessControlException always
      */
     @SuppressWarnings("removal")
     public void checkPermission(Permission perm)
         throws AccessControlException
     {
-        boolean dumpDebug = false;
-
-        if (perm == null) {
-            throw new NullPointerException("permission can't be null");
-        }
-        if (getDebug() != null) {
-            // If "codebase" is not specified, we dump the info by default.
-            dumpDebug = !Debug.isOn("codebase=");
-            if (!dumpDebug) {
-                // If "codebase" is specified, only dump if the specified code
-                // value is in the stack.
-                for (int i = 0; context != null && i < context.length; i++) {
-                    if (context[i].getCodeSource() != null &&
-                        context[i].getCodeSource().getLocation() != null &&
-                        Debug.isOn("codebase=" + context[i].getCodeSource().getLocation().toString())) {
-                        dumpDebug = true;
-                        break;
-                    }
-                }
-            }
-
-            dumpDebug &= !Debug.isOn("permission=") ||
-                Debug.isOn("permission=" + perm.getClass().getCanonicalName());
-
-            if (dumpDebug && Debug.isOn("stack")) {
-                Thread.dumpStack();
-            }
-
-            if (dumpDebug && Debug.isOn("domain")) {
-                if (context == null) {
-                    debug.println("domain (context is null)");
-                } else {
-                    for (int i=0; i< context.length; i++) {
-                        debug.println("domain "+i+" "+context[i]);
-                    }
-                }
-            }
-        }
-
-        /*
-         * iterate through the ProtectionDomains in the context.
-         * Stop at the first one that doesn't allow the
-         * requested permission (throwing an exception).
-         *
-         */
-
-        /* if ctxt is null, all we had on the stack were system domains,
-           or the first domain was a Privileged system domain. This
-           is to make the common case for system code very fast */
-
-        if (context == null) {
-            checkPermission2(perm);
-            return;
-        }
-
-        for (int i=0; i< context.length; i++) {
-            if (context[i] != null && !context[i].impliesWithAltFilePerm(perm)) {
-                if (dumpDebug) {
-                    debug.println("access denied " + perm);
-                }
-
-                if (Debug.isOn("failure") && debug != null) {
-                    // Want to make sure this is always displayed for failure,
-                    // but do not want to display again if already displayed
-                    // above.
-                    if (!dumpDebug) {
-                        debug.println("access denied " + perm);
-                    }
-                    Thread.dumpStack();
-                    final ProtectionDomain pd = context[i];
-                    final Debug db = debug;
-                    AccessController.doPrivileged (new PrivilegedAction<>() {
-                        public Void run() {
-                            db.println("domain that failed "+pd);
-                            return null;
-                        }
-                    });
-                }
-                throw new AccessControlException("access denied "+perm, perm);
-            }
-        }
-
-        // allow if all of them allowed access
-        if (dumpDebug) {
-            debug.println("access allowed "+perm);
-        }
-
-        checkPermission2(perm);
+        throw new AccessControlException("checking permissions is not supported");
     }
 
-    /*
-     * Check the domains associated with the limited privilege scope.
-     */
-    private void checkPermission2(Permission perm) {
-        if (!isLimited) {
-            return;
-        }
-
-        /*
-         * Check the doPrivileged() context parameter, if present.
-         */
-        if (privilegedContext != null) {
-            privilegedContext.checkPermission2(perm);
-        }
-
-        /*
-         * Ignore the limited permissions and parent fields of a wrapper
-         * context since they were already carried down into the unwrapped
-         * context.
-         */
-        if (isWrapped) {
-            return;
-        }
-
-        /*
-         * Try to match any limited privilege scope.
-         */
-        if (permissions != null) {
-            Class<?> permClass = perm.getClass();
-            for (int i=0; i < permissions.length; i++) {
-                Permission limit = permissions[i];
-                if (limit.getClass().equals(permClass) && limit.implies(perm)) {
-                    return;
-                }
-            }
-        }
-
-        /*
-         * Check the limited privilege scope up the call stack or the inherited
-         * parent thread call stack of this ACC.
-         */
-        if (parent != null) {
-            /*
-             * As an optimization, if the parent context is the inherited call
-             * stack context from a parent thread then checking the protection
-             * domains of the parent context is redundant since they have
-             * already been merged into the child thread's context by
-             * optimize(). When parent is set to an inherited context this
-             * context was not directly created by a limited scope
-             * doPrivileged() and it does not have its own limited permissions.
-             */
-            if (permissions == null) {
-                parent.checkPermission2(perm);
-            } else {
-                parent.checkPermission(perm);
-            }
-        }
-    }
-
-    /**
-     * Take the stack-based context (this) and combine it with the
-     * privileged or inherited context, if need be. Any limited
-     * privilege scope is flagged regardless of whether the assigned
-     * context comes from an immediately enclosing limited doPrivileged().
-     * The limited privilege scope can indirectly flow from the inherited
-     * parent thread or an assigned context previously captured by getContext().
-     */
-    @SuppressWarnings("removal")
-    AccessControlContext optimize() {
-        // the assigned (privileged or inherited) context
-        AccessControlContext acc;
-        DomainCombiner combiner = null;
-        AccessControlContext parent = null;
-        Permission[] permissions = null;
-
-        if (isPrivileged) {
-            acc = privilegedContext;
-            if (acc != null) {
-                /*
-                 * If the context is from a limited scope doPrivileged() then
-                 * copy the permissions and parent fields out of the wrapper
-                 * context that was created to hold them.
-                 */
-                if (acc.isWrapped) {
-                    permissions = acc.permissions;
-                    parent = acc.parent;
-                }
-            }
-        } else {
-            acc = AccessController.getInheritedAccessControlContext();
-            if (acc != null) {
-                /*
-                 * If the inherited context is constrained by a limited scope
-                 * doPrivileged() then set it as our parent so we will process
-                 * the non-domain-related state.
-                 */
-                if (acc.isLimited) {
-                    parent = acc;
-                }
-            }
-        }
-
-        // this.context could be null if only system code is on the stack;
-        // in that case, ignore the stack context
-        boolean skipStack = (context == null);
-
-        // acc.context could be null if only system code was involved;
-        // in that case, ignore the assigned context
-        boolean skipAssigned = (acc == null || acc.context == null);
-        ProtectionDomain[] assigned = (skipAssigned) ? null : acc.context;
-        ProtectionDomain[] pd;
-
-        // if there is no enclosing limited privilege scope on the stack or
-        // inherited from a parent thread
-        boolean skipLimited = ((acc == null || !acc.isWrapped) && parent == null);
-
-        if (acc != null && acc.combiner != null) {
-            // let the assigned acc's combiner do its thing
-            if (getDebug() != null) {
-                debug.println("AccessControlContext invoking the Combiner");
-            }
-
-            // No need to clone current and assigned.context
-            // combine() will not update them
-            combiner = acc.combiner;
-            pd = combiner.combine(context, assigned);
-        } else {
-            if (skipStack) {
-                if (skipAssigned) {
-                    calculateFields(acc, parent, permissions);
-                    return this;
-                } else if (skipLimited) {
-                    return acc;
-                }
-            } else if (assigned != null) {
-                if (skipLimited) {
-                    // optimization: if there is a single stack domain and
-                    // that domain is already in the assigned context; no
-                    // need to combine
-                    if (context.length == 1 && context[0] == assigned[0]) {
-                        return acc;
-                    }
-                }
-            }
-
-            pd = combine(context, assigned);
-            if (skipLimited && !skipAssigned && pd == assigned) {
-                return acc;
-            } else if (skipAssigned && pd == context) {
-                calculateFields(acc, parent, permissions);
-                return this;
-            }
-        }
-
-        // Reuse existing ACC
-        this.context = pd;
-        this.combiner = combiner;
-        this.isPrivileged = false;
-
-        calculateFields(acc, parent, permissions);
-        return this;
-    }
-
-
-    /*
-     * Combine the current (stack) and assigned domains.
-     */
-    private static ProtectionDomain[] combine(ProtectionDomain[] current,
-        ProtectionDomain[] assigned) {
-
-        // current could be null if only system code is on the stack;
-        // in that case, ignore the stack context
-        boolean skipStack = (current == null);
-
-        // assigned could be null if only system code was involved;
-        // in that case, ignore the assigned context
-        boolean skipAssigned = (assigned == null);
-
-        int slen = (skipStack) ? 0 : current.length;
-
-        // optimization: if there is no assigned context and the stack length
-        // is less then or equal to two; there is no reason to compress the
-        // stack context, it already is
-        if (skipAssigned && slen <= 2) {
-            return current;
-        }
-
-        int n = (skipAssigned) ? 0 : assigned.length;
-
-        // now we combine both of them, and create a new context
-        ProtectionDomain[] pd = new ProtectionDomain[slen + n];
-
-        // first copy in the assigned context domains, no need to compress
-        if (!skipAssigned) {
-            System.arraycopy(assigned, 0, pd, 0, n);
-        }
-
-        // now add the stack context domains, discarding nulls and duplicates
-    outer:
-        for (int i = 0; i < slen; i++) {
-            ProtectionDomain sd = current[i];
-            if (sd != null) {
-                for (int j = 0; j < n; j++) {
-                    if (sd == pd[j]) {
-                        continue outer;
-                    }
-                }
-                pd[n++] = sd;
-            }
-        }
-
-        // if length isn't equal, we need to shorten the array
-        if (n != pd.length) {
-            // optimization: if we didn't really combine anything
-            if (!skipAssigned && n == assigned.length) {
-                return assigned;
-            } else if (skipAssigned && n == slen) {
-                return current;
-            }
-            ProtectionDomain[] tmp = new ProtectionDomain[n];
-            System.arraycopy(pd, 0, tmp, 0, n);
-            pd = tmp;
-        }
-
-        return pd;
-    }
-
-
-    /*
-     * Calculate the additional domains that could potentially be reached via
-     * limited privilege scope. Mark the context as being subject to limited
-     * privilege scope unless the reachable domains (if any) are already
-     * contained in this domain context (in which case any limited
-     * privilege scope checking would be redundant).
-     */
-    private void calculateFields(AccessControlContext assigned,
-        AccessControlContext parent, Permission[] permissions)
-    {
-        ProtectionDomain[] parentLimit = null;
-        ProtectionDomain[] assignedLimit = null;
-        ProtectionDomain[] newLimit;
-
-        parentLimit = (parent != null)? parent.limitedContext: null;
-        assignedLimit = (assigned != null)? assigned.limitedContext: null;
-        newLimit = combine(parentLimit, assignedLimit);
-        if (newLimit != null) {
-            if (context == null || !containsAllPDs(newLimit, context)) {
-                this.limitedContext = newLimit;
-                this.permissions = permissions;
-                this.parent = parent;
-                this.isLimited = true;
-            }
-        }
-    }
-
-
     /**
      * Checks two {@code AccessControlContext} objects for equality.
      * Checks that {@code obj} is
@@ -770,8 +159,7 @@ public boolean equals(Object obj) {
             return true;
 
         return obj instanceof AccessControlContext that
-                && equalContext(that)
-                && equalLimitedContext(that);
+                && equalContext(that);
     }
 
     /*
@@ -805,87 +193,6 @@ private boolean equalPDs(ProtectionDomain[] a, ProtectionDomain[] b) {
         return true;
     }
 
-    /*
-     * Compare for equality based on state that is captured during a
-     * call to AccessController.getContext() when a limited privilege
-     * scope is in effect.
-     */
-    private boolean equalLimitedContext(AccessControlContext that) {
-        if (that == null)
-            return false;
-
-        /*
-         * If neither instance has limited privilege scope then we're done.
-         */
-        if (!this.isLimited && !that.isLimited)
-            return true;
-
-        /*
-         * If only one instance has limited privilege scope then we're done.
-         */
-         if (!(this.isLimited && that.isLimited))
-             return false;
-
-        /*
-         * Wrapped instances should never escape outside the implementation
-         * this class and AccessController so this will probably never happen
-         * but it only makes any sense to compare if they both have the same
-         * isWrapped state.
-         */
-        if ((this.isWrapped && !that.isWrapped) ||
-            (!this.isWrapped && that.isWrapped)) {
-            return false;
-        }
-
-        if (this.permissions == null && that.permissions != null)
-            return false;
-
-        if (this.permissions != null && that.permissions == null)
-            return false;
-
-        if (!(this.containsAllLimits(that) && that.containsAllLimits(this)))
-            return false;
-
-        /*
-         * Skip through any wrapped contexts.
-         */
-        AccessControlContext thisNextPC = getNextPC(this);
-        AccessControlContext thatNextPC = getNextPC(that);
-
-        /*
-         * The protection domains and combiner of a privilegedContext are
-         * not relevant because they have already been included in the context
-         * of this instance by optimize() so we only care about any limited
-         * privilege state they may have.
-         */
-        if (thisNextPC == null && thatNextPC != null && thatNextPC.isLimited)
-            return false;
-
-        if (thisNextPC != null && !thisNextPC.equalLimitedContext(thatNextPC))
-            return false;
-
-        if (this.parent == null && that.parent != null)
-            return false;
-
-        if (this.parent != null && !this.parent.equals(that.parent))
-            return false;
-
-        return true;
-    }
-
-    /*
-     * Follow the privilegedContext link making our best effort to skip
-     * through any wrapper contexts.
-     */
-    private static AccessControlContext getNextPC(AccessControlContext acc) {
-        while (acc != null && acc.privilegedContext != null) {
-            acc = acc.privilegedContext;
-            if (!acc.isWrapped)
-                return acc;
-        }
-        return null;
-    }
-
     private static boolean containsAllPDs(ProtectionDomain[] thisContext,
         ProtectionDomain[] thatContext) {
         boolean match = false;
@@ -919,27 +226,6 @@ private static boolean containsAllPDs(ProtectionDomain[] thisContext,
         return match;
     }
 
-    private boolean containsAllLimits(AccessControlContext that) {
-        boolean match = false;
-
-        if (this.permissions == null && that.permissions == null)
-            return true;
-
-        for (int i = 0; i < this.permissions.length; i++) {
-            Permission limit = this.permissions[i];
-            Class <?> limitClass = limit.getClass();
-            match = false;
-            for (int j = 0; (j < that.permissions.length) && !match; j++) {
-                Permission perm = that.permissions[j];
-                match = (limitClass.equals(perm.getClass()) &&
-                    limit.equals(perm));
-            }
-            if (!match) return false;
-        }
-        return match;
-    }
-
-
     /**
      * {@return the hash code value for this context}
      * The hash code is computed by exclusive or-ing the hash code of all the
diff --git a/src/java.base/share/classes/java/security/AccessControlException.java b/src/java.base/share/classes/java/security/AccessControlException.java
index 6537b1855b3..4d46cd6887e 100644
--- a/src/java.base/share/classes/java/security/AccessControlException.java
+++ b/src/java.base/share/classes/java/security/AccessControlException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,16 @@
 package java.security;
 
 /**
- * <p> This exception is thrown by the {@code AccessController} to indicate
- * that a requested access (to a critical system resource such as the
- * file system or the network) is denied.
- *
- * <p> The reason to deny access can vary.  For example, the requested
- * permission might be of an incorrect type, contain an invalid
- * value, or request access that is not allowed according to the
- * security policy.  Such information should be given whenever
- * possible at the time the exception is thrown.
+ * This exception was originally thrown by the {@link AccessController} to
+ * indicate that a requested access was denied.
  *
  * @author Li Gong
  * @author Roland Schemers
  * @since 1.2
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated This exception was only useful in conjunction with
+ *       {@linkplain SecurityManager the Security Manager}, which is no
+ *       longer supported. There is no replacement for the Security Manager
+ *       or this class.
  */
 
 @Deprecated(since="17", forRemoval=true)
diff --git a/src/java.base/share/classes/java/security/AccessController.java b/src/java.base/share/classes/java/security/AccessController.java
index 6128681abb6..d93def03b36 100644
--- a/src/java.base/share/classes/java/security/AccessController.java
+++ b/src/java.base/share/classes/java/security/AccessController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,259 +25,17 @@
 
 package java.security;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.ref.Reference;
-
-import jdk.internal.vm.annotation.Hidden;
-import sun.security.util.Debug;
-import sun.security.util.SecurityConstants;
-import jdk.internal.reflect.CallerSensitive;
-import jdk.internal.reflect.Reflection;
-import jdk.internal.vm.annotation.DontInline;
-import jdk.internal.vm.annotation.ForceInline;
-import jdk.internal.vm.annotation.ReservedStackAccess;
-
 /**
- * <p> The {@code AccessController} class is used for access control operations
- * and decisions.
- *
- * <p> More specifically, the {@code AccessController} class is used for
- * three purposes:
- *
- * <ul>
- * <li> to decide whether an access to a critical system
- * resource is to be allowed or denied, based on the security policy
- * currently in effect,
- * <li>to mark code as being "privileged", thus affecting subsequent
- * access determinations, and
- * <li>to obtain a "snapshot" of the current calling context so
- * access-control decisions from a different context can be made with
- * respect to the saved context. </ul>
- *
- * <p> The {@link #checkPermission(Permission) checkPermission} method
- * determines whether the access request indicated by a specified
- * permission should be granted or denied. A sample call appears
- * below. In this example, {@code checkPermission} will determine
- * whether or not to grant "read" access to the file named "testFile" in
- * the "/temp" directory.
- *
- * <pre>
- *
- * FilePermission perm = new FilePermission("/temp/testFile", "read");
- * AccessController.checkPermission(perm);
- *
- * </pre>
- *
- * <p> If a requested access is allowed,
- * {@code checkPermission} returns quietly. If denied, an
- * {@code AccessControlException} is
- * thrown. {@code AccessControlException} can also be thrown if the requested
- * permission is of an incorrect type or contains an invalid value.
- * Such information is given whenever possible.
- *
- * Suppose the current thread traversed m callers, in the order of caller 1
- * to caller 2 to caller m. Then caller m invoked the
- * {@code checkPermission} method.
- * The {@code checkPermission} method determines whether access
- * is granted or denied based on the following algorithm:
- *
- *  <pre> {@code
- * for (int i = m; i > 0; i--) {
- *
- *     if (caller i's domain does not have the permission)
- *         throw AccessControlException
- *
- *     else if (caller i is marked as privileged) {
- *         if (a context was specified in the call to doPrivileged)
- *             context.checkPermission(permission)
- *         if (limited permissions were specified in the call to doPrivileged) {
- *             for (each limited permission) {
- *                 if (the limited permission implies the requested permission)
- *                     return;
- *             }
- *         } else
- *             return;
- *     }
- * }
- *
- * // Next, check the context inherited when the thread was created.
- * // Whenever a new thread is created, the AccessControlContext at
- * // that time is stored and associated with the new thread, as the
- * // "inherited" context.
- *
- * inheritedContext.checkPermission(permission);
- * }</pre>
- *
- * <p> A caller can be marked as being "privileged"
- * (see {@link #doPrivileged(PrivilegedAction) doPrivileged} and below).
- * When making access control decisions, the {@code checkPermission}
- * method stops checking if it reaches a caller that
- * was marked as "privileged" via a {@code doPrivileged}
- * call without a context argument (see below for information about a
- * context argument). If that caller's domain has the
- * specified permission and at least one limiting permission argument (if any)
- * implies the requested permission, no further checking is done and
- * {@code checkPermission}
- * returns quietly, indicating that the requested access is allowed.
- * If that domain does not have the specified permission, an exception
- * is thrown, as usual. If the caller's domain had the specified permission
- * but it was not implied by any limiting permission arguments given in the call
- * to {@code doPrivileged} then the permission checking continues
- * until there are no more callers or another {@code doPrivileged}
- * call matches the requested permission and returns normally.
- *
- * <p> The normal use of the "privileged" feature is as follows. If you
- * don't need to return a value from within the "privileged" block, do
- * the following:
- *
- *  <pre> {@code
- * somemethod() {
- *     ...normal code here...
- *     AccessController.doPrivileged(new PrivilegedAction<Void>() {
- *         public Void run() {
- *             // privileged code goes here, for example:
- *             System.loadLibrary("awt");
- *             return null; // nothing to return
- *         }
- *     });
- *     ...normal code here...
- * }}</pre>
- *
- * <p>
- * {@code PrivilegedAction} is an interface with a single method, named
- * {@code run}.
- * The above example shows creation of an implementation
- * of that interface; a concrete implementation of the
- * {@code run} method is supplied.
- * When the call to {@code doPrivileged} is made, an
- * instance of the {@code PrivilegedAction} implementation is passed
- * to it. The {@code doPrivileged} method calls the
- * {@code run} method from the {@code PrivilegedAction}
- * implementation after enabling privileges, and returns the
- * {@code run} method's return value as the
- * {@code doPrivileged} return value (which is
- * ignored in this example).
- *
- * <p> If you need to return a value, you can do something like the following:
- *
- *  <pre> {@code
- * somemethod() {
- *     ...normal code here...
- *     String user = AccessController.doPrivileged(
- *         new PrivilegedAction<String>() {
- *         public String run() {
- *             return System.getProperty("user.name");
- *             }
- *         });
- *     ...normal code here...
- * }}</pre>
- *
- * <p>If the action performed in your {@code run} method could
- * throw a "checked" exception (those listed in the {@code throws} clause
- * of a method), then you need to use the
- * {@code PrivilegedExceptionAction} interface instead of the
- * {@code PrivilegedAction} interface:
- *
- *  <pre> {@code
- * somemethod() throws FileNotFoundException {
- *     ...normal code here...
- *     try {
- *         FileInputStream fis = AccessController.doPrivileged(
- *         new PrivilegedExceptionAction<FileInputStream>() {
- *             public FileInputStream run() throws FileNotFoundException {
- *                 return new FileInputStream("someFile");
- *             }
- *         });
- *     } catch (PrivilegedActionException e) {
- *         // e.getException() should be an instance of FileNotFoundException,
- *         // as only "checked" exceptions will be "wrapped" in a
- *         // PrivilegedActionException.
- *         throw (FileNotFoundException) e.getException();
- *     }
- *     ...normal code here...
- *  }}</pre>
- *
- * <p> Be *very* careful in your use of the "privileged" construct, and
- * always remember to make the privileged code section as small as possible.
- * You can pass {@code Permission} arguments to further limit the
- * scope of the "privilege" (see below).
- *
- *
- * <p> Note that {@code checkPermission} always performs security checks
- * within the context of the currently executing thread.
- * Sometimes a security check that should be made within a given context
- * will actually need to be done from within a
- * <i>different</i> context (for example, from within a worker thread).
- * The {@link #getContext() getContext} method and
- * {@code AccessControlContext} class are provided
- * for this situation. The {@code getContext} method takes a "snapshot"
- * of the current calling context, and places
- * it in an {@code AccessControlContext} object, which it returns. A sample call is
- * the following:
- *
- * <pre>
- *
- * AccessControlContext acc = AccessController.getContext()
- *
- * </pre>
- *
- * <p>
- * {@code AccessControlContext} itself has a {@code checkPermission} method
- * that makes access decisions based on the context <i>it</i> encapsulates,
- * rather than that of the current execution thread.
- * Code within a different context can thus call that method on the
- * previously-saved {@code AccessControlContext} object. A sample call is the
- * following:
- *
- * <pre>
- *
- * acc.checkPermission(permission)
- *
- * </pre>
- *
- * <p> There are also times where you don't know a priori which permissions
- * to check the context against. In these cases you can use the
- * {@code doPrivileged} method that takes a context. You can also limit the
- * scope of the privileged code by passing additional {@code Permission}
- * parameters.
- *
- *  <pre> {@code
- * somemethod() {
- *     AccessController.doPrivileged(new PrivilegedAction<Object>() {
- *         public Object run() {
- *             // Code goes here. Any permission checks within this
- *             // run method will require that the intersection of the
- *             // caller's protection domain and the snapshot's
- *             // context have the desired permission. If a requested
- *             // permission is not implied by the limiting FilePermission
- *             // argument then checking of the thread continues beyond the
- *             // caller of doPrivileged.
- *         }
- *     }, acc, new FilePermission("/temp/*", read));
- *     ...normal code here...
- * }}</pre>
- * <p> Passing a limiting {@code Permission} argument of an instance of
- * {@code AllPermission} is equivalent to calling the equivalent
- * {@code doPrivileged} method without limiting {@code Permission}
- * arguments. Passing a zero length array of {@code Permission} disables
- * the code privileges so that checking always continues beyond the caller of
- * that {@code doPrivileged} method.
- *
- * @see AccessControlContext
+ * {@code AccessController} was used with the Security Manager for access
+ * control operations and decisions. This feature no longer exists.
  *
  * @author Li Gong
  * @author Roland Schemers
  * @since 1.2
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated This class was only useful in conjunction with {@linkplain
+ *       SecurityManager the Security Manager}, which is no longer supported.
+ *       There is no replacement for the Security Manager or this class.
  */
-
 @Deprecated(since="17", forRemoval=true)
 public final class AccessController {
 
@@ -287,264 +45,186 @@ public final class AccessController {
     private AccessController() { }
 
     /**
-     * Performs the specified {@code PrivilegedAction} with privileges
-     * enabled. The action is performed with <i>all</i> of the permissions
-     * possessed by the caller's protection domain.
+     * Performs the specified action.
      *
      * <p> If the action's {@code run} method throws an (unchecked)
      * exception, it will propagate through this method.
      *
-     * <p> Note that any {@code DomainCombiner} associated with the current
-     * {@code AccessControlContext} will be ignored while the action is
-     * performed.
-     *
      * @param <T> the type of the value returned by the PrivilegedAction's
-     *                  {@code run} method.
+     *                  {@code run} method
      *
-     * @param action the action to be performed.
+     * @param action the action to be performed
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
      * @throws    NullPointerException if the action is {@code null}
      *
      * @see #doPrivileged(PrivilegedAction,AccessControlContext)
      * @see #doPrivileged(PrivilegedExceptionAction)
-     * @see #doPrivilegedWithCombiner(PrivilegedAction)
-     * @see java.security.DomainCombiner
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedAction} with privileges enabled. Running the action
+     *     with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      */
-
-    @CallerSensitive
-    public static <T> T doPrivileged(PrivilegedAction<T> action)
-    {
-        return executePrivileged(action, null, Reflection.getCallerClass());
+    public static <T> T doPrivileged(PrivilegedAction<T> action) {
+        T result = action.run();
+        return result;
     }
 
     /**
-     * Performs the specified {@code PrivilegedAction} with privileges
-     * enabled. The action is performed with <i>all</i> of the permissions
-     * possessed by the caller's protection domain.
+     * Performs the specified action.
      *
      * <p> If the action's {@code run} method throws an (unchecked)
      * exception, it will propagate through this method.
      *
-     * <p> This method preserves the current AccessControlContext's
-     * {@code DomainCombiner} (which may be null) while the action is performed.
-     *
      * @param <T> the type of the value returned by the PrivilegedAction's
-     *                  {@code run} method.
+     *                  {@code run} method
      *
-     * @param action the action to be performed.
+     * @param action the action to be performed
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
      * @throws    NullPointerException if the action is {@code null}
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see java.security.DomainCombiner
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedAction} with privileges enabled and with the current
+     *     access control context's domain combiner preserved. Running the
+     *     action with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      *
      * @since 1.6
      */
-    @CallerSensitive
     public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) {
-        @SuppressWarnings("removal")
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            return AccessController.doPrivileged(action);
-        }
-        @SuppressWarnings("removal")
-        DomainCombiner dc = acc.getAssignedCombiner();
-        return AccessController.doPrivileged(action,
-                                             preserveCombiner(dc, Reflection.getCallerClass()));
+        T result = action.run();
+        return result;
     }
 
-
     /**
-     * Performs the specified {@code PrivilegedAction} with privileges
-     * enabled and restricted by the specified {@code AccessControlContext}.
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified {@code AccessControlContext}.
+     * Performs the specified action.
      * <p>
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
      *
      * @param <T> the type of the value returned by the PrivilegedAction's
-     *                  {@code run} method.
+     *                  {@code run} method
      * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null}, then no additional restriction is applied.
+     * @param context ignored
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
      * @throws    NullPointerException if the action is {@code null}
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedAction} with privileges enabled and restricted
+     *     by the specified {@code AccessControlContext}. Running the
+     *     action with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      */
-    @CallerSensitive
     public static <T> T doPrivileged(PrivilegedAction<T> action,
                                      @SuppressWarnings("removal") AccessControlContext context)
     {
-        Class<?> caller = Reflection.getCallerClass();
-        context = checkContext(context, caller);
-        return executePrivileged(action, context, caller);
+        T result = action.run();
+        return result;
     }
 
-
     /**
-     * Performs the specified {@code PrivilegedAction} with privileges
-     * enabled and restricted by the specified
-     * {@code AccessControlContext} and with a privilege scope limited
-     * by specified {@code Permission} arguments.
+     * Performs the specified action.
      *
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified
-     * {@code AccessControlContext}.
      * <p>
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
      *
      * @param <T> the type of the value returned by the PrivilegedAction's
-     *                  {@code run} method.
-     * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null},
-     *                then no additional restriction is applied.
-     * @param perms the {@code Permission} arguments which limit the
-     *              scope of the caller's privileges. The number of arguments
-     *              is variable.
+     *                  {@code run} method
+     * @param action the action to be performed
+     * @param context ignored
+     * @param perms ignored
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
-     * @throws NullPointerException if action or perms or any element of
-     *         perms is {@code null}
+     * @throws NullPointerException if action is {@code null}
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedAction} with privileges enabled and restricted
+     *     by the specified {@code AccessControlContext} and with a privilege
+     *     scope limited by the specified {@code Permission} arguments. Running
+     *     the action with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      *
      * @since 1.8
      */
-    @CallerSensitive
     public static <T> T doPrivileged(PrivilegedAction<T> action,
             @SuppressWarnings("removal") AccessControlContext context,
             Permission... perms) {
 
-        @SuppressWarnings("removal")
-        AccessControlContext parent = getContext();
-        if (perms == null) {
-            throw new NullPointerException("null permissions parameter");
-        }
-        Class<?> caller = Reflection.getCallerClass();
-        @SuppressWarnings("removal")
-        DomainCombiner dc = (context == null) ? null : context.getCombiner();
-        return AccessController.doPrivileged(action, createWrapper(dc,
-            caller, parent, context, perms));
+        T result = action.run();
+        return result;
     }
 
-
     /**
-     * Performs the specified {@code PrivilegedAction} with privileges
-     * enabled and restricted by the specified
-     * {@code AccessControlContext} and with a privilege scope limited
-     * by specified {@code Permission} arguments.
+     * Performs the specified action.
      *
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified
-     * {@code AccessControlContext}.
      * <p>
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
      *
-     * <p> This method preserves the current AccessControlContext's
-     * {@code DomainCombiner} (which may be null) while the action is performed.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
-     *
      * @param <T> the type of the value returned by the PrivilegedAction's
-     *                  {@code run} method.
-     * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null},
-     *                then no additional restriction is applied.
-     * @param perms the {@code Permission} arguments which limit the
-     *              scope of the caller's privileges. The number of arguments
-     *              is variable.
-     *
-     * @return the value returned by the action's {@code run} method.
+     *                  {@code run} method
+     * @param action the action to be performed
+     * @param context ignored
+     * @param perms ignored
      *
-     * @throws NullPointerException if action or perms or any element of
-     *         perms is {@code null}
+     * @return the value returned by the action's {@code run} method
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     * @see java.security.DomainCombiner
+     * @throws NullPointerException if action is {@code null}
+     *
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedAction} with privileges enabled and restricted
+     *     by the specified {@code AccessControlContext} and with a privilege
+     *     scope limited by the specified {@code Permission} arguments. This
+     *     method also originally preserved the current access control context's
+     *     domain combiner while the action was performed. Running the action
+     *     with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      *
      * @since 1.8
      */
-    @CallerSensitive
     public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action,
             @SuppressWarnings("removal") AccessControlContext context,
             Permission... perms) {
 
-        @SuppressWarnings("removal")
-        AccessControlContext parent = getContext();
-        @SuppressWarnings("removal")
-        DomainCombiner dc = parent.getCombiner();
-        if (dc == null && context != null) {
-            dc = context.getCombiner();
-        }
-        if (perms == null) {
-            throw new NullPointerException("null permissions parameter");
-        }
-        Class<?> caller = Reflection.getCallerClass();
-        return AccessController.doPrivileged(action, createWrapper(dc, caller,
-            parent, context, perms));
+        T result = action.run();
+        return result;
     }
 
     /**
-     * Performs the specified {@code PrivilegedExceptionAction} with
-     * privileges enabled.  The action is performed with <i>all</i> of the
-     * permissions possessed by the caller's protection domain.
+     * Performs the specified action.
      *
      * <p> If the action's {@code run} method throws an <i>unchecked</i>
      * exception, it will propagate through this method.
      *
-     * <p> Note that any {@code DomainCombiner} associated with the current
-     * {@code AccessControlContext} will be ignored while the action is
-     * performed.
-     *
      * @param <T> the type of the value returned by the
-     *                  PrivilegedExceptionAction's {@code run} method.
+     *                  PrivilegedExceptionAction's {@code run} method
      *
      * @param action the action to be performed
      *
@@ -554,21 +234,22 @@ public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action,
      *         {@code run} method threw a <i>checked</i> exception
      * @throws    NullPointerException if the action is {@code null}
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     * @see #doPrivilegedWithCombiner(PrivilegedExceptionAction)
-     * @see java.security.DomainCombiner
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedExceptionAction} with privileges enabled. Running
+     *     the action with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      */
-    @CallerSensitive
     public static <T> T
         doPrivileged(PrivilegedExceptionAction<T> action)
         throws PrivilegedActionException
     {
-        @SuppressWarnings("removal")
-        AccessControlContext context = null;
-        Class<?> caller = Reflection.getCallerClass();
         try {
-            return executePrivileged(action, context, caller);
+            T result = action.run();
+            return result;
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {
@@ -577,20 +258,15 @@ public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action,
     }
 
     /**
-     * Performs the specified {@code PrivilegedExceptionAction} with
-     * privileges enabled.  The action is performed with <i>all</i> of the
-     * permissions possessed by the caller's protection domain.
+     * Performs the specified action.
      *
      * <p> If the action's {@code run} method throws an <i>unchecked</i>
      * exception, it will propagate through this method.
      *
-     * <p> This method preserves the current AccessControlContext's
-     * {@code DomainCombiner} (which may be null) while the action is performed.
-     *
      * @param <T> the type of the value returned by the
-     *                  PrivilegedExceptionAction's {@code run} method.
+     *                  PrivilegedExceptionAction's {@code run} method
      *
-     * @param action the action to be performed.
+     * @param action the action to be performed
      *
      * @return the value returned by the action's {@code run} method
      *
@@ -598,100 +274,41 @@ public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action,
      *         {@code run} method threw a <i>checked</i> exception
      * @throws    NullPointerException if the action is {@code null}
      *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     * @see java.security.DomainCombiner
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedExceptionAction} with privileges enabled and with
+     *     the current access control context's domain combiner preserved.
+     *     Running the action with privileges enabled was only useful in
+     *     conjunction with {@linkplain SecurityManager the Security Manager},
+     *     which is no longer supported. This method has been changed to run
+     *     the action as is, and has equivalent behavior as if there were no
+     *     Security Manager enabled. There is no replacement for the Security
+     *     Manager or this method.
      *
      * @since 1.6
      */
-    @CallerSensitive
     public static <T> T doPrivilegedWithCombiner(PrivilegedExceptionAction<T> action)
         throws PrivilegedActionException
     {
-        @SuppressWarnings("removal")
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            return AccessController.doPrivileged(action);
-        }
-        @SuppressWarnings("removal")
-        DomainCombiner dc = acc.getAssignedCombiner();
-        return AccessController.doPrivileged(action,
-                                             preserveCombiner(dc, Reflection.getCallerClass()));
-    }
-
-    /**
-     * preserve the combiner across the doPrivileged call
-     */
-    @SuppressWarnings("removal")
-    private static AccessControlContext preserveCombiner(DomainCombiner combiner,
-                                                         Class<?> caller)
-    {
-        return createWrapper(combiner, caller, null, null, null);
-    }
-
-    /**
-     * Create a wrapper to contain the limited privilege scope data.
-     */
-    @SuppressWarnings("removal")
-    private static AccessControlContext
-        createWrapper(DomainCombiner combiner, Class<?> caller,
-                      AccessControlContext parent, AccessControlContext context,
-                      Permission[] perms)
-    {
-        ProtectionDomain callerPD = getProtectionDomain(caller);
-        // check if caller is authorized to create context
-        if (System.getSecurityManager() != null &&
-            context != null && !context.isAuthorized() &&
-            !callerPD.implies(SecurityConstants.CREATE_ACC_PERMISSION))
-        {
-            return getInnocuousAcc();
-        } else {
-            return new AccessControlContext(callerPD, combiner, parent,
-                                            context, perms);
+        try {
+            T result = action.run();
+            return result;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw wrapException(e);
         }
     }
 
-    private static class AccHolder {
-        // An AccessControlContext with no granted permissions.
-        // Only initialized on demand when getInnocuousAcc() is called.
-        @SuppressWarnings("removal")
-        static final AccessControlContext innocuousAcc =
-            new AccessControlContext(new ProtectionDomain[] {
-                                     new ProtectionDomain(null, null) });
-    }
-    @SuppressWarnings("removal")
-    private static AccessControlContext getInnocuousAcc() {
-        return AccHolder.innocuousAcc;
-    }
-
-    private static native ProtectionDomain getProtectionDomain(final Class<?> caller);
-
     /**
-     * Performs the specified {@code PrivilegedExceptionAction} with
-     * privileges enabled and restricted by the specified
-     * {@code AccessControlContext}.  The action is performed with the
-     * intersection of the permissions possessed by the caller's
-     * protection domain, and those possessed by the domains represented by the
-     * specified {@code AccessControlContext}.
+     * Performs the specified action.
      * <p>
      * If the action's {@code run} method throws an <i>unchecked</i>
      * exception, it will propagate through this method.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
      *
      * @param <T> the type of the value returned by the
-     *                  PrivilegedExceptionAction's {@code run} method.
+     *                  PrivilegedExceptionAction's {@code run} method
      * @param action the action to be performed
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null}, then no additional restriction is applied.
+     * @param context ignored
      *
      * @return the value returned by the action's {@code run} method
      *
@@ -701,17 +318,24 @@ private static AccessControlContext getInnocuousAcc() {
      *
      * @see #doPrivileged(PrivilegedAction)
      * @see #doPrivileged(PrivilegedAction,AccessControlContext)
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedExceptionAction} with privileges enabled and
+     *     restricted by the specified {@code AccessControlContext}. Running the
+     *     action with privileges enabled was only useful in conjunction with
+     *     {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      */
-    @CallerSensitive
     public static <T> T
         doPrivileged(PrivilegedExceptionAction<T> action,
                      @SuppressWarnings("removal") AccessControlContext context)
         throws PrivilegedActionException
     {
-        Class<?> caller = Reflection.getCallerClass();
-        context = checkContext(context, caller);
         try {
-            return executePrivileged(action, context, caller);
+            T result = action.run();
+            return result;
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {
@@ -719,369 +343,155 @@ private static AccessControlContext getInnocuousAcc() {
         }
     }
 
-    @SuppressWarnings("removal")
-    private static AccessControlContext checkContext(AccessControlContext context,
-        Class<?> caller)
-    {
-        // check if caller is authorized to create context
-        if (System.getSecurityManager() != null &&
-            context != null && !context.isAuthorized() &&
-            context != getInnocuousAcc())
-        {
-            ProtectionDomain callerPD = getProtectionDomain(caller);
-            if (callerPD != null && !callerPD.implies(SecurityConstants.CREATE_ACC_PERMISSION)) {
-                return getInnocuousAcc();
-            }
-        }
-        return context;
-    }
-
-    /**
-     * The value needs to be physically located in the frame, so that it
-     * can be found by a stack walk.
-     */
-    @Hidden
-    private static native void ensureMaterializedForStackWalk(Object o);
-
-    /**
-     * Sanity check that the caller context is indeed privileged.
-     *
-     * Used by {@code executePrivileged} to make sure the frame is properly
-     * recognized by the VM.
-     */
-    private static boolean isPrivileged() {
-        @SuppressWarnings("removal")
-        AccessControlContext ctx = getStackAccessControlContext();
-        return ctx == null || ctx.isPrivileged();
-    }
-
-    /**
-     * Execute the action as privileged.
-     *
-     * The VM recognizes this method as special, so any changes to the
-     * name or signature require corresponding changes in
-     * getStackAccessControlContext().
-     */
-    @Hidden
-    @ForceInline
-    private static <T> T
-        executePrivileged(PrivilegedAction<T> action,
-                          @SuppressWarnings("removal") AccessControlContext context,
-                          Class<?> caller)
-    {
-        // Ensure context has a physical value in the frame
-        if (context != null) {
-            ensureMaterializedForStackWalk(context);
-        }
-
-        assert isPrivileged(); // sanity check invariant
-        T result = action.run();
-        assert isPrivileged(); // sanity check invariant
-
-        // The 'getStackAccessControlContext' call inside 'isPrivileged'
-        // requires that no Local was scalar replaced. However, in some
-        // situations, after inlining, 'result' (or part of a possibly
-        // allocation merge Phi leading to it) might become NonEscaping and get
-        // scalar replaced. The call below enforces 'result' to always escape.
-        ensureMaterializedForStackWalk(result);
-
-        // Keep these alive across the run() call so they can be
-        // retrieved by getStackAccessControlContext().
-        Reference.reachabilityFence(context);
-        Reference.reachabilityFence(caller);
-        return result;
-    }
-
-    /**
-     * Execute the action as privileged.
-     *
-     * The VM recognizes this method as special, so any changes to the
-     * name or signature require corresponding changes in
-     * getStackAccessControlContext().
-     */
-    @Hidden
-    @ForceInline
-    private static <T> T
-        executePrivileged(PrivilegedExceptionAction<T> action,
-                          @SuppressWarnings("removal") AccessControlContext context,
-                          Class<?> caller)
-        throws Exception
-    {
-        // Ensure context has a physical value in the frame
-        if (context != null) {
-            ensureMaterializedForStackWalk(context);
-        }
-
-        assert isPrivileged(); // sanity check invariant
-        T result = action.run();
-        assert isPrivileged(); // sanity check invariant
-
-        // The 'getStackAccessControlContext' call inside 'isPrivileged'
-        // requires that no Local was scalar replaced. However, in some
-        // situations, after inlining, 'result' (or part of a possibly
-        // allocation merge Phi leading to it) might become NonEscaping and get
-        // scalar replaced. The call below enforces 'result' to always escape.
-        ensureMaterializedForStackWalk(result);
-
-        // Keep these alive across the run() call so they can be
-        // retrieved by getStackAccessControlContext().
-        Reference.reachabilityFence(context);
-        Reference.reachabilityFence(caller);
-        return result;
-    }
-
-
     /**
-     * Wrap an exception.  The annotations are used in a best effort to
-     * avoid StackOverflowError in the caller.  Inlining the callees as
-     * well and tail-call elimination could also help here, but are not
-     * needed for correctness, only quality of implementation.
-     */
-    @Hidden
-    @ForceInline
-    @ReservedStackAccess
-    private static PrivilegedActionException wrapException(Exception e) {
-        return new PrivilegedActionException(e);
-    }
-
-    /**
-     * Performs the specified {@code PrivilegedExceptionAction} with
-     * privileges enabled and restricted by the specified
-     * {@code AccessControlContext} and with a privilege scope limited by
-     * specified {@code Permission} arguments.
+     * Performs the specified action.
      *
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified
-     * {@code AccessControlContext}.
      * <p>
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
      *
      * @param <T> the type of the value returned by the
-     *                  PrivilegedExceptionAction's {@code run} method.
-     * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null},
-     *                then no additional restriction is applied.
-     * @param perms the {@code Permission} arguments which limit the
-     *              scope of the caller's privileges. The number of arguments
-     *              is variable.
+     *                  PrivilegedExceptionAction's {@code run} method
+     * @param action the action to be performed
+     * @param context ignored
+     * @param perms ignored
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
      * @throws PrivilegedActionException if the specified action's
      *         {@code run} method threw a <i>checked</i> exception
-     * @throws NullPointerException if action or perms or any element of
-     *         perms is {@code null}
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedAction,AccessControlContext)
+     * @throws NullPointerException if action is {@code null}
+     *
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedExceptionAction} with privileges enabled and
+     *     restricted by the specified {@code AccessControlContext} and with a
+     *     privilege scope limited by the specified {@code Permission}
+     *     arguments. Running the action with privileges enabled was only useful
+     *     in conjunction with {@linkplain SecurityManager the Security Manager},
+     *     which is no longer supported. This method has been changed to run
+     *     the action as is, and has equivalent behavior as if there were no
+     *     Security Manager enabled. There is no replacement for the Security
+     *     Manager or this method.
      *
      * @since 1.8
      */
-    @CallerSensitive
     public static <T> T doPrivileged(PrivilegedExceptionAction<T> action,
             @SuppressWarnings("removal") AccessControlContext context,
             Permission... perms)
         throws PrivilegedActionException
     {
-        @SuppressWarnings("removal")
-        AccessControlContext parent = getContext();
-        if (perms == null) {
-            throw new NullPointerException("null permissions parameter");
+        try {
+            T result = action.run();
+            return result;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw wrapException(e);
         }
-        Class<?> caller = Reflection.getCallerClass();
-        @SuppressWarnings("removal")
-        DomainCombiner dc = (context == null) ? null : context.getCombiner();
-        return AccessController.doPrivileged(action, createWrapper(dc, caller, parent, context, perms));
     }
 
+    private static PrivilegedActionException wrapException(Exception e) {
+         return new PrivilegedActionException(e);
+    }
 
     /**
-     * Performs the specified {@code PrivilegedExceptionAction} with
-     * privileges enabled and restricted by the specified
-     * {@code AccessControlContext} and with a privilege scope limited by
-     * specified {@code Permission} arguments.
+     * Performs the specified action.
      *
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified
-     * {@code AccessControlContext}.
      * <p>
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
      *
-     * <p> This method preserves the current AccessControlContext's
-     * {@code DomainCombiner} (which may be null) while the action is performed.
-     * <p>
-     * If a security manager is installed and the specified
-     * {@code AccessControlContext} was not created by system code and the
-     * caller's {@code ProtectionDomain} has not been granted the
-     * {@literal "createAccessControlContext"}
-     * {@link java.security.SecurityPermission}, then the action is performed
-     * with no permissions.
-     *
      * @param <T> the type of the value returned by the
-     *                  PrivilegedExceptionAction's {@code run} method.
-     * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                {@code null},
-     *                then no additional restriction is applied.
-     * @param perms the {@code Permission} arguments which limit the
-     *              scope of the caller's privileges. The number of arguments
-     *              is variable.
+     *                  PrivilegedExceptionAction's {@code run} method
+     * @param action the action to be performed
+     * @param context ignored
+     * @param perms ignored
      *
-     * @return the value returned by the action's {@code run} method.
+     * @return the value returned by the action's {@code run} method
      *
      * @throws PrivilegedActionException if the specified action's
      *         {@code run} method threw a <i>checked</i> exception
-     * @throws NullPointerException if action or perms or any element of
-     *         perms is {@code null}
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedAction,AccessControlContext)
-     * @see java.security.DomainCombiner
+     * @throws NullPointerException if action is {@code null}
+     *
+     * @apiNote This method originally performed the specified
+     *     {@code PrivilegedExceptionAction} with privileges enabled and
+     *     restricted by the specified {@code AccessControlContext} and with a
+     *     privilege scope limited by the specified {@code Permission}
+     *     arguments. This method also preserved the current access control
+     *     context's domain combiner while the action was performed. Running
+     *     the action with privileges enabled was only useful in conjunction
+     *     with {@linkplain SecurityManager the Security Manager}, which is no
+     *     longer supported. This method has been changed to run the action as
+     *     is, and has equivalent behavior as if there were no Security Manager
+     *     enabled. There is no replacement for the Security Manager or this
+     *     method.
      *
      * @since 1.8
      */
-    @CallerSensitive
     public static <T> T doPrivilegedWithCombiner(PrivilegedExceptionAction<T> action,
                                                  @SuppressWarnings("removal") AccessControlContext context,
                                                  Permission... perms)
         throws PrivilegedActionException
     {
-        @SuppressWarnings("removal")
-        AccessControlContext parent = getContext();
-        @SuppressWarnings("removal")
-        DomainCombiner dc = parent.getCombiner();
-        if (dc == null && context != null) {
-            dc = context.getCombiner();
-        }
-        if (perms == null) {
-            throw new NullPointerException("null permissions parameter");
+        try {
+            T result = action.run();
+            return result;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw wrapException(e);
         }
-        Class<?> caller = Reflection.getCallerClass();
-        return AccessController.doPrivileged(action, createWrapper(dc, caller,
-            parent, context, perms));
     }
 
-    /**
-     * Returns the {@code AccessControlContext}. i.e., it gets
-     * the protection domains of all the callers on the stack,
-     * starting at the first class with a non-null
-     * {@code ProtectionDomain}.
-     *
-     * @return the access control context based on the current stack or
-     *         {@code null} if there was only privileged system code.
-     */
-
     @SuppressWarnings("removal")
-    private static native AccessControlContext getStackAccessControlContext();
-
+    private static AccessControlContext NO_PERMISSIONS_ACC =
+        new AccessControlContext(new ProtectionDomain[] {
+            new ProtectionDomain(null, null)
+    });
 
     /**
-     * Returns the "inherited" {@code AccessControlContext}. This is the context
-     * that existed when the thread was created. Package private so
-     * {@code AccessControlContext} can use it.
-     */
-
-    @SuppressWarnings("removal")
-    static native AccessControlContext getInheritedAccessControlContext();
-
-    /**
-     * This method takes a "snapshot" of the current calling context, which
-     * includes the current thread's inherited {@code AccessControlContext}
-     * and any limited privilege scope, and places it in an
-     * {@code AccessControlContext} object.
-     * This context may then be checked at a later point, possibly in another thread.
+     * Returns an {@code AccessControlContext} where the {@code checkPermission}
+     * method always throws an {@code AccessControlException} and the
+     * {@code getDomainCombiner} method always returns {@code null}.
      *
-     * @see AccessControlContext
+     * @return an {@code AccessControlContext} as specified above
      *
-     * @return the {@code AccessControlContext} based on the current context.
+     * @see AccessControlContext
+     * @apiNote This method originally returned a snapshot of the current
+     *       calling context, which included the current thread's access
+     *       control context and any limited privilege scope. This method has
+     *       been changed to always return an innocuous
+     *       {@code AccessControlContext} that fails all permission checks.
+     *       This method was only useful in conjunction with
+     *       {@linkplain SecurityManager the Security Manager}, which is no
+     *       longer supported. There is no replacement for the Security Manager
+     *       or this method.
      */
-
     @SuppressWarnings("removal")
     public static AccessControlContext getContext()
     {
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            // all we had was privileged system code. We don't want
-            // to return null though, so we construct a real ACC.
-            return new AccessControlContext(null, true);
-        } else {
-            return acc.optimize();
-        }
+        return NO_PERMISSIONS_ACC;
     }
 
     /**
-     * Determines whether the access request indicated by the
-     * specified permission should be allowed or denied, based on
-     * the current {@code AccessControlContext} and security policy.
-     * This method quietly returns if the access request
-     * is permitted, or throws an {@code AccessControlException} otherwise. The
-     * {@code getPermission} method of the {@code AccessControlException}
-     * returns the {@code Permission} object instance ({@code perm}}.
-     *
-     * @param perm the requested permission.
-     *
-     * @throws    AccessControlException if the specified permission
-     *            is not permitted, based on the current security policy.
-     * @throws    NullPointerException if the specified permission
-     *            is {@code null} and is checked based on the
-     *            security policy currently in effect.
+     * Throws {@code AccessControlException}.
+     *
+     * @param perm ignored
+     * @throws    AccessControlException always
+     *
+     * @apiNote This method originally determined whether the access request
+     *       indicated by the specified permission should be allowed or denied,
+     *       based on the current {@code AccessControlContext} and security
+     *       policy. This method has been changed to always throw
+     *       {@code AccessControlException}. This method was only useful in
+     *       conjunction with {@linkplain SecurityManager the Security Manager},
+     *       which is no longer supported. There is no replacement for the
+     *       Security Manager or this method.
      */
-
     @SuppressWarnings("removal")
     public static void checkPermission(Permission perm)
         throws AccessControlException
     {
-        //System.err.println("checkPermission "+perm);
-        //Thread.currentThread().dumpStack();
-
-        if (perm == null) {
-            throw new NullPointerException("permission can't be null");
-        }
-
-        AccessControlContext stack = getStackAccessControlContext();
-        // if context is null, we had privileged system code on the stack.
-        if (stack == null) {
-            Debug debug = AccessControlContext.getDebug();
-            boolean dumpDebug = false;
-            if (debug != null) {
-                dumpDebug = !Debug.isOn("codebase=");
-                dumpDebug &= !Debug.isOn("permission=") ||
-                    Debug.isOn("permission=" + perm.getClass().getCanonicalName());
-            }
-
-            if (dumpDebug && Debug.isOn("stack")) {
-                Thread.dumpStack();
-            }
-
-            if (dumpDebug && Debug.isOn("domain")) {
-                debug.println("domain (context is null)");
-            }
-
-            if (dumpDebug) {
-                debug.println("access allowed "+perm);
-            }
-            return;
-        }
-
-        AccessControlContext acc = stack.optimize();
-        acc.checkPermission(perm);
+        throw new AccessControlException("checking permissions is not supported");
     }
 }
diff --git a/src/java.base/share/classes/java/security/AllPermission.java b/src/java.base/share/classes/java/security/AllPermission.java
index c93e60fb913..15a4f78123f 100644
--- a/src/java.base/share/classes/java/security/AllPermission.java
+++ b/src/java.base/share/classes/java/security/AllPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,22 +31,14 @@
 
 /**
  * The {@code AllPermission} is a permission that implies all other permissions.
- * <p>
- * <b>Note:</b> Granting {@code AllPermission} should be done with extreme care,
- * as it implies all other permissions. Thus, it grants code the ability
- * to run with security
- * disabled.  Extreme caution should be taken before granting such
- * a permission to code.  This permission should be used only during testing,
- * or in extremely rare cases where an application or applet is
- * completely trusted and adding the necessary permissions to the policy
- * is prohibitively cumbersome.
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.Permission
- * @see java.security.AccessController
  * @see java.security.Permissions
  * @see java.security.PermissionCollection
- * @see java.lang.SecurityManager
- *
  *
  * @author Roland Schemers
  * @since 1.2
diff --git a/src/java.base/share/classes/java/security/AuthProvider.java b/src/java.base/share/classes/java/security/AuthProvider.java
index 1c0ce64c625..679df47d92c 100644
--- a/src/java.base/share/classes/java/security/AuthProvider.java
+++ b/src/java.base/share/classes/java/security/AuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,11 +98,6 @@ protected AuthProvider(String name, String versionStr, String info) {
      * @throws IllegalStateException if the provider requires configuration
      * and {@link #configure} has not been called
      * @throws LoginException if the login operation fails
-     * @throws SecurityException if the caller does not pass a
-     *  security check for
-     *  {@code SecurityPermission("authProvider.name")},
-     *  where {@code name} is the value returned by
-     *  this provider's {@code getName} method
      */
     public abstract void login(Subject subject, CallbackHandler handler)
         throws LoginException;
@@ -113,11 +108,6 @@ public abstract void login(Subject subject, CallbackHandler handler)
      * @throws IllegalStateException if the provider requires configuration
      * and {@link #configure} has not been called
      * @throws LoginException if the logout operation fails
-     * @throws SecurityException if the caller does not pass a
-     *  security check for
-     *  {@code SecurityPermission("authProvider.name")},
-     *  where {@code name} is the value returned by
-     *  this provider's {@code getName} method
      */
     public abstract void logout() throws LoginException;
 
@@ -140,11 +130,6 @@ public abstract void login(Subject subject, CallbackHandler handler)
      *
      * @throws IllegalStateException if the provider requires configuration
      * and {@link #configure} has not been called
-     * @throws SecurityException if the caller does not pass a
-     *  security check for
-     *  {@code SecurityPermission("authProvider.name")},
-     *  where {@code name} is the value returned by
-     *  this provider's {@code getName} method
      */
     public abstract void setCallbackHandler(CallbackHandler handler);
 }
diff --git a/src/java.base/share/classes/java/security/DomainCombiner.java b/src/java.base/share/classes/java/security/DomainCombiner.java
index 8ecf1e313ed..704c6315bb1 100644
--- a/src/java.base/share/classes/java/security/DomainCombiner.java
+++ b/src/java.base/share/classes/java/security/DomainCombiner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,62 +26,14 @@
 package java.security;
 
 /**
- * A {@code DomainCombiner} provides a means to dynamically
- * update the ProtectionDomains associated with the current
- * {@code AccessControlContext}.
+ * {@code DomainCombiner} was used to dynamically update
+ * {@code ProtectionDomain}s for access control operations and decisions. This
+ * feature no longer exists.
  *
- * <p> A {@code DomainCombiner} is passed as a parameter to the
- * appropriate constructor for {@code AccessControlContext}.
- * The newly constructed context is then passed to the
- * {@code AccessController.doPrivileged(..., context)} method
- * to bind the provided context (and associated {@code DomainCombiner})
- * with the current execution thread.  Subsequent calls to
- * {@code AccessController.getContext} or
- * {@code AccessController.checkPermission}
- * cause the {@code DomainCombiner.combine} to get invoked.
- *
- * <p> The combine method takes two arguments.  The first argument represents
- * an array of ProtectionDomains from the current execution thread,
- * since the most recent call to {@code AccessController.doPrivileged}.
- * If no call to doPrivileged was made, then the first argument will contain
- * all the ProtectionDomains from the current execution thread.
- * The second argument represents an array of inherited ProtectionDomains,
- * which may be {@code null}.  ProtectionDomains may be inherited
- * from a parent thread, or from a privileged context.  If no call to
- * doPrivileged was made, then the second argument will contain the
- * ProtectionDomains inherited from the parent thread.  If one or more calls
- * to doPrivileged were made, and the most recent call was to
- * doPrivileged(action, context), then the second argument will contain the
- * ProtectionDomains from the privileged context.  If the most recent call
- * was to doPrivileged(action), then there is no privileged context,
- * and the second argument will be {@code null}.
- *
- * <p> The {@code combine} method investigates the two input arrays
- * of ProtectionDomains and returns a single array containing the updated
- * ProtectionDomains.  In the simplest case, the {@code combine}
- * method merges the two stacks into one.  In more complex cases,
- * the {@code combine} method returns a modified
- * stack of ProtectionDomains.  The modification may have added new
- * ProtectionDomains, removed certain ProtectionDomains, or simply
- * updated existing ProtectionDomains.  Re-ordering and other optimizations
- * to the ProtectionDomains are also permitted.  Typically the
- * {@code combine} method bases its updates on the information
- * encapsulated in the {@code DomainCombiner}.
- *
- * <p> After the {@code AccessController.getContext} method
- * receives the combined stack of ProtectionDomains back from
- * the {@code DomainCombiner}, it returns a new
- * AccessControlContext that has both the combined ProtectionDomains
- * as well as the {@code DomainCombiner}.
- *
- * @see AccessController
- * @see AccessControlContext
  * @since 1.3
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated This class was only useful in conjunction with {@linkplain
+ *       SecurityManager the Security Manager}, which is no longer supported.
+ *       There is no replacement for the Security Manager or this class.
  */
 @Deprecated(since="17", forRemoval=true)
 public interface DomainCombiner {
diff --git a/src/java.base/share/classes/java/security/Identity.java b/src/java.base/share/classes/java/security/Identity.java
index 90325234b3a..f717f5576b0 100644
--- a/src/java.base/share/classes/java/security/Identity.java
+++ b/src/java.base/share/classes/java/security/Identity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,21 +168,12 @@ public PublicKey getPublicKey() {
      * Sets this identity's public key. The old key and all of this
      * identity's certificates are removed by this operation.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "setIdentityPublicKey"}
-     * as its argument to see if it's ok to set the public key.
-     *
      * @param key the public key for this {@code Identity}.
      *
      * @throws    KeyManagementException if another identity in the
      * identity's scope has the same public key, or if another exception occurs.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * setting the public key.
-     *
      * @see #getPublicKey
-     * @see SecurityManager#checkSecurityAccess
      */
     /* Should we throw an exception if this is already set? */
     public void setPublicKey(PublicKey key) throws KeyManagementException {
@@ -195,18 +186,9 @@ public void setPublicKey(PublicKey key) throws KeyManagementException {
     /**
      * Specifies a general information string for this {@code Identity}.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "setIdentityInfo"}
-     * as its argument to see if it's ok to specify the information string.
-     *
      * @param info the information string.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * setting the information string.
-     *
      * @see #getInfo
-     * @see SecurityManager#checkSecurityAccess
      */
     public void setInfo(String info) {
         check("setIdentityInfo");
@@ -230,21 +212,11 @@ public String getInfo() {
      * the {@code Identity} does not have a public key, the identity's
      * public key is set to be that specified in the certificate.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "addIdentityCertificate"}
-     * as its argument to see if it's ok to add a certificate.
-     *
      * @param certificate the certificate to be added.
      *
      * @throws    KeyManagementException if the certificate is not valid,
      * if the public key in the certificate being added conflicts with
      * this identity's public key, or if another exception occurs.
-     *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * adding a certificate.
-     *
-     * @see SecurityManager#checkSecurityAccess
      */
     public void addCertificate(Certificate certificate)
     throws KeyManagementException {
@@ -281,20 +253,10 @@ private boolean keyEquals(PublicKey aKey, PublicKey anotherKey) {
     /**
      * Removes a certificate from this {@code Identity}.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "removeIdentityCertificate"}
-     * as its argument to see if it's ok to remove a certificate.
-     *
      * @param certificate the certificate to be removed.
      *
      * @throws    KeyManagementException if the certificate is
      * missing, or if another exception occurs.
-     *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * removing a certificate.
-     *
-     * @see SecurityManager#checkSecurityAccess
      */
     public void removeCertificate(Certificate certificate)
     throws KeyManagementException {
@@ -392,18 +354,8 @@ String fullName() {
      * Returns a short string describing this {@code Identity}, telling its
      * name and its scope (if any).
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "printIdentity"}
-     * as its argument to see if it's ok to return the string.
-     *
      * @return information about this {@code Identity}, such as its name and the
      * name of its scope (if any).
-     *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * returning a string describing this {@code Identity}.
-     *
-     * @see SecurityManager#checkSecurityAccess
      */
     public String toString() {
         check("printIdentity");
@@ -419,22 +371,13 @@ public String toString() {
      * optionally more details than that provided by the
      * {@code toString} method without any arguments.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "printIdentity"}
-     * as its argument to see if it's ok to return the string.
-     *
      * @param detailed whether or not to provide detailed information.
      *
      * @return information about this {@code Identity}. If {@code detailed}
      * is {@code true}, then this method returns more information than that
      * provided by the {@code toString} method without any arguments.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * returning a string describing this {@code Identity}.
-     *
      * @see #toString
-     * @see SecurityManager#checkSecurityAccess
      */
     public String toString(boolean detailed) {
         String out = toString();
diff --git a/src/java.base/share/classes/java/security/IdentityScope.java b/src/java.base/share/classes/java/security/IdentityScope.java
index 7112457252f..73128d0e010 100644
--- a/src/java.base/share/classes/java/security/IdentityScope.java
+++ b/src/java.base/share/classes/java/security/IdentityScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,19 +148,9 @@ public static IdentityScope getSystemScope() {
     /**
      * Sets the system's identity scope.
      *
-     * <p>First, if there is a security manager, its
-     * {@code checkSecurityAccess}
-     * method is called with {@code "setSystemScope"}
-     * as its argument to see if it's ok to set the identity scope.
-     *
      * @param scope the scope to set.
      *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * setting the identity scope.
-     *
      * @see #getSystemScope
-     * @see SecurityManager#checkSecurityAccess
      */
     protected static void setSystemScope(IdentityScope scope) {
         check("setSystemScope");
diff --git a/src/java.base/share/classes/java/security/KeyStore.java b/src/java.base/share/classes/java/security/KeyStore.java
index 76d537afb7a..0370b5e9884 100644
--- a/src/java.base/share/classes/java/security/KeyStore.java
+++ b/src/java.base/share/classes/java/security/KeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1694,9 +1694,6 @@ public final void setEntry(String alias, Entry entry,
      * @throws IllegalArgumentException if file does not exist or does not
      *             refer to a normal file.
      * @throws NullPointerException if file is {@code null}.
-     * @throws SecurityException if a security manager exists and its
-     *             {@link java.lang.SecurityManager#checkRead} method denies
-     *             read access to the specified file.
      *
      * @see Provider
      *
@@ -1751,9 +1748,6 @@ public static final KeyStore getInstance(File file, char[] password)
      * @throws IllegalArgumentException if file does not exist or does not
      *             refer to a normal file, or if param is not recognized.
      * @throws NullPointerException if file is {@code null}.
-     * @throws SecurityException if a security manager exists and its
-     *             {@link java.lang.SecurityManager#checkRead} method denies
-     *             read access to the specified file.
      *
      * @see Provider
      *
@@ -1970,10 +1964,6 @@ public ProtectionParameter getProtectionParameter(String alias)
          * object encapsulating the password that was used to invoke the
          * {@code load} method.
          *
-         * <p><em>Note</em> that the {@link #getKeyStore} method is executed
-         * within the {@link AccessControlContext} of the code invoking this
-         * method.
-         *
          * @return a new {@code Builder} object
          * @param type the type of {@code KeyStore} to be constructed
          * @param provider the provider from which the {@code KeyStore} is to
@@ -2034,10 +2024,6 @@ public static Builder newInstance(String type, Provider provider,
          * object encapsulating the password that was used to invoke the
          * {@code load} method.
          *
-         * <p><em>Note</em> that the {@link #getKeyStore} method is executed
-         * within the {@link AccessControlContext} of the code invoking this
-         * method.
-         *
          * @return a new {@code Builder} object
          * @param file the File that contains the {@code KeyStore} data
          * @param protection the {@code ProtectionParameter} securing the
@@ -2196,10 +2182,6 @@ public KeyStore run0() throws Exception {
          * <p>Calls to {@link #getProtectionParameter getProtectionParameter()}
          * will return {@code protection}.
          *
-         * <p><em>Note</em> that the {@link #getKeyStore} method is executed
-         * within the {@link AccessControlContext} of the code invoking this
-         * method.
-         *
          * @return a new {@code Builder} object
          * @param type the type of {@code KeyStore} to be constructed
          * @param provider the provider from which the {@code KeyStore} is to
diff --git a/src/java.base/share/classes/java/security/Permission.java b/src/java.base/share/classes/java/security/Permission.java
index f5d27681bda..71bad14e395 100644
--- a/src/java.base/share/classes/java/security/Permission.java
+++ b/src/java.base/share/classes/java/security/Permission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,27 +85,28 @@ public Permission(String name) {
     }
 
     /**
-     * Implements the guard interface for a permission. The
-     * {@code SecurityManager.checkPermission} method is called,
-     * passing this permission object as the permission to check.
+     * Implements the guard interface for a permission.
      * Returns silently if access is granted. Otherwise, throws
      * a {@code SecurityException}.
      *
+     * @apiNote This method originally threw a {@code SecurityException} if a
+     *       security manager was enabled and the requested access, specified
+     *       by this permission, was not permitted.
+     *       {@linkplain SecurityManager The Security Manager} is no longer
+     *       supported; thus, this method always throws a
+     *       {@code SecurityException}.
+     *
      * @param object the object being guarded (currently ignored).
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow access.
+     * @throws SecurityException always
      *
      * @see Guard
      * @see GuardedObject
-     * @see SecurityManager#checkPermission
      *
      */
+    @Override
     public void checkGuard(Object object) throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(this);
+        throw new SecurityException("checking permissions is not supported");
     }
 
     /**
@@ -116,10 +117,6 @@ public void checkGuard(Object object) throws SecurityException {
      * are the only ones that can impose semantics on a {@code Permission}
      * object.
      *
-     * <p>The {@code implies} method is used by the AccessController to determine
-     * whether a requested permission is implied by another permission that
-     * is known to be valid in the current execution context.
-     *
      * @param permission the permission to check against.
      *
      * @return {@code true} if the specified permission is implied by this
diff --git a/src/java.base/share/classes/java/security/Policy.java b/src/java.base/share/classes/java/security/Policy.java
index 37f7cc3d9a6..5bf590623f4 100644
--- a/src/java.base/share/classes/java/security/Policy.java
+++ b/src/java.base/share/classes/java/security/Policy.java
@@ -27,72 +27,32 @@
 package java.security;
 
 import java.util.Enumeration;
-import java.util.WeakHashMap;
 import java.util.Objects;
 import sun.security.jca.GetInstance;
-import sun.security.util.Debug;
-import sun.security.util.SecurityConstants;
-
 
 /**
- * A {@code Policy} object is responsible for determining whether code executing
- * in the Java runtime environment has permission to perform a
- * security-sensitive operation.
- *
- * <p> There is only one {@code Policy} object installed in the runtime at any
- * given time.  A {@code Policy} object can be installed by calling the
- * {@code setPolicy} method.  The installed {@code Policy} object can be
- * obtained by calling the {@code getPolicy} method.
- *
- * <p> If no {@code Policy} object has been installed in the runtime, a call to
- * {@code getPolicy} installs an instance of the default {@code Policy}
- * implementation (a default subclass implementation of this abstract class).
- * The default {@code Policy} implementation can be changed by setting the value
- * of the {@code policy.provider} security property to the fully qualified
- * name of the desired {@code Policy} subclass implementation. The system
- * class loader is used to load this class.
- *
- * <p> Application code can directly subclass {@code Policy} to provide a custom
- * implementation.  In addition, an instance of a {@code Policy} object can be
- * constructed by invoking one of the {@code getInstance} factory methods
- * with a standard type.  The default policy type is "JavaPolicy".
- *
- * <p> Once a {@code Policy} instance has been installed (either by default,
- * or by calling {@code setPolicy}), the Java runtime invokes its
- * {@code implies} method when it needs to
- * determine whether executing code (encapsulated in a ProtectionDomain)
- * can perform SecurityManager-protected operations.  How a {@code Policy}
- * object retrieves its policy data is up to the {@code Policy} implementation
- * itself. The policy data may be stored, for example, in a flat ASCII file,
- * in a serialized binary file of the {@code Policy} class, or in a database.
- *
- * <p> The {@code refresh} method causes the policy object to
- * refresh/reload its data.  This operation is implementation-dependent.
- * For example, if the policy object stores its data in configuration files,
- * calling {@code refresh} will cause it to re-read the configuration
- * policy files.  If a refresh operation is not supported, this method does
- * nothing.  Note that refreshed policy may not have an effect on classes
- * in a particular ProtectionDomain. This is dependent on the policy
- * provider's implementation of the {@code implies}
- * method and its PermissionCollection caching strategy.
+ * A {@code Policy} object was responsible for determining whether code
+ * executing in the Java runtime environment had permission to perform a
+ * security-sensitive operation. This feature no longer exists.
  *
  * @author Roland Schemers
  * @author Gary Ellison
  * @since 1.2
- * @see java.security.Provider
- * @see java.security.ProtectionDomain
- * @see java.security.Permission
- * @see java.security.Security security properties
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated This class was only useful in conjunction with
+ *       {@linkplain SecurityManager the Security Manager}, which is no longer
+ *       supported. Installing a system-wide {@code Policy} object is no longer
+ *       supported. The {@linkplain #setPolicy setPolicy} method has been
+ *       changed to always throw {@code UnsupportedOperationException}. The
+ *       {@linkplain getPolicy getPolicy} method has been changed to always
+ *       return a {@code Policy} object that grants no permissions. There is no
+ *       replacement for the Security Manager or this class.
  */
 
 @Deprecated(since="17", forRemoval=true)
 public abstract class Policy {
 
+    private static Policy NO_PERMISSIONS_POLICY = new Policy() {};
+
     /**
      * Constructor for subclasses to call.
      */
@@ -105,262 +65,56 @@ public Policy() {}
     public static final PermissionCollection UNSUPPORTED_EMPTY_COLLECTION =
                         new UnsupportedEmptyCollection();
 
-    // Information about the system-wide policy.
-    private static class PolicyInfo {
-        // the system-wide policy
-        final Policy policy;
-        // a flag indicating if the system-wide policy has been initialized
-        final boolean initialized;
-
-        PolicyInfo(Policy policy, boolean initialized) {
-            this.policy = policy;
-            this.initialized = initialized;
-        }
-    }
-
-    // PolicyInfo is volatile since we apply DCL during initialization.
-    // For correctness, care must be taken to read the field only once and only
-    // write to it after any other initialization action has taken place.
-    private static volatile PolicyInfo policyInfo = new PolicyInfo(null, false);
-
-    private static final Debug debug = Debug.getInstance("policy");
-
-    // Default policy provider
-    private static final String DEFAULT_POLICY =
-        "sun.security.provider.PolicyFile";
-
-    // Cache mapping ProtectionDomain.Key to PermissionCollection
-    private WeakHashMap<ProtectionDomain.Key, PermissionCollection> pdMapping;
-
-    /** package private for AccessControlContext and ProtectionDomain */
-    static boolean isSet() {
-        PolicyInfo pi = policyInfo;
-        return pi.policy != null && pi.initialized == true;
-    }
-
-    private static void checkPermission(String type) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new SecurityPermission("createPolicy." + type));
-        }
-    }
-
     /**
-     * Returns the installed {@code Policy} object. This value should not be
-     * cached, as it may be changed by a call to {@code setPolicy}.
-     * This method first calls
-     * {@code SecurityManager.checkPermission} with a
-     * {@code SecurityPermission("getPolicy")} permission
-     * to ensure it's ok to get the {@code Policy} object.
-     *
-     * @return the installed Policy.
+     * Returns a {@code Policy} object that grants no permissions.
+     * Specifically:
+     *
+     * <ul>
+     *     <li> The {@code getParameters} method returns {@code null}. </li>
+     *     <li> The {@code getPermissions(CodeSource)} and
+     *     {@code getPermissions(ProtectionDomain)} methods return a read-only
+     *     empty {@code PermissionCollection}. </li>
+     *     <li> The {@code implies} method always returns {@code false}. </li>
+     * </ul>
+     *
+     * @return a {@code Policy} object that grants no permissions
+     *
+     * @apiNote This method originally returned the installed {@code Policy}
+     *    object, or if no {@code Policy} object had been installed, a default
+     *    {@code Policy} implementation. Installing a system-wide {@code Policy}
+     *    object is no longer supported. This method always returns a
+     *    default {@code Policy} object that grants no permissions. A
+     *    {@code Policy} object was only useful in conjunction with
+     *    {@linkplain SecurityManager the Security Manager}, which is no
+     *    longer supported. There is no replacement for this method.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        getting the {@code Policy} object.
-     *
-     * @see SecurityManager#checkPermission(Permission)
      * @see #setPolicy(java.security.Policy)
      */
     public static Policy getPolicy()
     {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(SecurityConstants.GET_POLICY_PERMISSION);
-        return getPolicyNoCheck();
+        return NO_PERMISSIONS_POLICY;
     }
 
     /**
-     * Returns the installed {@code Policy} object, skipping the security check.
-     * Used by ProtectionDomain and getPolicy.
+     * Throws {@code UnsupportedOperationException}. Setting a system-wide
+     * {@code Policy} object is not supported.
      *
-     * @return the installed {@code Policy}.
-     */
-    static Policy getPolicyNoCheck()
-    {
-        PolicyInfo pi = policyInfo;
-        // Use double-check idiom to avoid locking if system-wide policy is
-        // already initialized
-        if (pi.initialized == false || pi.policy == null) {
-            synchronized (Policy.class) {
-                pi = policyInfo;
-                if (pi.policy == null) {
-                    return loadPolicyProvider();
-                }
-            }
-        }
-        return pi.policy;
-    }
-
-    /**
-     * Loads and instantiates a Policy implementation specified by the
-     * policy.provider security property. Note that this method should only
-     * be called by getPolicyNoCheck and from within a synchronized block with
-     * an intrinsic lock on the Policy.class.
-     */
-    private static Policy loadPolicyProvider() {
-        @SuppressWarnings("removal")
-        String policyProvider =
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-                @Override
-                public String run() {
-                    return Security.getProperty("policy.provider");
-                }
-            });
-
-        /*
-         * If policy.provider is not set or is set to the default provider,
-         * simply instantiate it and return.
-         */
-        if (policyProvider == null || policyProvider.isEmpty() ||
-            policyProvider.equals(DEFAULT_POLICY))
-        {
-            Policy polFile = new sun.security.provider.PolicyFile();
-            policyInfo = new PolicyInfo(polFile, true);
-            return polFile;
-        }
-
-        /*
-         * Locate, load, and instantiate the policy.provider impl using
-         * the system class loader. While doing so, install the bootstrap
-         * provider to avoid potential recursion.
-         */
-        Policy polFile = new sun.security.provider.PolicyFile();
-        policyInfo = new PolicyInfo(polFile, false);
-
-        @SuppressWarnings("removal")
-        Policy pol = AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Policy run() {
-                try {
-                    ClassLoader scl = ClassLoader.getSystemClassLoader();
-                    @SuppressWarnings("deprecation")
-                    Object o = Class.forName(policyProvider, true, scl).newInstance();
-                    return (Policy)o;
-                } catch (Exception e) {
-                    if (debug != null) {
-                        debug.println("policy provider " + policyProvider +
-                                      " not available");
-                        e.printStackTrace();
-                    }
-                    return null;
-                }
-            }
-        });
-
-        if (pol == null) {
-            // Fallback and use the system default implementation
-            if (debug != null) {
-                debug.println("using " + DEFAULT_POLICY);
-            }
-            pol = polFile;
-        }
-        policyInfo = new PolicyInfo(pol, true);
-        return pol;
-    }
-
-    /**
-     * Sets the system-wide {@code Policy} object. This method first calls
-     * {@code SecurityManager.checkPermission} with a
-     * {@code SecurityPermission("setPolicy")}
-     * permission to ensure it's ok to set the Policy.
-     *
-     * @param p the new system {@code Policy} object.
+     * @param p ignored
+     * @throws UnsupportedOperationException always
+     * @apiNote This method originally installed the system-wide
+     *    {@code Policy} object. Installing a system-wide {@code Policy} object
+     *    is no longer supported. A {@code Policy} object was only useful in
+     *    conjunction with {@linkplain SecurityManager the Security Manager},
+     *    which is no longer supported. There is no replacement for this method.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        setting the Policy.
-     *
-     * @see SecurityManager#checkPermission(Permission)
      * @see #getPolicy()
-     *
      */
     public static void setPolicy(Policy p)
     {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) sm.checkPermission(
-                                 new SecurityPermission("setPolicy"));
-        if (p != null) {
-            initPolicy(p);
-        }
-        synchronized (Policy.class) {
-            policyInfo = new PolicyInfo(p, p != null);
-        }
-    }
-
-    /**
-     * Initialize superclass state such that a legacy provider can
-     * handle queries for itself.
-     *
-     * @since 1.4
-     */
-    private static void initPolicy (final Policy p) {
-        /*
-         * A policy provider not on the bootclasspath could trigger
-         * security checks fulfilling a call to either Policy.implies
-         * or Policy.getPermissions. If this does occur the provider
-         * must be able to answer for it's own ProtectionDomain
-         * without triggering additional security checks, otherwise
-         * the policy implementation will end up in an infinite
-         * recursion.
-         *
-         * To mitigate this, the provider can collect it's own
-         * ProtectionDomain and associate a PermissionCollection while
-         * it is being installed. The currently installed policy
-         * provider (if there is one) will handle calls to
-         * Policy.implies or Policy.getPermissions during this
-         * process.
-         *
-         * This Policy superclass caches away the ProtectionDomain and
-         * statically binds permissions so that legacy Policy
-         * implementations will continue to function.
-         */
-
-        @SuppressWarnings("removal")
-        ProtectionDomain policyDomain =
-        AccessController.doPrivileged(new PrivilegedAction<>() {
-            public ProtectionDomain run() {
-                return p.getClass().getProtectionDomain();
-            }
-        });
-
-        /*
-         * Collect the permissions granted to this protection domain
-         * so that the provider can be security checked while processing
-         * calls to Policy.implies or Policy.getPermissions.
-         */
-        PermissionCollection policyPerms = null;
-        synchronized (p) {
-            if (p.pdMapping == null) {
-                p.pdMapping = new WeakHashMap<>();
-           }
-        }
-
-        if (policyDomain.getCodeSource() != null) {
-            Policy pol = policyInfo.policy;
-            if (pol != null) {
-                policyPerms = pol.getPermissions(policyDomain);
-            }
-
-            if (policyPerms == null) { // assume it has all
-                policyPerms = new Permissions();
-                policyPerms.add(SecurityConstants.ALL_PERMISSION);
-            }
-
-            synchronized (p.pdMapping) {
-                // cache of pd to permissions
-                p.pdMapping.put(policyDomain.key, policyPerms);
-            }
-        }
-        return;
+        throw new UnsupportedOperationException(
+                "Setting a system-wide Policy object is not supported");
     }
 
-
     /**
      * Returns a Policy object of the specified type.
      *
@@ -381,11 +135,7 @@ public ProtectionDomain run() {
      * may be different than the order of providers returned by
      * {@link Security#getProviders() Security.getProviders()}.
      *
-     * @param type the specified Policy type.  See the Policy section in the
-     *    <a href=
-     *    "{@docRoot}/../specs/security/standard-names.html#policy-types">
-     *    Java Security Standard Algorithm Names Specification</a>
-     *    for a list of standard Policy types.
+     * @param type the specified Policy type
      *
      * @param params parameters for the {@code Policy}, which may be
      * {@code null}.
@@ -401,9 +151,6 @@ public ProtectionDomain run() {
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Policy} instance for the specified type.
-     *
      * @see Provider
      * @since 1.6
      */
@@ -411,7 +158,6 @@ public ProtectionDomain run() {
     public static Policy getInstance(String type, Policy.Parameters params)
                 throws NoSuchAlgorithmException {
         Objects.requireNonNull(type, "null type name");
-        checkPermission(type);
         try {
             GetInstance.Instance instance = GetInstance.getInstance("Policy",
                                                         PolicySpi.class,
@@ -437,11 +183,7 @@ public static Policy getInstance(String type, Policy.Parameters params)
      * <p> Note that the list of registered providers may be retrieved via
      * the {@link Security#getProviders() Security.getProviders()} method.
      *
-     * @param type the specified Policy type.  See the Policy section in the
-     *    <a href=
-     *    "{@docRoot}/../specs/security/standard-names.html#policy-types">
-     *    Java Security Standard Algorithm Names Specification</a>
-     *    for a list of standard Policy types.
+     * @param type the specified Policy type
      *
      * @param params parameters for the {@code Policy}, which may be
      * {@code null}.
@@ -464,9 +206,6 @@ public static Policy getInstance(String type, Policy.Parameters params)
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Policy} instance for the specified type
-     *
      * @see Provider
      * @since 1.6
      */
@@ -481,7 +220,6 @@ public static Policy getInstance(String type,
             throw new IllegalArgumentException("missing provider");
         }
 
-        checkPermission(type);
         try {
             GetInstance.Instance instance = GetInstance.getInstance("Policy",
                                                         PolicySpi.class,
@@ -505,11 +243,7 @@ public static Policy getInstance(String type,
      * is returned.  Note that the specified provider does not
      * have to be registered in the provider list.
      *
-     * @param type the specified Policy type.  See the Policy section in the
-     *    <a href=
-     *    "{@docRoot}/../specs/security/standard-names.html#policy-types">
-     *    Java Security Standard Algorithm Names Specification</a>
-     *    for a list of standard Policy types.
+     * @param type the specified Policy type
      *
      * @param params parameters for the {@code Policy}, which may be
      * {@code null}.
@@ -529,9 +263,6 @@ public static Policy getInstance(String type,
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Policy} instance for the specified type
-     *
      * @see Provider
      * @since 1.6
      */
@@ -546,7 +277,6 @@ public static Policy getInstance(String type,
             throw new IllegalArgumentException("missing provider");
         }
 
-        checkPermission(type);
         try {
             GetInstance.Instance instance = GetInstance.getInstance("Policy",
                                                         PolicySpi.class,
@@ -620,20 +350,10 @@ public Policy.Parameters getParameters() {
      * Return a PermissionCollection object containing the set of
      * permissions granted to the specified CodeSource.
      *
-     * <p> Applications are discouraged from calling this method
-     * since this operation may not be supported by all policy implementations.
-     * Applications should solely rely on the {@code implies} method
-     * to perform policy checks.  If an application absolutely must call
-     * a getPermissions method, it should call
-     * {@code getPermissions(ProtectionDomain)}.
-     *
-     * <p> The default implementation of this method returns
-     * Policy.UNSUPPORTED_EMPTY_COLLECTION.  This method can be
-     * overridden if the policy implementation can return a set of
-     * permissions granted to a CodeSource.
+     * <p> The default implementation of this method ignores the
+     * CodeSource and returns Policy.UNSUPPORTED_EMPTY_COLLECTION.
      *
-     * @param codesource the CodeSource to which the returned
-     *          PermissionCollection has been granted.
+     * @param codesource ignored
      *
      * @return a set of permissions granted to the specified CodeSource.
      *          If this operation is supported, the returned
@@ -650,26 +370,10 @@ public PermissionCollection getPermissions(CodeSource codesource) {
      * Return a PermissionCollection object containing the set of
      * permissions granted to the specified ProtectionDomain.
      *
-     * <p> Applications are discouraged from calling this method
-     * since this operation may not be supported by all policy implementations.
-     * Applications should rely on the {@code implies} method
-     * to perform policy checks.
+     * <p> The default implementation of this method ignores the
+     * ProtectionDomain and returns Policy.UNSUPPORTED_EMPTY_COLLECTION.
      *
-     * <p> The default implementation of this method first retrieves
-     * the permissions returned via {@code getPermissions(CodeSource)}
-     * (the CodeSource is taken from the specified ProtectionDomain),
-     * as well as the permissions located inside the specified ProtectionDomain.
-     * All of these permissions are then combined and returned in a new
-     * PermissionCollection object.  If {@code getPermissions(CodeSource)}
-     * returns Policy.UNSUPPORTED_EMPTY_COLLECTION, then this method
-     * returns the permissions contained inside the specified ProtectionDomain
-     * in a new PermissionCollection object.
-     *
-     * <p> This method can be overridden if the policy implementation
-     * supports returning a set of permissions granted to a ProtectionDomain.
-     *
-     * @param domain the ProtectionDomain to which the returned
-     *          PermissionCollection has been granted.
+     * @param domain ignored
      *
      * @return a set of permissions granted to the specified ProtectionDomain.
      *          If this operation is supported, the returned
@@ -681,103 +385,32 @@ public PermissionCollection getPermissions(CodeSource codesource) {
      * @since 1.4
      */
     public PermissionCollection getPermissions(ProtectionDomain domain) {
-        PermissionCollection pc = null;
-
-        if (domain == null)
-            return new Permissions();
-
-        if (pdMapping == null) {
-            initPolicy(this);
-        }
-
-        synchronized (pdMapping) {
-            pc = pdMapping.get(domain.key);
-        }
-
-        if (pc != null) {
-            Permissions perms = new Permissions();
-            synchronized (pc) {
-                for (Enumeration<Permission> e = pc.elements() ; e.hasMoreElements() ;) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return perms;
-        }
-
-        pc = getPermissions(domain.getCodeSource());
-        if (pc == null || pc == UNSUPPORTED_EMPTY_COLLECTION) {
-            pc = new Permissions();
-        }
-
-        addStaticPerms(pc, domain.getPermissions());
-        return pc;
-    }
-
-    /**
-     * add static permissions to provided permission collection
-     */
-    private void addStaticPerms(PermissionCollection perms,
-                                PermissionCollection statics) {
-        if (statics != null) {
-            synchronized (statics) {
-                Enumeration<Permission> e = statics.elements();
-                while (e.hasMoreElements()) {
-                    perms.add(e.nextElement());
-                }
-            }
-        }
+        return Policy.UNSUPPORTED_EMPTY_COLLECTION;
     }
 
     /**
-     * Evaluates the global policy for the permissions granted to
-     * the ProtectionDomain and tests whether the permission is
-     * granted.
+     * Evaluates the permissions granted to the ProtectionDomain and tests
+     * whether the permission is granted.
      *
-     * @param domain the ProtectionDomain to test
-     * @param permission the Permission object to be tested for implication.
+     * <p> The default implementation of this method ignores the
+     * ProtectionDomain and Permission parameters and always returns false.
      *
-     * @return {@code true} if "permission" is a proper subset of a permission
-     * granted to this ProtectionDomain.
+     * @param domain ignored
+     * @param permission ignored
+     *
+     * @return {@code false} always
      *
      * @see java.security.ProtectionDomain
      * @since 1.4
      */
     public boolean implies(ProtectionDomain domain, Permission permission) {
-        PermissionCollection pc;
-
-        if (pdMapping == null) {
-            initPolicy(this);
-        }
-
-        synchronized (pdMapping) {
-            pc = pdMapping.get(domain.key);
-        }
-
-        if (pc != null) {
-            return pc.implies(permission);
-        }
-
-        pc = getPermissions(domain);
-        if (pc == null) {
-            return false;
-        }
-
-        synchronized (pdMapping) {
-            // cache it
-            pdMapping.put(domain.key, pc);
-        }
-
-        return pc.implies(permission);
+        return false;
     }
 
     /**
-     * Refreshes/reloads the policy configuration. The behavior of this method
-     * depends on the implementation. For example, calling {@code refresh}
-     * on a file-based policy will cause the file to be re-read.
+     * Refreshes/reloads the policy configuration.
      *
      * <p> The default implementation of this method does nothing.
-     * This method should be overridden if a refresh operation is supported
-     * by the policy implementation.
      */
     public void refresh() { }
 
@@ -829,11 +462,10 @@ public void refresh() {
      * This represents a marker interface for Policy parameters.
      *
      * @since 1.6
-     * @deprecated This class is only useful in conjunction with
+     * @deprecated This class was only useful in conjunction with
      *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this class is also deprecated and subject to removal.
-     *       There is no replacement for the Security Manager or this class.
+     *       no longer supported. There is no replacement for the Security
+     *       Manager or this class.
      */
     @Deprecated(since="17", forRemoval=true)
     public static interface Parameters { }
diff --git a/src/java.base/share/classes/java/security/PolicySpi.java b/src/java.base/share/classes/java/security/PolicySpi.java
index 2f104b335a7..ebe45c76ac0 100644
--- a/src/java.base/share/classes/java/security/PolicySpi.java
+++ b/src/java.base/share/classes/java/security/PolicySpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,22 +28,13 @@
 
 /**
  * This class defines the <i>Service Provider Interface</i> (<b>SPI</b>)
- * for the {@code Policy} class.
- * All the abstract methods in this class must be implemented by each
- * service provider who wishes to supply a {@code Policy} implementation.
- *
- * <p> Subclass implementations of this abstract class must provide
- * a public constructor that takes a {@code Policy.Parameters}
- * object as an input parameter.  This constructor also must throw
- * an {@code IllegalArgumentException} if it does not understand the
- * {@code Policy.Parameters} input.
- *
+ * for the {@code Policy} class. Installing a system-wide {@code Policy}
+ * object is no longer supported.
  *
  * @since 1.6
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
+ * @deprecated This class was only useful in conjunction with
+ *       {@linkplain SecurityManager the Security Manager}, which is no
+ *       longer supported. There is no replacement for
  *       the Security Manager or this class.
  */
 
@@ -51,31 +42,27 @@
 public abstract class PolicySpi {
 
     /**
-     * Constructor for subclasses to call.
+     * Constructor.
      */
     public PolicySpi() {}
 
     /**
      * Check whether the policy has granted a Permission to a ProtectionDomain.
      *
-     * @param domain the ProtectionDomain to check.
+     * @param domain the ProtectionDomain to check
      *
      * @param permission check whether this permission is granted to the
-     *          specified domain.
+     *          specified domain
      *
-     * @return boolean {@code true} if the permission is granted to the domain.
+     * @return boolean {@code true} if the permission is granted to the domain
      */
     protected abstract boolean engineImplies
         (ProtectionDomain domain, Permission permission);
 
     /**
-     * Refreshes/reloads the policy configuration. The behavior of this method
-     * depends on the implementation. For example, calling {@code refresh}
-     * on a file-based policy will cause the file to be re-read.
+     * Refreshes/reloads the policy configuration.
      *
      * <p> The default implementation of this method does nothing.
-     * This method should be overridden if a refresh operation is supported
-     * by the policy implementation.
      */
     protected void engineRefresh() { }
 
@@ -84,19 +71,12 @@ protected void engineRefresh() { }
      * permissions granted to the specified CodeSource.
      *
      * <p> The default implementation of this method returns
-     * Policy.UNSUPPORTED_EMPTY_COLLECTION object.  This method can be
-     * overridden if the policy implementation can return a set of
-     * permissions granted to a CodeSource.
+     * Policy.UNSUPPORTED_EMPTY_COLLECTION object.
      *
      * @param codesource the CodeSource to which the returned
-     *          PermissionCollection has been granted.
+     *          PermissionCollection has been granted
      *
-     * @return a set of permissions granted to the specified CodeSource.
-     *          If this operation is supported, the returned
-     *          set of permissions must be a new mutable instance
-     *          and it must support heterogeneous Permission types.
-     *          If this operation is not supported,
-     *          Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
+     * @return a set of permissions granted to the specified CodeSource
      */
     @SuppressWarnings("removal")
     protected PermissionCollection engineGetPermissions
@@ -109,19 +89,12 @@ protected void engineRefresh() { }
      * permissions granted to the specified ProtectionDomain.
      *
      * <p> The default implementation of this method returns
-     * Policy.UNSUPPORTED_EMPTY_COLLECTION object.  This method can be
-     * overridden if the policy implementation can return a set of
-     * permissions granted to a ProtectionDomain.
+     * Policy.UNSUPPORTED_EMPTY_COLLECTION object.
      *
      * @param domain the ProtectionDomain to which the returned
-     *          PermissionCollection has been granted.
+     *          PermissionCollection has been granted
      *
-     * @return a set of permissions granted to the specified ProtectionDomain.
-     *          If this operation is supported, the returned
-     *          set of permissions must be a new mutable instance
-     *          and it must support heterogeneous Permission types.
-     *          If this operation is not supported,
-     *          Policy.UNSUPPORTED_EMPTY_COLLECTION is returned.
+     * @return a set of permissions granted to the specified ProtectionDomain
      */
     @SuppressWarnings("removal")
     protected PermissionCollection engineGetPermissions
diff --git a/src/java.base/share/classes/java/security/ProtectionDomain.java b/src/java.base/share/classes/java/security/ProtectionDomain.java
index 168774befb9..231f998edb3 100644
--- a/src/java.base/share/classes/java/security/ProtectionDomain.java
+++ b/src/java.base/share/classes/java/security/ProtectionDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,23 @@
 
 package java.security;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
 import jdk.internal.access.JavaSecurityAccess;
 import jdk.internal.access.SharedSecrets;
-import sun.security.action.GetPropertyAction;
-import sun.security.provider.PolicyFile;
-import sun.security.util.Debug;
-import sun.security.util.FilePermCompat;
-import sun.security.util.SecurityConstants;
 
 /**
  * The {@code ProtectionDomain} class encapsulates the characteristics of a
  * domain, which encloses a set of classes whose instances are granted a set
- * of permissions when being executed on behalf of a given set of Principals.
+ * of permissions.
  * <p>
  * A static set of permissions can be bound to a {@code ProtectionDomain}
  * when it is constructed; such permissions are granted to the domain
  * regardless of the policy in force. However, to support dynamic security
  * policies, a {@code ProtectionDomain} can also be constructed such that it
- * is dynamically mapped to a set of permissions by the current policy whenever
- * a permission is checked.
+ * is dynamically mapped to a set of permissions by the current policy.
+ *
+ * @apiNote Installing a system-wide {@link Policy} object is
+ * no longer supported. The {@linkplain Policy#getPolicy current policy}
+ * is always a {@code Policy} object that grants no permissions.
  *
  * @author Li Gong
  * @author Roland Schemers
@@ -60,15 +51,6 @@
 
 public class ProtectionDomain {
 
-    /**
-     * If {@code true}, {@link #impliesWithAltFilePerm} will try to be
-     * compatible on FilePermission checking even if a 3rd-party Policy
-     * implementation is set.
-     */
-    private static final boolean filePermCompatInPD =
-            "true".equals(GetPropertyAction.privilegedGetProperty(
-                "jdk.security.filePermCompat"));
-
     private static class JavaSecurityAccessImpl implements JavaSecurityAccess {
 
         private JavaSecurityAccessImpl() {
@@ -84,10 +66,7 @@ public <T> T doIntersectionPrivilege(
                 throw new NullPointerException();
             }
 
-            return AccessController.doPrivileged(
-                action,
-                getCombinedACC(context, stack)
-            );
+            return AccessController.doPrivileged(action);
         }
 
         @SuppressWarnings("removal")
@@ -98,35 +77,6 @@ public <T> T doIntersectionPrivilege(
             return doIntersectionPrivilege(action,
                 AccessController.getContext(), context);
         }
-
-        @Override
-        public ProtectionDomain[] getProtectDomains(@SuppressWarnings("removal") AccessControlContext context) {
-            return context.getContext();
-        }
-
-        @SuppressWarnings("removal")
-        private static AccessControlContext getCombinedACC(
-            AccessControlContext context, AccessControlContext stack) {
-            AccessControlContext acc =
-                new AccessControlContext(context, stack.getCombiner(), true);
-
-            return new AccessControlContext(stack.getContext(), acc).optimize();
-        }
-
-        @Override
-        public ProtectionDomainCache getProtectionDomainCache() {
-            return new ProtectionDomainCache() {
-                private final Map<Key, PermissionCollection> map =
-                        Collections.synchronizedMap(new WeakHashMap<>());
-                public void put(ProtectionDomain pd,
-                                PermissionCollection pc) {
-                    map.put((pd == null ? null : pd.key), pc);
-                }
-                public PermissionCollection get(ProtectionDomain pd) {
-                    return pd == null ? map.get(null) : map.get(pd.key);
-                }
-            };
-        }
     }
 
     static {
@@ -153,11 +103,6 @@ public PermissionCollection get(ProtectionDomain pd) {
        or dynamic (via a policy refresh) */
     private final boolean staticPermissions;
 
-    /*
-     * An object used as a key when the ProtectionDomain is stored in a Map.
-     */
-    final Key key = new Key();
-
     /**
      * Creates a new {@code ProtectionDomain} with the given {@code CodeSource}
      * and permissions. If permissions is not {@code null}, then
@@ -170,6 +115,10 @@ or dynamic (via a policy refresh) */
      * They contain only the ones passed to this constructor and
      * the current policy will not be consulted.
      *
+     * @apiNote Installing a system-wide {@link Policy} object is
+     * no longer supported. The {@linkplain Policy#getPolicy current policy}
+     * is always a {@code Policy} object that grants no permissions.
+     *
      * @param codesource the codesource associated with this domain
      * @param permissions the permissions granted to this domain
      */
@@ -199,16 +148,11 @@ public ProtectionDomain(CodeSource codesource,
      * invoking the {@link #staticPermissionsOnly()} method returns
      * {@code false}.
      * They include both the static permissions passed to this constructor,
-     * and any permissions granted to this domain by the current policy at the
-     * time a permission is checked.
-     * <p>
-     * This constructor is typically used by
-     * {@link SecureClassLoader ClassLoaders}
-     * and {@link DomainCombiner DomainCombiners} which delegate to the
-     * {@code Policy} object to actively associate the permissions granted to
-     * this domain. This constructor affords the
-     * policy provider the opportunity to augment the supplied
-     * {@code PermissionCollection} to reflect policy changes.
+     * and any permissions granted to this domain by the current policy.
+     *
+     * @apiNote Installing a system-wide {@link Policy} object is
+     * no longer supported. The {@linkplain Policy#getPolicy current policy}
+     * is always a {@code Policy} object that grants no permissions.
      *
      * @param codesource the {@code CodeSource} associated with this domain
      * @param permissions the permissions granted to this domain
@@ -216,7 +160,6 @@ public ProtectionDomain(CodeSource codesource,
      * @param principals the array of {@code Principal} objects associated
      * with this domain. The contents of the array are copied to protect against
      * subsequent modification.
-     * @see Policy#refresh
      * @see Policy#getPermissions(ProtectionDomain)
      * @since 1.4
      */
@@ -248,7 +191,6 @@ public final CodeSource getCodeSource() {
         return this.codesource;
     }
 
-
     /**
      * Returns the {@code ClassLoader} of this domain.
      * @return the {@code ClassLoader} of this domain which may be {@code null}.
@@ -259,7 +201,6 @@ public final ClassLoader getClassLoader() {
         return this.classloader;
     }
 
-
     /**
      * Returns an array of principals for this domain.
      * @return a non-null array of principals for this domain.
@@ -285,8 +226,11 @@ public final PermissionCollection getPermissions() {
 
     /**
      * Returns {@code true} if this domain contains only static permissions
-     * and does not check the current {@code Policy} at the time of
-     * permission checking.
+     * and does not check the current {@code Policy}.
+     *
+     * @apiNote Installing a system-wide {@link Policy} object is
+     * no longer supported. The {@linkplain Policy#getPolicy current policy}
+     * is always a {@code Policy} object that grants no permissions.
      *
      * @return {@code true} if this domain contains only static permissions.
      *
@@ -310,7 +254,11 @@ public final boolean staticPermissionsOnly() {
      * <p>
      * Otherwise, the permission will be checked against the combination
      * of the {@code PermissionCollection} supplied at construction and
-     * the current policy binding.
+     * the current policy.
+     *
+     * @apiNote Installing a system-wide {@link Policy} object is
+     * no longer supported. The {@linkplain Policy#getPolicy current policy}
+     * is always a {@code Policy} object that grants no permissions.
      *
      * @param perm the {code Permission} object to check.
      *
@@ -327,7 +275,7 @@ public boolean implies(Permission perm) {
         }
 
         if (!staticPermissions &&
-            Policy.getPolicyNoCheck().implies(this, perm)) {
+            Policy.getPolicy().implies(this, perm)) {
             return true;
         }
         if (permissions != null) {
@@ -337,73 +285,6 @@ public boolean implies(Permission perm) {
         return false;
     }
 
-    /**
-     * This method has almost the same logic flow as {@link #implies} but
-     * it ensures some level of FilePermission compatibility after JDK-8164705.
-     *
-     * This method is called by {@link AccessControlContext#checkPermission}
-     * and not intended to be called by an application.
-     */
-    boolean impliesWithAltFilePerm(Permission perm) {
-
-        // If FilePermCompat.compat is set (default value), FilePermission
-        // checking compatibility should be considered.
-
-        // If filePermCompatInPD is set, this method checks for alternative
-        // FilePermission to keep compatibility for any Policy implementation.
-        // When set to false (default value), implies() is called since
-        // the PolicyFile implementation already supports compatibility.
-
-        // If this is a subclass of ProtectionDomain, call implies()
-        // because most likely user has overridden it.
-
-        if (!filePermCompatInPD || !FilePermCompat.compat ||
-                getClass() != ProtectionDomain.class) {
-            return implies(perm);
-        }
-
-        if (hasAllPerm) {
-            // internal permission collection already has AllPermission -
-            // no need to go to policy
-            return true;
-        }
-
-        Permission p2 = null;
-        boolean p2Calculated = false;
-
-        if (!staticPermissions) {
-            @SuppressWarnings("removal")
-            Policy policy = Policy.getPolicyNoCheck();
-            if (policy instanceof PolicyFile) {
-                // The PolicyFile implementation supports compatibility
-                // inside, and it also covers the static permissions.
-                return policy.implies(this, perm);
-            } else {
-                if (policy.implies(this, perm)) {
-                    return true;
-                }
-                p2 = FilePermCompat.newPermUsingAltPath(perm);
-                p2Calculated = true;
-                if (p2 != null && policy.implies(this, p2)) {
-                    return true;
-                }
-            }
-        }
-        if (permissions != null) {
-            if (permissions.implies(perm)) {
-                return true;
-            } else {
-                if (!p2Calculated) {
-                    p2 = FilePermCompat.newPermUsingAltPath(perm);
-                }
-                if (p2 != null) {
-                    return permissions.implies(p2);
-                }
-            }
-        }
-        return false;
-    }
-
     /**
      * Convert a {@code ProtectionDomain} to a {@code String}.
      */
@@ -424,153 +305,10 @@ boolean impliesWithAltFilePerm(Permission perm) {
             pals = palBuf.toString();
         }
 
-        // Check if policy is set; we don't want to load
-        // the policy prematurely here
-        @SuppressWarnings("removal")
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
-
         return "ProtectionDomain "+
             " "+codesource+"\n"+
             " "+classloader+"\n"+
             " "+pals+"\n"+
-            " "+pc+"\n";
-    }
-
-    /*
-     * holder class for the static field "debug" to delay its initialization
-     */
-    private static class DebugHolder {
-        private static final Debug debug = Debug.getInstance("domain");
-    }
-
-    /**
-     * Return {@code true} (merge policy permissions) in the following cases:
-     *
-     * . SecurityManager is {@code null}
-     *
-     * . SecurityManager is not {@code null},
-     *          debug is not {@code null},
-     *          SecurityManager implementation is in bootclasspath,
-     *          Policy implementation is in bootclasspath
-     *          (the bootclasspath restrictions avoid recursion)
-     *
-     * . SecurityManager is not {@code null},
-     *          debug is {@code null},
-     *          caller has Policy.getPolicy permission
-     */
-    @SuppressWarnings("removal")
-    private static boolean seeAllp() {
-        SecurityManager sm = System.getSecurityManager();
-
-        if (sm == null) {
-            return true;
-        } else {
-            if (DebugHolder.debug != null) {
-                return sm.getClass().getClassLoader() == null &&
-                        Policy.getPolicyNoCheck().getClass().getClassLoader()
-                                == null;
-            } else {
-                try {
-                    sm.checkPermission(SecurityConstants.GET_POLICY_PERMISSION);
-                    return true;
-                } catch (SecurityException se) {
-                    return false;
-                }
-            }
-        }
-    }
-
-    private PermissionCollection mergePermissions() {
-        if (staticPermissions)
-            return permissions;
-
-        @SuppressWarnings("removal")
-        PermissionCollection perms =
-            java.security.AccessController.doPrivileged
-            ((PrivilegedAction<PermissionCollection>) () ->
-                Policy.getPolicyNoCheck().getPermissions(ProtectionDomain.this));
-
-        Permissions mergedPerms = new Permissions();
-        int swag = 32;
-        int vcap = 8;
-        Enumeration<Permission> e;
-        List<Permission> pdVector = new ArrayList<>(vcap);
-        List<Permission> plVector = new ArrayList<>(swag);
-
-        //
-        // Build a vector of domain permissions for subsequent merge
-        if (permissions != null) {
-            synchronized (permissions) {
-                e = permissions.elements();
-                while (e.hasMoreElements()) {
-                    pdVector.add(e.nextElement());
-                }
-            }
-        }
-
-        //
-        // Build a vector of Policy permissions for subsequent merge
-        if (perms != null) {
-            synchronized (perms) {
-                e = perms.elements();
-                while (e.hasMoreElements()) {
-                    plVector.add(e.nextElement());
-                    vcap++;
-                }
-            }
-        }
-
-        if (perms != null && permissions != null) {
-            //
-            // Weed out the duplicates from the policy. Unless a refresh
-            // has occurred since the pd was consed this should result in
-            // an empty vector.
-            synchronized (permissions) {
-                e = permissions.elements();   // domain vs policy
-                while (e.hasMoreElements()) {
-                    Permission pdp = e.nextElement();
-                    Class<?> pdpClass = pdp.getClass();
-                    String pdpActions = pdp.getActions();
-                    String pdpName = pdp.getName();
-                    for (int i = 0; i < plVector.size(); i++) {
-                        Permission pp = plVector.get(i);
-                        if (pdpClass.isInstance(pp)) {
-                            // The equals() method on some permissions
-                            // have some side effects so this manual
-                            // comparison is sufficient.
-                            if (pdpName.equals(pp.getName()) &&
-                                Objects.equals(pdpActions, pp.getActions())) {
-                                plVector.remove(i);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (perms !=null) {
-            // the order of adding to merged perms and permissions
-            // needs to preserve the bugfix 4301064
-
-            for (int i = plVector.size()-1; i >= 0; i--) {
-                mergedPerms.add(plVector.get(i));
-            }
-        }
-        if (permissions != null) {
-            for (int i = pdVector.size()-1; i >= 0; i--) {
-                mergedPerms.add(pdVector.get(i));
-            }
-        }
-
-        return mergedPerms;
+            " "+permissions+"\n";
     }
-
-    /**
-     * Used for storing ProtectionDomains as keys in a Map.
-     */
-    static final class Key {}
-
 }
diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
index c4dac74c680..385247d4c8f 100644
--- a/src/java.base/share/classes/java/security/Provider.java
+++ b/src/java.base/share/classes/java/security/Provider.java
@@ -355,16 +355,6 @@ public String toString() {
      * Clears this {@code Provider} so that it no longer contains the properties
      * used to look up facilities implemented by the {@code Provider}.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "clearProviderProperties."+name}
-     * (where {@code name} is the provider name) to see if it's ok to clear
-     * this provider.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to clear this provider
-     *
      * @since 1.2
      */
     @Override
@@ -467,16 +457,6 @@ public Collection<Object> values() {
      * Sets the {@code key} property to have the specified
      * {@code value}.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "putProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to set this
-     * provider's property values.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values.
-     *
      * @since 1.2
      */
     @Override
@@ -494,16 +474,6 @@ public synchronized Object put(Object key, Object value) {
      * to {@code null}) associates it with the given value and returns
      * {@code null}, else returns the current value.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "putProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to set this
-     * provider's property values.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values.
-     *
      * @since 1.8
      */
     @Override
@@ -520,16 +490,6 @@ public synchronized Object putIfAbsent(Object key, Object value) {
      * Removes the {@code key} property (and its corresponding
      * {@code value}).
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "removeProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to remove this
-     * provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to remove this provider's properties.
-     *
      * @since 1.2
      */
     @Override
@@ -545,16 +505,6 @@ public synchronized Object remove(Object key) {
      * Removes the entry for the specified key only if it is currently
      * mapped to the specified value.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "removeProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to remove this
-     * provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to remove this provider's properties.
-     *
      * @since 1.8
      */
     @Override
@@ -570,16 +520,6 @@ public synchronized boolean remove(Object key, Object value) {
      * Replaces the entry for the specified key only if currently
      * mapped to the specified value.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "putProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to set this
-     * provider's property values.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values.
-     *
      * @since 1.8
      */
     @Override
@@ -596,16 +536,6 @@ public synchronized boolean replace(Object key, Object oldValue,
      * Replaces the entry for the specified key only if it is
      * currently mapped to some value.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "putProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to set this
-     * provider's property values.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values.
-     *
      * @since 1.8
      */
     @Override
@@ -623,16 +553,6 @@ public synchronized Object replace(Object key, Object value) {
      * set iterator, until all entries have been processed or the function
      * throws an exception.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the string {@code "putProviderProperty."+name},
-     * where {@code name} is the provider name, to see if it's ok to set this
-     * provider's property values.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values.
-     *
      * @since 1.8
      */
     @Override
@@ -650,17 +570,6 @@ public synchronized void replaceAll(BiFunction<? super Object,
      * current mapped value (or {@code null} if there is no current
      * mapping).
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the strings {@code "putProviderProperty."+name}
-     * and {@code "removeProviderProperty."+name}, where {@code name} is the
-     * provider name, to see if it's ok to set this provider's property values
-     * and remove this provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values or remove properties.
-     *
      * @since 1.8
      */
     @Override
@@ -680,17 +589,6 @@ public synchronized Object compute(Object key, BiFunction<? super Object,
      * the given mapping function and enters it into this map unless
      * {@code null}.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the strings {@code "putProviderProperty."+name}
-     * and {@code "removeProviderProperty."+name}, where {@code name} is the
-     * provider name, to see if it's ok to set this provider's property values
-     * and remove this provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values and remove properties.
-     *
      * @since 1.8
      */
     @Override
@@ -709,17 +607,6 @@ public synchronized Object computeIfAbsent(Object key,
      * If the value for the specified key is present and non-null, attempts to
      * compute a new mapping given the key and its current mapped value.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the strings {@code "putProviderProperty."+name}
-     * and {@code "removeProviderProperty."+name}, where {@code name} is the
-     * provider name, to see if it's ok to set this provider's property values
-     * and remove this provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values or remove properties.
-     *
      * @since 1.8
      */
     @Override
@@ -742,17 +629,6 @@ public synchronized Object computeIfPresent(Object key,
      * function, or removes if the result is {@code null}. This method may be
      * of use when combining multiple mapped values for a key.
      *
-     * <p>If a security manager is enabled, its {@code checkSecurityAccess}
-     * method is called with the strings {@code "putProviderProperty."+name}
-     * and {@code "removeProviderProperty."+name}, where {@code name} is the
-     * provider name, to see if it's ok to set this provider's property values
-     * and remove this provider's properties.
-     *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to set property values or remove properties.
-     *
      * @since 1.8
      */
     @Override
@@ -1356,22 +1232,8 @@ public Set<Service> getServices() {
      * {@extLink security_guide_jca
      * Java Cryptography Architecture (JCA) Reference Guide}.
      *
-     * <p>Also, if there is a security manager, its
-     * {@code checkSecurityAccess} method is called with the string
-     * {@code "putProviderProperty."+name}, where {@code name} is
-     * the provider name, to see if it's ok to set this provider's property
-     * values. If the default implementation of {@code checkSecurityAccess}
-     * is used (that is, that method is not overridden), then this results in
-     * a call to the security manager's {@code checkPermission} method with
-     * a {@code SecurityPermission("putProviderProperty."+name)}
-     * permission.
-     *
      * @param s the Service to add
      *
-     * @throws SecurityException
-     *      if a security manager exists and its {@link
-     *      java.lang.SecurityManager#checkSecurityAccess} method denies
-     *      access to set property values.
      * @throws NullPointerException if s is {@code null}
      *
      * @since 1.5
@@ -1477,23 +1339,8 @@ private void removePropertyStrings(Service s) {
      * {@link #getService getService()} and its information will be removed
      * from this provider's Hashtable.
      *
-     * <p>Also, if there is a security manager, its
-     * {@code checkSecurityAccess} method is called with the string
-     * {@code "removeProviderProperty."+name}, where {@code name} is
-     * the provider name, to see if it's ok to remove this provider's
-     * properties. If the default implementation of
-     * {@code checkSecurityAccess} is used (that is, that method is not
-     * overridden), then this results in a call to the security manager's
-     * {@code checkPermission} method with a
-     * {@code SecurityPermission("removeProviderProperty."+name)}
-     * permission.
-     *
      * @param s the Service to be removed
      *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method denies
-     *          access to remove this provider's properties.
      * @throws NullPointerException if s is {@code null}
      *
      * @since 1.5
diff --git a/src/java.base/share/classes/java/security/SecureClassLoader.java b/src/java.base/share/classes/java/security/SecureClassLoader.java
index 0a649ab7227..577b0f081ec 100644
--- a/src/java.base/share/classes/java/security/SecureClassLoader.java
+++ b/src/java.base/share/classes/java/security/SecureClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,11 @@
 
 /**
  * This class extends {@code ClassLoader} with additional support for defining
- * classes with an associated code source and permissions which are
- * retrieved by the system policy by default.
+ * classes with an associated code source and permissions.
+ *
+ * @apiNote
+ * Permissions cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @author  Li Gong
  * @author  Roland Schemers
@@ -63,15 +66,7 @@ public class SecureClassLoader extends ClassLoader {
      * Creates a new {@code SecureClassLoader} using the specified parent
      * class loader for delegation.
      *
-     * <p>If there is a security manager, this method first
-     * calls the security manager's {@code checkCreateClassLoader}
-     * method  to ensure creation of a class loader is allowed.
-     *
      * @param parent the parent ClassLoader
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkCreateClassLoader} method doesn't allow
-     *             creation of a class loader.
-     * @see SecurityManager#checkCreateClassLoader
      */
     protected SecureClassLoader(ClassLoader parent) {
         super(parent);
@@ -80,15 +75,6 @@ protected SecureClassLoader(ClassLoader parent) {
     /**
      * Creates a new {@code SecureClassLoader} using the default parent class
      * loader for delegation.
-     *
-     * <p>If there is a security manager, this method first
-     * calls the security manager's {@code checkCreateClassLoader}
-     * method  to ensure creation of a class loader is allowed.
-     *
-     * @throws     SecurityException  if a security manager exists and its
-     *             {@code checkCreateClassLoader} method doesn't allow
-     *             creation of a class loader.
-     * @see SecurityManager#checkCreateClassLoader
      */
     protected SecureClassLoader() {
         super();
@@ -103,10 +89,6 @@ protected SecureClassLoader() {
      *
      * @throws IllegalArgumentException if the given name is empty.
      *
-     * @throws SecurityException  if a security manager exists and its
-     *         {@link SecurityManager#checkCreateClassLoader()} method
-     *         doesn't allow creation of a class loader.
-     *
      * @since 9
      */
     protected SecureClassLoader(String name, ClassLoader parent) {
@@ -191,7 +173,7 @@ protected final Class<?> defineClass(String name, java.nio.ByteBuffer b,
      *
      * @param codesource the codesource.
      *
-     * @return the permissions granted to the codesource.
+     * @return the permissions for the codesource.
      *
      */
     protected PermissionCollection getPermissions(CodeSource codesource)
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
index 322605ef5ed..aab793b98e9 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -459,14 +459,6 @@ public static String getAlgorithmProperty(String algName,
      *
      * <p>A provider cannot be added if it is already installed.
      *
-     * <p>If there is a security manager, the
-     * {@link java.lang.SecurityManager#checkSecurityAccess} method is called
-     * with the {@code "insertProvider"} permission target name to see if
-     * it's ok to add a new provider. If this permission check is denied,
-     * {@code checkSecurityAccess} is called again with the
-     * {@code "insertProvider."+provider.getName()} permission target name. If
-     * both checks are denied, a {@code SecurityException} is thrown.
-     *
      * @param provider the provider to be added.
      *
      * @param position the preference position that the caller would
@@ -477,14 +469,9 @@ public static String getAlgorithmProperty(String algName,
      * already installed.
      *
      * @throws  NullPointerException if provider is {@code null}
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to add a new provider
      *
      * @see #getProvider
      * @see #removeProvider
-     * @see java.security.SecurityPermission
      */
     public static synchronized int insertProviderAt(Provider provider,
             int position) {
@@ -502,14 +489,6 @@ public static synchronized int insertProviderAt(Provider provider,
     /**
      * Adds a provider to the next position available.
      *
-     * <p>If there is a security manager, the
-     * {@link java.lang.SecurityManager#checkSecurityAccess} method is called
-     * with the {@code "insertProvider"} permission target name to see if
-     * it's ok to add a new provider. If this permission check is denied,
-     * {@code checkSecurityAccess} is called again with the
-     * {@code "insertProvider."+provider.getName()} permission target name. If
-     * both checks are denied, a {@code SecurityException} is thrown.
-     *
      * @param provider the provider to be added.
      *
      * @return the preference position in which the provider was
@@ -517,14 +496,9 @@ public static synchronized int insertProviderAt(Provider provider,
      * already installed.
      *
      * @throws  NullPointerException if provider is {@code null}
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies access to add a new provider
      *
      * @see #getProvider
      * @see #removeProvider
-     * @see java.security.SecurityPermission
      */
     public static int addProvider(Provider provider) {
         /*
@@ -547,24 +521,8 @@ public static int addProvider(Provider provider) {
      * <p>This method returns silently if the provider is not installed or
      * if name is {@code null}.
      *
-     * <p>First, if there is a security manager, its
-     * {@code checkSecurityAccess}
-     * method is called with the string {@code "removeProvider."+name}
-     * to see if it's ok to remove the provider.
-     * If the default implementation of {@code checkSecurityAccess}
-     * is used (i.e., that method is not overridden), then this will result in
-     * a call to the security manager's {@code checkPermission} method
-     * with a {@code SecurityPermission("removeProvider."+name)}
-     * permission.
-     *
      * @param name the name of the provider to remove.
      *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkSecurityAccess} method
-     *          denies
-     *          access to remove the provider
-     *
      * @see #getProvider
      * @see #addProvider
      */
@@ -850,29 +808,17 @@ static Object[] getImpl(String algorithm, String type, Provider provider,
     /**
      * Gets a security property value.
      *
-     * <p>First, if there is a security manager, its
-     * {@code checkPermission}  method is called with a
-     * {@code java.security.SecurityPermission("getProperty."+key)}
-     * permission to see if it's ok to retrieve the specified
-     * security property value.
-     *
      * @param key the key of the property being retrieved.
      *
      * @return the value of the security property, or {@code null} if there
      *          is no property with that key.
      *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkPermission} method
-     *          denies
-     *          access to retrieve the specified security property value
      * @throws  NullPointerException if key is {@code null}
      * @throws  IllegalArgumentException if key is reserved and cannot be
      *          used as a Security property name. Reserved keys are:
      *          "include".
      *
      * @see #setProperty
-     * @see java.security.SecurityPermission
      */
     public static String getProperty(String key) {
         SecPropLoader.checkReservedKey(key);
@@ -886,33 +832,21 @@ public static String getProperty(String key) {
     /**
      * Sets a security property value.
      *
-     * <p>First, if there is a security manager, its
-     * {@code checkPermission} method is called with a
-     * {@code java.security.SecurityPermission("setProperty."+key)}
-     * permission to see if it's ok to set the specified
-     * security property value.
-     *
      * @param key the name of the property to be set.
      *
      * @param datum the value of the property to be set.
      *
-     * @throws  SecurityException
-     *          if a security manager exists and its {@link
-     *          java.lang.SecurityManager#checkPermission} method
-     *          denies access to set the specified security property value
      * @throws  NullPointerException if key or datum is {@code null}
      * @throws  IllegalArgumentException if key is reserved and cannot be
      *          used as a Security property name. Reserved keys are:
      *          "include".
      *
      * @see #getProperty
-     * @see java.security.SecurityPermission
      */
     public static void setProperty(String key, String datum) {
         SecPropLoader.checkReservedKey(key);
         check("setProperty." + key);
         props.put(key, datum);
-        invalidateSMCache(key);  /* See below. */
 
         SecurityPropertyModificationEvent spe = new SecurityPropertyModificationEvent();
         // following is a no-op if event is disabled
@@ -925,23 +859,6 @@ public static void setProperty(String key, String datum) {
         }
     }
 
-    /*
-     * Implementation detail:  If the property we just set in
-     * setProperty() was either "package.access" or
-     * "package.definition", we need to signal to the SecurityManager
-     * class that the value has just changed, and that it should
-     * invalidate its local cache values.
-     */
-    private static void invalidateSMCache(String key) {
-
-        final boolean pa = key.equals("package.access");
-        final boolean pd = key.equals("package.definition");
-
-        if (pa || pd) {
-            SharedSecrets.getJavaLangAccess().invalidatePackageAccessCache();
-        }
-    }
-
     private static void check(String directive) {
         @SuppressWarnings("removal")
         SecurityManager security = System.getSecurityManager();
diff --git a/src/java.base/share/classes/java/security/SecurityPermission.java b/src/java.base/share/classes/java/security/SecurityPermission.java
index 63e51db2273..c378953095c 100644
--- a/src/java.base/share/classes/java/security/SecurityPermission.java
+++ b/src/java.base/share/classes/java/security/SecurityPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,291 +30,11 @@
  * contains a name (also referred to as a "target name") but no actions list;
  * you either have the named permission or you don't.
  * <p>
- * The target name is the name of a security configuration parameter
- * (see below). Currently, the {@code SecurityPermission} object is used to
- * guard access to the {@link AccessControlContext}, {@link Policy},
- * {@link Provider}, {@link Security}, {@link Signer}, and {@link Identity}
- * objects.
- * <p>
- * The following table lists the standard {@code SecurityPermission}
- * target names, and for each provides a description of what the permission
- * allows and a discussion of the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- *
- * <tr>
- *   <th scope="row">authProvider.{provider name}</th>
- *   <td>Allow the named provider to be an AuthProvider for login and
- * logout operations. </td>
- *   <td>This allows the named provider to perform login and logout
- * operations. The named provider must extend {@code AuthProvider}
- * and care must be taken to grant to a trusted provider since
- * login operations involve sensitive authentication information
- * such as PINs and passwords. </td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">createAccessControlContext</th>
- *   <td>Creation of an AccessControlContext</td>
- *   <td>This allows someone to instantiate an AccessControlContext
- * with a {@code DomainCombiner}.  Extreme care must be taken when
- * granting this permission. Malicious code could create a DomainCombiner
- * that augments the set of permissions granted to code, and even grant the
- * code {@link java.security.AllPermission}.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getDomainCombiner</th>
- *   <td>Retrieval of an AccessControlContext's DomainCombiner</td>
- *   <td>This allows someone to retrieve an AccessControlContext's
- * {@code DomainCombiner}.  Since DomainCombiners may contain
- * sensitive information, this could potentially lead to a privacy leak.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getPolicy</th>
- *   <td>Retrieval of the system-wide security policy (specifically, of the
- * currently-installed Policy object)</td>
- *   <td>This allows someone to query the policy via the
- * {@code getPermissions} call,
- * which discloses which permissions would be granted to a given CodeSource.
- * While revealing the policy does not compromise the security of
- * the system, it does provide malicious code with additional information
- * which it may use to better aim an attack. It is wise
- * not to divulge more information than necessary.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setPolicy</th>
- *   <td>Setting of the system-wide security policy (specifically,
- * the Policy object)</td>
- *   <td>Granting this permission is extremely dangerous, as malicious
- * code may grant itself all the necessary permissions it needs
- * to successfully mount an attack on the system.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">createPolicy.{policy type}</th>
- *   <td>Getting an instance of a Policy implementation from a provider</td>
- *   <td>Granting this permission enables code to obtain a Policy object.
- * Malicious code may query the Policy object to determine what permissions
- * have been granted to code other than itself.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getProperty.{key}</th>
- *   <td>Retrieval of the security property with the specified key</td>
- *   <td>Depending on the particular key for which access has
- * been granted, the code may have access to the list of security
- * providers, as well as the location of the system-wide and user
- * security policies.  while revealing this information does not
- * compromise the security of the system, it does provide malicious
- * code with additional information which it may use to better aim
- * an attack.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setProperty.{key}</th>
- *   <td>Setting of the security property with the specified key</td>
- *   <td>This could include setting a security provider or defining
- * the location of the system-wide security policy.  Malicious
- * code that has permission to set a new security provider may
- * set a rogue provider that steals confidential information such
- * as cryptographic private keys. In addition, malicious code with
- * permission to set the location of the system-wide security policy
- * may point it to a security policy that grants the attacker
- * all the necessary permissions it requires to successfully mount
- * an attack on the system.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">insertProvider</th>
- *   <td>Addition of a new provider</td>
- *   <td>This would allow somebody to introduce a possibly
- * malicious provider (e.g., one that discloses the private keys passed
- * to it) as the highest-priority provider. This would be possible
- * because the Security object (which manages the installed providers)
- * currently does not check the integrity or authenticity of a provider
- * before attaching it. The "insertProvider" permission subsumes the
- * "insertProvider.{provider name}" permission (see the section below for
- * more information).</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">removeProvider.{provider name}</th>
- *   <td>Removal of the specified provider</td>
- *   <td>This may change the behavior or disable execution of other
- * parts of the program. If a provider subsequently requested by the
- * program has been removed, execution may fail. Also, if the removed
- * provider is not explicitly requested by the rest of the program, but
- * it would normally be the provider chosen when a cryptography service
- * is requested (due to its previous order in the list of providers),
- * a different provider will be chosen instead, or no suitable provider
- * will be found, thereby resulting in program failure.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">clearProviderProperties.{provider name}</th>
- *   <td>"Clearing" of a Provider so that it no longer contains the properties
- * used to look up services implemented by the provider</td>
- *   <td>This disables the lookup of services implemented by the provider.
- * This may thus change the behavior or disable execution of other
- * parts of the program that would normally utilize the Provider, as
- * described under the "removeProvider.{provider name}" permission.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">putProviderProperty.{provider name}</th>
- *   <td>Setting of properties for the specified Provider</td>
- *   <td>The provider properties each specify the name and location
- * of a particular service implemented by the provider. By granting
- * this permission, you let code replace the service specification
- * with another one, thereby specifying a different implementation.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">removeProviderProperty.{provider name}</th>
- *   <td>Removal of properties from the specified Provider</td>
- *   <td>This disables the lookup of services implemented by the
- * provider. They are no longer accessible due to removal of the properties
- * specifying their names and locations. This
- * may change the behavior or disable execution of other
- * parts of the program that would normally utilize the Provider, as
- * described under the "removeProvider.{provider name}" permission.</td>
- * </tr>
+ * The target name is the name of a security configuration parameter.
  *
- * </tbody>
- * </table>
- *
- * <P>
- * The following permissions have been superseded by newer permissions or are
- * associated with classes that have been deprecated: {@link Identity},
- * {@link IdentityScope}, {@link Signer}. Use of them is discouraged. See the
- * applicable classes for more information.
- *
- * <table class="striped">
- * <caption style="display:none">target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- *
- * <tbody>
- * <tr>
- *   <th scope="row">insertProvider.{provider name}</th>
- *   <td>Addition of a new provider, with the specified name</td>
- *   <td>Use of this permission is discouraged from further use because it is
- * possible to circumvent the name restrictions by overriding the
- * {@link java.security.Provider#getName} method. Also, there is an equivalent
- * level of risk associated with granting code permission to insert a provider
- * with a specific name, or any name it chooses. Users should use the
- * "insertProvider" permission instead.
- * <p>This would allow somebody to introduce a possibly
- * malicious provider (e.g., one that discloses the private keys passed
- * to it) as the highest-priority provider. This would be possible
- * because the Security object (which manages the installed providers)
- * currently does not check the integrity or authenticity of a provider
- * before attaching it.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setSystemScope</th>
- *   <td>Setting of the system identity scope</td>
- *   <td>This would allow an attacker to configure the system identity scope with
- * certificates that should not be trusted, thereby granting applet or
- * application code signed with those certificates privileges that
- * would have been denied by the system's original identity scope.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setIdentityPublicKey</th>
- *   <td>Setting of the public key for an Identity</td>
- *   <td>If the identity is marked as "trusted", this allows an attacker to
- * introduce a different public key (e.g., its own) that is not trusted
- * by the system's identity scope, thereby granting applet or
- * application code signed with that public key privileges that
- * would have been denied otherwise.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setIdentityInfo</th>
- *   <td>Setting of a general information string for an Identity</td>
- *   <td>This allows attackers to set the general description for
- * an identity.  This may trick applications into using a different
- * identity than intended or may prevent applications from finding a
- * particular identity.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">addIdentityCertificate</th>
- *   <td>Addition of a certificate for an Identity</td>
- *   <td>This allows attackers to set a certificate for
- * an identity's public key.  This is dangerous because it affects
- * the trust relationship across the system. This public key suddenly
- * becomes trusted to a wider audience than it otherwise would be.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">removeIdentityCertificate</th>
- *   <td>Removal of a certificate for an Identity</td>
- *   <td>This allows attackers to remove a certificate for
- * an identity's public key. This is dangerous because it affects
- * the trust relationship across the system. This public key suddenly
- * becomes considered less trustworthy than it otherwise would be.</td>
- * </tr>
- *
- * <tr>
- *  <th scope="row">printIdentity</th>
- *  <td>Viewing the name of a principal
- * and optionally the scope in which it is used, and whether
- * or not it is considered "trusted" in that scope</td>
- *  <td>The scope that is printed out may be a filename, in which case
- * it may convey local system information. For example, here's a sample
- * printout of an identity named "carol", who is
- * marked not trusted in the user's identity database:<br>
- *   carol[/home/luehe/identitydb.obj][not trusted]</td>
- *</tr>
- *
- * <tr>
- *   <th scope="row">getSignerPrivateKey</th>
- *   <td>Retrieval of a Signer's private key</td>
- *   <td>It is very dangerous to allow access to a private key; private
- * keys are supposed to be kept secret. Otherwise, code can use the
- * private key to sign various files and claim the signature came from
- * the Signer.</td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setSignerKeyPair</th>
- *   <td>Setting of the key pair (public key and private key) for a Signer</td>
- *   <td>This would allow an attacker to replace somebody else's (the "target's")
- * keypair with a possibly weaker keypair (e.g., a keypair of a smaller
- * keysize).  This also would allow the attacker to listen in on encrypted
- * communication between the target and its peers. The target's peers
- * might wrap an encryption session key under the target's "new" public
- * key, which would allow the attacker (who possesses the corresponding
- * private key) to unwrap the session key and decipher the communication
- * data encrypted under that session key.</td>
- * </tr>
- *
- * </tbody>
- * </table>
- *
- * @implNote
- * Implementations may define additional target names, but should use naming
- * conventions such as reverse domain name notation to avoid name clashes.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
@@ -322,7 +42,6 @@
  * @see java.security.PermissionCollection
  * @see java.lang.SecurityManager
  *
- *
  * @author Marianne Mueller
  * @author Roland Schemers
  * @since 1.2
diff --git a/src/java.base/share/classes/java/security/Signer.java b/src/java.base/share/classes/java/security/Signer.java
index bb3e55040ef..4bdbff00b69 100644
--- a/src/java.base/share/classes/java/security/Signer.java
+++ b/src/java.base/share/classes/java/security/Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,18 +95,8 @@ public Signer(String name, IdentityScope scope)
     /**
      * Returns this signer's private key.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "getSignerPrivateKey"}
-     * as its argument to see if it's ok to return the private key.
-     *
      * @return this signer's private key, or {@code null} if the private key has
      * not yet been set.
-     *
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * returning the private key.
-     *
-     * @see SecurityManager#checkSecurityAccess
      */
     public PrivateKey getPrivateKey() {
         check("getSignerPrivateKey");
@@ -116,21 +106,12 @@ public PrivateKey getPrivateKey() {
     /**
      * Sets the key pair (public key and private key) for this {@code Signer}.
      *
-     * <p>First, if there is a security manager, its {@code checkSecurityAccess}
-     * method is called with {@code "setSignerKeyPair"}
-     * as its argument to see if it's ok to set the key pair.
-     *
      * @param pair an initialized key pair.
      *
      * @throws    InvalidParameterException if the key pair is not
      * properly initialized.
      * @throws    KeyException if the key pair cannot be set for any
      * other reason.
-     * @throws     SecurityException  if a security manager exists and its
-     * {@code checkSecurityAccess} method doesn't allow
-     * setting the key pair.
-     *
-     * @see SecurityManager#checkSecurityAccess
      */
     public final void setKeyPair(KeyPair pair)
     throws InvalidParameterException, KeyException {
diff --git a/src/java.base/share/classes/java/security/UnresolvedPermission.java b/src/java.base/share/classes/java/security/UnresolvedPermission.java
index 54d5a60d105..07c30e2668d 100644
--- a/src/java.base/share/classes/java/security/UnresolvedPermission.java
+++ b/src/java.base/share/classes/java/security/UnresolvedPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,68 +38,15 @@
 import java.util.Objects;
 
 /**
- * The {@code UnresolvedPermission} class is used to hold Permissions that
- * were "unresolved" when the Policy was initialized.
- * An unresolved permission is one whose actual Permission class
- * does not yet exist at the time the Policy is initialized (see below).
- *
- * <p>The policy for a Java runtime (specifying
- * which permissions are available for code from various principals)
- * is represented by a Policy object.
- * Whenever a Policy is initialized or refreshed, Permission objects of
- * appropriate classes are created for all permissions
- * allowed by the Policy.
- *
- * <p>Many permission class types
- * referenced by the policy configuration are ones that exist
- * locally (i.e., ones that can be found on CLASSPATH).
- * Objects for such permissions can be instantiated during
- * Policy initialization. For example, it is always possible
- * to instantiate a java.io.FilePermission, since the
- * FilePermission class is found on the CLASSPATH.
- *
- * <p>Other permission classes may not yet exist during Policy
- * initialization. For example, a referenced permission class may
- * be in a JAR file that will later be loaded.
- * For each such class, an {@code UnresolvedPermission} is instantiated.
- * Thus, an {@code UnresolvedPermission} is essentially a "placeholder"
- * containing information about the permission.
- *
- * <p>Later, when code calls {@link AccessController#checkPermission}
- * on a permission of a type that was previously unresolved,
- * but whose class has since been loaded, previously-unresolved
- * permissions of that type are "resolved". That is,
- * for each such {@code UnresolvedPermission}, a new object of
- * the appropriate class type is instantiated, based on the
- * information in the {@code UnresolvedPermission}.
- *
- * <p> To instantiate the new class, {@code UnresolvedPermission} assumes
- * the class provides a zero, one, and/or two-argument constructor.
- * The zero-argument constructor would be used to instantiate
- * a permission without a name and without actions.
- * A one-arg constructor is assumed to take a {@code String}
- * name as input, and a two-arg constructor is assumed to take a
- * {@code String} name and {@code String} actions
- * as input.  {@code UnresolvedPermission} may invoke a
- * constructor with a {@code null} name and/or actions.
- * If an appropriate permission constructor is not available,
- * the {@code UnresolvedPermission} is ignored and the relevant permission
- * will not be granted to executing code.
- *
- * <p> The newly created permission object replaces the
- * {@code UnresolvedPermission}, which is removed.
- *
- * <p> Note that the {@code getName} method for an
- * {@code UnresolvedPermission} returns the
- * {@code type} (class name) for the underlying permission
- * that has not been resolved.
+ * The {@code UnresolvedPermission} class used to hold Permissions that were
+ * "unresolved" when the {@code Policy} was initialized. Installing a
+ * system-wide {@code Policy} object is no longer supported.
  *
  * @see java.security.Permission
  * @see java.security.Permissions
  * @see java.security.PermissionCollection
  * @see java.security.Policy
  *
- *
  * @author Roland Schemers
  * @since 1.2
  */
diff --git a/src/java.base/share/classes/java/security/package-info.java b/src/java.base/share/classes/java/security/package-info.java
index 349a895922f..b887d5c17a3 100644
--- a/src/java.base/share/classes/java/security/package-info.java
+++ b/src/java.base/share/classes/java/security/package-info.java
@@ -25,8 +25,6 @@
 
 /**
  * Provides the classes and interfaces for the security framework.
- * This includes classes that implement an easily configurable,
- * fine-grained access control security architecture.
  * This package also supports
  * the generation and storage of cryptographic public key pairs,
  * as well as a number of exportable cryptographic operations
@@ -67,12 +65,6 @@
  *   <li> {@extLink security_guide_impl_provider
  *     How to Implement a Provider in the Java Cryptography Architecture}</li>
  *
- *   <li> {@extLink security_guide_default_policy
- *     Default Policy Implementation and Policy File Syntax}</li>
- *
- *   <li> {@extLink security_guide_permissions
- *     Permissions in the Java Development Kit (JDK)}</li>
- *
  *   <li> {@extLink security_guide_tools
  *     Summary of Tools for Java Platform Security}
  *     (for example {@code keytool} and {@code jarsigner}),</li>
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index 681333dfa9f..881dfb15fc7 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,18 +59,14 @@
 
 import static java.time.temporal.ChronoField.EPOCH_DAY;
 
-import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.time.Clock;
 import java.time.DateTimeException;
 import java.time.Instant;
@@ -88,6 +84,7 @@
 import java.util.Properties;
 import java.util.stream.Stream;
 
+import jdk.internal.util.StaticProperty;
 import sun.util.logging.PlatformLogger;
 
 /**
@@ -291,10 +288,7 @@ public final class HijrahChronology extends AbstractChronology implements Serial
         AbstractChronology.registerChrono(INSTANCE, "islamic");
 
         // custom config chronologies
-        @SuppressWarnings("removal")
-        String javaHome = AccessController.doPrivileged((PrivilegedAction<String>)
-                        () -> System.getProperty("java.home"));
-        CONF_PATH = Path.of(javaHome, "conf", "chronology");
+        CONF_PATH = Path.of(StaticProperty.javaHome(), "conf", "chronology");
         registerCustomChrono();
     }
 
@@ -824,19 +818,9 @@ private int epochMonthLength(int epochMonth) {
      */
     private static Properties readConfigProperties(final String chronologyId, final String calendarType) throws Exception {
         String resourceName = RESOURCE_PREFIX + chronologyId + "_" + calendarType + RESOURCE_SUFFIX;
-        PrivilegedAction<InputStream> getResourceAction =  calendarType.equals("islamic-umalqura") ?
-            () -> HijrahChronology.class.getResourceAsStream(resourceName) :
-            () -> {
-                try {
-                    return Files.newInputStream(CONF_PATH.resolve(resourceName),
-                            StandardOpenOption.READ);
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
-            };
-        FilePermission perm1 = new FilePermission("<<ALL FILES>>", "read");
-        RuntimePermission perm2 = new RuntimePermission("accessSystemModules");
-        try (@SuppressWarnings("removal") InputStream is = AccessController.doPrivileged(getResourceAction, null, perm1, perm2)) {
+        try (InputStream is = calendarType.equals("islamic-umalqura")
+                ? HijrahChronology.class.getResourceAsStream(resourceName)
+                : Files.newInputStream(CONF_PATH.resolve(resourceName), StandardOpenOption.READ)) {
             if (is == null) {
                 throw new RuntimeException("Hijrah calendar resource not found: " + resourceName);
             }
@@ -1031,38 +1015,32 @@ private int[] parseYMD(String string) {
      * Look for Hijrah chronology variant properties files in
      * <JAVA_HOME>/conf/chronology directory. Then register its chronology, if any.
      */
-    @SuppressWarnings("removal")
     private static void registerCustomChrono() {
-        AccessController.doPrivileged(
-            (PrivilegedAction<Void>)() -> {
-                if (Files.isDirectory(CONF_PATH)) {
-                    try (Stream<Path> stream = Files.list(CONF_PATH)) {
-                        stream.map(p -> p.getFileName().toString())
-                            .filter(fn -> fn.matches("hijrah-config-[^\\.]+\\.properties"))
-                            .map(fn -> fn.replaceAll("(hijrah-config-|\\.properties)", ""))
-                            .forEach(idtype -> {
-                                int delimiterPos = idtype.indexOf('_');
-                                // '_' should be somewhere in the middle of idtype
-                                if (delimiterPos > 1 && delimiterPos < idtype.length() - 1) {
-                                    AbstractChronology.registerChrono(
-                                        new HijrahChronology(
-                                                idtype.substring(0, delimiterPos),
-                                                idtype.substring(delimiterPos + 1)));
-                                } else {
-                                    PlatformLogger.getLogger("java.time.chrono")
-                                            .warning("Hijrah custom config init failed." +
-                                                    "'<id>_<type>' name convention not followed: " + idtype);
-                                }
-                            });
-                    } catch (IOException e) {
-                        PlatformLogger.getLogger("java.time.chrono")
-                                .warning("Hijrah custom config init failed.", e);
-                    }
-                }
-                return null;
-            },
-            null,
-            new FilePermission("<<ALL FILES>>", "read"));
+
+        if (Files.isDirectory(CONF_PATH)) {
+            try (Stream<Path> stream = Files.list(CONF_PATH)) {
+                stream.map(p -> p.getFileName().toString())
+                    .filter(fn -> fn.matches("hijrah-config-[^\\.]+\\.properties"))
+                    .map(fn -> fn.replaceAll("(hijrah-config-|\\.properties)", ""))
+                    .forEach(idtype -> {
+                        int delimiterPos = idtype.indexOf('_');
+                        // '_' should be somewhere in the middle of idtype
+                        if (delimiterPos > 1 && delimiterPos < idtype.length() - 1) {
+                            AbstractChronology.registerChrono(
+                                new HijrahChronology(
+                                        idtype.substring(0, delimiterPos),
+                                        idtype.substring(delimiterPos + 1)));
+                        } else {
+                            PlatformLogger.getLogger("java.time.chrono")
+                                    .warning("Hijrah custom config init failed." +
+                                            "'<id>_<type>' name convention not followed: " + idtype);
+                        }
+                    });
+            } catch (IOException e) {
+                PlatformLogger.getLogger("java.time.chrono")
+                        .warning("Hijrah custom config init failed.", e);
+            }
+        }
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java b/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
index 375be682c0c..c79b6355595 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,8 +61,6 @@
  */
 package java.time.zone;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -146,28 +144,21 @@ public abstract class ZoneRulesProvider {
     static {
         // if the property java.time.zone.DefaultZoneRulesProvider is
         // set then its value is the class name of the default provider
-        @SuppressWarnings("removal")
-        final List<ZoneRulesProvider> loaded =
-                AccessController.doPrivileged(new PrivilegedAction<List<ZoneRulesProvider>>() {
-                    public List<ZoneRulesProvider> run() {
-                        List<ZoneRulesProvider> result = new ArrayList<>();
-                        String prop = System.getProperty("java.time.zone.DefaultZoneRulesProvider");
-                        if (prop != null) {
-                            try {
-                                Class<?> c = Class.forName(prop, true, ClassLoader.getSystemClassLoader());
-                                @SuppressWarnings("deprecation")
-                                ZoneRulesProvider provider = ZoneRulesProvider.class.cast(c.newInstance());
-                                registerProvider(provider);
-                                result.add(provider);
-                            } catch (Exception x) {
-                                throw new Error(x);
-                            }
-                        } else {
-                            registerProvider(new TzdbZoneRulesProvider());
-                        }
-                        return result;
-                    }
-                });
+        final List<ZoneRulesProvider> loaded = new ArrayList<>();
+        String prop = System.getProperty("java.time.zone.DefaultZoneRulesProvider");
+        if (prop != null) {
+            try {
+                Class<?> c = Class.forName(prop, true, ClassLoader.getSystemClassLoader());
+                @SuppressWarnings("deprecation")
+                ZoneRulesProvider provider = ZoneRulesProvider.class.cast(c.newInstance());
+                registerProvider(provider);
+                loaded.add(provider);
+            } catch (Exception x) {
+                throw new Error(x);
+            }
+        } else {
+            registerProvider(new TzdbZoneRulesProvider());
+        }
 
         ServiceLoader<ZoneRulesProvider> sl = ServiceLoader.load(ZoneRulesProvider.class, ClassLoader.getSystemClassLoader());
         Iterator<ZoneRulesProvider> it = sl.iterator();
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index 1404892ff2a..6ab07e14594 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -2177,11 +2177,6 @@ public Formatter(Appendable a, Locale l) {
      *         zero size; otherwise, a new file will be created.  The output
      *         will be written to the file and is buffered.
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws  FileNotFoundException
      *          If the given file name does not denote an existing, writable
      *          regular file and a new regular file of that name cannot be
@@ -2217,11 +2212,6 @@ public Formatter(String fileName) throws FileNotFoundException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      */
@@ -2256,11 +2246,6 @@ public Formatter(String fileName, String csn)
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      */
@@ -2291,11 +2276,6 @@ public Formatter(String fileName, String csn, Locale l)
      * @throws  IOException
      *          if an I/O error occurs while opening or creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(fileName)} denies write
-     *          access to the file
-     *
      * @throws NullPointerException
      *         if {@code fileName} or {@code charset} is {@code null}.
      *
@@ -2323,11 +2303,6 @@ public Formatter(String fileName, Charset charset, Locale l) throws IOException
      *         a new file will be created.  The output will be written to the
      *         file and is buffered.
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())} denies
-     *          write access to the file
-     *
      * @throws  FileNotFoundException
      *          If the given file object does not denote an existing, writable
      *          regular file and a new regular file of that name cannot be
@@ -2363,11 +2338,6 @@ public Formatter(File file) throws FileNotFoundException {
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())} denies
-     *          write access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      */
@@ -2402,11 +2372,6 @@ public Formatter(File file, String csn)
      *          created, or if some other error occurs while opening or
      *          creating the file
      *
-     * @throws  SecurityException
-     *          If a security manager is present and {@link
-     *          SecurityManager#checkWrite checkWrite(file.getPath())} denies
-     *          write access to the file
-     *
      * @throws  UnsupportedEncodingException
      *          If the named charset is not supported
      */
@@ -2437,11 +2402,6 @@ public Formatter(File file, String csn, Locale l)
      * @throws IOException
      *         if an I/O error occurs while opening or creating the file
      *
-     * @throws SecurityException
-     *         If a security manager is present and {@link
-     *         SecurityManager#checkWrite checkWrite(file.getPath())} denies
-     *         write access to the file
-     *
      * @throws NullPointerException
      *         if {@code file} or {@code charset} is {@code null}.
      *
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 4d59fe73efe..600b20de639 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -1168,10 +1168,6 @@ private static Optional<LocaleExtensions> getDefaultExtensions(String extensions
      * this instance of the Java Virtual Machine. This does not affect the
      * host locale.
      * <p>
-     * If there is a security manager, its {@code checkPermission}
-     * method is called with a {@code PropertyPermission("user.language", "write")}
-     * permission before the default locale is changed.
-     * <p>
      * The Java Virtual Machine sets the default locale during startup
      * based on the host environment. It is used by many locale-sensitive
      * methods if no locale is explicitly specified.
@@ -1184,13 +1180,8 @@ private static Optional<LocaleExtensions> getDefaultExtensions(String extensions
      * By setting the default locale with this method, all of the default
      * locales for each Category are also set to the specified default locale.
      *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow the operation.
      * @throws NullPointerException if {@code newLocale} is null
      * @param newLocale the new default locale
-     * @see SecurityManager#checkPermission
-     * @see java.util.PropertyPermission
      */
     public static synchronized void setDefault(Locale newLocale) {
         setDefault(Category.DISPLAY, newLocale);
@@ -1203,10 +1194,6 @@ public static synchronized void setDefault(Locale newLocale) {
      * Category for this instance of the Java Virtual Machine. This does
      * not affect the host locale.
      * <p>
-     * If there is a security manager, its checkPermission method is called
-     * with a PropertyPermission("user.language", "write") permission before
-     * the default locale is changed.
-     * <p>
      * The Java Virtual Machine sets the default locale during startup based
      * on the host environment. It is used by many locale-sensitive methods
      * if no locale is explicitly specified.
@@ -1218,11 +1205,7 @@ public static synchronized void setDefault(Locale newLocale) {
      *
      * @param category the specified category to set the default locale
      * @param newLocale the new default locale
-     * @throws SecurityException if a security manager exists and its
-     *     checkPermission method doesn't allow the operation.
      * @throws NullPointerException if category and/or newLocale is null
-     * @see SecurityManager#checkPermission(java.security.Permission)
-     * @see PropertyPermission
      * @see #getDefault(Locale.Category)
      * @since 1.7
      */
diff --git a/src/java.base/share/classes/java/util/PropertyPermission.java b/src/java.base/share/classes/java/util/PropertyPermission.java
index ba93097c6ec..f5c6db0b781 100644
--- a/src/java.base/share/classes/java/util/PropertyPermission.java
+++ b/src/java.base/share/classes/java/util/PropertyPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,29 +48,15 @@
  * signify a wildcard match. For example: "java.*" and "*" signify a wildcard
  * match, while "*java" and "a*b" do not.
  * <P>
- * The actions to be granted are passed to the constructor in a string containing
+ * The actions are passed to the constructor in a string containing
  * a list of one or more comma-separated keywords. The possible keywords are
- * "read" and "write". Their meaning is defined as follows:
- *
- * <DL>
- *    <DT> read
- *    <DD> read permission. Allows {@code System.getProperty} to
- *         be called.
- *    <DT> write
- *    <DD> write permission. Allows {@code System.setProperty} to
- *         be called.
- * </DL>
+ * "read" and "write".
  * <P>
  * The actions string is converted to lowercase before processing.
- * <P>
- * Care should be taken before granting code permission to access
- * certain system properties.  For example, granting permission to
- * access the "java.home" system property gives potentially malevolent
- * code sensitive information about the system environment (the Java
- * installation directory).  Also, granting permission to access
- * the "user.name" and "user.home" system properties gives potentially
- * malevolent code sensitive information about the user environment
- * (the user's account name and home directory).
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
@@ -78,7 +64,6 @@
  * @see java.security.PermissionCollection
  * @see java.lang.SecurityManager
  *
- *
  * @author Roland Schemers
  * @since 1.2
  *
diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index d2407c403ae..83f58b8506f 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -944,9 +944,6 @@ public static final ResourceBundle getBundle(String baseName,
      * @param module   the module for which the resource bundle is searched
      * @throws NullPointerException
      *         if {@code baseName} or {@code module} is {@code null}
-     * @throws SecurityException
-     *         if a security manager exists and the caller is not the specified
-     *         module and doesn't have {@code RuntimePermission("getClassLoader")}
      * @throws MissingResourceException
      *         if no resource bundle for the specified base name can be found in the
      *         specified module
@@ -997,9 +994,6 @@ public static ResourceBundle getBundle(String baseName, Module module) {
      * @throws NullPointerException
      *         if {@code baseName}, {@code targetLocale}, or {@code module} is
      *         {@code null}
-     * @throws SecurityException
-     *         if a security manager exists and the caller is not the specified
-     *         module and doesn't have {@code RuntimePermission("getClassLoader")}
      * @throws MissingResourceException
      *         if no resource bundle for the specified base name and locale can
      *         be found in the specified {@code module}
@@ -3134,10 +3128,6 @@ public Locale getFallbackLocale(String baseName, Locale locale) {
          *        reason.
          * @throws    ExceptionInInitializerError
          *        if the initialization provoked by this method fails.
-         * @throws    SecurityException
-         *        If a security manager is present and creation of new
-         *        instances is denied. See {@link Class#newInstance()}
-         *        for details.
          * @throws    IOException
          *        if an error occurred when reading resources using
          *        any I/O operations
diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java
index d4858e7582a..07ed1875190 100644
--- a/src/java.base/share/classes/java/util/ServiceLoader.java
+++ b/src/java.base/share/classes/java/util/ServiceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,15 +362,6 @@
  *
  * </ul>
  *
- * <h2> Security </h2>
- *
- * <p> Service loaders always execute in the security context of the caller
- * of the iterator or stream methods and may also be restricted by the security
- * context of the caller that created the service loader.
- * Trusted system code should typically invoke the methods in this class, and
- * the methods of the iterators which they return, from within a privileged
- * security context.
- *
  * <h2> Concurrency </h2>
  *
  * <p> Instances of this class are not safe for use by multiple concurrent
diff --git a/src/java.base/share/classes/java/util/TimeZone.java b/src/java.base/share/classes/java/util/TimeZone.java
index 9e80c4ae57d..f1a2d92b6ba 100644
--- a/src/java.base/share/classes/java/util/TimeZone.java
+++ b/src/java.base/share/classes/java/util/TimeZone.java
@@ -725,11 +725,7 @@ private static synchronized TimeZone setDefaultZone() {
      * of the {@code user.timezone} property.
      *
      * @param zone the new default {@code TimeZone}, or null
-     * @throws SecurityException if the security manager's {@code checkPermission}
-     *                           denies {@code PropertyPermission("user.timezone",
-     *                           "write")}
      * @see #getDefault
-     * @see PropertyPermission
      */
     public static void setDefault(TimeZone zone)
     {
diff --git a/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
index d52d18a06d3..b16f3459601 100644
--- a/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
@@ -35,6 +35,7 @@
 
 package java.util.concurrent;
 
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.AbstractQueue;
 import java.util.Arrays;
@@ -1617,6 +1618,23 @@ private boolean invariantsSatisfied() {
             && (count == 0 || items[dec(putIndex, capacity)] != null);
     }
 
+    /**
+     * Writes the queue to the stream whilst holding the locks to prevent
+     * broken invariants.
+     *
+     * @param s the stream
+     * @throws java.io.IOException if an I/O error occurs
+     */
+    private void writeObject(java.io.ObjectOutputStream s) throws IOException {
+        final ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
+            s.defaultWriteObject();
+        } finally {
+            lock.unlock();
+        }
+    }
+
     /**
      * Reconstitutes this queue from a stream (that is, deserializes it).
      *
diff --git a/src/java.base/share/classes/java/util/concurrent/ExecutorService.java b/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
index 4539e3d86c7..0d4acf8913e 100644
--- a/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
+++ b/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
@@ -156,14 +156,6 @@ public interface ExecutorService extends Executor, AutoCloseable {
      * <p>This method does not wait for previously submitted tasks to
      * complete execution.  Use {@link #awaitTermination awaitTermination}
      * to do that.
-     *
-     * @throws SecurityException if a security manager exists and
-     *         shutting down this ExecutorService may manipulate
-     *         threads that the caller is not permitted to modify
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")},
-     *         or the security manager's {@code checkAccess} method
-     *         denies access.
      */
     void shutdown();
 
@@ -182,13 +174,6 @@ public interface ExecutorService extends Executor, AutoCloseable {
      * task that fails to respond to interrupts may never terminate.
      *
      * @return list of tasks that never commenced execution
-     * @throws SecurityException if a security manager exists and
-     *         shutting down this ExecutorService may manipulate
-     *         threads that the caller is not permitted to modify
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")},
-     *         or the security manager's {@code checkAccess} method
-     *         denies access.
      */
     List<Runnable> shutdownNow();
 
@@ -397,13 +382,6 @@ <T> T invokeAny(Collection<? extends Callable<T>> tasks,
      * The default implementation invokes {@code shutdown()} and waits for tasks
      * to complete execution with {@code awaitTermination}.
      *
-     * @throws SecurityException if a security manager exists and
-     *         shutting down this ExecutorService may manipulate
-     *         threads that the caller is not permitted to modify
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")},
-     *         or the security manager's {@code checkAccess} method
-     *         denies access.
      * @since 19
      */
     @Override
diff --git a/src/java.base/share/classes/java/util/concurrent/Executors.java b/src/java.base/share/classes/java/util/concurrent/Executors.java
index 24aa3f0a08c..a0a25b1a70d 100644
--- a/src/java.base/share/classes/java/util/concurrent/Executors.java
+++ b/src/java.base/share/classes/java/util/concurrent/Executors.java
@@ -38,7 +38,6 @@
 import static java.lang.ref.Reference.reachabilityFence;
 import java.lang.ref.Cleaner.Cleanable;
 import java.security.AccessControlContext;
-import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -373,9 +372,7 @@ public static ScheduledExecutorService unconfigurableScheduledExecutorService(Sc
     /**
      * Returns a default thread factory used to create new threads.
      * This factory creates all new threads used by an Executor in the
-     * same {@link ThreadGroup}. If there is a {@link
-     * java.lang.SecurityManager}, it uses the group of {@link
-     * System#getSecurityManager}, else the group of the thread
+     * same {@link ThreadGroup}. It uses the group of the thread
      * invoking this {@code defaultThreadFactory} method. Each new
      * thread is created as a non-daemon thread with priority set to
      * the smaller of {@code Thread.NORM_PRIORITY} and the maximum
@@ -391,26 +388,20 @@ public static ThreadFactory defaultThreadFactory() {
     }
 
     /**
-     * Returns a thread factory used to create new threads that
-     * have the same permissions as the current thread.
+     * Returns a thread factory used to create new threads that have
+     * the current context class loader as the context class loader.
+     *
      * This factory creates threads with the same settings as {@link
      * Executors#defaultThreadFactory}, additionally setting the
-     * AccessControlContext and contextClassLoader of new threads to
+     * contextClassLoader of new threads to
      * be the same as the thread invoking this
-     * {@code privilegedThreadFactory} method.  A new
-     * {@code privilegedThreadFactory} can be created within an
-     * {@link AccessController#doPrivileged AccessController.doPrivileged}
-     * action setting the current thread's access control context to
-     * create threads with the selected permission settings holding
-     * within that action.
+     * {@code privilegedThreadFactory} method.
      *
-     * <p>Note that while tasks running within such threads will have
-     * the same access control and class loader settings as the
-     * current thread, they need not have the same {@link
-     * java.lang.ThreadLocal} or {@link
-     * java.lang.InheritableThreadLocal} values. If necessary,
-     * particular values of thread locals can be set or reset before
-     * any task runs in {@link ThreadPoolExecutor} subclasses using
+     * <p>Note that while tasks running within such threads will have the
+     * same class loader as the current thread, they need not have the same
+     * {@link ThreadLocal} or {@link InheritableThreadLocal} values. If
+     * necessary, particular values of thread locals can be set or reset
+     * before any task runs in {@link ThreadPoolExecutor} subclasses using
      * {@link ThreadPoolExecutor#beforeExecute(Thread, Runnable)}.
      * Also, if it is necessary to initialize worker threads to have
      * the same InheritableThreadLocal settings as some other
@@ -419,16 +410,14 @@ public static ThreadFactory defaultThreadFactory() {
      * others that will inherit its values.
      *
      * @return a thread factory
-     * @throws AccessControlException if the current access control
-     * context does not have permission to both get and set context
-     * class loader
      *
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally returned a thread factory that
+     *       created new threads that had the same access control context
+     *       as the current thread. Access control contexts were
+     *       only useful in conjunction with
+     *       {@linkplain SecurityManager the Security Manager}, which is no
+     *       longer supported. There is no replacement for the Security Manager
+     *       or this method.
      */
     @Deprecated(since="17", forRemoval=true)
     public static ThreadFactory privilegedThreadFactory() {
@@ -496,24 +485,20 @@ public static Callable<Object> callable(final PrivilegedExceptionAction<?> actio
 
     /**
      * Returns a {@link Callable} object that will, when called,
-     * execute the given {@code callable} under the current access
-     * control context. This method should normally be invoked within
-     * an {@link AccessController#doPrivileged AccessController.doPrivileged}
-     * action to create callables that will, if possible, execute
-     * under the selected permission settings holding within that
-     * action; or if not possible, throw an associated {@link
-     * AccessControlException}.
+     * execute the given {@code callable} and return its result.
+     *
      * @param callable the underlying task
      * @param <T> the type of the callable's result
      * @return a callable object
      * @throws NullPointerException if callable null
      *
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally returned a {@code Callable} object
+     *       that when called, executed the given {@code callable} under the
+     *       current access control context. Access control contexts were
+     *       only useful in conjunction with
+     *       {@linkplain SecurityManager the Security Manager}, which is no
+     *       longer supported. There is no replacement for the Security Manager
+     *       or this method.
      */
     @Deprecated(since="17", forRemoval=true)
     public static <T> Callable<T> privilegedCallable(Callable<T> callable) {
@@ -524,30 +509,22 @@ public static <T> Callable<T> privilegedCallable(Callable<T> callable) {
 
     /**
      * Returns a {@link Callable} object that will, when called,
-     * execute the given {@code callable} under the current access
-     * control context, with the current context class loader as the
-     * context class loader. This method should normally be invoked
-     * within an
-     * {@link AccessController#doPrivileged AccessController.doPrivileged}
-     * action to create callables that will, if possible, execute
-     * under the selected permission settings holding within that
-     * action; or if not possible, throw an associated {@link
-     * AccessControlException}.
+     * execute the given {@code callable} with the current context
+     * class loader as the context class loader.
      *
      * @param callable the underlying task
      * @param <T> the type of the callable's result
      * @return a callable object
      * @throws NullPointerException if callable null
-     * @throws AccessControlException if the current access control
-     * context does not have permission to both set and get context
-     * class loader
      *
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally returned a {@code Callable} object
+     *       that when called, executed the given {@code callable} under the
+     *       current access control context, with the current context class
+     *       loader as the context class loader. Access control contexts were
+     *       only useful in conjunction with
+     *       {@linkplain SecurityManager the Security Manager}, which is no
+     *       longer supported. There is no replacement for the Security Manager
+     *       or this method.
      */
     @Deprecated(since="17", forRemoval=true)
     public static <T> Callable<T> privilegedCallableUsingCurrentClassLoader(Callable<T> callable) {
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
index 13ab965c530..ee2f85249d7 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -159,10 +159,6 @@
  * If no thread factory is supplied via a system property, then the
  * common pool uses a factory that uses the system class loader as the
  * {@linkplain Thread#getContextClassLoader() thread context class loader}.
- * In addition, if a {@link SecurityManager} is present, then
- * the common pool uses a factory supplying threads that have no
- * {@link Permissions} enabled, and are not guaranteed to preserve
- * the values of {@link java.lang.ThreadLocal} variables across tasks.
  *
  * Upon any error in establishing these settings, default parameters
  * are used. It is possible to disable or limit the use of threads in
@@ -2849,11 +2845,6 @@ private CountDownLatch terminationSignal() {
      * other parameters (see {@link #ForkJoinPool(int,
      * ForkJoinWorkerThreadFactory, UncaughtExceptionHandler, boolean,
      * int, int, int, Predicate, long, TimeUnit)}).
-     *
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public ForkJoinPool() {
         this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
@@ -2871,10 +2862,6 @@ public ForkJoinPool() {
      * @param parallelism the parallelism level
      * @throws IllegalArgumentException if parallelism less than or
      *         equal to zero, or greater than implementation limit
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public ForkJoinPool(int parallelism) {
         this(parallelism, defaultForkJoinWorkerThreadFactory, null, false,
@@ -2903,10 +2890,6 @@ public ForkJoinPool(int parallelism) {
      * @throws IllegalArgumentException if parallelism less than or
      *         equal to zero, or greater than implementation limit
      * @throws NullPointerException if the factory is null
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public ForkJoinPool(int parallelism,
                         ForkJoinWorkerThreadFactory factory,
@@ -2988,10 +2971,6 @@ public ForkJoinPool(int parallelism,
      *         or if maximumPoolSize is less than parallelism,
      *         of if the keepAliveTime is less than or equal to zero.
      * @throws NullPointerException if the factory is null
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      * @since 9
      */
     public ForkJoinPool(int parallelism,
@@ -3285,10 +3264,6 @@ public <T> ForkJoinTask<T> lazySubmit(ForkJoinTask<T> task) {
      *         #commonPool()} and parallelism level was set by System
      *         property {@systemProperty
      *         java.util.concurrent.ForkJoinPool.common.parallelism}.
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      * @since 19
      */
     public int setParallelism(int size) {
@@ -3692,11 +3667,6 @@ public String toString() {
      * already shut down.  Tasks that are in the process of being
      * submitted concurrently during the course of this method may or
      * may not be rejected.
-     *
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public void shutdown() {
         checkPermission();
@@ -3717,10 +3687,6 @@ public void shutdown() {
      * (unlike the case for some other Executors).
      *
      * @return an empty list
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public List<Runnable> shutdownNow() {
         checkPermission();
@@ -3825,13 +3791,6 @@ public boolean awaitQuiescence(long timeout, TimeUnit unit) {
      * execution are not executed. The interrupt status will be
      * re-asserted before this method returns.
      *
-     * @throws SecurityException if a security manager exists and
-     *         shutting down this ExecutorService may manipulate
-     *         threads that the caller is not permitted to modify
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")},
-     *         or the security manager's {@code checkAccess} method
-     *         denies access.
      * @since 19
      */
     @Override
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
index 2995fe3c63d..27b9b0812d6 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
@@ -92,9 +92,8 @@ public class ForkJoinWorkerThread extends Thread {
      * pool, and with the given policy for preserving ThreadLocals.
      *
      * @param group if non-null, the thread group for this
-     * thread. Otherwise, the thread group is chosen by the security
-     * manager if present, else set to the current thread's thread
-     * group.
+     * thread. Otherwise, the thread group is set to the current thread's
+     * thread group.
      * @param pool the pool this thread works in
      * @param preserveThreadLocals if true, always preserve the values of
      * ThreadLocal variables across tasks; otherwise they may be cleared.
@@ -236,19 +235,11 @@ static boolean hasKnownQueuedWork() {
      */
     static final class InnocuousForkJoinWorkerThread extends ForkJoinWorkerThread {
         /** The ThreadGroup for all InnocuousForkJoinWorkerThreads */
-        private static final ThreadGroup innocuousThreadGroup;
-        @SuppressWarnings("removal")
-        private static final AccessControlContext innocuousACC;
+        private static final ThreadGroup innocuousThreadGroup = createGroup();
         InnocuousForkJoinWorkerThread(ForkJoinPool pool) {
             super(innocuousThreadGroup, pool, true, true);
         }
 
-        @Override @SuppressWarnings("removal")
-        protected void onStart() {
-            Thread t = Thread.currentThread();
-            ThreadLocalRandom.setInheritedAccessControlContext(t, innocuousACC);
-        }
-
         @Override // to silently fail
         public void setUncaughtExceptionHandler(UncaughtExceptionHandler x) { }
 
@@ -258,32 +249,11 @@ public void setContextClassLoader(ClassLoader cl) {
                 throw new SecurityException("setContextClassLoader");
         }
 
-        @SuppressWarnings("removal")
-        static AccessControlContext createACC() {
-            return new AccessControlContext(
-                new ProtectionDomain[] { new ProtectionDomain(null, null) });
-        }
         static ThreadGroup createGroup() {
             ThreadGroup group = Thread.currentThread().getThreadGroup();
             for (ThreadGroup p; (p = group.getParent()) != null; )
                 group = p;
             return new ThreadGroup(group, "InnocuousForkJoinWorkerThreadGroup");
         }
-        static {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            @SuppressWarnings("removal")
-            ThreadGroup g = innocuousThreadGroup =
-                (sm == null) ? createGroup() :
-                AccessController.doPrivileged(new PrivilegedAction<>() {
-                        public ThreadGroup run() {
-                            return createGroup(); }});
-            @SuppressWarnings("removal")
-            AccessControlContext a = innocuousACC =
-                (sm == null) ? createACC() :
-                AccessController.doPrivileged(new PrivilegedAction<>() {
-                        public AccessControlContext run() {
-                            return createACC(); }});
-        }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
index d2bfa40c9b9..94f40ccf6f5 100644
--- a/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
@@ -822,8 +822,6 @@ public boolean getRemoveOnCancelPolicy() {
      * ContinueExistingPeriodicTasksAfterShutdownPolicy} has been set
      * {@code true}, future executions of existing periodic tasks will
      * be cancelled.
-     *
-     * @throws SecurityException {@inheritDoc}
      */
     public void shutdown() {
         super.shutdown();
@@ -851,7 +849,6 @@ public void shutdown() {
      *         {@code ScheduledFuture}.  For tasks submitted using
      *         {@link #execute execute}, the element will be a
      *         zero-delay {@code ScheduledFuture}.
-     * @throws SecurityException {@inheritDoc}
      */
     public List<Runnable> shutdownNow() {
         return super.shutdownNow();
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index bd023a37d7b..751c190acc0 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -294,11 +294,6 @@ static final void eraseThreadLocals(Thread thread) {
         U.putReference(thread, INHERITABLETHREADLOCALS, null);
     }
 
-    static final void setInheritedAccessControlContext(Thread thread,
-                                                       @SuppressWarnings("removal") AccessControlContext acc) {
-        U.putReferenceRelease(thread, INHERITEDACCESSCONTROLCONTEXT, acc);
-    }
-
     // Serialization support
 
     private static final long serialVersionUID = -5851777807851030925L;
@@ -370,8 +365,6 @@ private Object readResolve() {
         = U.objectFieldOffset(Thread.class, "threadLocals");
     private static final long INHERITABLETHREADLOCALS
         = U.objectFieldOffset(Thread.class, "inheritableThreadLocals");
-    private static final long INHERITEDACCESSCONTROLCONTEXT
-        = U.objectFieldOffset(Thread.class, "inheritedAccessControlContext");
 
     /** Generates per-thread initialization/probe field */
     private static final AtomicInteger probeGenerator = new AtomicInteger();
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
index 9763c926ab7..65217849f19 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
@@ -1385,8 +1385,6 @@ else if (!addWorker(command, false))
      * <p>This method does not wait for previously submitted tasks to
      * complete execution.  Use {@link #awaitTermination awaitTermination}
      * to do that.
-     *
-     * @throws SecurityException {@inheritDoc}
      */
     public void shutdown() {
         final ReentrantLock mainLock = this.mainLock;
@@ -1416,8 +1414,6 @@ public void shutdown() {
      * processing actively executing tasks.  This implementation
      * interrupts tasks via {@link Thread#interrupt}; any task that
      * fails to respond to interrupts may never terminate.
-     *
-     * @throws SecurityException {@inheritDoc}
      */
     public List<Runnable> shutdownNow() {
         List<Runnable> tasks;
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
index e512c91f2df..1d7268609d7 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
@@ -279,6 +279,7 @@ public String toString() {
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V getPlain() {
         return (V)VALUE.get(this);
     }
@@ -302,6 +303,7 @@ public final void setPlain(V newValue) {
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V getOpaque() {
         return (V)VALUE.getOpaque(this);
     }
@@ -324,6 +326,7 @@ public final void setOpaque(V newValue) {
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V getAcquire() {
         return (V)VALUE.getAcquire(this);
     }
@@ -351,6 +354,7 @@ public final void setRelease(V newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V compareAndExchange(V expectedValue, V newValue) {
         return (V)VALUE.compareAndExchange(this, expectedValue, newValue);
     }
@@ -367,6 +371,7 @@ public final V compareAndExchange(V expectedValue, V newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V compareAndExchangeAcquire(V expectedValue, V newValue) {
         return (V)VALUE.compareAndExchangeAcquire(this, expectedValue, newValue);
     }
@@ -383,6 +388,7 @@ public final V compareAndExchangeAcquire(V expectedValue, V newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final V compareAndExchangeRelease(V expectedValue, V newValue) {
         return (V)VALUE.compareAndExchangeRelease(this, expectedValue, newValue);
     }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
index e8238320e21..ec00f40a568 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -358,6 +358,7 @@ private void readObject(java.io.ObjectInputStream s)
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E getPlain(int i) {
         return (E)AA.get(array, i);
     }
@@ -383,6 +384,7 @@ public final void setPlain(int i, E newValue) {
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E getOpaque(int i) {
         return (E)AA.getOpaque(array, i);
     }
@@ -407,6 +409,7 @@ public final void setOpaque(int i, E newValue) {
      * @return the value
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E getAcquire(int i) {
         return (E)AA.getAcquire(array, i);
     }
@@ -437,6 +440,7 @@ public final void setRelease(int i, E newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E compareAndExchange(int i, E expectedValue, E newValue) {
         return (E)AA.compareAndExchange(array, i, expectedValue, newValue);
     }
@@ -455,6 +459,7 @@ public final E compareAndExchange(int i, E expectedValue, E newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E compareAndExchangeAcquire(int i, E expectedValue, E newValue) {
         return (E)AA.compareAndExchangeAcquire(array, i, expectedValue, newValue);
     }
@@ -473,6 +478,7 @@ public final E compareAndExchangeAcquire(int i, E expectedValue, E newValue) {
      * expected value if successful
      * @since 9
      */
+    @SuppressWarnings("unchecked")
     public final E compareAndExchangeRelease(int i, E expectedValue, E newValue) {
         return (E)AA.compareAndExchangeRelease(array, i, expectedValue, newValue);
     }
diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
index 3a1f412e9c7..a14821d8046 100644
--- a/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -249,8 +249,6 @@ public static Runtime.Version runtimeVersion() {
      * it is signed.
      * @param name the name of the jar file to be opened for reading
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager
      */
     public JarFile(String name) throws IOException {
         this(new File(name), true, ZipFile.OPEN_READ);
@@ -263,8 +261,6 @@ public JarFile(String name) throws IOException {
      * @param verify whether or not to verify the jar file if
      * it is signed.
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager
      */
     public JarFile(String name, boolean verify) throws IOException {
         this(new File(name), verify, ZipFile.OPEN_READ);
@@ -276,8 +272,6 @@ public JarFile(String name, boolean verify) throws IOException {
      * it is signed.
      * @param file the jar file to be opened for reading
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager
      */
     public JarFile(File file) throws IOException {
         this(file, true, ZipFile.OPEN_READ);
@@ -290,8 +284,6 @@ public JarFile(File file) throws IOException {
      * @param verify whether or not to verify the jar file if
      * it is signed.
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager.
      */
     public JarFile(File file, boolean verify) throws IOException {
         this(file, verify, ZipFile.OPEN_READ);
@@ -309,8 +301,6 @@ public JarFile(File file, boolean verify) throws IOException {
      * @throws IOException if an I/O error has occurred
      * @throws IllegalArgumentException
      *         if the {@code mode} argument is invalid
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager
      * @since 1.3
      */
     public JarFile(File file, boolean verify, int mode) throws IOException {
@@ -337,8 +327,6 @@ public JarFile(File file, boolean verify, int mode) throws IOException {
      * @throws IOException if an I/O error has occurred
      * @throws IllegalArgumentException
      *         if the {@code mode} argument is invalid
-     * @throws SecurityException if access to the file is denied
-     *         by the SecurityManager
      * @throws NullPointerException if {@code version} is {@code null}
      * @since 9
      */
diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index 3ff59b2b7ea..46712e5c80b 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -234,10 +234,6 @@ private LocaleServiceProvider(Void ignore) { }
 
     /**
      * Initializes a new locale service provider.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission RuntimePermission("localeServiceProvider")}
      */
     protected LocaleServiceProvider() {
         this(checkPermission());
diff --git a/src/java.base/share/classes/java/util/stream/ForEachOps.java b/src/java.base/share/classes/java/util/stream/ForEachOps.java
index 1ba59709152..6163ed4061e 100644
--- a/src/java.base/share/classes/java/util/stream/ForEachOps.java
+++ b/src/java.base/share/classes/java/util/stream/ForEachOps.java
@@ -505,6 +505,7 @@ else if (spliterator != null) {
             // "happens-before" completion of the associated left-most leaf task
             // of right subtree (if any, which can be this task's right sibling)
             //
+            @SuppressWarnings("unchecked")
             var leftDescendant = (ForEachOrderedTask<S, T>)NEXT.getAndSet(this, null);
             if (leftDescendant != null)
                 leftDescendant.tryComplete();
diff --git a/src/java.base/share/classes/java/util/stream/Gatherer.java b/src/java.base/share/classes/java/util/stream/Gatherer.java
index 40c3c682e73..267ec62b931 100644
--- a/src/java.base/share/classes/java/util/stream/Gatherer.java
+++ b/src/java.base/share/classes/java/util/stream/Gatherer.java
@@ -24,7 +24,6 @@
  */
 package java.util.stream;
 
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.util.*;
@@ -195,9 +194,8 @@
  * @param <A> the potentially mutable state type of the gatherer operation
  *            (often hidden as an implementation detail)
  * @param <R> the type of output elements from the gatherer operation
- * @since 22
+ * @since 24
  */
-@PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
 public interface Gatherer<T, A, R> {
     /**
      * A function that produces an instance of the intermediate state used for
@@ -481,10 +479,9 @@ static <T, A, R> Gatherer<T, A, R> of(
      * A Downstream object is the next stage in a pipeline of operations,
      * to which elements can be sent.
      * @param <T> the type of elements this downstream accepts
-     * @since 22
+     * @since 24
      */
     @FunctionalInterface
-    @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
     interface Downstream<T> {
 
         /**
@@ -524,10 +521,9 @@ interface Downstream<T> {
      * @param <A> the type of state used by this integrator
      * @param <T> the type of elements this integrator consumes
      * @param <R> the type of results this integrator can produce
-     * @since 22
+     * @since 24
      */
     @FunctionalInterface
-    @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
     interface Integrator<A, T, R> {
         /**
          * Performs an action given: the current state, the next element, and
@@ -584,10 +580,9 @@ static <A, T, R> Greedy<A, T, R> ofGreedy(Greedy<A, T, R> greedy) {
          * @param <A> the type of state used by this integrator
          * @param <T> the type of elements this greedy integrator receives
          * @param <R> the type of results this greedy integrator can produce
-         * @since 22
+         * @since 24
          */
         @FunctionalInterface
-        @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
         interface Greedy<A, T, R> extends Integrator<A, T, R> { }
     }
 }
diff --git a/src/java.base/share/classes/java/util/stream/GathererOp.java b/src/java.base/share/classes/java/util/stream/GathererOp.java
index 37f01901201..39758bd834a 100644
--- a/src/java.base/share/classes/java/util/stream/GathererOp.java
+++ b/src/java.base/share/classes/java/util/stream/GathererOp.java
@@ -45,7 +45,7 @@
  * The performance-critical code below contains some more complicated encodings:
  * therefore, make sure to run benchmarks to verify changes to prevent regressions.
  *
- * @since 22
+ * @since 24
  */
 final class GathererOp<T, A, R> extends ReferencePipeline<T, R> {
     @SuppressWarnings("unchecked")
diff --git a/src/java.base/share/classes/java/util/stream/Gatherers.java b/src/java.base/share/classes/java/util/stream/Gatherers.java
index c201ee54609..b394f6fc7d8 100644
--- a/src/java.base/share/classes/java/util/stream/Gatherers.java
+++ b/src/java.base/share/classes/java/util/stream/Gatherers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 package java.util.stream;
 
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.util.ArrayDeque;
@@ -48,9 +47,8 @@
  * operations, such as windowing functions, folding functions,
  * transforming elements concurrently, etc.
  *
- * @since 22
+ * @since 24
 */
-@PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
 public final class Gatherers {
     private Gatherers() { } // This class is not intended to be instantiated
 
diff --git a/src/java.base/share/classes/java/util/stream/Stream.java b/src/java.base/share/classes/java/util/stream/Stream.java
index 30b87bd8b54..1dd13133fe1 100644
--- a/src/java.base/share/classes/java/util/stream/Stream.java
+++ b/src/java.base/share/classes/java/util/stream/Stream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
  */
 package java.util.stream;
 
-import jdk.internal.javac.PreviewFeature;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -1096,9 +1094,8 @@ <U> U reduce(U identity,
      * @param <R> The element type of the new stream
      * @param gatherer a gatherer
      * @return the new stream
-     * @since 22
+     * @since 24
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS)
     default <R> Stream<R> gather(Gatherer<? super T, ?, R> gatherer) {
         return StreamSupport.stream(spliterator(), isParallel())
                             .gather(gatherer)
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index 3883e245db3..a08d3bc7a1b 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -119,20 +119,12 @@ public class ZipFile implements ZipConstants, Closeable {
     /**
      * Opens a ZIP file for reading.
      *
-     * <p>First, if there is a security manager, its {@code checkRead}
-     * method is called with the {@code name} argument as its argument
-     * to ensure the read is allowed.
-     *
      * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
      * decode the entry names and comments.
      *
      * @param name the name of the ZIP file
      * @throws ZipException if a ZIP format error has occurred
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method doesn't allow read access to the file.
-     *
-     * @see SecurityManager#checkRead(java.lang.String)
      */
     public ZipFile(String name) throws IOException {
         this(new File(name), OPEN_READ);
@@ -143,10 +135,6 @@ public ZipFile(String name) throws IOException {
      * {@code File} object in the specified mode.  The mode argument
      * must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}.
      *
-     * <p>First, if there is a security manager, its {@code checkRead}
-     * method is called with the {@code name} argument as its argument to
-     * ensure the read is allowed.
-     *
      * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
      * decode the entry names and comments
      *
@@ -154,13 +142,7 @@ public ZipFile(String name) throws IOException {
      * @param mode the mode in which the file is to be opened
      * @throws ZipException if a ZIP format error has occurred
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException if a security manager exists and
-     *         its {@code checkRead} method
-     *         doesn't allow read access to the file,
-     *         or its {@code checkDelete} method doesn't allow deleting
-     *         the file when the {@code OPEN_DELETE} flag is set.
      * @throws IllegalArgumentException if the {@code mode} argument is invalid
-     * @see SecurityManager#checkRead(java.lang.String)
      * @since 1.3
      */
     public ZipFile(File file, int mode) throws IOException {
@@ -186,10 +168,6 @@ public ZipFile(File file) throws ZipException, IOException {
      * {@code File} object in the specified mode.  The mode argument
      * must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}.
      *
-     * <p>First, if there is a security manager, its {@code checkRead}
-     * method is called with the {@code name} argument as its argument to
-     * ensure the read is allowed.
-     *
      * @param file the ZIP file to be opened for reading
      * @param mode the mode in which the file is to be opened
      * @param charset
@@ -201,16 +179,8 @@ public ZipFile(File file) throws ZipException, IOException {
      * @throws ZipException if a ZIP format error has occurred
      * @throws IOException if an I/O error has occurred
      *
-     * @throws SecurityException
-     *         if a security manager exists and its {@code checkRead}
-     *         method doesn't allow read access to the file, or its
-     *         {@code checkDelete} method doesn't allow deleting the
-     *         file when the {@code OPEN_DELETE} flag is set
-     *
      * @throws IllegalArgumentException if the {@code mode} argument is invalid
      *
-     * @see SecurityManager#checkRead(java.lang.String)
-     *
      * @since 1.7
      */
     @SuppressWarnings("this-escape")
@@ -246,10 +216,6 @@ public ZipFile(File file, int mode, Charset charset) throws IOException
     /**
      * Opens a ZIP file for reading.
      *
-     * <p>First, if there is a security manager, its {@code checkRead}
-     * method is called with the {@code name} argument as its argument
-     * to ensure the read is allowed.
-     *
      * @param name the name of the ZIP file
      * @param charset
      *        the {@linkplain java.nio.charset.Charset charset} to
@@ -259,11 +225,6 @@ public ZipFile(File file, int mode, Charset charset) throws IOException
      *
      * @throws ZipException if a ZIP format error has occurred
      * @throws IOException if an I/O error has occurred
-     * @throws SecurityException
-     *         if a security manager exists and its {@code checkRead}
-     *         method doesn't allow read access to the file
-     *
-     * @see SecurityManager#checkRead(java.lang.String)
      *
      * @since 1.7
      */
diff --git a/src/java.base/share/classes/java/util/zip/ZipUtils.java b/src/java.base/share/classes/java/util/zip/ZipUtils.java
index 5b1d896f420..a2eb9c50d4a 100644
--- a/src/java.base/share/classes/java/util/zip/ZipUtils.java
+++ b/src/java.base/share/classes/java/util/zip/ZipUtils.java
@@ -174,7 +174,7 @@ public static final int get16(byte[] b, int off) {
         Preconditions.checkIndex(off, b.length, Preconditions.AIOOBE_FORMATTER);
         Preconditions.checkIndex(off + 1, b.length, Preconditions.AIOOBE_FORMATTER);
         return Short.toUnsignedInt(
-                UNSAFE.getShortUnaligned(b, off + Unsafe.ARRAY_BYTE_BASE_OFFSET, false));
+                UNSAFE.getShortUnaligned(b, off + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET, false));
     }
 
     /**
@@ -185,7 +185,7 @@ public static final long get32(byte[] b, int off) {
         Preconditions.checkIndex(off, b.length, Preconditions.AIOOBE_FORMATTER);
         Preconditions.checkIndex(off + 3, b.length, Preconditions.AIOOBE_FORMATTER);
         return Integer.toUnsignedLong(
-                UNSAFE.getIntUnaligned(b, off + Unsafe.ARRAY_BYTE_BASE_OFFSET, false));
+                UNSAFE.getIntUnaligned(b, off + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET, false));
     }
 
     /**
@@ -195,7 +195,7 @@ public static final long get32(byte[] b, int off) {
     public static final long get64S(byte[] b, int off) {
         Preconditions.checkIndex(off, b.length, Preconditions.AIOOBE_FORMATTER);
         Preconditions.checkIndex(off + 7, b.length, Preconditions.AIOOBE_FORMATTER);
-        return UNSAFE.getLongUnaligned(b, off + Unsafe.ARRAY_BYTE_BASE_OFFSET, false);
+        return UNSAFE.getLongUnaligned(b, off + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET, false);
     }
 
     /**
@@ -206,7 +206,7 @@ public static final long get64S(byte[] b, int off) {
     public static final int get32S(byte[] b, int off) {
         Preconditions.checkIndex(off, b.length, Preconditions.AIOOBE_FORMATTER);
         Preconditions.checkIndex(off + 3, b.length, Preconditions.AIOOBE_FORMATTER);
-        return UNSAFE.getIntUnaligned(b, off + Unsafe.ARRAY_BYTE_BASE_OFFSET, false);
+        return UNSAFE.getIntUnaligned(b, off + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET, false);
     }
 
     /*
diff --git a/src/java.base/share/classes/javax/crypto/KDF.java b/src/java.base/share/classes/javax/crypto/KDF.java
index ea2a0375813..0ee0904c1c2 100644
--- a/src/java.base/share/classes/javax/crypto/KDF.java
+++ b/src/java.base/share/classes/javax/crypto/KDF.java
@@ -396,19 +396,21 @@ public static KDF getInstance(String algorithm,
                    InvalidAlgorithmParameterException {
         Objects.requireNonNull(algorithm, "algorithm must not be null");
         Objects.requireNonNull(provider, "provider must not be null");
-
-        Instance instance = GetInstance.getInstance("KDF", KDFSpi.class,
-                                                    algorithm,
-                                                    kdfParameters,
-                                                    provider);
-        if (!JceSecurity.canUseProvider(instance.provider)) {
-            String msg = "JCE cannot authenticate the provider "
-                         + instance.provider.getName();
-            throw new NoSuchProviderException(msg);
+        try {
+            Instance instance = GetInstance.getInstance("KDF", KDFSpi.class,
+                                                        algorithm,
+                                                        kdfParameters,
+                                                        provider);
+            if (!JceSecurity.canUseProvider(instance.provider)) {
+                String msg = "JCE cannot authenticate the provider "
+                             + instance.provider.getName();
+                throw new NoSuchProviderException(msg);
+            }
+            return new KDF(new Delegate((KDFSpi) instance.impl,
+                                        instance.provider), algorithm);
+        } catch (NoSuchAlgorithmException nsae) {
+            return handleException(nsae);
         }
-        return new KDF(new Delegate((KDFSpi) instance.impl,
-                                    instance.provider), algorithm
-        );
     }
 
     /**
@@ -444,18 +446,31 @@ public static KDF getInstance(String algorithm,
                    InvalidAlgorithmParameterException {
         Objects.requireNonNull(algorithm, "algorithm must not be null");
         Objects.requireNonNull(provider, "provider must not be null");
-        Instance instance = GetInstance.getInstance("KDF", KDFSpi.class,
-                                                    algorithm,
-                                                    kdfParameters,
-                                                    provider);
-        if (!JceSecurity.canUseProvider(instance.provider)) {
-            String msg = "JCE cannot authenticate the provider "
-                         + instance.provider.getName();
-            throw new SecurityException(msg);
+        try {
+            Instance instance = GetInstance.getInstance("KDF", KDFSpi.class,
+                                                        algorithm,
+                                                        kdfParameters,
+                                                        provider);
+            if (!JceSecurity.canUseProvider(instance.provider)) {
+                String msg = "JCE cannot authenticate the provider "
+                             + instance.provider.getName();
+                throw new SecurityException(msg);
+            }
+            return new KDF(new Delegate((KDFSpi) instance.impl,
+                                        instance.provider), algorithm);
+        } catch (NoSuchAlgorithmException nsae) {
+            return handleException(nsae);
+        }
+    }
+
+    private static KDF handleException(NoSuchAlgorithmException e)
+            throws NoSuchAlgorithmException,
+                   InvalidAlgorithmParameterException {
+        Throwable cause = e.getCause();
+        if (cause instanceof InvalidAlgorithmParameterException iape) {
+            throw iape;
         }
-        return new KDF(new Delegate((KDFSpi) instance.impl,
-                                    instance.provider), algorithm
-        );
+        throw e;
     }
 
     /**
@@ -671,7 +686,8 @@ private static Delegate getNext(Iterator<Service> serviceIter,
         if (hasOne) throw new InvalidAlgorithmParameterException(
                 "The KDFParameters supplied could not be used in combination "
                 + "with the supplied algorithm for the selected Provider");
-        else throw new NoSuchAlgorithmException();
+        else throw new NoSuchAlgorithmException(
+                "No available provider supports the specified algorithm");
     }
 
     private static boolean checkSpiNonNull(Delegate d) {
diff --git a/src/java.base/share/classes/javax/net/ServerSocketFactory.java b/src/java.base/share/classes/javax/net/ServerSocketFactory.java
index 6fd276b66d9..a41b795dd47 100644
--- a/src/java.base/share/classes/javax/net/ServerSocketFactory.java
+++ b/src/java.base/share/classes/javax/net/ServerSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,21 +103,13 @@ public ServerSocket createServerSocket() throws IOException {
      * Returns a server socket bound to the specified port.
      * The socket is configured with the socket options
      * (such as accept timeout) given to this factory.
-     * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
      *
      * @param port the port to listen to
      * @return the <code>ServerSocket</code>
      * @throws IOException for networking errors
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      * @see java.net.ServerSocket#ServerSocket(int)
      */
     public abstract ServerSocket createServerSocket(int port)
@@ -132,22 +124,14 @@ public abstract ServerSocket createServerSocket(int port)
      * The <code>backlog</code> argument must be a positive
      * value greater than 0. If the value passed if equal or less
      * than 0, then the default value will be assumed.
-     * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
      *
      * @param port the port to listen to
      * @param backlog how many connections are queued
      * @return the <code>ServerSocket</code>
      * @throws IOException for networking errors
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      * @see java.net.ServerSocket#ServerSocket(int, int)
      */
     public abstract ServerSocket
@@ -169,23 +153,15 @@ public abstract ServerSocket createServerSocket(int port)
      * The <code>backlog</code> argument must be a positive
      * value greater than 0. If the value passed if equal or less
      * than 0, then the default value will be assumed.
-     * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
      *
      * @param port the port to listen to
      * @param backlog how many connections are queued
      * @param ifAddress the network interface address to use
      * @return the <code>ServerSocket</code>
      * @throws IOException for networking errors
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      * @see java.net.ServerSocket#ServerSocket(int, int, java.net.InetAddress)
      */
     public abstract ServerSocket
diff --git a/src/java.base/share/classes/javax/net/SocketFactory.java b/src/java.base/share/classes/javax/net/SocketFactory.java
index 9ef82caf3f9..efd178f3940 100644
--- a/src/java.base/share/classes/javax/net/SocketFactory.java
+++ b/src/java.base/share/classes/javax/net/SocketFactory.java
@@ -129,23 +129,16 @@ public Socket createSocket() throws IOException {
      * Creates a socket and connects it to the specified remote host
      * at the specified remote port.  This socket is configured using
      * the socket options established for this factory.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host the server host name with which to connect, or
      *        <code>null</code> for the loopback address.
      * @param port the server port
      * @return the <code>Socket</code>
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws UnknownHostException if the host is not known
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see SecurityManager#checkConnect
      * @see java.net.Socket#Socket(String, int)
      */
     public abstract Socket createSocket(String host, int port)
@@ -158,10 +151,6 @@ public abstract Socket createSocket(String host, int port)
      * The socket will also be bound to the local address and port supplied.
      * This socket is configured using
      * the socket options established for this factory.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host the server host name with which to connect, or
      *        <code>null</code> for the loopback address.
@@ -170,13 +159,10 @@ public abstract Socket createSocket(String host, int port)
      * @param localPort the local port the socket is bound to
      * @return the <code>Socket</code>
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws UnknownHostException if the host is not known
      * @throws IllegalArgumentException if the port parameter or localPort
      *         parameter is outside the specified range of valid port values,
      *         which is between 0 and 65535, inclusive.
-     * @see SecurityManager#checkConnect
      * @see java.net.Socket#Socket(String, int, java.net.InetAddress, int)
      */
     public abstract Socket
@@ -188,22 +174,15 @@ public abstract Socket createSocket(String host, int port)
      * Creates a socket and connects it to the specified port number
      * at the specified address.  This socket is configured using
      * the socket options established for this factory.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host the server host
      * @param port the server port
      * @return the <code>Socket</code>
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
      * @throws NullPointerException if <code>host</code> is null.
-     * @see SecurityManager#checkConnect
      * @see java.net.Socket#Socket(java.net.InetAddress, int)
      */
     public abstract Socket createSocket(InetAddress host, int port)
@@ -215,10 +194,6 @@ public abstract Socket createSocket(InetAddress host, int port)
      * on the specified remote port.  The socket will also be bound
      * to the local address and port supplied.  The socket is configured using
      * the socket options established for this factory.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param address the server network address
      * @param port the server port
@@ -226,13 +201,10 @@ public abstract Socket createSocket(InetAddress host, int port)
      * @param localPort the client port
      * @return the <code>Socket</code>
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter or localPort
      *         parameter is outside the specified range of valid port values,
      *         which is between 0 and 65535, inclusive.
      * @throws NullPointerException if <code>address</code> is null.
-     * @see SecurityManager#checkConnect
      * @see java.net.Socket#Socket(java.net.InetAddress, int,
      *     java.net.InetAddress, int)
      */
diff --git a/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
index 89f24d15923..d3308741ece 100644
--- a/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
+++ b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,9 +219,6 @@ public boolean verify(String hostname, SSLSession session) {
      * @param v the default host name verifier
      * @throws IllegalArgumentException if the <code>HostnameVerifier</code>
      *          parameter is null.
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkPermission</code> method does not allow
-     *         <code>SSLPermission("setHostnameVerifier")</code>
      * @see #getDefaultHostnameVerifier()
      */
     public static void setDefaultHostnameVerifier(HostnameVerifier v) {
@@ -301,9 +298,6 @@ public HostnameVerifier getHostnameVerifier() {
      * @param sf the default SSL socket factory
      * @throws IllegalArgumentException if the SSLSocketFactory
      *          parameter is null.
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkSetFactory</code> method does not allow
-     *         a socket factory to be specified.
      * @see #getDefaultSSLSocketFactory()
      */
     public static void setDefaultSSLSocketFactory(SSLSocketFactory sf) {
@@ -351,9 +345,6 @@ public static SSLSocketFactory getDefaultSSLSocketFactory() {
      * @param sf the SSL socket factory
      * @throws IllegalArgumentException if the <code>SSLSocketFactory</code>
      *          parameter is null.
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkSetFactory</code> method does not allow
-     *         a socket factory to be specified.
      * @see #getSSLSocketFactory()
      */
     public void setSSLSocketFactory(SSLSocketFactory sf) {
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLContext.java b/src/java.base/share/classes/javax/net/ssl/SSLContext.java
index f9acc28dee8..fe6d00daf4a 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLContext.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,9 +123,6 @@ public static SSLContext getDefault() throws NoSuchAlgorithmException {
      *
      * @param context the SSLContext
      * @throws  NullPointerException if context is null
-     * @throws  SecurityException if a security manager exists and its
-     *          {@code checkPermission} method does not allow
-     *          {@code SSLPermission("setDefaultSSLContext")}
      * @since 1.6
      */
     public static void setDefault(SSLContext context) {
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLPermission.java b/src/java.base/share/classes/javax/net/ssl/SSLPermission.java
index a671558b6d8..2f8e06d2ee6 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLPermission.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,62 +33,16 @@
  * no actions list; you either have the named permission
  * or you don't.
  * <P>
- * The target name is the name of the network permission (see below). The naming
+ * The target name is the name of the network permission. The naming
  * convention follows the  hierarchical property naming convention.
  * Also, an asterisk
  * may appear at the end of the name, following a ".", or by itself, to
  * signify a wildcard match. For example: "foo.*" and "*" signify a wildcard
  * match, while "*foo" and "a*b" do not.
- * <P>
- * The following table lists all the possible SSLPermission target names,
- * and for each provides a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
- *
- * <table class="striped">
- * <caption style="display:none">permission name, what it allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- *
- * <tbody>
- * <tr>
- *   <th scope="row">setHostnameVerifier</th>
- *   <td>The ability to set a callback which can decide whether to
- * allow a mismatch between the host being connected to by
- * an HttpsURLConnection and the common name field in
- * server certificate.
- *  </td>
- *   <td>Malicious
- * code can set a verifier that monitors host names visited by
- * HttpsURLConnection requests or that allows server certificates
- * with invalid common names.
- * </td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">getSSLSessionContext</th>
- *   <td>The ability to get the SSLSessionContext of an SSLSession.
- * </td>
- *   <td>Malicious code may monitor sessions which have been established
- * with SSL peers or might invalidate sessions to slow down performance.
- * </td>
- * </tr>
- *
- * <tr>
- *   <th scope="row">setDefaultSSLContext</th>
- *   <td>The ability to set the default SSL context
- * </td>
- *   <td>Malicious code can set a context that monitors the opening of
- * connections or the plaintext data that is transmitted.
- * </td>
- * </tr>
  *
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java
index ccf16f61d64..b4afed41a1b 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,20 +78,12 @@ protected SSLServerSocket()
      * reject new connection requests.
      * <P>
      * A port number of <code>0</code> creates a socket on any free port.
-     * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
      *
      * @param port the port on which to listen
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      */
     protected SSLServerSocket(int port)
     throws IOException
@@ -112,22 +104,14 @@ protected SSLServerSocket(int port)
      * or may choose to ignore the parameter altogether. The value provided
      * should be greater than <code>0</code>. If it is less than or equal to
      * <code>0</code>, then an implementation specific default will be used.
-     * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
      *
      * @param port the port on which to listen
      * @param backlog  requested maximum length of the queue of incoming
      *                  connections.
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      */
     protected SSLServerSocket(int port, int backlog)
     throws IOException
@@ -144,11 +128,6 @@ protected SSLServerSocket(int port, int backlog)
      * for firewalls or as routers, to control through which interface
      * a network service is provided.
      * <P>
-     * If there is a security manager, its <code>checkListen</code>
-     * method is called with the <code>port</code> argument as its
-     * argument to ensure the operation is allowed. This could result
-     * in a SecurityException.
-     * <P>
      * A port number of <code>0</code> creates a socket on any free port.
      * <P>
      * The <code>backlog</code> argument is the requested maximum number of
@@ -167,12 +146,9 @@ protected SSLServerSocket(int port, int backlog)
      * @param address the address of the network interface through
      *          which connections will be accepted
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkListen</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see    SecurityManager#checkListen
      */
     protected SSLServerSocket(int port, int backlog, InetAddress address)
     throws IOException
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSession.java b/src/java.base/share/classes/javax/net/ssl/SSLSession.java
index 3e1a2b94c0a..e83238e140c 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLSession.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,16 +78,7 @@ public interface SSLSession {
      * <P>
      * This context may be unavailable in some environments,
      * in which case this method returns null.
-     * <P>
-     * If the context is available and there is a
-     * security manager installed, the caller may require
-     * permission to access it or a security exception may be thrown.
-     * In a Java environment, the security manager's
-     * {@code checkPermission} method is called with a
-     * {@code SSLPermission("getSSLSessionContext")} permission.
-     *
-     * @throws SecurityException if the calling thread does not have
-     *         permission to get SSL session context.
+     *
      * @return the session context used for this session, or null
      * if the context is unavailable.
      */
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
index 25d572a5616..a77968ada16 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
@@ -209,22 +209,15 @@ protected SSLSocket()
      * Used only by subclasses.
      * Constructs a TCP connection to a named host at a specified port.
      * This acts as the SSL client.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host name of the host with which to connect, or
      *        <code>null</code> for the loopback address.
      * @param port number of the server's port
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws UnknownHostException if the host is not known
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
-     * @see SecurityManager#checkConnect
      */
     protected SSLSocket(String host, int port)
     throws IOException, UnknownHostException
@@ -235,21 +228,14 @@ protected SSLSocket(String host, int port)
      * Used only by subclasses.
      * Constructs a TCP connection to a server at a specified address
      * and port.  This acts as the SSL client.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param address the server's host
      * @param port its port
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter is outside the
      *         specified range of valid port values, which is between 0 and
      *         65535, inclusive.
      * @throws NullPointerException if <code>address</code> is null.
-     * @see SecurityManager#checkConnect
      */
     protected SSLSocket(InetAddress address, int port)
     throws IOException
@@ -261,10 +247,6 @@ protected SSLSocket(InetAddress address, int port)
      * Constructs an SSL connection to a named host at a specified port,
      * binding the client side of the connection a given address and port.
      * This acts as the SSL client.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param host name of the host with which to connect, or
      *        <code>null</code> for the loopback address.
@@ -274,13 +256,10 @@ protected SSLSocket(InetAddress address, int port)
      * @param clientPort the client's port the socket is bound to, or
      *        <code>zero</code> for a system selected free port.
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws UnknownHostException if the host is not known
      * @throws IllegalArgumentException if the port parameter or clientPort
      *         parameter is outside the specified range of valid port values,
      *         which is between 0 and 65535, inclusive.
-     * @see SecurityManager#checkConnect
      */
     protected SSLSocket(String host, int port,
         InetAddress clientAddress, int clientPort)
@@ -293,10 +272,6 @@ protected SSLSocket(String host, int port,
      * Constructs an SSL connection to a server at a specified address
      * and TCP port, binding the client side of the connection a given
      * address and port.  This acts as the SSL client.
-     * <p>
-     * If there is a security manager, its <code>checkConnect</code>
-     * method is called with the host address and <code>port</code>
-     * as its arguments. This could result in a SecurityException.
      *
      * @param address the server's host
      * @param port its port
@@ -305,13 +280,10 @@ protected SSLSocket(String host, int port,
      * @param clientPort the client's port the socket is bound to, or
      *        <code>zero</code> for a system selected free port.
      * @throws IOException if an I/O error occurs when creating the socket
-     * @throws SecurityException if a security manager exists and its
-     *         <code>checkConnect</code> method doesn't allow the operation.
      * @throws IllegalArgumentException if the port parameter or clientPort
      *         parameter is outside the specified range of valid port values,
      *         which is between 0 and 65535, inclusive.
      * @throws NullPointerException if <code>address</code> is null.
-     * @see SecurityManager#checkConnect
      */
     protected SSLSocket(InetAddress address, int port,
         InetAddress clientAddress, int clientPort)
diff --git a/src/java.base/share/classes/javax/security/auth/AuthPermission.java b/src/java.base/share/classes/javax/security/auth/AuthPermission.java
index 1a924e14f36..7ad61db21cf 100644
--- a/src/java.base/share/classes/javax/security/auth/AuthPermission.java
+++ b/src/java.base/share/classes/javax/security/auth/AuthPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,100 +30,10 @@
  * contains a name (also referred to as a "target name") but no actions
  * list; you either have the named permission or you don't.
  *
- * <p> The target name is the name of a security configuration parameter
- * (see below).  Currently, the {@code AuthPermission} object is used to
- * guard access to the {@link Subject},
- * {@link javax.security.auth.login.LoginContext}, and
- * {@link javax.security.auth.login.Configuration} objects.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
- * <p> The standard target names for an Authentication Permission are:
- *
- * <pre>
- *      doAs -                  allow the caller to invoke the
- *                              {@code Subject.doAs} methods.
- *
- *      doAsPrivileged -        allow the caller to invoke the
- *                              {@code Subject.doAsPrivileged} methods.
- *
- *      getSubject -            allow for the retrieval of the
- *                              Subject(s) associated with the
- *                              current Thread.
- *
- *      getSubjectFromDomainCombiner -  allow for the retrieval of the
- *                              Subject associated with the
- *                              a {@code SubjectDomainCombiner}.
- *
- *      setReadOnly -           allow the caller to set a Subject
- *                              to be read-only.
- *
- *      modifyPrincipals -      allow the caller to modify the {@code Set}
- *                              of Principals associated with a
- *                              {@code Subject}
- *
- *      modifyPublicCredentials - allow the caller to modify the
- *                              {@code Set} of public credentials
- *                              associated with a {@code Subject}
- *
- *      modifyPrivateCredentials - allow the caller to modify the
- *                              {@code Set} of private credentials
- *                              associated with a {@code Subject}
- *
- *      refreshCredential -     allow code to invoke the {@code refresh}
- *                              method on a credential which implements
- *                              the {@code Refreshable} interface.
- *
- *      destroyCredential -     allow code to invoke the {@code destroy}
- *                              method on a credential {@code object}
- *                              which implements the {@code Destroyable}
- *                              interface.
- *
- *      createLoginContext.{name} -  allow code to instantiate a
- *                              {@code LoginContext} with the
- *                              specified {@code name}.  {@code name}
- *                              is used as the index into the installed login
- *                              {@code Configuration}
- *                              (that returned by
- *                              {@code Configuration.getConfiguration()}).
- *                              <i>name</i> can be wildcarded (set to '*')
- *                              to allow for any name.
- *
- *      getLoginConfiguration - allow for the retrieval of the system-wide
- *                              login Configuration.
- *
- *      createLoginConfiguration.{type} - allow code to obtain a Configuration
- *                              object via
- *                              {@code Configuration.getInstance}.
- *
- *      setLoginConfiguration - allow for the setting of the system-wide
- *                              login Configuration.
- *
- *      refreshLoginConfiguration - allow for the refreshing of the system-wide
- *                              login Configuration.
- * </pre>
- *
- * <p>Please note that granting this permission with the "modifyPrincipals",
- * "modifyPublicCredentials" or "modifyPrivateCredentials" target allows
- * a JAAS login module to populate principal or credential objects into
- * the Subject. Although reading information inside the private credentials
- * set requires a {@link PrivateCredentialPermission} of the credential type to
- * be granted, reading information inside the principals set and the public
- * credentials set requires no additional permission. These objects can contain
- * potentially sensitive information. For example, login modules that read
- * local user information or perform a Kerberos login are able to add
- * potentially sensitive information such as user ids, groups and domain names
- * to the principals set.
- *
- * <p> The following target name has been deprecated in favor of
- * {@code createLoginContext.{name}}.
- *
- * <pre>
- *      createLoginContext -    allow code to instantiate a
- *                              {@code LoginContext}.
- * </pre>
- *
- * @implNote
- * Implementations may define additional target names, but should use naming
- * conventions such as reverse domain name notation to avoid name clashes.
  * @since 1.4
  */
 public final class AuthPermission extends
diff --git a/src/java.base/share/classes/javax/security/auth/Destroyable.java b/src/java.base/share/classes/javax/security/auth/Destroyable.java
index 4eb69191607..686fd5dc58f 100644
--- a/src/java.base/share/classes/javax/security/auth/Destroyable.java
+++ b/src/java.base/share/classes/javax/security/auth/Destroyable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,6 @@ public interface Destroyable {
      * The default implementation throws {@code DestroyFailedException}.
      *
      * @exception DestroyFailedException if the destroy operation fails.
-     *
-     * @exception SecurityException if the caller does not have permission
-     *          to destroy this {@code Object}.
      */
     default void destroy() throws DestroyFailedException {
         throw new DestroyFailedException();
diff --git a/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java b/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
index 1857caeb799..d25a5a81d9d 100644
--- a/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
+++ b/src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,59 +47,9 @@
  *      CredentialClass {PrincipalClass "PrincipalName"}*
  * </pre>
  *
- * For example, the following permission grants access to the
- * com.sun.PrivateCredential owned by Subjects which have
- * a com.sun.Principal with the name, "duke".  Note that although
- * this example, as well as all the examples below, do not contain
- * Codebase, SignedBy, or Principal information in the grant statement
- * (for simplicity reasons), actual policy configurations should
- * specify that information when appropriate.
- *
- * <pre>
- *
- *    grant {
- *      permission javax.security.auth.PrivateCredentialPermission
- *              "com.sun.PrivateCredential com.sun.Principal \"duke\"",
- *              "read";
- *    };
- * </pre>
- *
- * If CredentialClass is "*", then access is granted to
- * all private Credentials belonging to the specified
- * {@code Subject}.
- * If "PrincipalName" is "*", then access is granted to the
- * specified Credential owned by any {@code Subject} that has the
- * specified {@code Principal} (the actual PrincipalName doesn't matter).
- * For example, the following grants access to the
- * a.b.Credential owned by any {@code Subject} that has
- * an a.b.Principal.
- *
- * <pre>
- *    grant {
- *      permission javax.security.auth.PrivateCredentialPermission
- *              "a.b.Credential a.b.Principal "*"",
- *              "read";
- *    };
- * </pre>
- *
- * If both the PrincipalClass and "PrincipalName" are "*",
- * then access is granted to the specified Credential owned by
- * any {@code Subject}.
- *
- * <p> In addition, the PrincipalClass/PrincipalName pairing may be repeated:
- *
- * <pre>
- *    grant {
- *      permission javax.security.auth.PrivateCredentialPermission
- *              "a.b.Credential a.b.Principal "duke" c.d.Principal "dukette"",
- *              "read";
- *    };
- * </pre>
- *
- * The above grants access to the private Credential, "a.b.Credential",
- * belonging to a {@code Subject} with at least two associated Principals:
- * "a.b.Principal" with the name, "duke", and "c.d.Principal", with the name,
- * "dukette".
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.4
  */
diff --git a/src/java.base/share/classes/javax/security/auth/Refreshable.java b/src/java.base/share/classes/javax/security/auth/Refreshable.java
index 73f1ec48431..a670375e722 100644
--- a/src/java.base/share/classes/javax/security/auth/Refreshable.java
+++ b/src/java.base/share/classes/javax/security/auth/Refreshable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,10 +49,6 @@ public interface Refreshable {
      * Update or extend the validity period for this
      * {@code Object}.
      *
-     * @exception SecurityException if the caller does not have permission
-     *          to update or extend the validity period for this
-     *          {@code Object}.
-     *
      * @exception RefreshFailedException if the refresh attempt failed.
      */
     void refresh() throws RefreshFailedException;
diff --git a/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java
index 8815a3b2763..f6cc6e5e346 100644
--- a/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -35,7 +35,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionException;
 
-import jdk.internal.access.SharedSecrets;
 import sun.security.util.ResourcesMgr;
 
 /**
@@ -62,8 +61,7 @@
  * private cryptographic keys, are stored within a private credential
  * {@code Set}.  Credentials intended to be shared, such as
  * public key certificates or Kerberos server tickets are stored
- * within a public credential {@code Set}.  Different permissions
- * are required to access and modify the different credential Sets.
+ * within a public credential {@code Set}.
  *
  * <p> To retrieve all the Principals associated with a {@code Subject},
  * invoke the {@code getPrincipals} method.  To retrieve
@@ -103,28 +101,17 @@
  *     <li>{@link #doAsPrivileged(Subject, PrivilegedExceptionAction, AccessControlContext)}
  * </ul>
  * Methods {@link #current()} and {@link #callAs(Subject, Callable)}
- * are replacements for these methods, where {@code current}
- * is mostly equivalent to {@code getSubject(AccessController.getContext())}
+ * are replacements for these methods, where {@code current} is equivalent to
+ * {@code getSubject(AccessController.getContext())} (as originally specified)
  * and {@code callAs} is similar to {@code doAs} except that the
  * input type and exceptions thrown are slightly different.
  *
- * <p id="sm-allowed"><b>These methods behave differently depending on
- * whether a security manager is
- * {@linkplain SecurityManager##set-security-manager allowed or disallowed}</b>:
- * <ul>
- * <li>If a security manager is allowed, which means it is either already set
- * or allowed to be set dynamically, a {@code Subject} object is associated
- * with an {@code AccessControlContext} through a {@code doAs} or
- * {@code callAs} call, and the subject can then be retrieved using the
- * {@code getSubject(AccessControlContext)} or {@code current} method.
-*  <li>If a security manager is not allowed, which means it is not set and
- * not allowed to be set dynamically, a {@code doAs} or {@code callAs} call
+ * <p> A {@code doAs} or {@code callAs} call
  * binds a {@code Subject} object to the period of execution of an action,
  * and the subject can be retrieved using the {@code current} method inside
  * the action. This subject can be inherited by child threads if they are
  * started and terminate within the execution of its parent thread using
  * structured concurrency.
- * </ul>
  *
  * @since 1.4
  * @see java.security.Principal
@@ -174,17 +161,8 @@ public final class Subject implements java.io.Serializable {
      *
      * <p> The newly constructed Sets check whether this {@code Subject}
      * has been set read-only before permitting subsequent modifications.
-     * The newly created Sets also prevent illegal modifications
-     * by ensuring that callers have sufficient permissions.  These Sets
-     * also prohibit null elements, and attempts to add, query, or remove
-     * a null element will result in a {@code NullPointerException}.
-     *
-     * <p> To modify the Principals Set, the caller must have
-     * {@code AuthPermission("modifyPrincipals")}.
-     * To modify the public credential Set, the caller must have
-     * {@code AuthPermission("modifyPublicCredentials")}.
-     * To modify the private credential Set, the caller must have
-     * {@code AuthPermission("modifyPrivateCredentials")}.
+     * These Sets also prohibit null elements, and attempts to add, query,
+     * or remove a null element will result in a {@code NullPointerException}.
      */
     public Subject() {
 
@@ -204,17 +182,8 @@ public Subject() {
      * are copied into newly constructed Sets.
      * These newly created Sets check whether this {@code Subject}
      * has been set read-only before permitting subsequent modifications.
-     * The newly created Sets also prevent illegal modifications
-     * by ensuring that callers have sufficient permissions.  These Sets
-     * also prohibit null elements, and attempts to add, query, or remove
-     * a null element will result in a {@code NullPointerException}.
-     *
-     * <p> To modify the Principals Set, the caller must have
-     * {@code AuthPermission("modifyPrincipals")}.
-     * To modify the public credential Set, the caller must have
-     * {@code AuthPermission("modifyPublicCredentials")}.
-     * To modify the private credential Set, the caller must have
-     * {@code AuthPermission("modifyPrivateCredentials")}.
+     * These Sets also prohibit null elements, and attempts to add, query,
+     * or remove a null element will result in a {@code NullPointerException}.
      *
      * @param readOnly true if the {@code Subject} is to be read-only,
      *          and false otherwise.
@@ -266,12 +235,6 @@ public Subject(boolean readOnly, Set<? extends Principal> principals,
      * {@code IllegalStateException} being thrown.
      * Also, once a {@code Subject} is read-only,
      * it can not be reset to being writable again.
-     *
-     * @throws SecurityException if a security manager is installed and the
-     *         caller does not have an
-     *         {@link AuthPermission#AuthPermission(String)
-     *         AuthPermission("setReadOnly")} permission to set this
-     *         {@code Subject} to be read-only.
      */
     public void setReadOnly() {
         @SuppressWarnings("removal")
@@ -293,73 +256,31 @@ public boolean isReadOnly() {
     }
 
     /**
-     * Get the {@code Subject} associated with the provided
-     * {@code AccessControlContext}. This method is intended to be used with
-     * a security manager. It throws an {@code UnsupportedOperationException}
-     * if a security manager is not allowed.
-     *
-     * <p> The {@code AccessControlContext} may contain many
-     * Subjects (from nested {@code doAs} calls).
-     * In this situation, the most recent {@code Subject} associated
-     * with the {@code AccessControlContext} is returned.
-     *
-     * @param  acc the {@code AccessControlContext} from which to retrieve
-     *          the {@code Subject}.
-     *
-     * @return  the {@code Subject} associated with the provided
-     *          {@code AccessControlContext}, or {@code null}
-     *          if no {@code Subject} is associated
-     *          with the provided {@code AccessControlContext}.
-     *
-     * @throws UnsupportedOperationException if a security manager is
-     *          not allowed
-     *
-     * @throws SecurityException if a security manager is installed and the
-     *          caller does not have an
-     *          {@link AuthPermission#AuthPermission(String)
-     *          AuthPermission("getSubject")} permission to get the
-     *          {@code Subject}.
+     * Throws {@code UnsupportedOperationException}. A replacement API
+     * named {@link #current()} has been added which can be used to obtain
+     * the current subject.
+     *
+     * @param  acc ignored
+     *
+     * @return  n/a
+     *
+     * @throws UnsupportedOperationException always
      *
-     * @throws NullPointerException if the provided
-     *          {@code AccessControlContext} is {@code null}.
+     * @deprecated This method used to get the subject associated with the
+     *       provided {@link AccessControlContext}, which was only useful in
+     *       conjunction with {@linkplain SecurityManager the Security Manager},
+     *       which is no longer supported. This method has been changed to
+     *       always throw {@code UnsupportedOperationException}. A replacement
+     *       API named {@link #current()} has been added which can be used to
+     *       obtain the current subject. There is no replacement for the
+     *       Security Manager.
      *
-     * @deprecated This method depends on {@link AccessControlContext}
-     *       which, in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, is deprecated
-     *       and subject to removal in a future release. However,
-     *       obtaining a Subject is useful independent of the Security Manager.
-     *       Thus, a replacement API named {@link #current()} has been added
-     *       which can be used to obtain the current subject.
+     * @see #current()
      */
     @SuppressWarnings("removal")
     @Deprecated(since="17", forRemoval=true)
     public static Subject getSubject(final AccessControlContext acc) {
-
-        java.lang.SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(AuthPermissionHolder.GET_SUBJECT_PERMISSION);
-        }
-
-        Objects.requireNonNull(acc, ResourcesMgr.getString
-                ("invalid.null.AccessControlContext.provided"));
-
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            throw new UnsupportedOperationException(
-                    "getSubject is supported only if a security manager is allowed");
-        } else {
-            // return the Subject from the DomainCombiner of the provided context
-            return AccessController.doPrivileged
-                    (new java.security.PrivilegedAction<>() {
-                        public Subject run() {
-                            DomainCombiner dc = acc.getDomainCombiner();
-                            if (!(dc instanceof SubjectDomainCombiner)) {
-                                return null;
-                            }
-                            SubjectDomainCombiner sdc = (SubjectDomainCombiner) dc;
-                            return sdc.getSubject();
-                        }
-                    });
-        }
+        throw new UnsupportedOperationException("getSubject is not supported");
     }
 
     private static final ScopedValue<Subject> SCOPED_SUBJECT =
@@ -375,11 +296,7 @@ public Subject run() {
      * subject is reset to its previous value. The current
      * subject is {@code null} before the first call of {@code callAs()}.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>, this
-     * method is equivalent to calling {@link #getSubject} with the current
-     * {@code AccessControlContext}.
-     *
-     * <p> If a security manager is not allowed, this method returns the
+     * <p> This method returns the
      * {@code Subject} bound to the period of the execution of the current
      * thread.
      *
@@ -390,31 +307,14 @@ public Subject run() {
      */
     @SuppressWarnings("removal")
     public static Subject current() {
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            return SCOPED_SUBJECT.orElse(null);
-        } else {
-            return getSubject(AccessController.getContext());
-        }
+        return SCOPED_SUBJECT.orElse(null);
     }
 
     /**
      * Executes a {@code Callable} with {@code subject} as the
      * current subject.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>,
-     * this method first retrieves the current Thread's
-     * {@code AccessControlContext} via
-     * {@code AccessController.getContext},
-     * and then instantiates a new {@code AccessControlContext}
-     * using the retrieved context along with a new
-     * {@code SubjectDomainCombiner} (constructed using
-     * the provided {@code Subject}).
-     * Finally, this method invokes {@code AccessController.doPrivileged},
-     * passing it the provided {@code PrivilegedAction},
-     * as well as the newly constructed {@code AccessControlContext}.
-     *
-     * <p> If a security manager is not allowed,
-     * this method launches {@code action} and binds {@code subject} to the
+     * <p> This method launches {@code action} and binds {@code subject} to the
      * period of its execution.
      *
      * @param subject the {@code Subject} that the specified {@code action}
@@ -434,43 +334,17 @@ public static Subject current() {
     public static <T> T callAs(final Subject subject,
             final Callable<T> action) throws CompletionException {
         Objects.requireNonNull(action);
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            try {
-                return ScopedValue.where(SCOPED_SUBJECT, subject).call(action::call);
-            } catch (Exception e) {
-                throw new CompletionException(e);
-            }
-        } else {
-            try {
-                PrivilegedExceptionAction<T> pa = () -> action.call();
-                @SuppressWarnings("removal")
-                var result = doAs(subject, pa);
-                return result;
-            } catch (PrivilegedActionException e) {
-                throw new CompletionException(e.getCause());
-            } catch (Exception e) {
-                throw new CompletionException(e);
-            }
+        try {
+            return ScopedValue.where(SCOPED_SUBJECT, subject).call(action::call);
+        } catch (Exception e) {
+            throw new CompletionException(e);
         }
     }
 
     /**
      * Perform work as a particular {@code Subject}.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>,
-     * this method first retrieves the current Thread's
-     * {@code AccessControlContext} via
-     * {@code AccessController.getContext},
-     * and then instantiates a new {@code AccessControlContext}
-     * using the retrieved context along with a new
-     * {@code SubjectDomainCombiner} (constructed using
-     * the provided {@code Subject}).
-     * Finally, this method invokes {@code AccessController.doPrivileged},
-     * passing it the provided {@code PrivilegedAction},
-     * as well as the newly constructed {@code AccessControlContext}.
-     *
-     * <p> If a security manager is not allowed,
-     * this method launches {@code action} and binds {@code subject} to the
+     * <p> This method launches {@code action} and binds {@code subject} to the
      * period of its execution.
      *
      * @param subject the {@code Subject} that the specified
@@ -489,19 +363,17 @@ public static <T> T callAs(final Subject subject,
      * @throws NullPointerException if the {@code PrivilegedAction}
      *                  is {@code null}.
      *
-     * @throws SecurityException if a security manager is installed and the
-     *                  caller does not have an
-     *                  {@link AuthPermission#AuthPermission(String)
-     *                  AuthPermission("doAs")} permission to invoke this
-     *                  method.
-     *
-     * @deprecated This method depends on {@link AccessControlContext}
-     *       which, in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, is deprecated
-     *       and subject to removal in a future release. However, performing
-     *       work as a Subject is useful independent of the Security Manager.
-     *       Thus, a replacement API named {@link #callAs} has been added
-     *       which can be used to perform the same work.
+     * @deprecated This method originally performed the specified
+     *       {@code PrivilegedAction} with privileges enabled. Running the
+     *       action with privileges enabled was only useful in conjunction
+     *       with {@linkplain SecurityManager the Security Manager}, which is
+     *       no longer supported. This method has been changed to launch the
+     *       action as is and bind the subject to the period of its execution.
+     *       A replacement API named {@link #callAs} has been added which can
+     *       be used to perform the same work. There is no replacement for the
+     *       Security Manager.
+     *
+     * @see #callAs(Subject, Callable)
      */
     @SuppressWarnings("removal")
     @Deprecated(since="18", forRemoval=true)
@@ -516,50 +388,26 @@ public static <T> T doAs(final Subject subject,
         Objects.requireNonNull(action,
                 ResourcesMgr.getString("invalid.null.action.provided"));
 
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            try {
-                return callAs(subject, action::run);
-            } catch (CompletionException ce) {
-                var cause = ce.getCause();
-                if (cause instanceof RuntimeException re) {
-                    throw re;
-                } else if (cause instanceof Error er) {
-                    throw er;
-                } else {
-                    throw new AssertionError(ce);
-                }
+        try {
+            return callAs(subject, action::run);
+        } catch (CompletionException ce) {
+            var cause = ce.getCause();
+            if (cause instanceof RuntimeException re) {
+                throw re;
+            } else if (cause instanceof Error er) {
+                throw er;
+            } else {
+                throw new AssertionError(ce);
             }
-        } else {
-            // set up the new Subject-based AccessControlContext
-            // for doPrivileged
-            final AccessControlContext currentAcc = AccessController.getContext();
-
-            // call doPrivileged and push this new context on the stack
-            return java.security.AccessController.doPrivileged
-                    (action,
-                            createContext(subject, currentAcc));
         }
     }
 
     /**
      * Perform work as a particular {@code Subject}.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>,
-     * this method first retrieves the current Thread's
-     * {@code AccessControlContext} via
-     * {@code AccessController.getContext},
-     * and then instantiates a new {@code AccessControlContext}
-     * using the retrieved context along with a new
-     * {@code SubjectDomainCombiner} (constructed using
-     * the provided {@code Subject}).
-     * Finally, this method invokes {@code AccessController.doPrivileged},
-     * passing it the provided {@code PrivilegedExceptionAction},
-     * as well as the newly constructed {@code AccessControlContext}.
-     *
-     * <p> If a security manager is not allowed,
-     * this method launches {@code action} and binds {@code subject} to the
+     * <p> This method launches {@code action} and binds {@code subject} to the
      * period of its execution.
-
+     *
      * @param subject the {@code Subject} that the specified
      *                  {@code action} will run as.  This parameter
      *                  may be {@code null}.
@@ -581,19 +429,17 @@ public static <T> T doAs(final Subject subject,
      *                  {@code PrivilegedExceptionAction} is
      *                  {@code null}.
      *
-     * @throws SecurityException if a security manager is installed and the
-     *                  caller does not have an
-     *                  {@link AuthPermission#AuthPermission(String)
-     *                  AuthPermission("doAs")} permission to invoke this
-     *                  method.
-     *
-     * @deprecated This method depends on {@link AccessControlContext}
-     *       which, in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, is deprecated
-     *       and subject to removal in a future release. However, performing
-     *       work as a Subject is useful independent of the Security Manager.
-     *       Thus, a replacement API named {@link #callAs} has been added
-     *       which can be used to perform the same work.
+     * @deprecated This method originally performed the specified
+     *       {@code PrivilegedExceptionAction} with privileges enabled.
+     *       Running the action with privileges enabled was only useful in
+     *       conjunction with {@linkplain SecurityManager the Security Manager},
+     *       which is no longer supported. This method has been changed to
+     *       launch the action as is and bind the subject to the period of its
+     *       execution. A replacement API named {@link #callAs} has been added
+     *       which can be used to perform the same work. There is no
+     *       replacement for the Security Manager.
+     *
+     * @see #callAs(Subject, Callable)
      */
     @SuppressWarnings("removal")
     @Deprecated(since="18", forRemoval=true)
@@ -609,46 +455,26 @@ public static <T> T doAs(final Subject subject,
         Objects.requireNonNull(action,
                 ResourcesMgr.getString("invalid.null.action.provided"));
 
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            try {
-                return callAs(subject, action::run);
-            } catch (CompletionException ce) {
-                var cause = ce.getCause();
-                if (cause instanceof RuntimeException re) {
-                    throw re;
-                } else if (cause instanceof Error er) {
-                    throw er;
-                } else if (cause instanceof Exception e) {
-                    throw new PrivilegedActionException(e);
-                } else {
-                    throw new PrivilegedActionException(ce);
-                }
+        try {
+            return callAs(subject, action::run);
+        } catch (CompletionException ce) {
+            var cause = ce.getCause();
+            if (cause instanceof RuntimeException re) {
+                throw re;
+            } else if (cause instanceof Error er) {
+                throw er;
+            } else if (cause instanceof Exception e) {
+                throw new PrivilegedActionException(e);
+            } else {
+                throw new PrivilegedActionException(ce);
             }
-        } else {
-            // set up the new Subject-based AccessControlContext for doPrivileged
-            final AccessControlContext currentAcc = AccessController.getContext();
-
-            // call doPrivileged and push this new context on the stack
-            return java.security.AccessController.doPrivileged
-                    (action,
-                            createContext(subject, currentAcc));
         }
     }
 
     /**
      * Perform privileged work as a particular {@code Subject}.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>,
-     * this method behaves exactly as {@code Subject.doAs},
-     * except that instead of retrieving the current Thread's
-     * {@code AccessControlContext}, it uses the provided
-     * {@code AccessControlContext}.  If the provided
-     * {@code AccessControlContext} is {@code null},
-     * this method instantiates a new {@code AccessControlContext}
-     * with an empty collection of ProtectionDomains.
-     *
-     * <p> If a security manager is not allowed,
-     * this method ignores the {@code acc} argument, launches {@code action},
+     * <p> This method ignores the {@code acc} argument, launches {@code action},
      * and binds {@code subject} to the period of its execution.
      *
      * @param subject the {@code Subject} that the specified
@@ -670,18 +496,18 @@ public static <T> T doAs(final Subject subject,
      * @throws NullPointerException if the {@code PrivilegedAction}
      *                  is {@code null}.
      *
-     * @throws SecurityException if a security manager is installed and the
-     *                  caller does not have a
-     *                  {@link AuthPermission#AuthPermission(String)
-     *                  AuthPermission("doAsPrivileged")} permission to invoke
-     *                  this method.
-     *
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally performed the specified
+     *       {@code PrivilegedAction} with privileges enabled and restricted
+     *       by the specified {@code AccessControlContext}. Running the
+     *       action with privileges enabled was only useful in conjunction
+     *       with {@linkplain SecurityManager the Security Manager}, which is
+     *       no longer supported. This method has been changed to ignore the
+     *       {@code AccessControlContext} and launch the action as is and bind
+     *       the subject to the period of its execution. A replacement API
+     *       named {@link #callAs} has been added which can be used to perform
+     *       the same work. There is no replacement for the Security Manager.
+     *
+     * @see #callAs(Subject, Callable)
      */
     @SuppressWarnings("removal")
     @Deprecated(since="17", forRemoval=true)
@@ -697,48 +523,24 @@ public static <T> T doAsPrivileged(final Subject subject,
         Objects.requireNonNull(action,
                 ResourcesMgr.getString("invalid.null.action.provided"));
 
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            try {
-                return callAs(subject, action::run);
-            } catch (CompletionException ce) {
-                var cause = ce.getCause();
-                if (cause instanceof RuntimeException re) {
-                    throw re;
-                } else if (cause instanceof Error er) {
-                    throw er;
-                } else {
-                    throw new AssertionError(ce);
-                }
+        try {
+            return callAs(subject, action::run);
+        } catch (CompletionException ce) {
+            var cause = ce.getCause();
+            if (cause instanceof RuntimeException re) {
+                throw re;
+            } else if (cause instanceof Error er) {
+                throw er;
+            } else {
+                throw new AssertionError(ce);
             }
-        } else {
-            // set up the new Subject-based AccessControlContext
-            // for doPrivileged
-            final AccessControlContext callerAcc =
-                    (acc == null ?
-                            new AccessControlContext(NULL_PD_ARRAY) :
-                            acc);
-
-            // call doPrivileged and push this new context on the stack
-            return java.security.AccessController.doPrivileged
-                    (action,
-                            createContext(subject, callerAcc));
         }
     }
 
     /**
      * Perform privileged work as a particular {@code Subject}.
      *
-     * <p> If a security manager is <a href=#sm-allowed>allowed</a>,
-     * this method behaves exactly as {@code Subject.doAs},
-     * except that instead of retrieving the current Thread's
-     * {@code AccessControlContext}, it uses the provided
-     * {@code AccessControlContext}.  If the provided
-     * {@code AccessControlContext} is {@code null},
-     * this method instantiates a new {@code AccessControlContext}
-     * with an empty collection of ProtectionDomains.
-     *
-     * <p> If a security manager is not allowed,
-     * this method ignores the {@code acc} argument, launches {@code action},
+     * <p> This method ignores the {@code acc} argument, launches {@code action},
      * and binds {@code subject} to the period of its execution.
      *
      * @param subject the {@code Subject} that the specified
@@ -765,18 +567,18 @@ public static <T> T doAsPrivileged(final Subject subject,
      *                  {@code PrivilegedExceptionAction} is
      *                  {@code null}.
      *
-     * @throws SecurityException if a security manager is installed and the
-     *                  caller does not have a
-     *                  {@link AuthPermission#AuthPermission(String)
-     *                  AuthPermission("doAsPrivileged")} permission to invoke
-     *                  this method.
-     *
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally performed the specified
+     *       {@code PrivilegedExceptionAction} with privileges enabled and
+     *       restricted by the specified {@code AccessControlContext}. Running
+     *       the action with privileges enabled was only useful in conjunction
+     *       with {@linkplain SecurityManager the Security Manager}, which is
+     *       no longer supported. This method has been changed to ignore the
+     *       {@code AccessControlContext} and launch the action as is and bind
+     *       the subject to the period of its execution. A replacement API
+     *       named {@link #callAs} has been added which can be used to perform
+     *       the same work. There is no replacement for the Security Manager.
+     *
+     * @see #callAs(Subject, Callable)
      */
     @SuppressWarnings("removal")
     @Deprecated(since="17", forRemoval=true)
@@ -793,32 +595,19 @@ public static <T> T doAsPrivileged(final Subject subject,
         Objects.requireNonNull(action,
                 ResourcesMgr.getString("invalid.null.action.provided"));
 
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            try {
-                return callAs(subject, action::run);
-            } catch (CompletionException ce) {
-                var cause = ce.getCause();
-                if (cause instanceof RuntimeException re) {
-                    throw re;
-                } else if (cause instanceof Error er) {
-                    throw er;
-                } else if (cause instanceof Exception e) {
-                    throw new PrivilegedActionException(e);
-                } else {
-                    throw new PrivilegedActionException(ce);
-                }
+        try {
+            return callAs(subject, action::run);
+        } catch (CompletionException ce) {
+            var cause = ce.getCause();
+            if (cause instanceof RuntimeException re) {
+                throw re;
+            } else if (cause instanceof Error er) {
+                throw er;
+            } else if (cause instanceof Exception e) {
+                throw new PrivilegedActionException(e);
+            } else {
+                throw new PrivilegedActionException(ce);
             }
-        } else {
-            // set up the new Subject-based AccessControlContext for doPrivileged
-            final AccessControlContext callerAcc =
-                    (acc == null ?
-                            new AccessControlContext(NULL_PD_ARRAY) :
-                            acc);
-
-            // call doPrivileged and push this new context on the stack
-            return java.security.AccessController.doPrivileged
-                    (action,
-                            createContext(subject, callerAcc));
         }
     }
 
@@ -851,11 +640,6 @@ public AccessControlContext run() {
      * to the returned {@code Set} affects the internal
      * {@code Principal} {@code Set} as well.
      *
-     * <p> If a security manager is installed, the caller must have a
-     * {@link AuthPermission#AuthPermission(String)
-     * AuthPermission("modifyPrincipals")} permission to modify
-     * the returned set, or a {@code SecurityException} will be thrown.
-     *
      * @return  the {@code Set} of Principals associated with this
      *          {@code Subject}.
      */
@@ -907,11 +691,6 @@ public <T extends Principal> Set<T> getPrincipals(Class<T> c) {
      * to the returned {@code Set} affects the internal public
      * Credential {@code Set} as well.
      *
-     * <p> If a security manager is installed, the caller must have a
-     * {@link AuthPermission#AuthPermission(String)
-     * AuthPermission("modifyPublicCredentials")} permission to modify
-     * the returned set, or a {@code SecurityException} will be thrown.
-     *
      * @return  a {@code Set} of public credentials held by this
      *          {@code Subject}.
      */
@@ -931,17 +710,6 @@ public Set<Object> getPublicCredentials() {
      * to the returned {@code Set} affects the internal private
      * Credential {@code Set} as well.
      *
-     * <p> If a security manager is installed, the caller must have a
-     * {@link AuthPermission#AuthPermission(String)
-     * AuthPermission("modifyPrivateCredentials")} permission to modify
-     * the returned set, or a {@code SecurityException} will be thrown.
-     *
-     * <p> While iterating through the {@code Set},
-     * a {@code SecurityException} is thrown if a security manager is installed
-     * and the caller does not have a {@link PrivateCredentialPermission}
-     * to access a particular Credential.  The {@code Iterator}
-     * is nevertheless advanced to the next element in the {@code Set}.
-     *
      * @return  a {@code Set} of private credentials held by this
      *          {@code Subject}.
      */
@@ -997,10 +765,6 @@ public <T> Set<T> getPublicCredentials(Class<T> c) {
      * {@code Subject} that are instances or subclasses of the specified
      * {@code Class}.
      *
-     * <p> If a security manager is installed, the caller must have a
-     * {@link PrivateCredentialPermission} to access all of the requested
-     * Credentials, or a {@code SecurityException} will be thrown.
-     *
      * <p> The returned {@code Set} is not backed by this Subject's
      * internal private Credential {@code Set}.  A new
      * {@code Set} is created and returned for each method invocation.
@@ -1049,11 +813,6 @@ public <T> Set<T> getPrivateCredentials(Class<T> c) {
      *
      * @return true if the specified Object is equal to this
      *          {@code Subject}.
-     *
-     * @throws SecurityException if a security manager is installed and the
-     *         caller does not have a {@link PrivateCredentialPermission}
-     *         permission to access the private credentials for this
-     *         {@code Subject} or the provided {@code Subject}.
      */
     @Override
     public boolean equals(Object o) {
@@ -1151,10 +910,6 @@ String toString(boolean includePrivateCredentials) {
 
     /**
      * {@return a hashcode for this {@code Subject}}
-     *
-     * @throws SecurityException if a security manager is installed and the
-     *         caller does not have a {@link PrivateCredentialPermission}
-     *         permission to access this Subject's private credentials.
      */
     @Override
     public int hashCode() {
diff --git a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
index 80533e3668c..222976051c8 100644
--- a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
+++ b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,13 @@
 import java.lang.ref.WeakReference;
 
 /**
- * A {@code SubjectDomainCombiner} updates ProtectionDomains
- * with Principals from the {@code Subject} associated with this
- * {@code SubjectDomainCombiner}.
+ * SubjectDomainCombiner was used to dynamically update ProtectionDomains with
+ * Principals for access control operations and decisions. This feature no
+ * longer exists.
  *
  * @since 1.4
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
+ * @deprecated This class was only useful in conjunction with the Security
+ *       Manager, which is no longer supported. There is no replacement for
  *       the Security Manager or this class.
  */
 @SuppressWarnings("removal")
@@ -84,10 +82,6 @@ public SubjectDomainCombiner(Subject subject) {
      *          {@code SubjectDomainCombiner}, or {@code null}
      *          if no {@code Subject} is associated with this
      *          {@code SubjectDomainCombiner}.
-     *
-     * @exception SecurityException if the caller does not have permission
-     *          to get the {@code Subject} associated with this
-     *          {@code SubjectDomainCombiner}.
      */
     public Subject getSubject() {
         java.lang.SecurityManager sm = System.getSecurityManager();
diff --git a/src/java.base/share/classes/javax/security/auth/login/Configuration.java b/src/java.base/share/classes/javax/security/auth/login/Configuration.java
index 595c797fa11..b46a671e6d3 100644
--- a/src/java.base/share/classes/javax/security/auth/login/Configuration.java
+++ b/src/java.base/share/classes/javax/security/auth/login/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,9 +217,6 @@ protected Configuration() { }
      *          then that object is returned.  Otherwise, a default
      *          Configuration object is returned.
      *
-     * @exception SecurityException if the caller does not have permission
-     *                          to retrieve the Configuration.
-     *
      * @see #setConfiguration
      */
     @SuppressWarnings("removal")
@@ -291,9 +288,6 @@ public Void run() {
      *
      * @param configuration the new {@code Configuration}
      *
-     * @exception SecurityException if the current thread does not have
-     *                  Permission to set the {@code Configuration}.
-     *
      * @see #getConfiguration
      */
     public static void setConfiguration(Configuration configuration) {
@@ -343,9 +337,6 @@ public static void setConfiguration(Configuration configuration) {
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Configuration} instance for the specified type
-     *
      * @see Provider
      *
      * @since 1.6
@@ -408,9 +399,6 @@ public static Configuration getInstance(String type,
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Configuration} instance for the specified type
-     *
      * @see Provider
      * @since 1.6
      */
@@ -472,9 +460,6 @@ public static Configuration getInstance(String type,
      *
      * @throws NullPointerException if {@code type} is {@code null}
      *
-     * @throws SecurityException if the caller does not have permission
-     *         to get a {@code Configuration} instance for the specified type
-     *
      * @see Provider
      * @since 1.6
      */
@@ -583,9 +568,6 @@ public Configuration.Parameters getParameters() {
      * <p> The default implementation of this method does nothing.
      * This method should be overridden if a refresh operation is supported
      * by the implementation.
-     *
-     * @exception SecurityException if the caller does not have permission
-     *                          to refresh its Configuration.
      */
     public void refresh() { }
 
diff --git a/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java b/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
index 071b5876a1d..51213f8b93c 100644
--- a/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
+++ b/src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,9 +70,6 @@ public ConfigurationSpi() {}
      * <p> The default implementation of this method does nothing.
      * This method should be overridden if a refresh operation is supported
      * by the implementation.
-     *
-     * @exception SecurityException if the caller does not have permission
-     *          to refresh its Configuration.
      */
     protected void engineRefresh() { }
 }
diff --git a/src/java.base/share/classes/javax/security/auth/login/LoginContext.java b/src/java.base/share/classes/javax/security/auth/login/LoginContext.java
index da559017c79..5878da078f6 100644
--- a/src/java.base/share/classes/javax/security/auth/login/LoginContext.java
+++ b/src/java.base/share/classes/javax/security/auth/login/LoginContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,24 +135,6 @@
  * {@code getAppConfigurationEntry} with the name, "<i>other</i>"
  * (the default entry name).  If there is no entry for "<i>other</i>",
  * then a {@code LoginException} is thrown.
- *
- * <li> When LoginContext uses the installed Configuration, the caller
- * requires the createLoginContext.<em>name</em> and possibly
- * createLoginContext.other AuthPermissions. Furthermore, the
- * LoginContext will invoke configured modules from within an
- * {@code AccessController.doPrivileged} call so that modules that
- * perform security-sensitive tasks (such as connecting to remote hosts,
- * and updating the Subject) will require the respective permissions, but
- * the callers of the LoginContext will not require those permissions.
- *
- * <li> When LoginContext uses a caller-specified Configuration, the caller
- * does not require any createLoginContext AuthPermission.  The LoginContext
- * saves the {@code AccessControlContext} for the caller,
- * and invokes the configured modules from within an
- * {@code AccessController.doPrivileged} call constrained by that context.
- * This means the caller context (stored when the LoginContext was created)
- * must have sufficient permissions to perform any security-sensitive tasks
- * that the modules may perform.
  * </ul>
  *
  * <li> {@code CallbackHandler}
@@ -173,22 +155,11 @@
  * with users.  The caller thus assumes that the configured
  * modules have alternative means for authenticating the user.
  *
- *
- * <li> When the LoginContext uses the installed Configuration (instead of
- * a caller-specified Configuration, see above),
- * then this LoginContext must wrap any
- * caller-specified or default CallbackHandler implementation
- * in a new CallbackHandler implementation
- * whose {@code handle} method implementation invokes the
- * specified CallbackHandler's {@code handle} method in a
- * {@code java.security.AccessController.doPrivileged} call
- * constrained by the caller's current {@code AccessControlContext}.
  * </ul>
  * </ol>
  *
  * @since 1.4
  * @see java.security.Security
- * @see javax.security.auth.AuthPermission
  * @see javax.security.auth.Subject
  * @see javax.security.auth.callback.CallbackHandler
  * @see javax.security.auth.login.Configuration
@@ -345,13 +316,6 @@ public CallbackHandler run() throws Exception {
      *          {@code auth.login.defaultCallbackHandler}
      *          security property was set, but the implementation
      *          class could not be loaded.
-     *
-     * @exception SecurityException if a SecurityManager is set and
-     *          the caller does not have
-     *          AuthPermission("createLoginContext.<i>name</i>"),
-     *          or if a configuration entry for {@code name} does not exist and
-     *          the caller does not additionally have
-     *          AuthPermission("createLoginContext.other")
      */
     public LoginContext(String name) throws LoginException {
         init(name);
@@ -375,13 +339,6 @@ public LoginContext(String name) throws LoginException {
      *          <i>auth.login.defaultCallbackHandler</i>
      *          security property was set, but the implementation
      *          class could not be loaded.
-     *
-     * @exception SecurityException if a SecurityManager is set and
-     *          the caller does not have
-     *          AuthPermission("createLoginContext.<i>name</i>"),
-     *          or if a configuration entry for <i>name</i> does not exist and
-     *          the caller does not additionally have
-     *          AuthPermission("createLoginContext.other")
      */
     public LoginContext(String name, Subject subject)
     throws LoginException {
@@ -409,13 +366,6 @@ public LoginContext(String name, Subject subject)
      *          and there is no {@code Configuration} entry
      *          for "{@code other}", or if the caller-specified
      *          {@code callbackHandler} is {@code null}.
-     *
-     * @exception SecurityException if a SecurityManager is set and
-     *          the caller does not have
-     *          AuthPermission("createLoginContext.<i>name</i>"),
-     *          or if a configuration entry for <i>name</i> does not exist and
-     *          the caller does not additionally have
-     *          AuthPermission("createLoginContext.other")
      */
     @SuppressWarnings("removal")
     public LoginContext(String name, CallbackHandler callbackHandler)
@@ -449,13 +399,6 @@ public LoginContext(String name, CallbackHandler callbackHandler)
      *          {@code subject} is {@code null},
      *          or if the caller-specified
      *          {@code callbackHandler} is {@code null}.
-     *
-     * @exception SecurityException if a SecurityManager is set and
-     *          the caller does not have
-     *          AuthPermission("createLoginContext.<i>name</i>"),
-     *          or if a configuration entry for <i>name</i> does not exist and
-     *          the caller does not additionally have
-     *          AuthPermission("createLoginContext.other")
      */
     @SuppressWarnings("removal")
     public LoginContext(String name, Subject subject,
@@ -492,14 +435,6 @@ public LoginContext(String name, Subject subject,
      *          and there is no {@code Configuration} entry
      *          for "<i>other</i>".
      *
-     * @exception SecurityException if a SecurityManager is set,
-     *          <i>config</i> is {@code null},
-     *          and either the caller does not have
-     *          AuthPermission("createLoginContext.<i>name</i>"),
-     *          or if a configuration entry for <i>name</i> does not exist and
-     *          the caller does not additionally have
-     *          AuthPermission("createLoginContext.other")
-     *
      * @since 1.5
      */
     @SuppressWarnings("removal")
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index 0436cbb314f..80f4dfdf2aa 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -144,12 +144,6 @@ public interface JavaLangAccess {
      */
     void registerShutdownHook(int slot, boolean registerShutdownInProgress, Runnable hook);
 
-    /**
-     * Returns a new Thread with the given Runnable and an
-     * inherited AccessControlContext.
-     */
-    Thread newThreadWithAcc(Runnable target, @SuppressWarnings("removal") AccessControlContext acc);
-
     /**
      * Invokes the finalize method of the given object.
      */
@@ -184,16 +178,6 @@ public interface JavaLangAccess {
      */
     Package definePackage(ClassLoader cl, String name, Module module);
 
-    /**
-     * Record the non-exported packages of the modules in the given layer
-     */
-    void addNonExportedPackages(ModuleLayer layer);
-
-    /**
-     * Invalidate package access cache
-     */
-    void invalidatePackageAccessCache();
-
     /**
      * Defines a new module to the Java virtual machine. The module
      * is defined to the given class loader.
@@ -633,10 +617,4 @@ StackWalker newStackWalkerInstance(Set<StackWalker.Option> options,
      * Are the string bytes compatible with the given charset?
      */
     boolean bytesCompatible(String string, Charset charset);
-
-    /**
-     * Is a security manager already set or allowed to be set
-     * (using -Djava.security.manager=allow)?
-     */
-    boolean allowSecurityManager();
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangRefAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangRefAccess.java
index ed9967ec3eb..909c5b80d25 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangRefAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangRefAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,11 +50,4 @@ public interface JavaLangRefAccess {
      * Invoked by Runtime.runFinalization()
      */
     void runFinalization();
-
-    /**
-     * Constructs a new NativeReferenceQueue.
-     *
-     * Invoked by jdk.internal.util.ReferencedKeyMap
-     */
-    <T> ReferenceQueue<T> newNativeReferenceQueue();
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java
index cb1fd49c518..fa8e603ac23 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,7 @@
 package jdk.internal.access;
 
 import java.security.AccessControlContext;
-import java.security.PermissionCollection;
 import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 
 public interface JavaSecurityAccess {
 
@@ -38,16 +36,4 @@ <T> T doIntersectionPrivilege(PrivilegedAction<T> action,
 
     <T> T doIntersectionPrivilege(PrivilegedAction<T> action,
                                   @SuppressWarnings("removal") AccessControlContext context);
-
-    ProtectionDomain[] getProtectDomains(@SuppressWarnings("removal") AccessControlContext context);
-
-    interface ProtectionDomainCache {
-        void put(ProtectionDomain pd, PermissionCollection pc);
-        PermissionCollection get(ProtectionDomain pd);
-    }
-
-    /**
-     * Returns the ProtectionDomainCache.
-     */
-    ProtectionDomainCache getProtectionDomainCache();
 }
diff --git a/src/java.base/share/classes/jdk/internal/event/VirtualThreadPinnedEvent.java b/src/java.base/share/classes/jdk/internal/event/VirtualThreadPinnedEvent.java
deleted file mode 100644
index 73746dc4abc..00000000000
--- a/src/java.base/share/classes/jdk/internal/event/VirtualThreadPinnedEvent.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.internal.event;
-
-/**
- * Event recording that a virtual thread has parked on its carrier thread.
- */
-public class VirtualThreadPinnedEvent extends Event {
-}
diff --git a/src/java.base/share/classes/jdk/internal/foreign/CABI.java b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
index 500e312b2f3..216a9fd874c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  *  questions.
  *
  */
+
 package jdk.internal.foreign;
 
 import jdk.internal.foreign.abi.fallback.FallbackLinker;
@@ -31,7 +32,6 @@
 import jdk.internal.util.StaticProperty;
 
 import static java.lang.foreign.ValueLayout.ADDRESS;
-import static sun.security.action.GetPropertyAction.privilegedGetProperty;
 
 public enum CABI {
     SYS_V,
@@ -50,7 +50,7 @@ public enum CABI {
     private static final CABI CURRENT = computeCurrent();
 
     private static CABI computeCurrent() {
-        String abi = privilegedGetProperty("jdk.internal.foreign.CABI");
+        String abi = System.getProperty("jdk.internal.foreign.CABI");
         if (abi != null) {
             return CABI.valueOf(abi);
         }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/ConfinedSession.java b/src/java.base/share/classes/jdk/internal/foreign/ConfinedSession.java
index 432b324c1bd..9b98bf82b5e 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/ConfinedSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/ConfinedSession.java
@@ -41,8 +41,7 @@ final class ConfinedSession extends MemorySessionImpl {
 
     private int asyncReleaseCount = 0;
 
-    static final VarHandle ASYNC_RELEASE_COUNT= MhUtil.findVarHandle(
-            MethodHandles.lookup(), "asyncReleaseCount", int.class);
+    static final VarHandle ASYNC_RELEASE_COUNT= MhUtil.findVarHandle(MethodHandles.lookup(), "asyncReleaseCount", int.class);
 
     public ConfinedSession(Thread owner) {
         super(owner, new ConfinedResourceList());
@@ -52,17 +51,17 @@ public ConfinedSession(Thread owner) {
     @ForceInline
     public void acquire0() {
         checkValidState();
-        if (state == MAX_FORKS) {
+        if (acquireCount == MAX_FORKS) {
             throw tooManyAcquires();
         }
-        state++;
+        acquireCount++;
     }
 
     @Override
     @ForceInline
     public void release0() {
         if (Thread.currentThread() == owner) {
-            state--;
+            acquireCount--;
         } else {
             // It is possible to end up here in two cases: this session was kept alive by some other confined session
             // which is implicitly released (in which case the release call comes from the cleaner thread). Or,
@@ -75,11 +74,11 @@ public void release0() {
     void justClose() {
         checkValidState();
         int asyncCount = (int)ASYNC_RELEASE_COUNT.getVolatile(this);
-        if ((state == 0 && asyncCount == 0)
-                || ((state - asyncCount) == 0)) {
+        int acquire = acquireCount - asyncCount;
+        if (acquire == 0) {
             state = CLOSED;
         } else {
-            throw alreadyAcquired(state - asyncCount);
+            throw alreadyAcquired(acquire);
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java b/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
index c075778b5ee..3fc46d6c0bc 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
@@ -42,6 +42,7 @@ non-sealed class GlobalSession extends MemorySessionImpl {
 
     public GlobalSession() {
         super(null, null);
+        this.state = NONCLOSEABLE;
     }
 
     @Override
@@ -50,11 +51,6 @@ public void release0() {
         // do nothing
     }
 
-    @Override
-    public boolean isCloseable() {
-        return false;
-    }
-
     @Override
     @ForceInline
     public void acquire0() {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java b/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
index 0eb3642508c..0b79e45960a 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
@@ -42,6 +42,7 @@ final class ImplicitSession extends SharedSession {
 
     public ImplicitSession(Cleaner cleaner) {
         super();
+        this.state = NONCLOSEABLE;
         cleaner.register(this, resourceList);
     }
 
@@ -55,11 +56,6 @@ public void acquire0() {
         // do nothing
     }
 
-    @Override
-    public boolean isCloseable() {
-        return false;
-    }
-
     @Override
     public void justClose() {
         throw nonCloseable();
diff --git a/src/java.base/share/classes/jdk/internal/foreign/MemorySessionImpl.java b/src/java.base/share/classes/jdk/internal/foreign/MemorySessionImpl.java
index a12b16ca8b4..541a0907e4c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/MemorySessionImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/MemorySessionImpl.java
@@ -38,6 +38,7 @@
 import jdk.internal.misc.ScopedMemoryAccess;
 import jdk.internal.invoke.MhUtil;
 import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
 
 /**
  * This class manages the temporal bounds associated with a memory segment as well
@@ -55,11 +56,19 @@
 public abstract sealed class MemorySessionImpl
         implements Scope
         permits ConfinedSession, GlobalSession, SharedSession {
+
+    /**
+     * The value of the {@code state} of a {@code MemorySessionImpl}. The only possible transition
+     * is OPEN -> CLOSED. As a result, the states CLOSED and NONCLOSEABLE are stable. This allows
+     * us to annotate {@code state} with {@link Stable} and elide liveness check on non-closeable
+     * constant scopes, such as {@code GLOBAL_SESSION}.
+     */
     static final int OPEN = 0;
     static final int CLOSED = -1;
+    static final int NONCLOSEABLE = 1;
 
-    static final VarHandle STATE = MhUtil.findVarHandle(
-            MethodHandles.lookup(), "state", int.class);
+    static final VarHandle STATE = MhUtil.findVarHandle(MethodHandles.lookup(), "state", int.class);
+    static final VarHandle ACQUIRE_COUNT = MhUtil.findVarHandle(MethodHandles.lookup(), "acquireCount", int.class);
 
     static final int MAX_FORKS = Integer.MAX_VALUE;
 
@@ -70,7 +79,11 @@ public abstract sealed class MemorySessionImpl
 
     final ResourceList resourceList;
     final Thread owner;
-    int state = OPEN;
+
+    @Stable
+    int state;
+
+    int acquireCount;
 
     public Arena asArena() {
         return new ArenaImpl(this);
@@ -214,8 +227,8 @@ protected Object clone() throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
     }
 
-    public boolean isCloseable() {
-        return true;
+    public final boolean isCloseable() {
+        return state <= OPEN;
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
index d5a5954fa0e..773b8e57440 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
@@ -29,7 +29,6 @@
 import jdk.internal.util.Architecture;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.vm.annotation.ForceInline;
-import sun.security.action.GetIntegerAction;
 
 import java.lang.foreign.MemorySegment;
 
@@ -293,7 +292,7 @@ private static long vectorizedMismatchLargeForBytes(MemorySessionImpl aSession,
 
     // The returned value is in the interval [0, 2^30]
     static int powerOfPropertyOr(String name, int defaultPower) {
-        final int power = GetIntegerAction.privilegedGetProperty(PROPERTY_PATH + name, defaultPower);
+        final int power = Integer.getInteger(PROPERTY_PATH + name, defaultPower);
         return 1 << Math.clamp(power, 0, Integer.SIZE - 2);
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SharedSession.java b/src/java.base/share/classes/jdk/internal/foreign/SharedSession.java
index 6c9666c2b58..b4415ad4959 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SharedSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SharedSession.java
@@ -44,6 +44,8 @@ sealed class SharedSession extends MemorySessionImpl permits ImplicitSession {
 
     private static final ScopedMemoryAccess SCOPED_MEMORY_ACCESS = ScopedMemoryAccess.getScopedMemoryAccess();
 
+    private static final int CLOSED_ACQUIRE_COUNT = -1;
+
     SharedSession() {
         super(null, new SharedResourceList());
     }
@@ -53,15 +55,15 @@ sealed class SharedSession extends MemorySessionImpl permits ImplicitSession {
     public void acquire0() {
         int value;
         do {
-            value = (int) STATE.getVolatile(this);
-            if (value < OPEN) {
+            value = (int) ACQUIRE_COUNT.getVolatile(this);
+            if (value < 0) {
                 //segment is not open!
-                throw alreadyClosed();
+                throw sharedSessionAlreadyClosed();
             } else if (value == MAX_FORKS) {
                 //overflow
                 throw tooManyAcquires();
             }
-        } while (!STATE.compareAndSet(this, value, value + 1));
+        } while (!ACQUIRE_COUNT.compareAndSet(this, value, value + 1));
     }
 
     @Override
@@ -69,24 +71,35 @@ public void acquire0() {
     public void release0() {
         int value;
         do {
-            value = (int) STATE.getVolatile(this);
-            if (value <= OPEN) {
+            value = (int) ACQUIRE_COUNT.getVolatile(this);
+            if (value <= 0) {
                 //cannot get here - we can't close segment twice
-                throw alreadyClosed();
+                throw sharedSessionAlreadyClosed();
             }
-        } while (!STATE.compareAndSet(this, value, value - 1));
+        } while (!ACQUIRE_COUNT.compareAndSet(this, value, value - 1));
     }
 
     void justClose() {
-        int prevState = (int) STATE.compareAndExchange(this, OPEN, CLOSED);
-        if (prevState < 0) {
-            throw alreadyClosed();
-        } else if (prevState != OPEN) {
-            throw alreadyAcquired(prevState);
+        int acquireCount = (int) ACQUIRE_COUNT.compareAndExchange(this, 0, CLOSED_ACQUIRE_COUNT);
+        if (acquireCount < 0) {
+            throw sharedSessionAlreadyClosed();
+        } else if (acquireCount > 0) {
+            throw alreadyAcquired(acquireCount);
         }
+
+        STATE.setVolatile(this, CLOSED);
         SCOPED_MEMORY_ACCESS.closeScope(this, ALREADY_CLOSED);
     }
 
+    private IllegalStateException sharedSessionAlreadyClosed() {
+        // To avoid the situation where a scope fails to be acquired or closed but still reports as
+        // alive afterward, we wait for the state to change before throwing the exception
+        while ((int) STATE.getVolatile(this) == OPEN) {
+            Thread.onSpinWait();
+        }
+        return alreadyClosed();
+    }
+
     /**
      * A shared resource list; this implementation has to handle add vs. add races, as well as add vs. cleanup races.
      */
diff --git a/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
index b74d09be0dd..78550c56136 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.foreign.abi.SharedUtils;
 import jdk.internal.util.ArraysSupport;
-import sun.security.action.GetPropertyAction;
 
 import java.lang.foreign.MemorySegment;
 import java.nio.charset.Charset;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
index 98e02140af6..7194813aff7 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
@@ -29,14 +29,12 @@
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import jdk.internal.loader.NativeLibrary;
 import jdk.internal.loader.RawNativeLibraries;
-import sun.security.action.GetPropertyAction;
+import jdk.internal.util.OperatingSystem;
 
 import static java.lang.foreign.ValueLayout.ADDRESS;
 
@@ -60,7 +58,7 @@ private SystemLookup() { }
 
     private static SymbolLookup makeSystemLookup() {
         try {
-            if (Utils.IS_WINDOWS) {
+            if (OperatingSystem.isWindows()) {
                 return makeWindowsLookup();
             } else {
                 return libLookup(libs -> libs.load(jdkLibraryPath("syslookup")));
@@ -74,24 +72,12 @@ private static SymbolLookup makeSystemLookup() {
     }
 
     private static SymbolLookup makeWindowsLookup() {
-        @SuppressWarnings("removal")
-        String systemRoot = AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public String run() {
-                return System.getenv("SystemRoot");
-            }
-        });
+        String systemRoot = System.getenv("SystemRoot");
         Path system32 = Path.of(systemRoot, "System32");
         Path ucrtbase = system32.resolve("ucrtbase.dll");
         Path msvcrt = system32.resolve("msvcrt.dll");
 
-        @SuppressWarnings("removal")
-        boolean useUCRT = AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Boolean run() {
-                return Files.exists(ucrtbase);
-            }
-        });
+        boolean useUCRT = Files.exists(ucrtbase);
         Path stdLib = useUCRT ? ucrtbase : msvcrt;
         SymbolLookup lookup = libLookup(libs -> libs.load(stdLib));
 
@@ -139,8 +125,8 @@ private static SymbolLookup libLookup(Function<RawNativeLibraries, NativeLibrary
      * Returns the path of the given library name from JDK
      */
     private static Path jdkLibraryPath(String name) {
-        Path javahome = Path.of(GetPropertyAction.privilegedGetProperty("java.home"));
-        String lib = Utils.IS_WINDOWS ? "bin" : "lib";
+        Path javahome = Path.of(System.getProperty("java.home"));
+        String lib = OperatingSystem.isWindows() ? "bin" : "lib";
         String libname = System.mapLibraryName(name);
         return javahome.resolve(lib).resolve(libname);
     }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
index f214d3fb806..3d252dcf233 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
@@ -48,15 +48,11 @@
 import jdk.internal.vm.annotation.ForceInline;
 import sun.invoke.util.Wrapper;
 
-import static sun.security.action.GetPropertyAction.privilegedGetProperty;
-
 /**
  * This class contains misc helper functions to support creation of memory segments.
  */
 public final class Utils {
 
-    public static final boolean IS_WINDOWS = privilegedGetProperty("os.name").startsWith("Windows");
-
     // Suppresses default constructor, ensuring non-instantiability.
     private Utils() {}
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java b/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
index 41d7e3339d5..144af9dac79 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.internal.foreign.abi;
 
 import java.lang.classfile.Annotation;
@@ -48,9 +49,6 @@
 import jdk.internal.foreign.abi.Binding.VMLoad;
 import jdk.internal.foreign.abi.Binding.VMStore;
 import jdk.internal.vm.annotation.ForceInline;
-import sun.security.action.GetBooleanAction;
-import sun.security.action.GetIntegerAction;
-import sun.security.action.GetPropertyAction;
 
 import java.io.IOException;
 import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
@@ -78,11 +76,11 @@
 
 public class BindingSpecializer {
     private static final String DUMP_CLASSES_DIR
-        = GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.DUMP_CLASSES_DIR");
+            = System.getProperty("jdk.internal.foreign.abi.Specializer.DUMP_CLASSES_DIR");
     private static final boolean PERFORM_VERIFICATION
-        = GetBooleanAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.PERFORM_VERIFICATION");
+            = Boolean.getBoolean("jdk.internal.foreign.abi.Specializer.PERFORM_VERIFICATION");
     private static final int SCOPE_DEDUP_DEPTH
-            = GetIntegerAction.privilegedGetProperty("jdk.internal.foreign.abi.Specializer.SCOPE_DEDUP_DEPTH", 2);
+            = Integer.getInteger("jdk.internal.foreign.abi.Specializer.SCOPE_DEDUP_DEPTH", 2);
 
     // Bunch of helper constants
     private static final int CLASSFILE_VERSION = ClassFileFormatVersion.latest().major();
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java b/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
index a439df3eb1d..f24de62c807 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *  or visit www.oracle.com if you need additional information or have any
  *  questions.
  */
+
 package jdk.internal.foreign.abi;
 
 import jdk.internal.foreign.Utils;
@@ -38,7 +39,6 @@
 import jdk.internal.foreign.abi.Binding.ShiftRight;
 import jdk.internal.foreign.abi.Binding.VMLoad;
 import jdk.internal.foreign.abi.Binding.VMStore;
-import sun.security.action.GetPropertyAction;
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemoryLayout;
@@ -54,7 +54,7 @@
 
 public class CallingSequenceBuilder {
     private static final boolean VERIFY_BINDINGS = Boolean.parseBoolean(
-            GetPropertyAction.privilegedGetProperty("java.lang.foreign.VERIFY_BINDINGS", "true"));
+            System.getProperty("java.lang.foreign.VERIFY_BINDINGS", "true"));
 
     private final ABIDescriptor abi;
     private final LinkerOptions linkerOptions;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
index 8689751a3c8..7fb62c56bf1 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.internal.foreign.abi;
 
-import jdk.internal.foreign.Utils;
+import jdk.internal.util.OperatingSystem;
 
 import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.StructLayout;
@@ -35,8 +36,8 @@
 import static java.lang.foreign.ValueLayout.JAVA_INT;
 
 public enum CapturableState {
-    GET_LAST_ERROR    ("GetLastError",    JAVA_INT, 1 << 0, Utils.IS_WINDOWS),
-    WSA_GET_LAST_ERROR("WSAGetLastError", JAVA_INT, 1 << 1, Utils.IS_WINDOWS),
+    GET_LAST_ERROR    ("GetLastError",    JAVA_INT, 1 << 0, OperatingSystem.isWindows()),
+    WSA_GET_LAST_ERROR("WSAGetLastError", JAVA_INT, 1 << 1, OperatingSystem.isWindows()),
     ERRNO             ("errno",           JAVA_INT, 1 << 2, true);
 
     public static final StructLayout LAYOUT = MemoryLayout.structLayout(
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
index c56cca30912..627de9f0765 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.internal.foreign.abi;
 
 import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.invoke.MhUtil;
-import sun.security.action.GetPropertyAction;
 
 import java.lang.foreign.AddressLayout;
 import java.lang.foreign.Arena;
@@ -52,7 +52,7 @@
 
 public class DowncallLinker {
     private static final boolean USE_SPEC = Boolean.parseBoolean(
-        GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.DowncallLinker.USE_SPEC", "true"));
+            System.getProperty("jdk.internal.foreign.DowncallLinker.USE_SPEC", "true"));
 
     private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
index 272cfc3ca4e..486ee8b57c5 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package jdk.internal.foreign.abi;
 
 import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
-import sun.security.action.GetPropertyAction;
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
@@ -43,13 +42,12 @@
 import static java.lang.invoke.MethodHandles.insertArguments;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodType.methodType;
-import static sun.security.action.GetBooleanAction.privilegedGetProperty;
 
 public class UpcallLinker {
     private static final boolean DEBUG =
-        privilegedGetProperty("jdk.internal.foreign.UpcallLinker.DEBUG");
+            Boolean.getBoolean("jdk.internal.foreign.UpcallLinker.DEBUG");
     private static final boolean USE_SPEC = Boolean.parseBoolean(
-        GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.UpcallLinker.USE_SPEC", "true"));
+            System.getProperty("jdk.internal.foreign.UpcallLinker.USE_SPEC", "true"));
 
     private static final MethodHandle MH_invokeInterpBindings;
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
index 19682d6c43f..b68b1ed4bad 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
@@ -36,23 +36,18 @@ private LibFallback() {}
 
     static final boolean SUPPORTED = tryLoadLibrary();
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings({"restricted"})
     private static boolean tryLoadLibrary() {
-        return java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<>() {
-                    public Boolean run() {
-                        try {
-                            System.loadLibrary("fallbackLinker");
-                        } catch (UnsatisfiedLinkError ule) {
-                            return false;
-                        }
-                        if (!init()) {
-                            // library failed to initialize. Do not silently mark as unsupported
-                            throw new ExceptionInInitializerError("Fallback library failed to initialize");
-                        }
-                        return true;
-                    }
-                });
+        try {
+            System.loadLibrary("fallbackLinker");
+        } catch (UnsatisfiedLinkError ule) {
+            return false;
+        }
+        if (!init()) {
+            // library failed to initialize. Do not silently mark as unsupported
+            throw new ExceptionInInitializerError("Fallback library failed to initialize");
+        }
+        return true;
     }
 
     static int defaultABI() { return NativeConstants.DEFAULT_ABI; }
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 483093e66eb..4b2a0629706 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -76,7 +76,6 @@ public enum Feature {
         STRUCTURED_CONCURRENCY,
         @JEP(number=466, title="ClassFile API", status="Second Preview")
         CLASSFILE_API,
-        @JEP(number=473, title="Stream Gatherers", status="Second Preview")
         STREAM_GATHERERS,
         @JEP(number=476, title="Module Import Declarations", status="Preview")
         MODULE_IMPORTS,
diff --git a/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java b/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
index d20b402fe92..b314b1823a5 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
@@ -25,10 +25,6 @@
 
 package jdk.internal.misc;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
 import jdk.internal.access.JavaLangAccess;
@@ -44,12 +40,9 @@ public class CarrierThread extends ForkJoinWorkerThread {
     private static final Unsafe U = Unsafe.getUnsafe();
 
     private static final ThreadGroup CARRIER_THREADGROUP = carrierThreadGroup();
-    @SuppressWarnings("removal")
-    private static final AccessControlContext INNOCUOUS_ACC = innocuousACC();
 
     private static final long CONTEXTCLASSLOADER;
     private static final long INHERITABLETHREADLOCALS;
-    private static final long INHERITEDACCESSCONTROLCONTEXT;
 
     // compensating state
     private static final int NOT_COMPENSATING = 0;
@@ -65,7 +58,6 @@ public CarrierThread(ForkJoinPool pool) {
         super(CARRIER_THREADGROUP, pool, true);
         U.putReference(this, CONTEXTCLASSLOADER, ClassLoader.getSystemClassLoader());
         U.putReference(this, INHERITABLETHREADLOCALS, null);
-        U.putReferenceRelease(this, INHERITEDACCESSCONTROLCONTEXT, INNOCUOUS_ACC);
     }
 
     /**
@@ -120,27 +112,12 @@ public void setContextClassLoader(ClassLoader cl) {
     /**
      * The thread group for the carrier threads.
      */
-    @SuppressWarnings("removal")
     private static ThreadGroup carrierThreadGroup() {
-        return AccessController.doPrivileged(new PrivilegedAction<ThreadGroup>() {
-            public ThreadGroup run() {
-                ThreadGroup group = JLA.currentCarrierThread().getThreadGroup();
-                for (ThreadGroup p; (p = group.getParent()) != null; )
-                    group = p;
-                var carrierThreadsGroup = new ThreadGroup(group, "CarrierThreads");
-                return carrierThreadsGroup;
-            }
-        });
-    }
-
-    /**
-     * Return an AccessControlContext that doesn't support any permissions.
-     */
-    @SuppressWarnings("removal")
-    private static AccessControlContext innocuousACC() {
-        return new AccessControlContext(new ProtectionDomain[] {
-                new ProtectionDomain(null, null)
-        });
+        ThreadGroup group = JLA.currentCarrierThread().getThreadGroup();
+        for (ThreadGroup p; (p = group.getParent()) != null; )
+            group = p;
+        var carrierThreadsGroup = new ThreadGroup(group, "CarrierThreads");
+        return carrierThreadsGroup;
     }
 
     /**
@@ -163,7 +140,5 @@ static void endCompensatedBlock(ForkJoinPool pool, long post) {
                 "contextClassLoader");
         INHERITABLETHREADLOCALS = U.objectFieldOffset(Thread.class,
                 "inheritableThreadLocals");
-        INHERITEDACCESSCONTROLCONTEXT = U.objectFieldOffset(Thread.class,
-                "inheritedAccessControlContext");
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
index f8db0bc1c6e..ca2fcf11e99 100644
--- a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
+++ b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
 
 package jdk.internal.misc;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.ProtectionDomain;
-import java.security.PrivilegedAction;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -41,8 +37,6 @@ public final class InnocuousThread extends Thread {
     private static final long THREAD_LOCALS;
     private static final long INHERITABLE_THREAD_LOCALS;
     private static final ThreadGroup INNOCUOUSTHREADGROUP;
-    private static final AccessControlContext ACC;
-    private static final long INHERITEDACCESSCONTROLCONTEXT;
     private static final long CONTEXTCLASSLOADER;
 
     private static final AtomicInteger threadNumber = new AtomicInteger(1);
@@ -71,18 +65,8 @@ public static Thread newThread(String name, Runnable target) {
      * set to the given priority.
      */
     public static Thread newThread(String name, Runnable target, int priority) {
-        if (System.getSecurityManager() == null) {
-            return createThread(name, target, 0L,
-                    ClassLoader.getSystemClassLoader(), priority);
-        }
-        return AccessController.doPrivileged(
-                new PrivilegedAction<Thread>() {
-                    @Override
-                    public Thread run() {
-                        return createThread(name, target, 0L,
-                                ClassLoader.getSystemClassLoader(), priority);
-                    }
-                });
+        return createThread(name, target, 0L,
+                ClassLoader.getSystemClassLoader(), priority);
     }
 
     /**
@@ -105,17 +89,7 @@ public static Thread newSystemThread(String name, Runnable target) {
      * Thread priority is set to the given priority.
      */
     public static Thread newSystemThread(String name, Runnable target, int priority) {
-        if (System.getSecurityManager() == null) {
-            return createThread(name, target, 0L, null, priority);
-        }
-        return AccessController.doPrivileged(
-                new PrivilegedAction<Thread>() {
-                    @Override
-                    public Thread run() {
-                        return createThread(name, target, 0L,
-                                null, priority);
-                    }
-                });
+        return createThread(name, target, 0L, null, priority);
     }
 
     /**
@@ -124,17 +98,7 @@ public Thread run() {
      */
     public static Thread newSystemThread(String name, Runnable target,
                                          long stackSize, int priority) {
-        if (System.getSecurityManager() == null) {
-            return createThread(name, target, stackSize, null, priority);
-        }
-        return AccessController.doPrivileged(
-                new PrivilegedAction<Thread>() {
-                    @Override
-                    public Thread run() {
-                        return createThread(name, target, 0L,
-                                null, priority);
-                    }
-                });
+        return createThread(name, target, stackSize, null, priority);
     }
 
     private static Thread createThread(String name, Runnable target, long stackSize,
@@ -150,7 +114,6 @@ private static Thread createThread(String name, Runnable target, long stackSize,
     private InnocuousThread(ThreadGroup group, Runnable target, String name,
                             long stackSize, ClassLoader tccl) {
         super(group, target, name, stackSize, false);
-        UNSAFE.putReferenceRelease(this, INHERITEDACCESSCONTROLCONTEXT, ACC);
         UNSAFE.putReferenceRelease(this, CONTEXTCLASSLOADER, tccl);
     }
 
@@ -190,10 +153,6 @@ public void run() {
     // Use Unsafe to access Thread group and ThreadGroup parent fields
     static {
         try {
-            ACC = new AccessControlContext(new ProtectionDomain[] {
-                new ProtectionDomain(null, null)
-            });
-
             // Find and use topmost ThreadGroup as parent of new group
             UNSAFE = jdk.internal.misc.Unsafe.getUnsafe();
             Class<?> tk = Thread.class;
@@ -202,8 +161,6 @@ public void run() {
             THREAD_LOCALS = UNSAFE.objectFieldOffset(tk, "threadLocals");
             INHERITABLE_THREAD_LOCALS = UNSAFE.objectFieldOffset
                     (tk, "inheritableThreadLocals");
-            INHERITEDACCESSCONTROLCONTEXT = UNSAFE.objectFieldOffset
-                (tk, "inheritedAccessControlContext");
             CONTEXTCLASSLOADER = UNSAFE.objectFieldOffset
                 (tk, "contextClassLoader");
 
@@ -216,18 +173,7 @@ public void run() {
                     break;
                 group = parent;
             }
-            final ThreadGroup root = group;
-            if (System.getSecurityManager() == null) {
-                INNOCUOUSTHREADGROUP = new ThreadGroup(root, "InnocuousThreadGroup");
-            } else {
-                INNOCUOUSTHREADGROUP = AccessController.doPrivileged(
-                    new PrivilegedAction<ThreadGroup>() {
-                        @Override
-                        public ThreadGroup run() {
-                            return new ThreadGroup(root, "InnocuousThreadGroup");
-                        }
-                    });
-            }
+            INNOCUOUSTHREADGROUP = new ThreadGroup(group, "InnocuousThreadGroup");
         } catch (Exception e) {
             throw new Error(e);
         }
diff --git a/src/java.base/share/classes/jdk/internal/misc/InternalLock.java b/src/java.base/share/classes/jdk/internal/misc/InternalLock.java
index d7a271e68c5..822b64f74ca 100644
--- a/src/java.base/share/classes/jdk/internal/misc/InternalLock.java
+++ b/src/java.base/share/classes/jdk/internal/misc/InternalLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,10 +39,10 @@ public class InternalLock {
     private static final boolean CAN_USE_INTERNAL_LOCK;
     static {
         String s = System.getProperty("jdk.io.useMonitors");
-        if (s != null && (s.isEmpty() || s.equals("true"))) {
-            CAN_USE_INTERNAL_LOCK = false;
-        } else {
+        if (s != null && s.equals("false")) {
             CAN_USE_INTERNAL_LOCK = true;
+        } else {
+            CAN_USE_INTERNAL_LOCK = false;
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/module/Modules.java b/src/java.base/share/classes/jdk/internal/module/Modules.java
index be3f8b63a9b..11ca2d5e521 100644
--- a/src/java.base/share/classes/jdk/internal/module/Modules.java
+++ b/src/java.base/share/classes/jdk/internal/module/Modules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -259,9 +259,6 @@ public static synchronized Module loadModule(String name) {
             layer = parents.isEmpty() ? null : parents.get(0);
         }
 
-        // update security manager before making types visible
-        JLA.addNonExportedPackages(newLayer);
-
         // update the built-in class loaders to make the types visible
         for (ResolvedModule resolvedModule : cf.modules()) {
             ModuleReference mref = resolvedModule.reference();
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
index 810d43ae38a..766aca20b21 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
@@ -142,29 +142,7 @@ private ReferencedKeyMap(boolean isSoft, Map<ReferenceKey<K>, V> map, ReferenceQ
      */
     public static <K, V> ReferencedKeyMap<K, V>
     create(boolean isSoft, Supplier<Map<ReferenceKey<K>, V>> supplier) {
-        return create(isSoft, false, supplier);
-    }
-
-    /**
-     * Create a new {@link ReferencedKeyMap} map.
-     *
-     * @param isSoft          true if {@link SoftReference} keys are to
-     *                        be used, {@link WeakReference} otherwise.
-     * @param useNativeQueue  true if uses NativeReferenceQueue
-     *                        otherwise use {@link ReferenceQueue}.
-     * @param supplier        {@link Supplier} of the backing map
-     *
-     * @return a new map with {@link Reference} keys
-     *
-     * @param <K> the type of keys maintained by the new map
-     * @param <V> the type of mapped values
-     */
-    public static <K, V> ReferencedKeyMap<K, V>
-    create(boolean isSoft, boolean useNativeQueue, Supplier<Map<ReferenceKey<K>, V>> supplier) {
-        return new ReferencedKeyMap<K, V>(isSoft, supplier.get(),
-                useNativeQueue ? SharedSecrets.getJavaLangRefAccess().newNativeReferenceQueue()
-                               : new ReferenceQueue<>()
-                );
+        return new ReferencedKeyMap<K, V>(isSoft, supplier.get(), new ReferenceQueue<>());
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
index 73ad6f32640..355af10aa7c 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,25 +106,7 @@ private ReferencedKeySet(ReferencedKeyMap<T, ReferenceKey<T>> map) {
      */
     public static <E> ReferencedKeySet<E>
     create(boolean isSoft, Supplier<Map<ReferenceKey<E>, ReferenceKey<E>>> supplier) {
-        return create(isSoft, false, supplier);
-    }
-
-    /**
-     * Create a new {@link ReferencedKeySet} elements.
-     *
-     * @param isSoft          true if {@link SoftReference} elements are to
-     *                        be used, {@link WeakReference} otherwise.
-     * @param useNativeQueue  true if uses NativeReferenceQueue
-     *                        otherwise use {@link ReferenceQueue}.
-     * @param supplier        {@link Supplier} of the backing map
-     *
-     * @return a new set with {@link Reference} elements
-     *
-     * @param <E> the type of elements maintained by this set
-     */
-    public static <E> ReferencedKeySet<E>
-    create(boolean isSoft, boolean useNativeQueue, Supplier<Map<ReferenceKey<E>, ReferenceKey<E>>> supplier) {
-         return new ReferencedKeySet<>(ReferencedKeyMap.create(isSoft, useNativeQueue, supplier));
+        return new ReferencedKeySet<>(ReferencedKeyMap.create(isSoft, supplier));
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
index b863def8e6a..05a32cc3b21 100644
--- a/src/java.base/share/classes/jdk/internal/vm/Continuation.java
+++ b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
@@ -59,7 +59,9 @@ public class Continuation {
     public enum Pinned {
         /** Native frame on stack */ NATIVE,
         /** Monitor held */          MONITOR,
-        /** In critical section */   CRITICAL_SECTION }
+        /** In critical section */   CRITICAL_SECTION,
+        /** Exception (OOME/SOE) */  EXCEPTION
+    }
 
     /** Preemption attempt result */
     public enum PreemptStatus {
@@ -85,6 +87,7 @@ private static Pinned pinnedReason(int reason) {
             case 2 -> Pinned.CRITICAL_SECTION;
             case 3 -> Pinned.NATIVE;
             case 4 -> Pinned.MONITOR;
+            case 5 -> Pinned.EXCEPTION;
             default -> throw new AssertionError("Unknown pinned reason: " + reason);
         };
     }
@@ -358,8 +361,6 @@ public static boolean yield(ContinuationScope scope) {
     @Hidden
     @JvmtiHideEvents
     private boolean yield0(ContinuationScope scope, Continuation child) {
-        preempted = false;
-
         if (scope != this.scope)
             this.yieldInfo = scope;
         int res = doYield();
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 4e43245e520..f3b62c37fa8 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -165,8 +165,6 @@
         java.desktop,
         java.logging,
         java.management,
-        java.management.rmi,
-        java.naming,
         java.rmi,
         jdk.charsets,
         jdk.jartool,
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index ccb82c84c92..cbcc61e332c 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -63,6 +63,7 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.function.Function;
 import java.util.jar.Attributes;
@@ -318,6 +319,8 @@ private static void printLocale(boolean verbose) {
                 Locale.getDefault(Category.DISPLAY).getDisplayName());
         ostream.println(INDENT + "default format locale = " +
                 Locale.getDefault(Category.FORMAT).getDisplayName());
+        ostream.println(INDENT + "default timezone = " +
+                TimeZone.getDefault().getID());
         ostream.println(INDENT + "tzdata version = " +
                 ZoneInfoFile.getVersion());
         if (verbose) {
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index 9f85aec7cd3..74c54105201 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -60,8 +60,6 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.SelectorProvider;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -293,8 +291,7 @@ public DatagramSocket socket() {
     public SocketAddress getLocalAddress() throws IOException {
         synchronized (stateLock) {
             ensureOpen();
-            // Perform security check before returning address
-            return Net.getRevealedLocalAddress(localAddress);
+            return localAddress;
         }
     }
 
@@ -573,24 +570,16 @@ public SocketAddress receive(ByteBuffer dst) throws IOException {
                 SocketAddress remote = beginRead(blocking, false);
                 configureSocketNonBlockingIfVirtualThread();
                 boolean connected = (remote != null);
-                @SuppressWarnings("removal")
-                SecurityManager sm = System.getSecurityManager();
-                if (connected || (sm == null)) {
-                    // connected or no security manager
-                    int n = receive(dst, connected);
-                    if (blocking) {
-                        while (IOStatus.okayToRetry(n) && isOpen()) {
-                            park(Net.POLLIN);
-                            n = receive(dst, connected);
-                        }
-                    }
-                    if (n > 0 || (n == 0 && isOpen())) {
-                        // sender address is in socket address buffer
-                        sender = sourceSocketAddress();
+                int n = receive(dst, connected);
+                if (blocking) {
+                    while (IOStatus.okayToRetry(n) && isOpen()) {
+                        park(Net.POLLIN);
+                        n = receive(dst, connected);
                     }
-                } else {
-                    // security manager and unconnected
-                    sender = untrustedReceive(dst);
+                }
+                if (n > 0 || (n == 0 && isOpen())) {
+                    // sender address is in socket address buffer
+                    sender = sourceSocketAddress();
                 }
                 return sender;
             } finally {
@@ -601,49 +590,6 @@ public SocketAddress receive(ByteBuffer dst) throws IOException {
         }
     }
 
-    /**
-     * Receives a datagram into an untrusted buffer. When there is a security
-     * manager set, and the socket is not connected, datagrams have to be received
-     * into a buffer that is not accessible to the user. The datagram is copied
-     * into the user's buffer when the sender address is accepted by the security
-     * manager.
-     */
-    private SocketAddress untrustedReceive(ByteBuffer dst) throws IOException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        assert readLock.isHeldByCurrentThread()
-                && sm != null && remoteAddress == null;
-
-        boolean blocking = isBlocking();
-        for (;;) {
-            int n;
-            ByteBuffer bb = Util.getTemporaryDirectBuffer(dst.remaining());
-            try {
-                n = receive(bb, false);
-                if (n >= 0) {
-                    // sender address is in socket address buffer
-                    InetSocketAddress isa = sourceSocketAddress();
-                    try {
-                        sm.checkAccept(isa.getAddress().getHostAddress(), isa.getPort());
-                        bb.flip();
-                        dst.put(bb);
-                        return isa;
-                    } catch (SecurityException se) {
-                        // ignore datagram
-                    }
-                }
-            } finally {
-                Util.releaseTemporaryDirectBuffer(bb);
-            }
-
-            if (blocking && IOStatus.okayToRetry(n) && isOpen()) {
-                park(Net.POLLIN);
-            } else {
-                return null;
-            }
-        }
-    }
-
     /**
      * Receives a datagram.
      *
@@ -675,58 +621,30 @@ void blockingReceive(DatagramPacket p, long nanos) throws IOException {
                 bufLength = DatagramPackets.getBufLength(p);
             }
 
-            long startNanos = System.nanoTime();
-            long remainingNanos = nanos;
-            SocketAddress sender = null;
+            boolean completed = false;
             try {
                 SocketAddress remote = beginRead(true, false);
                 boolean connected = (remote != null);
-                do {
-                    ByteBuffer dst = tryBlockingReceive(connected, bufLength, remainingNanos);
-
+                ByteBuffer dst = tryBlockingReceive(connected, bufLength, nanos);
+                if (dst != null) {
                     // if datagram received then get sender and copy to DatagramPacket
-                    if (dst != null) {
-                        try {
-                            // sender address is in socket address buffer
-                            sender = sourceSocketAddress();
-
-                            // check sender when security manager set and not connected
-                            @SuppressWarnings("removal")
-                            SecurityManager sm = System.getSecurityManager();
-                            if (sm != null && !connected) {
-                                InetSocketAddress isa = (InetSocketAddress) sender;
-                                try {
-                                    sm.checkAccept(isa.getAddress().getHostAddress(), isa.getPort());
-                                } catch (SecurityException e) {
-                                    sender = null;
-                                }
-                            }
-
-                            if (sender != null) {
-                                // copy bytes to the DatagramPacket, and set length and sender
-                                synchronized (p) {
-                                    // re-read p.bufLength in case DatagramPacket changed
-                                    int len = Math.min(dst.limit(), DatagramPackets.getBufLength(p));
-                                    dst.get(p.getData(), p.getOffset(), len);
-                                    DatagramPackets.setLength(p, len);
-                                    p.setSocketAddress(sender);
-                                }
-                            } else {
-                                // need to retry, adjusting timeout if needed
-                                if (nanos > 0) {
-                                    remainingNanos = nanos - (System.nanoTime() - startNanos);
-                                    if (remainingNanos <= 0) {
-                                        throw new SocketTimeoutException("Receive timed out");
-                                    }
-                                }
-                            }
-                        } finally {
-                            Util.offerFirstTemporaryDirectBuffer(dst);
+                    try {
+                        SocketAddress sender = sourceSocketAddress();
+                        synchronized (p) {
+                            // copy bytes to the DatagramPacket, and set length and sender.
+                            // Need to re-read p.bufLength in case DatagramPacket changed
+                            int len = Math.min(dst.limit(), DatagramPackets.getBufLength(p));
+                            dst.get(p.getData(), p.getOffset(), len);
+                            DatagramPackets.setLength(p, len);
+                            p.setSocketAddress(sender);
                         }
+                    } finally {
+                        Util.offerFirstTemporaryDirectBuffer(dst);
                     }
-                } while (sender == null && isOpen());
+                    completed = true;
+                }
             } finally {
-                endRead(true, (sender != null));
+                endRead(true, completed);
             }
         } finally {
             readLock.unlock();
@@ -884,16 +802,7 @@ public int send(ByteBuffer src, SocketAddress target)
                     completed = (n > 0);
                 } else {
                     // not connected
-                    @SuppressWarnings("removal")
-                    SecurityManager sm = System.getSecurityManager();
                     InetAddress ia = isa.getAddress();
-                    if (sm != null) {
-                        if (ia.isMulticastAddress()) {
-                            sm.checkMulticast(ia);
-                        } else {
-                            sm.checkConnect(ia.getHostAddress(), isa.getPort());
-                        }
-                    }
                     if (ia.isLinkLocalAddress())
                         isa = IPAddressUtil.toScopedAddress(isa);
                     if (isa.getPort() == 0)
@@ -1344,10 +1253,6 @@ private void bindInternal(SocketAddress local) throws IOException {
         } else {
             isa = Net.checkAddress(local, family);
         }
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkListen(isa.getPort());
 
         Net.bind(family, fd, isa.getAddress(), isa.getPort());
         localAddress = Net.localAddress(fd);
@@ -1373,17 +1278,6 @@ public DatagramChannel connect(SocketAddress sa) throws IOException {
      */
     DatagramChannel connect(SocketAddress sa, boolean check) throws IOException {
         InetSocketAddress isa = Net.checkAddress(sa, family);
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            InetAddress ia = isa.getAddress();
-            if (ia.isMulticastAddress()) {
-                sm.checkMulticast(ia);
-            } else {
-                sm.checkConnect(ia.getHostAddress(), isa.getPort());
-                sm.checkAccept(ia.getHostAddress(), isa.getPort());
-            }
-        }
 
         readLock.lock();
         try {
@@ -1589,17 +1483,13 @@ private void repairSocket(InetSocketAddress target)
     /**
      * Defines static methods to access AbstractSelectableChannel non-public members.
      */
-    @SuppressWarnings("removal")
     private static class AbstractSelectableChannels {
         private static final Method FOREACH;
         static {
             try {
-                PrivilegedExceptionAction<Method> pae = () -> {
-                    Method m = AbstractSelectableChannel.class.getDeclaredMethod("forEach", Consumer.class);
-                    m.setAccessible(true);
-                    return m;
-                };
-                FOREACH = AccessController.doPrivileged(pae);
+                Method m = AbstractSelectableChannel.class.getDeclaredMethod("forEach", Consumer.class);
+                m.setAccessible(true);
+                FOREACH = m;
             } catch (Exception e) {
                 throw new InternalError(e);
             }
@@ -1646,11 +1536,6 @@ private MembershipKey innerJoin(InetAddress group,
                 throw new IllegalArgumentException("Source address is different type to group");
         }
 
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkMulticast(group);
-
         synchronized (stateLock) {
             ensureOpen();
 
@@ -2051,10 +1936,7 @@ private static class DatagramPackets {
         private static final VarHandle BUF_LENGTH;
         static {
             try {
-                PrivilegedExceptionAction<MethodHandles.Lookup> pa = () ->
-                    MethodHandles.privateLookupIn(DatagramPacket.class, MethodHandles.lookup());
-                @SuppressWarnings("removal")
-                MethodHandles.Lookup l = AccessController.doPrivileged(pa);
+                MethodHandles.Lookup l = MethodHandles.privateLookupIn(DatagramPacket.class, MethodHandles.lookup());
                 LENGTH = l.findVarHandle(DatagramPacket.class, "length", int.class);
                 BUF_LENGTH = l.findVarHandle(DatagramPacket.class, "bufLength", int.class);
             } catch (Exception e) {
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
index 324c481f8a8..6ea20ec6270 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
@@ -48,9 +48,6 @@
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.MembershipKey;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
@@ -167,24 +164,11 @@ public SocketAddress getRemoteSocketAddress() {
 
     @Override
     public SocketAddress getLocalSocketAddress() {
-        InetSocketAddress local = dc.localAddress();
-        if (local == null || isClosed())
+        if (isClosed()) {
             return null;
-
-        InetAddress addr = local.getAddress();
-        if (addr.isAnyLocalAddress())
-            return local;
-
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                sm.checkConnect(addr.getHostAddress(), -1);
-            } catch (SecurityException x) {
-                return new InetSocketAddress(local.getPort());
-            }
+        } else {
+            return dc.localAddress();
         }
-        return local;
     }
 
     @Override
@@ -223,17 +207,7 @@ public InetAddress getLocalAddress() {
         InetSocketAddress local = dc.localAddress();
         if (local == null)
             local = new InetSocketAddress(0);
-        InetAddress result = local.getAddress();
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                sm.checkConnect(result.getHostAddress(), -1);
-            } catch (SecurityException x) {
-                return new InetSocketAddress(0).getAddress();
-            }
-        }
-        return result;
+        return local.getAddress();
     }
 
     @Override
@@ -484,11 +458,6 @@ public void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf) throws IO
         synchronized (this) {
             MembershipKey key = dc.findMembership(group, ni);
             if (key != null) {
-                // already a member but need to check permission anyway
-                @SuppressWarnings("removal")
-                SecurityManager sm = System.getSecurityManager();
-                if (sm != null)
-                    sm.checkMulticast(group);
                 throw new SocketException("Already a member of group");
             }
             dc.join(group, ni);  // checks permission
@@ -501,10 +470,6 @@ public void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf) throws I
         NetworkInterface ni = (netIf != null) ? netIf : defaultNetworkInterface();
         if (isClosed())
             throw new SocketException("Socket is closed");
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkMulticast(group);
         synchronized (this) {
             MembershipKey key = dc.findMembership(group, ni);
             if (key == null)
@@ -541,12 +506,7 @@ public InetAddress getInterface() throws SocketException {
                     return outgoingInetAddress;
                 } else {
                     // network interface has changed so update cached values
-                    PrivilegedAction<InetAddress> pa;
-                    pa = () -> ni.inetAddresses().findFirst().orElse(null);
-                    @SuppressWarnings("removal")
-                    InetAddress ia = AccessController.doPrivileged(pa);
-                    if (ia == null)
-                        throw new SocketException("Network interface has no IP address");
+                    InetAddress ia = ni.inetAddresses().findFirst().orElse(null);
                     outgoingNetworkInterface = ni;
                     outgoingInetAddress = ia;
                     return ia;
@@ -660,10 +620,7 @@ private static class NetworkInterfaces {
         static final MethodHandle CONSTRUCTOR;
         static {
             try {
-                PrivilegedExceptionAction<Lookup> pa = () ->
-                    MethodHandles.privateLookupIn(NetworkInterface.class, MethodHandles.lookup());
-                @SuppressWarnings("removal")
-                MethodHandles.Lookup l = AccessController.doPrivileged(pa);
+                Lookup l = MethodHandles.privateLookupIn(NetworkInterface.class, MethodHandles.lookup());
                 MethodType methodType = MethodType.methodType(NetworkInterface.class);
                 GET_DEFAULT = l.findStatic(NetworkInterface.class, "getDefault", methodType);
                 methodType = MethodType.methodType(void.class, String.class, int.class, InetAddress[].class);
@@ -703,10 +660,7 @@ private static class DatagramSockets {
         private static final SocketAddress NO_DELEGATE;
         static {
             try {
-                PrivilegedExceptionAction<Lookup> pa = () ->
-                    MethodHandles.privateLookupIn(DatagramSocket.class, MethodHandles.lookup());
-                @SuppressWarnings("removal")
-                MethodHandles.Lookup l = AccessController.doPrivileged(pa);
+                Lookup l = MethodHandles.privateLookupIn(DatagramSocket.class, MethodHandles.lookup());
                 var handle = l.findStaticVarHandle(DatagramSocket.class, "NO_DELEGATE", SocketAddress.class);
                 NO_DELEGATE = (SocketAddress) handle.get();
             } catch (Exception e) {
diff --git a/src/java.base/share/classes/sun/nio/ch/Poller.java b/src/java.base/share/classes/sun/nio/ch/Poller.java
index 9d3a0e7d32c..ec45a398176 100644
--- a/src/java.base/share/classes/sun/nio/ch/Poller.java
+++ b/src/java.base/share/classes/sun/nio/ch/Poller.java
@@ -26,7 +26,9 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -40,7 +42,7 @@
  * Polls file descriptors. Virtual threads invoke the poll method to park
  * until a given file descriptor is ready for I/O.
  */
-abstract class Poller {
+public abstract class Poller {
     private static final Pollers POLLERS;
     static {
         try {
@@ -142,6 +144,20 @@ static void poll(int fdVal, int event, long nanos, BooleanSupplier supplier)
         }
     }
 
+    /**
+     * Parks the current thread until a Selector's file descriptor is ready.
+     * @param fdVal the Selector's file descriptor
+     * @param nanos the waiting time or 0 to wait indefinitely
+     */
+    static void pollSelector(int fdVal, long nanos) throws IOException {
+        assert nanos >= 0L;
+        Poller poller = POLLERS.masterPoller();
+        if (poller == null) {
+            poller = POLLERS.readPoller(fdVal);
+        }
+        poller.poll(fdVal, nanos, () -> true);
+    }
+
     /**
      * If there is a thread polling the given file descriptor for the given event then
      * the thread is unparked.
@@ -258,6 +274,18 @@ private void subPollerLoop(Poller masterPoller) {
         }
     }
 
+    /**
+     * Returns the number I/O operations currently registered with this poller.
+     */
+    public int registered() {
+        return map.size();
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toIdentityString(this) + " [registered = " + registered() + "]";
+    }
+
     /**
      * The Pollers used for read and write events.
      */
@@ -344,6 +372,13 @@ void start() {
             }
         }
 
+        /**
+         * Returns the master poller, or null if there is no master poller.
+         */
+        Poller masterPoller() {
+            return masterPoller;
+        }
+
         /**
          * Returns the read poller for the given file descriptor.
          */
@@ -360,6 +395,21 @@ Poller writePoller(int fdVal) {
             return writePollers[index];
         }
 
+        /**
+         * Return the list of read pollers.
+         */
+        List<Poller> readPollers() {
+            return List.of(readPollers);
+        }
+
+        /**
+         * Return the list of write pollers.
+         */
+        List<Poller> writePollers() {
+            return List.of(writePollers);
+        }
+
+
         /**
          * Reads the given property name to get the poller count. If the property is
          * set then the value must be a power of 2. Returns 1 if the property is not
diff --git a/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/src/java.base/share/classes/sun/security/provider/PolicyFile.java
deleted file mode 100644
index f218591ce11..00000000000
--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java
+++ /dev/null
@@ -1,2250 +0,0 @@
-/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.provider;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.security.*;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-import java.net.SocketPermission;
-import java.net.NetPermission;
-import java.util.concurrent.ConcurrentHashMap;
-import jdk.internal.access.JavaSecurityAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.util.StaticProperty;
-import sun.nio.fs.DefaultFileSystemProvider;
-import sun.security.util.*;
-import sun.net.www.ParseUtil;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.internal.access.JavaSecurityAccess.ProtectionDomainCache;
-
-/**
- * This class represents a default Policy implementation for the
- * "JavaPolicy" type.
- *
- * <p> This object stores the policy for the entire Java runtime,
- * and is the amalgamation of multiple static policy
- * configurations that resides in files.
- * The algorithm for locating the policy file(s) and reading their
- * information into this <code>Policy</code> object is:
- *
- * <ol>
- * <li>
- *   Read in and load the default policy file named
- *   &lt;JAVA_HOME&gt;/lib/security/default.policy. &lt;JAVA_HOME&gt; refers
- *   to the value of the java.home system property, and specifies the directory
- *   where the JRE is installed. This policy file grants permissions to the
- *   modules loaded by the platform class loader. If the default policy file
- *   cannot be loaded, a fatal InternalError is thrown as these permissions
- *   are needed in order for the runtime to operate correctly.
- * <li>
- *   Loop through the <code>java.security.Security</code> properties,
- *   and <i>policy.url.1</i>, <i>policy.url.2</i>, ...,
- *   <i>policy.url.X</i>".  These properties are set
- *   in the Java security properties file, which is located in the file named
- *   &lt;JAVA_HOME&gt;/conf/security/java.security.
- *   Each property value specifies a <code>URL</code> pointing to a
- *   policy file to be loaded.  Read in and load each policy.
- *
- *   If none of these could be loaded, use a builtin static policy
- *   equivalent to the conf/security/java.policy file.
- *
- * <li>
- *   The <code>java.lang.System</code> property <i>java.security.policy</i>
- *   may also be set to a <code>URL</code> pointing to another policy file
- *   (which is the case when a user uses the -D switch at runtime).
- *   If this property is defined, and its use is allowed by the
- *   security property file (the Security property,
- *   <i>policy.allowSystemProperty</i> is set to <i>true</i>),
- *   also load that policy.
- *
- *   If the <i>java.security.policy</i> property is defined using
- *   "==" (rather than "="), then load the specified policy file and ignore
- *   all other configured policies. Note, that the default.policy file is
- *   also loaded, as specified in the first step of the algorithm above.
- *   If the specified policy file cannot be loaded, use a builtin static policy
- *   equivalent to the default conf/security/java.policy file.
- * </ol>
- *
- * Each policy file consists of one or more grant entries, each of
- * which consists of a number of permission entries.
- *
- * <pre>
- *   grant signedBy "<b>alias</b>", codeBase "<b>URL</b>",
- *         principal <b>principalClass</b> "<b>principalName</b>",
- *         principal <b>principalClass</b> "<b>principalName</b>",
- *         ... {
- *
- *     permission <b>Type</b> "<b>name</b> "<b>action</b>",
- *         signedBy "<b>alias</b>";
- *     permission <b>Type</b> "<b>name</b> "<b>action</b>",
- *         signedBy "<b>alias</b>";
- *     ....
- *   };
- * </pre>
- *
- * All non-bold items above must appear as is (although case
- * doesn't matter and some are optional, as noted below).
- * principal entries are optional and need not be present.
- * Italicized items represent variable values.
- *
- * <p> A grant entry must begin with the word <code>grant</code>.
- * The <code>signedBy</code>,<code>codeBase</code> and <code>principal</code>
- * name/value pairs are optional.
- * If they are not present, then any signer (including unsigned code)
- * will match, and any codeBase will match.
- * Note that the <i>principalClass</i>
- * may be set to the wildcard value, *, which allows it to match
- * any <code>Principal</code> class.  In addition, the <i>principalName</i>
- * may also be set to the wildcard value, *, allowing it to match
- * any <code>Principal</code> name.  When setting the <i>principalName</i>
- * to the *, do not surround the * with quotes.
- *
- * <p> A permission entry must begin with the word <code>permission</code>.
- * The word <code><i>Type</i></code> in the template above is
- * a specific permission type, such as <code>java.io.FilePermission</code>
- * or <code>java.lang.RuntimePermission</code>.
- *
- * <p> The "<i>action</i>" is required for
- * many permission types, such as <code>java.io.FilePermission</code>
- * (where it specifies what type of file access that is permitted).
- * It is not required for categories such as
- * <code>java.lang.RuntimePermission</code>
- * where it is not necessary - you either have the
- * permission specified by the <code>"<i>name</i>"</code>
- * value following the type name or you don't.
- *
- * <p> The <code>signedBy</code> name/value pair for a permission entry
- * is optional. If present, it indicates a signed permission. That is,
- * the permission class itself must be signed by the given alias in
- * order for it to be granted. For example,
- * suppose you have the following grant entry:
- *
- * <pre>
- *   grant principal foo.com.Principal "Duke" {
- *     permission Foo "foobar", signedBy "FooSoft";
- *   }
- * </pre>
- *
- * <p> Then this permission of type <i>Foo</i> is granted if the
- * <code>Foo.class</code> permission has been signed by the
- * "FooSoft" alias, or if XXX <code>Foo.class</code> is a
- * system class (i.e., is found on the CLASSPATH).
- *
- * <p> Items that appear in an entry must appear in the specified order
- * (<code>permission</code>, <i>Type</i>, "<i>name</i>", and
- * "<i>action</i>"). An entry is terminated with a semicolon.
- *
- * <p> Case is unimportant for the identifiers (<code>permission</code>,
- * <code>signedBy</code>, <code>codeBase</code>, etc.) but is
- * significant for the <i>Type</i>
- * or for any string that is passed in as a value.
- *
- * <p> An example of two entries in a policy configuration file is
- * <pre>
- *   // if the code is comes from "foo.com" and is running as "Duke",
- *   // grant it read/write to all files in /tmp.
- *
- *   grant codeBase "foo.com", principal foo.com.Principal "Duke" {
- *              permission java.io.FilePermission "/tmp/*", "read,write";
- *   };
- *
- *   // grant any code running as "Duke" permission to read
- *   // the "java.vendor" Property.
- *
- *   grant principal foo.com.Principal "Duke" {
- *         permission java.util.PropertyPermission "java.vendor";
- *
- *
- * </pre>
- *  This Policy implementation supports special handling of any
- *  permission that contains the string, "<b>${{self}}</b>", as part of
- *  its target name.  When such a permission is evaluated
- *  (such as during a security check), <b>${{self}}</b> is replaced
- *  with one or more Principal class/name pairs.  The exact
- *  replacement performed depends upon the contents of the
- *  grant clause to which the permission belongs.
- * <p>
- *
- *  If the grant clause does not contain any principal information,
- *  the permission will be ignored (permissions containing
- *  <b>${{self}}</b> in their target names are only valid in the context
- *  of a principal-based grant clause).  For example, BarPermission
- *  will always be ignored in the following grant clause:
- *
- * <pre>
- *    grant codebase "www.foo.com", signedby "duke" {
- *      permission BarPermission "... ${{self}} ...";
- *    };
- * </pre>
- *
- *  If the grant clause contains principal information, <b>${{self}}</b>
- *  will be replaced with that same principal information.
- *  For example, <b>${{self}}</b> in BarPermission will be replaced by
- *  <b>javax.security.auth.x500.X500Principal "cn=Duke"</b>
- *  in the following grant clause:
- *
- *  <pre>
- *    grant principal javax.security.auth.x500.X500Principal "cn=Duke" {
- *      permission BarPermission "... ${{self}} ...";
- *    };
- *  </pre>
- *
- *  If there is a comma-separated list of principals in the grant
- *  clause, then <b>${{self}}</b> will be replaced by the same
- *  comma-separated list or principals.
- *  In the case where both the principal class and name are
- *  wildcarded in the grant clause, <b>${{self}}</b> is replaced
- *  with all the principals associated with the <code>Subject</code>
- *  in the current <code>AccessControlContext</code>.
- *
- * <p> For PrivateCredentialPermissions, you can also use "<b>self</b>"
- * instead of "<b>${{self}}</b>". However the use of "<b>self</b>" is
- * deprecated in favour of "<b>${{self}}</b>".
- *
- * @see java.security.CodeSource
- * @see java.security.Permissions
- * @see java.security.ProtectionDomain
- */
-@SuppressWarnings("removal")
-public class PolicyFile extends java.security.Policy {
-
-    private static final Debug debug = Debug.getInstance("policy");
-
-    private static final String SELF = "${{self}}";
-    private static final String X500PRINCIPAL =
-                        "javax.security.auth.x500.X500Principal";
-    private static final String POLICY = "java.security.policy";
-    private static final String POLICY_URL = "policy.url.";
-
-    private static final int DEFAULT_CACHE_SIZE = 1;
-
-    // contains the policy grant entries, PD cache, and alias mapping
-    // can be updated if refresh() is called
-    private volatile PolicyInfo policyInfo;
-
-    private boolean expandProperties = true;
-    private boolean allowSystemProperties = true;
-    private boolean notUtf8 = false;
-    private URL url;
-
-    // for use with the reflection API
-    private static final Class<?>[] PARAMS0 = { };
-    private static final Class<?>[] PARAMS1 = { String.class };
-    private static final Class<?>[] PARAMS2 = { String.class, String.class };
-
-    /**
-     * When a policy file has a syntax error, the exception code may generate
-     * another permission check and this can cause the policy file to be parsed
-     * repeatedly, leading to a StackOverflowError or ClassCircularityError.
-     * To avoid this, this set is populated with policy files that have been
-     * previously parsed and have syntax errors, so that they can be
-     * subsequently ignored.
-     */
-    private static Set<URL> badPolicyURLs =
-        Collections.newSetFromMap(new ConcurrentHashMap<URL,Boolean>());
-
-    /**
-     * Use the platform's default file system to avoid recursive initialization
-     * issues when the VM is configured to use a custom file system provider.
-     */
-    private static final java.nio.file.FileSystem builtInFS =
-        DefaultFileSystemProvider.theFileSystem();
-
-    /**
-     * Initializes the Policy object and reads the default policy
-     * configuration file(s) into the Policy object.
-     */
-    public PolicyFile() {
-        init((URL)null);
-    }
-
-    /**
-     * Initializes the Policy object and reads the default policy
-     * from the specified URL only.
-     */
-    public PolicyFile(URL url) {
-        this.url = url;
-        init(url);
-    }
-
-    /**
-     * Initializes the Policy object and reads the default policy
-     * configuration file(s) into the Policy object.
-     *
-     * See the class description for details on the algorithm used to
-     * initialize the Policy object.
-     */
-    private void init(URL url) {
-        // Properties are set once for each init(); ignore changes
-        // between diff invocations of initPolicyFile(policy, url, info).
-        String numCacheStr =
-          AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public String run() {
-                expandProperties = "true".equalsIgnoreCase
-                    (Security.getProperty("policy.expandProperties"));
-                allowSystemProperties = "true".equalsIgnoreCase
-                    (Security.getProperty("policy.allowSystemProperty"));
-                notUtf8 = "false".equalsIgnoreCase
-                    (System.getProperty("sun.security.policy.utf8"));
-                return System.getProperty("sun.security.policy.numcaches");
-            }});
-
-        int numCaches;
-        if (numCacheStr != null) {
-            try {
-                numCaches = Integer.parseInt(numCacheStr);
-            } catch (NumberFormatException e) {
-                numCaches = DEFAULT_CACHE_SIZE;
-            }
-        } else {
-            numCaches = DEFAULT_CACHE_SIZE;
-        }
-        PolicyInfo newInfo = new PolicyInfo(numCaches);
-        initPolicyFile(newInfo, url);
-        policyInfo = newInfo;
-    }
-
-    private void initPolicyFile(final PolicyInfo newInfo, final URL url) {
-
-        // always load default.policy
-        AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Void run() {
-                initDefaultPolicy(newInfo);
-                return null;
-            }
-        });
-
-        if (url != null) {
-
-            /**
-             * If the caller specified a URL via Policy.getInstance,
-             * we only read from default.policy and that URL.
-             */
-
-            if (debug != null) {
-                debug.println("reading " + url);
-            }
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-                @Override
-                public Void run() {
-                    if (init(url, newInfo) == false) {
-                        // use static policy if all else fails
-                        initStaticPolicy(newInfo);
-                    }
-                    return null;
-                }
-            });
-
-        } else {
-
-            /**
-             * Caller did not specify URL via Policy.getInstance.
-             * Read from URLs listed in the java.security properties file.
-             */
-
-            boolean loaded_one = initPolicyFile(POLICY, POLICY_URL, newInfo);
-            // To maintain strict backward compatibility
-            // we load the static policy only if POLICY load failed
-            if (!loaded_one) {
-                // use static policy if all else fails
-                initStaticPolicy(newInfo);
-            }
-        }
-    }
-
-    private boolean initPolicyFile(final String propname, final String urlname,
-                                   final PolicyInfo newInfo) {
-        boolean loadedPolicy =
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Boolean run() {
-                boolean loaded_policy = false;
-
-                if (allowSystemProperties) {
-                    String extra_policy = System.getProperty(propname);
-                    if (extra_policy != null) {
-                        boolean overrideAll = false;
-                        if (extra_policy.startsWith("=")) {
-                            overrideAll = true;
-                            extra_policy = extra_policy.substring(1);
-                        }
-                        try {
-                            extra_policy =
-                                PropertyExpander.expand(extra_policy);
-                            URL policyURL;
-
-                            File policyFile = new File(extra_policy);
-                            if (policyFile.exists()) {
-                                policyURL = ParseUtil.fileToEncodedURL
-                                    (new File(policyFile.getCanonicalPath()));
-                            } else {
-                                policyURL = newURL(extra_policy);
-                            }
-                            if (debug != null) {
-                                debug.println("reading "+policyURL);
-                            }
-                            if (init(policyURL, newInfo)) {
-                                loaded_policy = true;
-                            }
-                        } catch (Exception e) {
-                            // ignore.
-                            if (debug != null) {
-                                debug.println("caught exception: "+e);
-                            }
-                        }
-                        if (overrideAll) {
-                            if (debug != null) {
-                                debug.println("overriding other policies!");
-                            }
-                            return Boolean.valueOf(loaded_policy);
-                        }
-                    }
-                }
-
-                int n = 1;
-                String policy_uri;
-
-                while ((policy_uri = Security.getProperty(urlname+n)) != null) {
-                    try {
-                        URL policy_url = null;
-                        String expanded_uri = PropertyExpander.expand
-                                (policy_uri).replace(File.separatorChar, '/');
-
-                        if (policy_uri.startsWith("file:${java.home}/") ||
-                            policy_uri.startsWith("file:${user.home}/")) {
-
-                            // this special case accommodates
-                            // the situation java.home/user.home
-                            // expand to a single slash, resulting in
-                            // a file://foo URI
-                            policy_url = new File
-                                (expanded_uri.substring(5)).toURI().toURL();
-                        } else {
-                            policy_url = new URI(expanded_uri).toURL();
-                        }
-
-                        if (debug != null) {
-                            debug.println("reading " + policy_url);
-                        }
-                        if (init(policy_url, newInfo)) {
-                            loaded_policy = true;
-                        }
-                    } catch (Exception e) {
-                        if (debug != null) {
-                            debug.println(
-                                "Debug info only. Error reading policy " +e);
-                            e.printStackTrace();
-                        }
-                        // ignore that policy
-                    }
-                    n++;
-                }
-                return Boolean.valueOf(loaded_policy);
-            }
-        });
-
-        return loadedPolicy;
-    }
-
-    private void initDefaultPolicy(PolicyInfo newInfo) {
-        Path defaultPolicy = builtInFS.getPath(StaticProperty.javaHome(),
-                                     "lib",
-                                     "security",
-                                     "default.policy");
-        if (debug != null) {
-            debug.println("reading " + defaultPolicy);
-        }
-        try (BufferedReader br = Files.newBufferedReader(defaultPolicy)) {
-
-            PolicyParser pp = new PolicyParser(expandProperties);
-            pp.read(br);
-
-            Enumeration<PolicyParser.GrantEntry> enum_ = pp.grantElements();
-            while (enum_.hasMoreElements()) {
-                PolicyParser.GrantEntry ge = enum_.nextElement();
-                addGrantEntry(ge, null, newInfo);
-            }
-        } catch (Exception e) {
-            throw new InternalError("Failed to load default.policy", e);
-        }
-    }
-
-    /**
-     * Reads a policy configuration into the Policy object using a
-     * Reader object.
-     */
-    private boolean init(URL policy, PolicyInfo newInfo) {
-
-        // skip parsing policy file if it has been previously parsed and
-        // has syntax errors
-        if (badPolicyURLs.contains(policy)) {
-            if (debug != null) {
-                debug.println("skipping bad policy file: " + policy);
-            }
-            return false;
-        }
-
-        try (InputStreamReader isr =
-                 getInputStreamReader(PolicyUtil.getInputStream(policy))) {
-
-            PolicyParser pp = new PolicyParser(expandProperties);
-            pp.read(isr);
-
-            KeyStore keyStore = null;
-            try {
-                keyStore = PolicyUtil.getKeyStore
-                                (policy,
-                                pp.getKeyStoreUrl(),
-                                pp.getKeyStoreType(),
-                                pp.getKeyStoreProvider(),
-                                pp.getStorePassURL(),
-                                debug);
-            } catch (Exception e) {
-                // ignore, treat it like we have no keystore
-                if (debug != null) {
-                    debug.println("Debug info only. Ignoring exception.");
-                    e.printStackTrace();
-                }
-            }
-
-            Enumeration<PolicyParser.GrantEntry> enum_ = pp.grantElements();
-            while (enum_.hasMoreElements()) {
-                PolicyParser.GrantEntry ge = enum_.nextElement();
-                addGrantEntry(ge, keyStore, newInfo);
-            }
-            return true;
-        } catch (PolicyParser.ParsingException pe) {
-            // record bad policy file to avoid later reparsing it
-            badPolicyURLs.add(policy);
-            Object[] source = {policy, pe.getNonlocalizedMessage()};
-            System.err.println(LocalizedMessage.getNonlocalized
-                (POLICY + ".error.parsing.policy.message", source));
-            if (debug != null) {
-                pe.printStackTrace();
-            }
-        } catch (Exception e) {
-            if (debug != null) {
-                debug.println("error parsing "+policy);
-                debug.println(e.toString());
-                e.printStackTrace();
-            }
-        }
-
-        return false;
-    }
-
-    private InputStreamReader getInputStreamReader(InputStream is) {
-        /*
-         * Read in policy using UTF-8 by default.
-         *
-         * Check non-standard system property to see if the default encoding
-         * should be used instead.
-         */
-        return (notUtf8)
-            ? new InputStreamReader(is)
-            : new InputStreamReader(is, UTF_8);
-    }
-
-    private void initStaticPolicy(final PolicyInfo newInfo) {
-        if (debug != null) {
-            debug.println("Initializing with static permissions");
-        }
-        AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Void run() {
-                PolicyEntry pe = new PolicyEntry(new CodeSource(null,
-                    (Certificate[]) null));
-                pe.add(SecurityConstants.LOCAL_LISTEN_PERMISSION);
-                pe.add(new PropertyPermission("java.version",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.vendor",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.vendor.url",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.class.version",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("os.name",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("os.version",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("os.arch",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("file.separator",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("path.separator",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("line.separator",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.specification.version",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.specification.maintenance.version",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.specification.vendor",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.specification.name",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.vm.specification.version",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.vm.specification.vendor",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission
-                                ("java.vm.specification.name",
-                                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.vm.version",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.vm.vendor",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-                pe.add(new PropertyPermission("java.vm.name",
-                    SecurityConstants.PROPERTY_READ_ACTION));
-
-                // No need to sync because no one has access to newInfo yet
-                newInfo.policyEntries.add(pe);
-
-                return null;
-            }
-        });
-    }
-
-    /**
-     * Given a GrantEntry, create a codeSource.
-     *
-     * @return null if signedBy alias is not recognized
-     */
-    private CodeSource getCodeSource(PolicyParser.GrantEntry ge, KeyStore keyStore,
-        PolicyInfo newInfo) throws java.net.MalformedURLException
-    {
-        Certificate[] certs = null;
-        if (ge.signedBy != null) {
-            certs = getCertificates(keyStore, ge.signedBy, newInfo);
-            if (certs == null) {
-                // we don't have a key for this alias,
-                // just return
-                if (debug != null) {
-                    debug.println("  -- No certs for alias '" +
-                                       ge.signedBy + "' - ignoring entry");
-                }
-                return null;
-            }
-        }
-
-        URL location;
-
-        if (ge.codeBase != null)
-            location = newURL(ge.codeBase);
-        else
-            location = null;
-
-        return (canonicalizeCodebase(new CodeSource(location, certs),false));
-    }
-
-    /**
-     * Add one policy entry to the list.
-     */
-    private void addGrantEntry(PolicyParser.GrantEntry ge,
-                               KeyStore keyStore, PolicyInfo newInfo) {
-
-        if (debug != null) {
-            debug.println("Adding policy entry: ");
-            debug.println("  signedBy " + ge.signedBy);
-            debug.println("  codeBase " + ge.codeBase);
-            if (ge.principals != null) {
-                for (PolicyParser.PrincipalEntry pppe : ge.principals) {
-                    debug.println("  " + pppe.toString());
-                }
-            }
-        }
-
-        try {
-            CodeSource codesource = getCodeSource(ge, keyStore, newInfo);
-            // skip if signedBy alias was unknown...
-            if (codesource == null) return;
-
-            // perform keystore alias principal replacement.
-            // for example, if alias resolves to X509 certificate,
-            // replace principal with:  <X500Principal class>  <SubjectDN>
-            // -- skip if alias is unknown
-            if (replacePrincipals(ge.principals, keyStore) == false)
-                return;
-            PolicyEntry entry = new PolicyEntry(codesource, ge.principals);
-            Enumeration<PolicyParser.PermissionEntry> enum_ =
-                                                ge.permissionElements();
-            while (enum_.hasMoreElements()) {
-                PolicyParser.PermissionEntry pe = enum_.nextElement();
-
-                try {
-                    // perform ${{ ... }} expansions within permission name
-                    expandPermissionName(pe, keyStore);
-
-                    // XXX special case PrivateCredentialPermission-SELF
-                    Permission perm;
-                    if (pe.permission.equals
-                        ("javax.security.auth.PrivateCredentialPermission") &&
-                        pe.name.endsWith(" self")) {
-                        pe.name = pe.name.substring(0, pe.name.indexOf("self"))
-                                + SELF;
-                    }
-                    // check for self
-                    if (pe.name != null && pe.name.contains(SELF)) {
-                        // Create a "SelfPermission" , it could be an
-                        // an unresolved permission which will be resolved
-                        // when implies is called
-                        // Add it to entry
-                        Certificate[] certs;
-                        if (pe.signedBy != null) {
-                            certs = getCertificates(keyStore,
-                                                    pe.signedBy,
-                                                    newInfo);
-                        } else {
-                            certs = null;
-                        }
-                        perm = new SelfPermission(pe.permission,
-                                                  pe.name,
-                                                  pe.action,
-                                                  certs);
-                    } else {
-                        perm = getInstance(pe.permission,
-                                           pe.name,
-                                           pe.action);
-                    }
-                    entry.add(perm);
-                    if (debug != null) {
-                        debug.println("  "+perm);
-                    }
-                } catch (ClassNotFoundException cnfe) {
-                    Certificate[] certs;
-                    if (pe.signedBy != null) {
-                        certs = getCertificates(keyStore,
-                                                pe.signedBy,
-                                                newInfo);
-                    } else {
-                        certs = null;
-                    }
-
-                    // only add if we had no signer or we had
-                    // a signer and found the keys for it.
-                    if (certs != null || pe.signedBy == null) {
-                        Permission perm = new UnresolvedPermission(
-                                                  pe.permission,
-                                                  pe.name,
-                                                  pe.action,
-                                                  certs);
-                        entry.add(perm);
-                        if (debug != null) {
-                            debug.println("  "+perm);
-                        }
-                    }
-                } catch (java.lang.reflect.InvocationTargetException ite) {
-                    Object[] source = {pe.permission,
-                                       ite.getCause().toString()};
-                    System.err.println(
-                        LocalizedMessage.getNonlocalized(
-                            POLICY + ".error.adding.Permission.perm.message",
-                            source));
-                } catch (Exception e) {
-                    Object[] source = {pe.permission,
-                                       e.toString()};
-                    System.err.println(
-                        LocalizedMessage.getNonlocalized(
-                            POLICY + ".error.adding.Permission.perm.message",
-                            source));
-                }
-            }
-
-            // No need to sync because no one has access to newInfo yet
-            newInfo.policyEntries.add(entry);
-        } catch (Exception e) {
-            Object[] source = {e.toString()};
-            System.err.println(
-                LocalizedMessage.getNonlocalized(
-                    POLICY + ".error.adding.Entry.message",
-                    source));
-        }
-        if (debug != null)
-            debug.println();
-    }
-
-    /**
-     * Returns a new Permission object of the given Type. The Permission is
-     * created by getting the
-     * Class object using the <code>Class.forName</code> method, and using
-     * the reflection API to invoke the (String name, String actions)
-     * constructor on the
-     * object.
-     *
-     * @param type the type of Permission being created.
-     * @param name the name of the Permission being created.
-     * @param actions the actions of the Permission being created.
-     *
-     * @exception  ClassNotFoundException  if the particular Permission
-     *             class could not be found.
-     *
-     * @exception  IllegalAccessException  if the class or initializer is
-     *               not accessible.
-     *
-     * @exception  InstantiationException  if getInstance tries to
-     *               instantiate an abstract class or an interface, or if the
-     *               instantiation fails for some other reason.
-     *
-     * @exception  NoSuchMethodException if the (String, String) constructor
-     *               is not found.
-     *
-     * @exception  InvocationTargetException if the underlying Permission
-     *               constructor throws an exception.
-     *
-     */
-
-    private static final Permission getInstance(String type,
-                                    String name,
-                                    String actions)
-        throws ClassNotFoundException,
-               InstantiationException,
-               IllegalAccessException,
-               NoSuchMethodException,
-               InvocationTargetException
-    {
-        Class<?> pc = Class.forName(type, false, null);
-        Permission answer = getKnownPermission(pc, name, actions);
-        if (answer != null) {
-            return answer;
-        }
-        if (!Permission.class.isAssignableFrom(pc)) {
-            // not the right subtype
-            throw new ClassCastException(type + " is not a Permission");
-        }
-
-        if (name == null && actions == null) {
-            try {
-                Constructor<?> c = pc.getConstructor(PARAMS0);
-                return (Permission) c.newInstance(new Object[] {});
-            } catch (NoSuchMethodException ne) {
-                try {
-                    Constructor<?> c = pc.getConstructor(PARAMS1);
-                    return (Permission) c.newInstance(
-                              new Object[] { name});
-                } catch (NoSuchMethodException ne1 ) {
-                    Constructor<?> c = pc.getConstructor(PARAMS2);
-                    return (Permission) c.newInstance(
-                        new Object[] { name, actions });
-                }
-            }
-        } else {
-            if (name != null && actions == null) {
-                try {
-                    Constructor<?> c = pc.getConstructor(PARAMS1);
-                    return (Permission) c.newInstance(new Object[] { name});
-                } catch (NoSuchMethodException ne) {
-                    Constructor<?> c = pc.getConstructor(PARAMS2);
-                    return (Permission) c.newInstance(
-                          new Object[] { name, actions });
-                }
-            } else {
-                Constructor<?> c = pc.getConstructor(PARAMS2);
-                return (Permission) c.newInstance(
-                      new Object[] { name, actions });
-             }
-        }
-    }
-
-    /**
-     * Creates one of the well-known permissions in the java.base module
-     * directly instead of via reflection. Keep list short to not penalize
-     * permissions from other modules.
-     */
-    private static Permission getKnownPermission(Class<?> claz, String name,
-                                                 String actions) {
-        if (claz.equals(FilePermission.class)) {
-            return new FilePermission(name, actions);
-        } else if (claz.equals(SocketPermission.class)) {
-            return new SocketPermission(name, actions);
-        } else if (claz.equals(RuntimePermission.class)) {
-            return new RuntimePermission(name, actions);
-        } else if (claz.equals(PropertyPermission.class)) {
-            return new PropertyPermission(name, actions);
-        } else if (claz.equals(NetPermission.class)) {
-            return new NetPermission(name, actions);
-        } else if (claz.equals(AllPermission.class)) {
-            return SecurityConstants.ALL_PERMISSION;
-        } else if (claz.equals(SecurityPermission.class)) {
-            return new SecurityPermission(name, actions);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Creates one of the well-known principals in the java.base module
-     * directly instead of via reflection. Keep list short to not penalize
-     * principals from other modules.
-     */
-    private static Principal getKnownPrincipal(Class<?> claz, String name) {
-        if (claz.equals(X500Principal.class)) {
-            return new X500Principal(name);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Fetch all certs associated with this alias.
-     */
-    private Certificate[] getCertificates
-                (KeyStore keyStore, String aliases, PolicyInfo newInfo) {
-
-        List<Certificate> vcerts = null;
-
-        StringTokenizer st = new StringTokenizer(aliases, ",");
-        int n = 0;
-
-        while (st.hasMoreTokens()) {
-            String alias = st.nextToken().trim();
-            n++;
-            Certificate cert = null;
-            // See if this alias's cert has already been cached
-            synchronized (newInfo.aliasMapping) {
-                cert = (Certificate)newInfo.aliasMapping.get(alias);
-
-                if (cert == null && keyStore != null) {
-
-                    try {
-                        cert = keyStore.getCertificate(alias);
-                    } catch (KeyStoreException kse) {
-                        // never happens, because keystore has already been loaded
-                        // when we call this
-                    }
-                    if (cert != null) {
-                        newInfo.aliasMapping.put(alias, cert);
-                        newInfo.aliasMapping.put(cert, alias);
-                    }
-                }
-            }
-
-            if (cert != null) {
-                if (vcerts == null)
-                    vcerts = new ArrayList<>();
-                vcerts.add(cert);
-            }
-        }
-
-        // make sure n == vcerts.size, since we are doing a logical *and*
-        if (vcerts != null && n == vcerts.size()) {
-            Certificate[] certs = new Certificate[vcerts.size()];
-            vcerts.toArray(certs);
-            return certs;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Refreshes the policy object by re-reading all the policy files.
-     */
-    @Override public void refresh() {
-        init(url);
-    }
-
-    /**
-     * Evaluates the global policy for the permissions granted to
-     * the ProtectionDomain and tests whether the permission is
-     * granted.
-     *
-     * @param pd the ProtectionDomain to test
-     * @param p the Permission object to be tested for implication.
-     *
-     * @return true if "permission" is a proper subset of a permission
-     * granted to this ProtectionDomain.
-     *
-     * @see java.security.ProtectionDomain
-     */
-    @Override
-    public boolean implies(ProtectionDomain pd, Permission p) {
-        ProtectionDomainCache pdMap = policyInfo.getPdMapping();
-        PermissionCollection pc = pdMap.get(pd);
-
-        if (pc != null) {
-            return pc.implies(p);
-        }
-
-        pc = getPermissions(pd);
-        if (pc == null) {
-            return false;
-        }
-
-        // cache mapping of protection domain to its PermissionCollection
-        pdMap.put(pd, pc);
-        return pc.implies(p);
-    }
-
-    /**
-     * Examines this <code>Policy</code> and returns the permissions granted
-     * to the specified <code>ProtectionDomain</code>.  This includes
-     * the permissions currently associated with the domain as well
-     * as the policy permissions granted to the domain's
-     * CodeSource, ClassLoader, and Principals.
-     *
-     * <p> Note that this <code>Policy</code> implementation has
-     * special handling for PrivateCredentialPermissions.
-     * When this method encounters a <code>PrivateCredentialPermission</code>
-     * which specifies "self" as the <code>Principal</code> class and name,
-     * it does not add that <code>Permission</code> to the returned
-     * <code>PermissionCollection</code>.  Instead, it builds
-     * a new <code>PrivateCredentialPermission</code>
-     * for each <code>Principal</code> associated with the provided
-     * <code>Subject</code>.  Each new <code>PrivateCredentialPermission</code>
-     * contains the same Credential class as specified in the
-     * originally granted permission, as well as the Class and name
-     * for the respective <code>Principal</code>.
-     *
-     * @param domain the Permissions granted to this
-     *          <code>ProtectionDomain</code> are returned.
-     *
-     * @return the Permissions granted to the provided
-     *          <code>ProtectionDomain</code>.
-     */
-    @Override
-    public PermissionCollection getPermissions(ProtectionDomain domain) {
-        Permissions perms = new Permissions();
-
-        if (domain == null)
-           return perms;
-
-        // first get policy perms
-        getPermissions(perms, domain);
-
-        // add static perms
-        //      - adding static perms after policy perms is necessary
-        //        to avoid a regression for 4301064
-        PermissionCollection pc = domain.getPermissions();
-        if (pc != null) {
-            synchronized (pc) {
-                Enumeration<Permission> e = pc.elements();
-                while (e.hasMoreElements()) {
-                    perms.add(FilePermCompat.newPermPlusAltPath(e.nextElement()));
-                }
-            }
-        }
-
-        return perms;
-    }
-
-    /**
-     * Examines this Policy and creates a PermissionCollection object with
-     * the set of permissions for the specified CodeSource.
-     *
-     * @param codesource the CodeSource associated with the caller.
-     * This encapsulates the original location of the code (where the code
-     * came from) and the public key(s) of its signer.
-     *
-     * @return the set of permissions according to the policy.
-     */
-    @Override
-    public PermissionCollection getPermissions(CodeSource codesource) {
-        return getPermissions(new Permissions(), codesource);
-    }
-
-    /**
-     * Examines the global policy and returns the provided Permissions
-     * object with additional permissions granted to the specified
-     * ProtectionDomain.
-     *
-     * @param perms the Permissions to populate
-     * @param pd the ProtectionDomain associated with the caller.
-     *
-     * @return the set of Permissions according to the policy.
-     */
-    private PermissionCollection getPermissions(Permissions perms,
-                                        ProtectionDomain pd ) {
-        if (debug != null) {
-            debug.println("getPermissions:\n\t" + printPD(pd));
-        }
-
-        final CodeSource cs = pd.getCodeSource();
-        if (cs == null)
-            return perms;
-
-        CodeSource canonCodeSource = AccessController.doPrivileged(
-            new java.security.PrivilegedAction<>(){
-                @Override
-                public CodeSource run() {
-                    return canonicalizeCodebase(cs, true);
-                }
-            });
-        return getPermissions(perms, canonCodeSource, pd.getPrincipals());
-    }
-
-    /**
-     * Examines the global policy and returns the provided Permissions
-     * object with additional permissions granted to the specified
-     * CodeSource.
-     *
-     * @param perms the permissions to populate
-     * @param cs the codesource associated with the caller.
-     * This encapsulates the original location of the code (where the code
-     * came from) and the public key(s) of its signer.
-     *
-     * @return the set of permissions according to the policy.
-     */
-    private PermissionCollection getPermissions(Permissions perms,
-                                                final CodeSource cs) {
-
-        if (cs == null)
-            return perms;
-
-        CodeSource canonCodeSource = AccessController.doPrivileged(
-            new PrivilegedAction<>(){
-                @Override
-                public CodeSource run() {
-                    return canonicalizeCodebase(cs, true);
-                }
-            });
-
-        return getPermissions(perms, canonCodeSource, null);
-    }
-
-    private Permissions getPermissions(Permissions perms,
-                                       final CodeSource cs,
-                                       Principal[] principals) {
-        for (PolicyEntry entry : policyInfo.policyEntries) {
-            addPermissions(perms, cs, principals, entry);
-        }
-
-        return perms;
-    }
-
-    private void addPermissions(Permissions perms,
-        final CodeSource cs,
-        Principal[] principals,
-        final PolicyEntry entry) {
-
-        if (debug != null) {
-            debug.println("evaluate codesources:\n" +
-                "\tPolicy CodeSource: " + entry.getCodeSource() + "\n" +
-                "\tActive CodeSource: " + cs);
-        }
-
-        // check to see if the CodeSource implies
-        Boolean imp = AccessController.doPrivileged
-            (new PrivilegedAction<>() {
-            @Override
-            public Boolean run() {
-                return entry.getCodeSource().implies(cs);
-            }
-        });
-        if (!imp.booleanValue()) {
-            if (debug != null) {
-                debug.println("evaluation (codesource) failed");
-            }
-
-            // CodeSource does not imply - return and try next policy entry
-            return;
-        }
-
-        // check to see if the Principals imply
-
-        List<PolicyParser.PrincipalEntry> entryPs = entry.getPrincipals();
-        if (debug != null) {
-            List<PolicyParser.PrincipalEntry> accPs = new ArrayList<>();
-            if (principals != null) {
-                for (int i = 0; i < principals.length; i++) {
-                    accPs.add(new PolicyParser.PrincipalEntry
-                                        (principals[i].getClass().getName(),
-                                        principals[i].getName()));
-                }
-            }
-            debug.println("evaluate principals:\n" +
-                "\tPolicy Principals: " + entryPs + "\n" +
-                "\tActive Principals: " + accPs);
-        }
-
-        if (entryPs == null || entryPs.isEmpty()) {
-
-            // policy entry has no principals -
-            // add perms regardless of principals in current ACC
-
-            addPerms(perms, principals, entry);
-            if (debug != null) {
-                debug.println("evaluation (codesource/principals) passed");
-            }
-            return;
-
-        } else if (principals == null || principals.length == 0) {
-
-            // current thread has no principals but this policy entry
-            // has principals - perms are not added
-
-            if (debug != null) {
-                debug.println("evaluation (principals) failed");
-            }
-            return;
-        }
-
-        // current thread has principals and this policy entry
-        // has principals.  see if policy entry principals match
-        // principals in current ACC
-
-        for (PolicyParser.PrincipalEntry pppe : entryPs) {
-
-            // Check for wildcards
-            if (pppe.isWildcardClass()) {
-                // a wildcard class matches all principals in current ACC
-                continue;
-            }
-
-            if (pppe.isWildcardName()) {
-                // a wildcard name matches any principal with the same class
-                if (wildcardPrincipalNameImplies(pppe.principalClass,
-                                                 principals)) {
-                    continue;
-                }
-                if (debug != null) {
-                    debug.println("evaluation (principal name wildcard) failed");
-                }
-                // policy entry principal not in current ACC -
-                // immediately return and go to next policy entry
-                return;
-            }
-
-            Set<Principal> pSet = new HashSet<>(Arrays.asList(principals));
-            Subject subject = new Subject(true, pSet,
-                                          Collections.EMPTY_SET,
-                                          Collections.EMPTY_SET);
-            try {
-                ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                Class<?> pClass = Class.forName(pppe.principalClass, false, cl);
-                Principal p = getKnownPrincipal(pClass, pppe.principalName);
-                if (p == null) {
-                    if (!Principal.class.isAssignableFrom(pClass)) {
-                        // not the right subtype
-                        throw new ClassCastException(pppe.principalClass +
-                                                     " is not a Principal");
-                    }
-
-                    Constructor<?> c = pClass.getConstructor(PARAMS1);
-                    p = (Principal)c.newInstance(new Object[] {
-                                                 pppe.principalName });
-
-                }
-
-                if (debug != null) {
-                    debug.println("found Principal " + p.getClass().getName());
-                }
-
-                // check if the Principal implies the current
-                // thread's principals
-                if (!p.implies(subject)) {
-                    if (debug != null) {
-                        debug.println("evaluation (principal implies) failed");
-                    }
-
-                    // policy principal does not imply the current Subject -
-                    // immediately return and go to next policy entry
-                    return;
-                }
-            } catch (Exception e) {
-                // fall back to default principal comparison.
-                // see if policy entry principal is in current ACC
-
-                if (debug != null) {
-                    e.printStackTrace();
-                }
-
-                if (!pppe.implies(subject)) {
-                    if (debug != null) {
-                        debug.println("evaluation (default principal implies) failed");
-                    }
-
-                    // policy entry principal not in current ACC -
-                    // immediately return and go to next policy entry
-                    return;
-                }
-            }
-
-            // either the principal information matched,
-            // or the Principal.implies succeeded.
-            // continue loop and test the next policy principal
-        }
-
-        // all policy entry principals were found in the current ACC -
-        // grant the policy permissions
-
-        if (debug != null) {
-            debug.println("evaluation (codesource/principals) passed");
-        }
-        addPerms(perms, principals, entry);
-    }
-
-    /**
-     * Returns true if the array of principals contains at least one
-     * principal of the specified class.
-     */
-    private static boolean wildcardPrincipalNameImplies(String principalClass,
-                                                        Principal[] principals)
-    {
-        for (Principal p : principals) {
-            if (principalClass.equals(p.getClass().getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void addPerms(Permissions perms,
-                        Principal[] accPs,
-                        PolicyEntry entry) {
-        for (int i = 0; i < entry.permissions.size(); i++) {
-            Permission p = entry.permissions.get(i);
-            if (debug != null) {
-                debug.println("  granting " + p);
-            }
-
-            if (p instanceof SelfPermission) {
-                // handle "SELF" permissions
-                expandSelf((SelfPermission)p,
-                        entry.getPrincipals(),
-                        accPs,
-                        perms);
-            } else {
-                perms.add(FilePermCompat.newPermPlusAltPath(p));
-            }
-        }
-    }
-
-    /**
-     * @param sp the SelfPermission that needs to be expanded.
-     *
-     * @param entryPs list of principals for the Policy entry.
-     *
-     * @param pdp Principal array from the current ProtectionDomain.
-     *
-     * @param perms the PermissionCollection where the individual
-     *                  Permissions will be added after expansion.
-     */
-
-    private void expandSelf(SelfPermission sp,
-                            List<PolicyParser.PrincipalEntry> entryPs,
-                            Principal[] pdp,
-                            Permissions perms) {
-
-        if (entryPs == null || entryPs.isEmpty()) {
-            // No principals in the grant to substitute
-            if (debug != null) {
-                debug.println("Ignoring permission "
-                                + sp.getSelfType()
-                                + " with target name ("
-                                + sp.getSelfName() + ").  "
-                                + "No Principal(s) specified "
-                                + "in the grant clause.  "
-                                + "SELF-based target names are "
-                                + "only valid in the context "
-                                + "of a Principal-based grant entry."
-                             );
-            }
-            return;
-        }
-        int startIndex = 0;
-        int v;
-        StringBuilder sb = new StringBuilder();
-        while ((v = sp.getSelfName().indexOf(SELF, startIndex)) != -1) {
-
-            // add non-SELF string
-            sb.append(sp.getSelfName().substring(startIndex, v));
-
-            // expand SELF
-            Iterator<PolicyParser.PrincipalEntry> pli = entryPs.iterator();
-            while (pli.hasNext()) {
-                PolicyParser.PrincipalEntry pppe = pli.next();
-                String[][] principalInfo = getPrincipalInfo(pppe,pdp);
-                for (int i = 0; i < principalInfo.length; i++) {
-                    if (i != 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(principalInfo[i][0] + " " +
-                        "\"" + principalInfo[i][1] + "\"");
-                }
-                if (pli.hasNext()) {
-                    sb.append(", ");
-                }
-            }
-            startIndex = v + SELF.length();
-        }
-        // add remaining string (might be the entire string)
-        sb.append(sp.getSelfName().substring(startIndex));
-
-        if (debug != null) {
-            debug.println("  expanded:\n\t" + sp.getSelfName()
-                        + "\n  into:\n\t" + sb.toString());
-        }
-        try {
-            // first try to instantiate the permission
-            perms.add(FilePermCompat.newPermPlusAltPath(getInstance(sp.getSelfType(),
-                                  sb.toString(),
-                                  sp.getSelfActions())));
-        } catch (ClassNotFoundException cnfe) {
-            // ok, the permission is not in the bootclasspath.
-            // before we add an UnresolvedPermission, check to see
-            // whether this perm already belongs to the collection.
-            // if so, use that perm's ClassLoader to create a new
-            // one.
-            Class<?> pc = null;
-            synchronized (perms) {
-                Enumeration<Permission> e = perms.elements();
-                while (e.hasMoreElements()) {
-                    Permission pElement = e.nextElement();
-                    if (pElement.getClass().getName().equals(sp.getSelfType())) {
-                        pc = pElement.getClass();
-                        break;
-                    }
-                }
-            }
-            if (pc == null) {
-                // create an UnresolvedPermission
-                perms.add(new UnresolvedPermission(sp.getSelfType(),
-                                                        sb.toString(),
-                                                        sp.getSelfActions(),
-                                                        sp.getCerts()));
-            } else {
-                try {
-                    // we found an instantiated permission.
-                    // use its class loader to instantiate a new permission.
-                    Constructor<?> c;
-                    // name parameter can not be null
-                    if (sp.getSelfActions() == null) {
-                        try {
-                            c = pc.getConstructor(PARAMS1);
-                            perms.add((Permission)c.newInstance
-                                 (new Object[] {sb.toString()}));
-                        } catch (NoSuchMethodException ne) {
-                            c = pc.getConstructor(PARAMS2);
-                            perms.add((Permission)c.newInstance
-                                 (new Object[] {sb.toString(),
-                                                sp.getSelfActions() }));
-                        }
-                    } else {
-                        c = pc.getConstructor(PARAMS2);
-                        perms.add((Permission)c.newInstance
-                           (new Object[] {sb.toString(),
-                                          sp.getSelfActions()}));
-                    }
-                } catch (Exception nme) {
-                    if (debug != null) {
-                        debug.println("self entry expansion " +
-                        " instantiation failed: "
-                        +  nme.toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            if (debug != null) {
-                debug.println(e.toString());
-            }
-        }
-    }
-
-    /**
-     * return the principal class/name pair in the 2D array.
-     * array[x][y]:     x corresponds to the array length.
-     *                  if (y == 0), it's the principal class.
-     *                  if (y == 1), it's the principal name.
-     */
-    private String[][] getPrincipalInfo
-        (PolicyParser.PrincipalEntry pe, Principal[] pdp) {
-
-        // there are 3 possibilities:
-        // 1) the entry's Principal class and name are not wildcarded
-        // 2) the entry's Principal name is wildcarded only
-        // 3) the entry's Principal class and name are wildcarded
-
-        if (!pe.isWildcardClass() && !pe.isWildcardName()) {
-
-            // build an info array for the principal
-            // from the Policy entry
-            String[][] info = new String[1][2];
-            info[0][0] = pe.principalClass;
-            info[0][1] = pe.principalName;
-            return info;
-
-        } else if (!pe.isWildcardClass() && pe.isWildcardName()) {
-
-            // build an info array for every principal
-            // in the current domain which has a principal class
-            // that is equal to policy entry principal class name
-            List<Principal> plist = new ArrayList<>();
-            for (int i = 0; i < pdp.length; i++) {
-                if (pe.principalClass.equals(pdp[i].getClass().getName()))
-                    plist.add(pdp[i]);
-            }
-            String[][] info = new String[plist.size()][2];
-            int i = 0;
-            for (Principal p : plist) {
-                info[i][0] = p.getClass().getName();
-                info[i][1] = p.getName();
-                i++;
-            }
-            return info;
-
-        } else {
-
-            // build an info array for every
-            // one of the current Domain's principals
-
-            String[][] info = new String[pdp.length][2];
-
-            for (int i = 0; i < pdp.length; i++) {
-                info[i][0] = pdp[i].getClass().getName();
-                info[i][1] = pdp[i].getName();
-            }
-            return info;
-        }
-    }
-
-    /*
-     * Returns the signer certificates from the list of certificates
-     * associated with the given code source.
-     *
-     * The signer certificates are those certificates that were used
-     * to verify signed code originating from the codesource location.
-     *
-     * This method assumes that in the given code source, each signer
-     * certificate is followed by its supporting certificate chain
-     * (which may be empty), and that the signer certificate and its
-     * supporting certificate chain are ordered bottom-to-top
-     * (i.e., with the signer certificate first and the (root) certificate
-     * authority last).
-     */
-    protected Certificate[] getSignerCertificates(CodeSource cs) {
-        Certificate[] certs = null;
-        if ((certs = cs.getCertificates()) == null)
-            return null;
-        for (int i=0; i<certs.length; i++) {
-            if (!(certs[i] instanceof X509Certificate))
-                return cs.getCertificates();
-        }
-
-        // Do we have to do anything?
-        int i = 0;
-        int count = 0;
-        while (i < certs.length) {
-            count++;
-            while (((i+1) < certs.length)
-                   && ((X509Certificate)certs[i]).getIssuerX500Principal().equals(
-                           ((X509Certificate)certs[i+1]).getSubjectX500Principal())) {
-                i++;
-            }
-            i++;
-        }
-        if (count == certs.length)
-            // Done
-            return certs;
-
-        List<Certificate> userCertList = new ArrayList<>();
-        i = 0;
-        while (i < certs.length) {
-            userCertList.add(certs[i]);
-            while (((i+1) < certs.length)
-                   && ((X509Certificate)certs[i]).getIssuerX500Principal().equals(
-                           ((X509Certificate)certs[i+1]).getSubjectX500Principal())) {
-                i++;
-            }
-            i++;
-        }
-        Certificate[] userCerts = new Certificate[userCertList.size()];
-        userCertList.toArray(userCerts);
-        return userCerts;
-    }
-
-    private CodeSource canonicalizeCodebase(CodeSource cs,
-                                            boolean extractSignerCerts) {
-
-        String path = null;
-
-        CodeSource canonCs = cs;
-        URL u = cs.getLocation();
-        if (u != null) {
-            if (u.getProtocol().equals("jar")) {
-                // unwrap url embedded inside jar url
-                String spec = u.getFile();
-                int separator = spec.indexOf("!/");
-                if (separator != -1) {
-                    try {
-                        u = newURL(spec.substring(0, separator));
-                    } catch (MalformedURLException e) {
-                        // Fail silently. In this case, url stays what
-                        // it was above
-                    }
-                }
-            }
-            if (u.getProtocol().equals("file")) {
-                boolean isLocalFile = false;
-                String host = u.getHost();
-                isLocalFile = (host == null || host.isEmpty() ||
-                    host.equals("~") || host.equalsIgnoreCase("localhost"));
-
-                if (isLocalFile) {
-                    path = u.getFile().replace('/', File.separatorChar);
-                    path = ParseUtil.decode(path);
-                }
-            }
-        }
-
-        if (path != null) {
-            try {
-                URL csUrl = null;
-                path = canonPath(path);
-                csUrl = ParseUtil.fileToEncodedURL(new File(path));
-
-                if (extractSignerCerts) {
-                    canonCs = new CodeSource(csUrl,
-                                             getSignerCertificates(cs));
-                } else {
-                    canonCs = new CodeSource(csUrl,
-                                             cs.getCertificates());
-                }
-            } catch (IOException ioe) {
-                // leave codesource as it is, unless we have to extract its
-                // signer certificates
-                if (extractSignerCerts) {
-                    canonCs = new CodeSource(cs.getLocation(),
-                                             getSignerCertificates(cs));
-                }
-            }
-        } else {
-            if (extractSignerCerts) {
-                canonCs = new CodeSource(cs.getLocation(),
-                                         getSignerCertificates(cs));
-            }
-        }
-        return canonCs;
-    }
-
-    // Wrapper to return a canonical path that avoids calling getCanonicalPath()
-    // with paths that are intended to match all entries in the directory
-    private static String canonPath(String path) throws IOException {
-        if (path.endsWith("*")) {
-            path = path.substring(0, path.length()-1) + "-";
-            path = new File(path).getCanonicalPath();
-            return path.substring(0, path.length()-1) + "*";
-        } else {
-            return new File(path).getCanonicalPath();
-        }
-    }
-
-    private String printPD(ProtectionDomain pd) {
-        Principal[] principals = pd.getPrincipals();
-        String pals = "<no principals>";
-        if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
-            for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                              " \"" + principals[i].getName() +
-                              "\"");
-                if (i < principals.length-1)
-                    palBuf.append(", ");
-                else
-                    palBuf.append(")");
-            }
-            pals = palBuf.toString();
-        }
-        return "PD CodeSource: "
-                + pd.getCodeSource()
-                +"\n\t" + "PD ClassLoader: "
-                + pd.getClassLoader()
-                +"\n\t" + "PD Principals: "
-                + pals;
-    }
-
-    /**
-     * return true if no replacement was performed,
-     * or if replacement succeeded.
-     */
-    private boolean replacePrincipals(
-        List<PolicyParser.PrincipalEntry> principals, KeyStore keystore) {
-
-        if (principals == null || principals.isEmpty() || keystore == null)
-            return true;
-
-        for (PolicyParser.PrincipalEntry pppe : principals) {
-            if (pppe.isReplaceName()) {
-
-                // perform replacement
-                // (only X509 replacement is possible now)
-                String name;
-                if ((name = getDN(pppe.principalName, keystore)) == null) {
-                    return false;
-                }
-
-                if (debug != null) {
-                    debug.println("  Replacing \"" +
-                        pppe.principalName +
-                        "\" with " +
-                        X500PRINCIPAL + "/\"" +
-                        name +
-                        "\"");
-                }
-
-                pppe.principalClass = X500PRINCIPAL;
-                pppe.principalName = name;
-            }
-        }
-        // return true if no replacement was performed,
-        // or if replacement succeeded
-        return true;
-    }
-
-    private void expandPermissionName(PolicyParser.PermissionEntry pe,
-                                        KeyStore keystore) throws Exception {
-        // short cut the common case
-        if (pe.name == null || pe.name.indexOf("${{", 0) == -1) {
-            return;
-        }
-
-        int startIndex = 0;
-        int b, e;
-        StringBuilder sb = new StringBuilder();
-        while ((b = pe.name.indexOf("${{", startIndex)) != -1) {
-            e = pe.name.indexOf("}}", b);
-            if (e < 1) {
-                break;
-            }
-            sb.append(pe.name.substring(startIndex, b));
-
-            // get the value in ${{...}}
-            String value = pe.name.substring(b+3, e);
-
-            // parse up to the first ':'
-            int colonIndex;
-            String prefix = value;
-            String suffix;
-            if ((colonIndex = value.indexOf(':')) != -1) {
-                prefix = value.substring(0, colonIndex);
-            }
-
-            // handle different prefix possibilities
-            if (prefix.equalsIgnoreCase("self")) {
-                // do nothing - handled later
-                sb.append(pe.name.substring(b, e+2));
-                startIndex = e+2;
-                continue;
-            } else if (prefix.equalsIgnoreCase("alias")) {
-                // get the suffix and perform keystore alias replacement
-                if (colonIndex == -1) {
-                    Object[] source = {pe.name};
-                    throw new Exception(
-                        LocalizedMessage.getNonlocalized(
-                            "alias.name.not.provided.pe.name.",
-                            source));
-                }
-                suffix = value.substring(colonIndex+1);
-                if ((suffix = getDN(suffix, keystore)) == null) {
-                    Object[] source = {value.substring(colonIndex+1)};
-                    throw new Exception(
-                        LocalizedMessage.getNonlocalized(
-                            "unable.to.perform.substitution.on.alias.suffix",
-                            source));
-                }
-
-                sb.append(X500PRINCIPAL + " \"" + suffix + "\"");
-                startIndex = e+2;
-            } else {
-                Object[] source = {prefix};
-                throw new Exception(
-                    LocalizedMessage.getNonlocalized(
-                        "substitution.value.prefix.unsupported",
-                        source));
-            }
-        }
-
-        // copy the rest of the value
-        sb.append(pe.name.substring(startIndex));
-
-        // replace the name with expanded value
-        if (debug != null) {
-            debug.println("  Permission name expanded from:\n\t" +
-                        pe.name + "\nto\n\t" + sb.toString());
-        }
-        pe.name = sb.toString();
-    }
-
-    private String getDN(String alias, KeyStore keystore) {
-        Certificate cert = null;
-        try {
-            cert = keystore.getCertificate(alias);
-        } catch (Exception e) {
-            if (debug != null) {
-                debug.println("  Error retrieving certificate for '" +
-                                alias +
-                                "': " +
-                                e.toString());
-            }
-            return null;
-        }
-
-        if (!(cert instanceof X509Certificate x509Cert)) {
-            if (debug != null) {
-                debug.println("  -- No certificate for '" +
-                                alias +
-                                "' - ignoring entry");
-            }
-            return null;
-        } else {
-            // 4702543:  X500 names with an EmailAddress
-            // were encoded incorrectly.  create new
-            // X500Principal name with correct encoding
-
-            X500Principal p = new X500Principal
-                (x509Cert.getSubjectX500Principal().toString());
-            return p.getName();
-        }
-    }
-
-    /**
-     * Each entry in the policy configuration file is represented by a
-     * PolicyEntry object.  <p>
-     *
-     * A PolicyEntry is a (CodeSource,Permission) pair.  The
-     * CodeSource contains the (URL, PublicKey) that together identify
-     * where the Java bytecodes come from and who (if anyone) signed
-     * them.  The URL could refer to localhost.  The URL could also be
-     * null, meaning that this policy entry is given to all comers, as
-     * long as they match the signer field.  The signer could be null,
-     * meaning the code is not signed. <p>
-     *
-     * The Permission contains the (Type, Name, Action) triplet. <p>
-     *
-     * For now, the Policy object retrieves the public key from the
-     * X.509 certificate on disk that corresponds to the signedBy
-     * alias specified in the Policy config file.  For reasons of
-     * efficiency, the Policy object keeps a hashtable of certs already
-     * read in.  This could be replaced by a secure internal key
-     * store.
-     *
-     * <p>
-     * For example, the entry
-     * <pre>
-     *          permission java.io.File "/tmp", "read,write",
-     *          signedBy "Duke";
-     * </pre>
-     * is represented internally
-     * <pre>
-     *
-     * FilePermission f = new FilePermission("/tmp", "read,write");
-     * PublicKey p = publickeys.get("Duke");
-     * URL u = InetAddress.getLocalHost();
-     * CodeBase c = new CodeBase( p, u );
-     * pe = new PolicyEntry(f, c);
-     * </pre>
-     *
-     * @author Marianne Mueller
-     * @author Roland Schemers
-     * @see java.security.CodeSource
-     * @see java.security.Policy
-     * @see java.security.Permissions
-     * @see java.security.ProtectionDomain
-     */
-    private static class PolicyEntry {
-
-        private final CodeSource codesource;
-        final List<Permission> permissions;
-        private final List<PolicyParser.PrincipalEntry> principals;
-
-        /**
-         * Given a Permission and a CodeSource, create a policy entry.
-         *
-         * XXX Decide if/how to add validity fields and "purpose" fields to
-         * XXX policy entries
-         *
-         * @param cs the CodeSource, which encapsulates the URL and the
-         *        public key
-         *        attributes from the policy config file. Validity checks
-         *        are performed on the public key before PolicyEntry is
-         *        called.
-         *
-         */
-        PolicyEntry(CodeSource cs, List<PolicyParser.PrincipalEntry> principals)
-        {
-            this.codesource = cs;
-            this.permissions = new ArrayList<Permission>();
-            this.principals = principals; // can be null
-        }
-
-        PolicyEntry(CodeSource cs)
-        {
-            this(cs, null);
-        }
-
-        List<PolicyParser.PrincipalEntry> getPrincipals() {
-            return principals; // can be null
-        }
-
-        /**
-         * add a Permission object to this entry.
-         * No need to sync add op because perms are added to entry only
-         * while entry is being initialized
-         */
-        void add(Permission p) {
-            permissions.add(p);
-        }
-
-        /**
-         * Return the CodeSource for this policy entry
-         */
-        CodeSource getCodeSource() {
-            return codesource;
-        }
-
-        @Override public String toString(){
-            StringBuilder sb = new StringBuilder();
-            sb.append(ResourcesMgr.getString("LPARAM"));
-            sb.append(getCodeSource());
-            sb.append("\n");
-            for (int j = 0; j < permissions.size(); j++) {
-                Permission p = permissions.get(j);
-                sb.append(ResourcesMgr.getString("SPACE"));
-                sb.append(ResourcesMgr.getString("SPACE"));
-                sb.append(p);
-                sb.append(ResourcesMgr.getString("NEWLINE"));
-            }
-            sb.append(ResourcesMgr.getString("RPARAM"));
-            sb.append(ResourcesMgr.getString("NEWLINE"));
-            return sb.toString();
-        }
-    }
-
-    private static class SelfPermission extends Permission {
-
-        @java.io.Serial
-        private static final long serialVersionUID = -8315562579967246806L;
-
-        /**
-         * The class name of the Permission class that will be
-         * created when this self permission is expanded .
-         *
-         * @serial
-         */
-        private String type;
-
-        /**
-         * The permission name.
-         *
-         * @serial
-         */
-        private String name;
-
-        /**
-         * The actions of the permission.
-         *
-         * @serial
-         */
-        private String actions;
-
-        /**
-         * The certs of the permission.
-         *
-         * @serial
-         */
-        private Certificate[] certs;
-
-        /**
-         * Creates a new SelfPermission containing the permission
-         * information needed later to expand the self
-         * @param type the class name of the Permission class that will be
-         * created when this permission is expanded and if necessary resolved.
-         * @param name the name of the permission.
-         * @param actions the actions of the permission.
-         * @param certs the certificates the permission's class was signed with.
-         * This is a list of certificate chains, where each chain is composed of
-         * a signer certificate and optionally its supporting certificate chain.
-         * Each chain is ordered bottom-to-top (i.e., with the signer
-         * certificate first and the (root) certificate authority last).
-         */
-        public SelfPermission(String type, String name, String actions,
-                              Certificate[] certs)
-        {
-            super(type);
-            if (type == null) {
-                throw new NullPointerException
-                    (LocalizedMessage.getNonlocalized("type.can.t.be.null"));
-            }
-            this.type = type;
-            this.name = name;
-            this.actions = actions;
-            if (certs != null) {
-                // Extract the signer certs from the list of certificates.
-                for (int i=0; i<certs.length; i++) {
-                    if (!(certs[i] instanceof X509Certificate)) {
-                        // there is no concept of signer certs, so we store the
-                        // entire cert array
-                        this.certs = certs.clone();
-                        break;
-                    }
-                }
-
-                if (this.certs == null) {
-                    // Go through the list of certs and see if all the certs are
-                    // signer certs.
-                    int i = 0;
-                    int count = 0;
-                    while (i < certs.length) {
-                        count++;
-                        while (((i+1) < certs.length) &&
-                            ((X509Certificate)certs[i]).getIssuerX500Principal().equals(
-                            ((X509Certificate)certs[i+1]).getSubjectX500Principal())) {
-                            i++;
-                        }
-                        i++;
-                    }
-                    if (count == certs.length) {
-                        // All the certs are signer certs, so we store the
-                        // entire array
-                        this.certs = certs.clone();
-                    }
-
-                    if (this.certs == null) {
-                        // extract the signer certs
-                        List<Certificate> signerCerts = new ArrayList<>();
-                        i = 0;
-                        while (i < certs.length) {
-                            signerCerts.add(certs[i]);
-                            while (((i+1) < certs.length) &&
-                                ((X509Certificate)certs[i]).getIssuerX500Principal().equals(
-                                ((X509Certificate)certs[i+1]).getSubjectX500Principal())) {
-                                i++;
-                            }
-                            i++;
-                        }
-                        this.certs = new Certificate[signerCerts.size()];
-                        signerCerts.toArray(this.certs);
-                    }
-                }
-            }
-        }
-
-        /**
-         * This method always returns false for SelfPermission permissions.
-         * That is, an SelfPermission never considered to
-         * imply another permission.
-         *
-         * @param p the permission to check against.
-         *
-         * @return false.
-         */
-        @Override public boolean implies(Permission p) {
-            return false;
-        }
-
-        /**
-         * Checks two SelfPermission objects for equality.
-         *
-         * Checks that <i>obj</i> is an SelfPermission, and has
-         * the same type (class) name, permission name, actions, and
-         * certificates as this object.
-         *
-         * @param obj the object we are testing for equality with this object.
-         *
-         * @return true if obj is an SelfPermission, and has the same
-         * type (class) name, permission name, actions, and
-         * certificates as this object.
-         */
-        @Override public boolean equals(Object obj) {
-            if (obj == this)
-                return true;
-
-            if (! (obj instanceof SelfPermission))
-                return false;
-            SelfPermission that = (SelfPermission) obj;
-
-            if (!(this.type.equals(that.type) &&
-                this.name.equals(that.name) &&
-                this.actions.equals(that.actions)))
-                return false;
-
-            if ((this.certs == null) && (that.certs == null)) {
-                return true;
-            }
-
-            if ((this.certs == null) || (that.certs == null)) {
-                return false;
-            }
-
-            if (this.certs.length != that.certs.length) {
-                return false;
-            }
-
-            int i,j;
-            boolean match;
-
-            for (i = 0; i < this.certs.length; i++) {
-                match = false;
-                for (j = 0; j < that.certs.length; j++) {
-                    if (this.certs[i].equals(that.certs[j])) {
-                        match = true;
-                        break;
-                    }
-                }
-                if (!match) return false;
-            }
-
-            for (i = 0; i < that.certs.length; i++) {
-                match = false;
-                for (j = 0; j < this.certs.length; j++) {
-                    if (that.certs[i].equals(this.certs[j])) {
-                        match = true;
-                        break;
-                    }
-                }
-                if (!match) return false;
-            }
-            return true;
-        }
-
-        /**
-         * {@return the hash code value for this object}
-         */
-        @Override public int hashCode() {
-            return type.hashCode() ^ Objects.hashCode(name)
-                    ^ Objects.hashCode(actions);
-        }
-
-        /**
-         * Returns the canonical string representation of the actions,
-         * which currently is the empty string "", since there are no actions
-         * for an SelfPermission. That is, the actions for the
-         * permission that will be created when this SelfPermission
-         * is resolved may be non-null, but an SelfPermission
-         * itself is never considered to have any actions.
-         *
-         * @return the empty string "".
-         */
-        @Override public String getActions() {
-            return "";
-        }
-
-        public String getSelfType() {
-            return type;
-        }
-
-        public String getSelfName() {
-            return name;
-        }
-
-        public String getSelfActions() {
-            return actions;
-        }
-
-        public Certificate[] getCerts() {
-            return (certs == null ? null : certs.clone());
-        }
-
-        /**
-         * Returns a string describing this SelfPermission.  The convention
-         * is to specify the class name, the permission name, and the actions,
-         * in the following format: '(unresolved "ClassName" "name" "actions")'.
-         *
-         * @return information about this SelfPermission.
-         */
-        @Override public String toString() {
-            return "(SelfPermission " + type + " " + name + " " + actions + ")";
-        }
-
-        /**
-         * Restores the state of this object from the stream.
-         *
-         * @param  stream the {@code ObjectInputStream} from which data is read
-         * @throws IOException if an I/O error occurs
-         * @throws ClassNotFoundException if a serialized class cannot be loaded
-         */
-        @java.io.Serial
-        private void readObject(ObjectInputStream stream)
-                throws IOException, ClassNotFoundException {
-            stream.defaultReadObject();
-            if (certs != null) {
-                this.certs = certs.clone();
-            }
-        }
-    }
-
-    /**
-     * holds policy information that we need to synch on
-     */
-    private static class PolicyInfo {
-        private static final boolean verbose = false;
-
-        // Stores grant entries in the policy
-        final List<PolicyEntry> policyEntries;
-
-        // Maps aliases to certs
-        final Map<Object, Object> aliasMapping;
-
-        // Maps ProtectionDomain to PermissionCollection
-        private final ProtectionDomainCache[] pdMapping;
-        private java.util.Random random;
-
-        PolicyInfo(int numCaches) {
-            policyEntries = new ArrayList<>();
-            aliasMapping = Collections.synchronizedMap(new HashMap<>(11));
-
-            pdMapping = new ProtectionDomainCache[numCaches];
-            JavaSecurityAccess jspda
-                = SharedSecrets.getJavaSecurityAccess();
-            for (int i = 0; i < numCaches; i++) {
-                pdMapping[i] = jspda.getProtectionDomainCache();
-            }
-            if (numCaches > 1) {
-                random = new java.util.Random();
-            }
-        }
-        ProtectionDomainCache getPdMapping() {
-            if (pdMapping.length == 1) {
-                return pdMapping[0];
-            } else {
-                int i = java.lang.Math.abs(random.nextInt() % pdMapping.length);
-                return pdMapping[i];
-            }
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private static URL newURL(String spec) throws MalformedURLException {
-        return new URL(spec);
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/provider/PolicyParser.java b/src/java.base/share/classes/sun/security/provider/PolicyParser.java
index 2789d37c7a7..b6b7c6e347e 100644
--- a/src/java.base/share/classes/sun/security/provider/PolicyParser.java
+++ b/src/java.base/share/classes/sun/security/provider/PolicyParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,51 +25,33 @@
 
 package sun.security.provider;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StreamTokenizer;
 import java.security.GeneralSecurityException;
-import java.security.Principal;
-import java.util.*;
-import javax.security.auth.x500.X500Principal;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
 
-import sun.security.util.Debug;
 import sun.security.util.PropertyExpander;
 import sun.security.util.LocalizedMessage;
 
 /**
- * The policy for a Java runtime (specifying
- * which permissions are available for code from various principals)
- * is represented as a separate
- * persistent configuration.  The configuration may be stored as a
- * flat ASCII file, as a serialized binary file of
- * the Policy class, or as a database.
+ * Configuration data that specifies the keystores in a DKS keystore.
+ * A keystore domain is a collection of keystores that are presented as a
+ * single logical keystore. The configuration data is used during KeyStore
+ * load and store operations.
  *
- * <p>The Java runtime creates one global Policy object, which is used to
- * represent the static policy configuration file.  It is consulted by
- * a ProtectionDomain when the protection domain initializes its set of
- * permissions.
+ * The following syntax is supported for configuration data:
  *
- * <p>The Policy <code>init</code> method parses the policy
- * configuration file, and then
- * populates the Policy object.  The Policy object is agnostic in that
- * it is not involved in making policy decisions.  It is merely the
- * Java runtime representation of the persistent policy configuration
- * file.
- *
- * <p>When a protection domain needs to initialize its set of
- * permissions, it executes code such as the following
- * to ask the global Policy object to populate a
- * Permissions object with the appropriate permissions:
- * <pre>
- *  policy = Policy.getPolicy();
- *  Permissions perms = policy.getPermissions(protectiondomain)
- * </pre>
- *
- * <p>The protection domain contains a CodeSource
- * object, which encapsulates its codebase (URL) and public key attributes.
- * It also contains the principals associated with the domain.
- * The Policy object evaluates the global policy in light of whom the
- * principal is and what the code source is and returns an appropriate
- * Permissions object.
+ *     domain <domainName> [<property> ...] {
+ *        keystore <keystoreName> [<property> ...] ;
+ *        ...
+ *    };
+ *    ...
  *
  * @author Roland Schemers
  * @author Ram Marti
@@ -79,19 +61,11 @@
 
 public class PolicyParser {
 
-    private final Vector<GrantEntry> grantEntries;
     private Map<String, DomainEntry> domainEntries;
 
-    // Convenience variables for parsing
-    private static final Debug debug = Debug.getInstance("parser",
-                                                "\t[Policy Parser]");
     private StreamTokenizer st;
     private int lookahead;
     private boolean expandProp = false;
-    private String keyStoreUrlString = null; // unexpanded
-    private String keyStoreType = null;
-    private String keyStoreProvider = null;
-    private String storePassURL = null;
 
     private String expand(String value)
         throws PropertyExpander.ExpandException
@@ -112,14 +86,7 @@ private String expand(String value, boolean encodeURL)
     /**
      * Creates a PolicyParser object.
      */
-
-    public PolicyParser() {
-        grantEntries = new Vector<>();
-    }
-
-
     public PolicyParser(boolean expandProp) {
-        this();
         this.expandProp = expandProp;
     }
 
@@ -135,7 +102,6 @@ public PolicyParser(boolean expandProp) {
      * @exception IOException if an error occurs while reading the policy
      *          configuration.
      */
-
     public void read(Reader policy)
         throws ParsingException, IOException
     {
@@ -171,31 +137,14 @@ public void read(Reader policy)
 
         /*
          * The main parsing loop.  The loop is executed once
-         * for each entry in the config file.      The entries
-         * are delimited by semicolons.   Once we've read in
-         * the information for an entry, go ahead and try to
-         * add it to the policy vector.
+         * for each entry in the config file. The entries
+         * are delimited by semicolons.
          *
          */
 
         lookahead = st.nextToken();
-        GrantEntry ge = null;
         while (lookahead != StreamTokenizer.TT_EOF) {
-            if (peek("grant")) {
-                ge = parseGrantEntry();
-                // could be null if we couldn't expand a property
-                if (ge != null)
-                    add(ge);
-            } else if (peek("keystore") && keyStoreUrlString==null) {
-                // only one keystore entry per policy file, others will be
-                // ignored
-                parseKeyStoreEntry();
-            } else if (peek("keystorePasswordURL") && storePassURL==null) {
-                // only one keystore passwordURL per policy file, others will be
-                // ignored
-                parseStorePassURL();
-            } else if (ge == null && keyStoreUrlString == null &&
-                storePassURL == null && peek("domain")) {
+            if (peek("domain")) {
                 if (domainEntries == null) {
                     domainEntries = new TreeMap<>();
                 }
@@ -214,399 +163,12 @@ public void read(Reader policy)
             }
             match(";");
         }
-
-        if (keyStoreUrlString == null && storePassURL != null) {
-            throw new ParsingException(LocalizedMessage.getNonlocalized
-                ("keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore"));
-        }
-    }
-
-    public void add(GrantEntry ge)
-    {
-        grantEntries.addElement(ge);
-    }
-
-    public void replace(GrantEntry origGe, GrantEntry newGe)
-    {
-        grantEntries.setElementAt(newGe, grantEntries.indexOf(origGe));
-    }
-
-    public boolean remove(GrantEntry ge)
-    {
-        return grantEntries.removeElement(ge);
-    }
-
-    /**
-     * Returns the (possibly expanded) keystore location, or null if the
-     * expansion fails.
-     */
-    public String getKeyStoreUrl() {
-        try {
-            if (keyStoreUrlString!=null && keyStoreUrlString.length()!=0) {
-                return expand(keyStoreUrlString, true).replace
-                                                (File.separatorChar, '/');
-            }
-        } catch (PropertyExpander.ExpandException peee) {
-            if (debug != null) {
-                debug.println(peee.toString());
-            }
-            return null;
-        }
-        return null;
-    }
-
-    public void setKeyStoreUrl(String url) {
-        keyStoreUrlString = url;
-    }
-
-    public String getKeyStoreType() {
-        return keyStoreType;
-    }
-
-    public void setKeyStoreType(String type) {
-        keyStoreType = type;
-    }
-
-    public String getKeyStoreProvider() {
-        return keyStoreProvider;
-    }
-
-    public void setKeyStoreProvider(String provider) {
-        keyStoreProvider = provider;
-    }
-
-    public String getStorePassURL() {
-        try {
-            if (storePassURL!=null && storePassURL.length()!=0) {
-                return expand(storePassURL, true).replace
-                                                (File.separatorChar, '/');
-            }
-        } catch (PropertyExpander.ExpandException peee) {
-            if (debug != null) {
-                debug.println(peee.toString());
-            }
-            return null;
-        }
-        return null;
-    }
-
-    public void setStorePassURL(String storePassURL) {
-        this.storePassURL = storePassURL;
-    }
-
-    /**
-     * Enumerate all the entries in the global policy object.
-     * This method is used by policy admin tools.   The tools
-     * should use the Enumeration methods on the returned object
-     * to fetch the elements sequentially.
-     */
-    public Enumeration<GrantEntry> grantElements(){
-        return grantEntries.elements();
     }
 
     public Collection<DomainEntry> getDomainEntries() {
         return domainEntries.values();
     }
 
-    /**
-     * write out the policy
-     */
-
-    public void write(Writer policy)
-    {
-        PrintWriter out = new PrintWriter(new BufferedWriter(policy));
-
-        out.println("/* AUTOMATICALLY GENERATED ON "+
-                    (new java.util.Date()) + "*/");
-        out.println("/* DO NOT EDIT */");
-        out.println();
-
-        // write the (unexpanded) keystore entry as the first entry of the
-        // policy file
-        if (keyStoreUrlString != null) {
-            writeKeyStoreEntry(out);
-        }
-        if (storePassURL != null) {
-            writeStorePassURL(out);
-        }
-
-        // write "grant" entries
-        for (GrantEntry ge : grantEntries) {
-            ge.write(out);
-            out.println();
-        }
-        out.flush();
-    }
-
-    /**
-     * parses a keystore entry
-     */
-    private void parseKeyStoreEntry() throws ParsingException, IOException {
-        match("keystore");
-        keyStoreUrlString = match("quoted string");
-
-        // parse keystore type
-        if (!peek(",")) {
-            return; // default type
-        }
-        match(",");
-
-        if (peek("\"")) {
-            keyStoreType = match("quoted string");
-        } else {
-            throw new ParsingException(st.lineno(),
-                LocalizedMessage.getNonlocalized("expected.keystore.type"));
-        }
-
-        // parse keystore provider
-        if (!peek(",")) {
-            return; // provider optional
-        }
-        match(",");
-
-        if (peek("\"")) {
-            keyStoreProvider = match("quoted string");
-        } else {
-            throw new ParsingException(st.lineno(),
-                LocalizedMessage.getNonlocalized("expected.keystore.provider"));
-        }
-    }
-
-    private void parseStorePassURL() throws ParsingException, IOException {
-        match("keyStorePasswordURL");
-        storePassURL = match("quoted string");
-    }
-
-    /**
-     * writes the (unexpanded) keystore entry
-     */
-    private void writeKeyStoreEntry(PrintWriter out) {
-        out.print("keystore \"");
-        out.print(keyStoreUrlString);
-        out.print('"');
-        if (keyStoreType != null && !keyStoreType.isEmpty())
-            out.print(", \"" + keyStoreType + "\"");
-        if (keyStoreProvider != null && !keyStoreProvider.isEmpty())
-            out.print(", \"" + keyStoreProvider + "\"");
-        out.println(";");
-        out.println();
-    }
-
-    private void writeStorePassURL(PrintWriter out) {
-        out.print("keystorePasswordURL \"");
-        out.print(storePassURL);
-        out.print('"');
-        out.println(";");
-        out.println();
-    }
-
-    /**
-     * parse a Grant entry
-     */
-    private GrantEntry parseGrantEntry()
-        throws ParsingException, IOException
-    {
-        GrantEntry e = new GrantEntry();
-        LinkedList<PrincipalEntry> principals = null;
-        boolean ignoreEntry = false;
-
-        match("grant");
-
-        while(!peek("{")) {
-
-            if (peekAndMatch("Codebase")) {
-                if (e.codeBase != null)
-                    throw new ParsingException(
-                            st.lineno(),
-                            LocalizedMessage.getNonlocalized
-                                ("multiple.Codebase.expressions"));
-                e.codeBase = match("quoted string");
-                peekAndMatch(",");
-            } else if (peekAndMatch("SignedBy")) {
-                if (e.signedBy != null)
-                    throw new ParsingException(
-                            st.lineno(),
-                            LocalizedMessage.getNonlocalized
-                                ("multiple.SignedBy.expressions"));
-                e.signedBy = match("quoted string");
-
-                // verify syntax of the aliases
-                StringTokenizer aliases = new StringTokenizer(e.signedBy,
-                                                              ",", true);
-                int actr = 0;
-                int cctr = 0;
-                while (aliases.hasMoreTokens()) {
-                    String alias = aliases.nextToken().trim();
-                    if (alias.equals(","))
-                        cctr++;
-                    else if (!alias.isEmpty())
-                        actr++;
-                }
-                if (actr <= cctr)
-                    throw new ParsingException(
-                            st.lineno(),
-                            LocalizedMessage.getNonlocalized
-                                ("SignedBy.has.empty.alias"));
-
-                peekAndMatch(",");
-            } else if (peekAndMatch("Principal")) {
-                if (principals == null) {
-                    principals = new LinkedList<>();
-                }
-
-                String principalClass;
-                String principalName;
-
-                if (peek("\"")) {
-                    // both the principalClass and principalName
-                    // will be replaced later
-                    principalClass = PrincipalEntry.REPLACE_NAME;
-                    principalName = match("principal type");
-                } else {
-                    // check for principalClass wildcard
-                    if (peek("*")) {
-                        match("*");
-                        principalClass = PrincipalEntry.WILDCARD_CLASS;
-                    } else {
-                        principalClass = match("principal type");
-                    }
-
-                    // check for principalName wildcard
-                    if (peek("*")) {
-                        match("*");
-                        principalName = PrincipalEntry.WILDCARD_NAME;
-                    } else {
-                        principalName = match("quoted string");
-                    }
-
-                    // disallow WILDCARD_CLASS && actual name
-                    if (principalClass.equals(PrincipalEntry.WILDCARD_CLASS) &&
-                        !principalName.equals(PrincipalEntry.WILDCARD_NAME)) {
-                        if (debug != null) {
-                                debug.println("disallowing principal that " +
-                                    "has WILDCARD class but no WILDCARD name");
-                        }
-                        throw new ParsingException
-                                (st.lineno(),
-                                LocalizedMessage.getNonlocalized
-                                    ("can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name"));
-                    }
-                }
-
-                try {
-                    principalName = expand(principalName);
-
-                    if (principalClass.equals
-                                ("javax.security.auth.x500.X500Principal") &&
-                        !principalName.equals(PrincipalEntry.WILDCARD_NAME)) {
-
-                        // 4702543:  X500 names with an EmailAddress
-                        // were encoded incorrectly.  construct a new
-                        // X500Principal with correct encoding.
-
-                        X500Principal p = new X500Principal
-                                ((new X500Principal(principalName)).toString());
-                        principalName = p.getName();
-                    }
-
-                    principals.add
-                        (new PrincipalEntry(principalClass, principalName));
-                } catch (PropertyExpander.ExpandException peee) {
-                    // ignore the entire policy entry
-                    // but continue parsing all the info
-                    // so we can get to the next entry
-                    if (debug != null) {
-                        debug.println("principal name expansion failed: " +
-                                        principalName);
-                    }
-                    ignoreEntry = true;
-                }
-                peekAndMatch(",");
-
-            } else {
-                throw new ParsingException(st.lineno(),
-                    LocalizedMessage.getNonlocalized
-                        ("expected.codeBase.or.SignedBy.or.Principal"));
-            }
-        }
-
-        if (principals != null) e.principals = principals;
-        match("{");
-
-        while(!peek("}")) {
-            if (peek("Permission")) {
-                try {
-                    PermissionEntry pe = parsePermissionEntry();
-                    e.add(pe);
-                } catch (PropertyExpander.ExpandException peee) {
-                    // ignore. The add never happened
-                    if (debug != null) {
-                        debug.println(peee.toString());
-                    }
-                    skipEntry();  // BugId 4219343
-                }
-                match(";");
-            } else {
-                throw new
-                    ParsingException(st.lineno(),
-                        LocalizedMessage.getNonlocalized
-                            ("expected.permission.entry"));
-            }
-        }
-        match("}");
-
-        try {
-            if (e.signedBy != null) e.signedBy = expand(e.signedBy);
-            if (e.codeBase != null) {
-                e.codeBase = expand(e.codeBase, true).replace
-                                    (File.separatorChar, '/');
-            }
-        } catch (PropertyExpander.ExpandException peee) {
-            if (debug != null) {
-                debug.println(peee.toString());
-            }
-            return null;
-        }
-
-        return (ignoreEntry) ? null : e;
-    }
-
-    /**
-     * parse a Permission entry
-     */
-    private PermissionEntry parsePermissionEntry()
-        throws ParsingException, IOException, PropertyExpander.ExpandException
-    {
-        PermissionEntry e = new PermissionEntry();
-
-        // Permission
-        match("Permission");
-        e.permission = match("permission type");
-
-        if (peek("\"")) {
-            // Permission name
-            e.name = expand(match("quoted string"));
-        }
-
-        if (!peek(",")) {
-            return e;
-        }
-        match(",");
-
-        if (peek("\"")) {
-                e.action = expand(match("quoted string"));
-                if (!peek(",")) {
-                    return e;
-                }
-                match(",");
-        }
-
-        if (peekAndMatch("SignedBy")) {
-            e.signedBy = expand(match("quoted string"));
-        }
-        return e;
-    }
-
     /**
      * parse a domain entry
      */
@@ -735,12 +297,6 @@ private String match(String expect)
         case StreamTokenizer.TT_WORD:
             if (expect.equalsIgnoreCase(st.sval)) {
                 lookahead = st.nextToken();
-            } else if (expect.equalsIgnoreCase("permission type")) {
-                value = st.sval;
-                lookahead = st.nextToken();
-            } else if (expect.equalsIgnoreCase("principal type")) {
-                value = st.sval;
-                lookahead = st.nextToken();
             } else if (expect.equalsIgnoreCase("domain name") ||
                        expect.equalsIgnoreCase("keystore name") ||
                        expect.equalsIgnoreCase("property name")) {
@@ -755,12 +311,6 @@ private String match(String expect)
             if (expect.equalsIgnoreCase("quoted string")) {
                 value = st.sval;
                 lookahead = st.nextToken();
-            } else if (expect.equalsIgnoreCase("permission type")) {
-                value = st.sval;
-                lookahead = st.nextToken();
-            } else if (expect.equalsIgnoreCase("principal type")) {
-                value = st.sval;
-                lookahead = st.nextToken();
             } else {
                 throw new ParsingException(st.lineno(), expect, st.sval);
             }
@@ -827,340 +377,6 @@ private void skipEntry() throws ParsingException, IOException {
         }
     }
 
-    /**
-     * Each grant entry in the policy configuration file is
-     * represented by a GrantEntry object.
-     *
-     * <p>
-     * For example, the entry
-     * <pre>
-     *      grant signedBy "Duke" {
-     *          permission java.io.FilePermission "/tmp", "read,write";
-     *      };
-     *
-     * </pre>
-     * is represented internally
-     * <pre>
-     *
-     * pe = new PermissionEntry("java.io.FilePermission",
-     *                           "/tmp", "read,write");
-     *
-     * ge = new GrantEntry("Duke", null);
-     *
-     * ge.add(pe);
-     *
-     * </pre>
-     *
-     * @author Roland Schemers
-     *
-     * version 1.19, 05/21/98
-     */
-
-    public static class GrantEntry {
-
-        public String signedBy;
-        public String codeBase;
-        public LinkedList<PrincipalEntry> principals;
-        public Vector<PermissionEntry> permissionEntries;
-
-        public GrantEntry() {
-            principals = new LinkedList<>();
-            permissionEntries = new Vector<>();
-        }
-
-        public GrantEntry(String signedBy, String codeBase) {
-            this.codeBase = codeBase;
-            this.signedBy = signedBy;
-            principals = new LinkedList<>();
-            permissionEntries = new Vector<>();
-        }
-
-        public void add(PermissionEntry pe)
-        {
-            permissionEntries.addElement(pe);
-        }
-
-        public boolean remove(PrincipalEntry pe)
-        {
-            return principals.remove(pe);
-        }
-
-        public boolean remove(PermissionEntry pe)
-        {
-            return permissionEntries.removeElement(pe);
-        }
-
-        public boolean contains(PrincipalEntry pe)
-        {
-            return principals.contains(pe);
-        }
-
-        public boolean contains(PermissionEntry pe)
-        {
-            return permissionEntries.contains(pe);
-        }
-
-        /**
-         * Enumerate all the permission entries in this GrantEntry.
-         */
-        public Enumeration<PermissionEntry> permissionElements(){
-            return permissionEntries.elements();
-        }
-
-
-        public void write(PrintWriter out) {
-            out.print("grant");
-            if (signedBy != null) {
-                out.print(" signedBy \"");
-                out.print(signedBy);
-                out.print('"');
-                if (codeBase != null)
-                    out.print(", ");
-            }
-            if (codeBase != null) {
-                out.print(" codeBase \"");
-                out.print(codeBase);
-                out.print('"');
-                if (principals != null && principals.size() > 0)
-                    out.print(",\n");
-            }
-            if (principals != null && principals.size() > 0) {
-                Iterator<PrincipalEntry> pli = principals.iterator();
-                while (pli.hasNext()) {
-                    out.print("      ");
-                    PrincipalEntry pe = pli.next();
-                    pe.write(out);
-                    if (pli.hasNext())
-                        out.print(",\n");
-                }
-            }
-            out.println(" {");
-            for (PermissionEntry pe : permissionEntries) {
-                out.write("  ");
-                pe.write(out);
-            }
-            out.println("};");
-        }
-
-        public Object clone() {
-            GrantEntry ge = new GrantEntry();
-            ge.codeBase = this.codeBase;
-            ge.signedBy = this.signedBy;
-            ge.principals = new LinkedList<>(this.principals);
-            ge.permissionEntries = new Vector<>(this.permissionEntries);
-            return ge;
-        }
-    }
-
-    /**
-     * Principal info (class and name) in a grant entry
-     */
-    public static class PrincipalEntry implements Principal {
-
-        public static final String WILDCARD_CLASS = "WILDCARD_PRINCIPAL_CLASS";
-        public static final String WILDCARD_NAME = "WILDCARD_PRINCIPAL_NAME";
-        public static final String REPLACE_NAME = "PolicyParser.REPLACE_NAME";
-
-        String principalClass;
-        String principalName;
-
-        /**
-         * A PrincipalEntry consists of the Principal class and Principal name.
-         *
-         * @param principalClass the Principal class
-         * @param principalName the Principal name
-         * @throws NullPointerException if principalClass or principalName
-         *                              are null
-         */
-        public PrincipalEntry(String principalClass, String principalName) {
-            if (principalClass == null || principalName == null)
-                throw new NullPointerException(LocalizedMessage.getNonlocalized
-                    ("null.principalClass.or.principalName"));
-            this.principalClass = principalClass;
-            this.principalName = principalName;
-        }
-
-        boolean isWildcardName() {
-            return principalName.equals(WILDCARD_NAME);
-        }
-
-        boolean isWildcardClass() {
-            return principalClass.equals(WILDCARD_CLASS);
-        }
-
-        boolean isReplaceName() {
-            return principalClass.equals(REPLACE_NAME);
-        }
-
-        public String getPrincipalClass() {
-            return principalClass;
-        }
-
-        public String getPrincipalName() {
-            return principalName;
-        }
-
-        public String getDisplayClass() {
-            if (isWildcardClass()) {
-                return "*";
-            } else if (isReplaceName()) {
-                return "";
-            }
-            else return principalClass;
-        }
-
-        public String getDisplayName() {
-            return getDisplayName(false);
-        }
-
-        public String getDisplayName(boolean addQuote) {
-            if (isWildcardName()) {
-                return "*";
-            }
-            else {
-                if (addQuote) return "\"" + principalName + "\"";
-                else return principalName;
-            }
-        }
-
-        @Override
-        public String getName() {
-            return principalName;
-        }
-
-        @Override
-        public String toString() {
-            if (!isReplaceName()) {
-                return getDisplayClass() + "/" + getDisplayName();
-            } else {
-                return getDisplayName();
-            }
-        }
-
-        /**
-         * Test for equality between the specified object and this object.
-         * Two PrincipalEntries are equal if their class and name values
-         * are equal.
-         *
-         * @param obj the object to test for equality with this object
-         * @return true if the objects are equal, false otherwise
-         */
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-
-            if (!(obj instanceof PrincipalEntry that))
-                return false;
-
-            return (principalClass.equals(that.principalClass) &&
-                    principalName.equals(that.principalName));
-        }
-
-        /**
-         * {@return a hashcode for this PrincipalEntry}
-         */
-        @Override
-        public int hashCode() {
-            return principalClass.hashCode();
-        }
-
-        public void write(PrintWriter out) {
-            out.print("principal " + getDisplayClass() + " " +
-                      getDisplayName(true));
-        }
-    }
-
-    /**
-     * Each permission entry in the policy configuration file is
-     * represented by a
-     * PermissionEntry object.
-     *
-     * <p>
-     * For example, the entry
-     * <pre>
-     *          permission java.io.FilePermission "/tmp", "read,write";
-     * </pre>
-     * is represented internally
-     * <pre>
-     *
-     * pe = new PermissionEntry("java.io.FilePermission",
-     *                           "/tmp", "read,write");
-     * </pre>
-     *
-     * @author Roland Schemers
-     *
-     * version 1.19, 05/21/98
-     */
-
-    public static class PermissionEntry {
-
-        public String permission;
-        public String name;
-        public String action;
-        public String signedBy;
-
-        public PermissionEntry() {
-        }
-
-        public PermissionEntry(String permission,
-                        String name,
-                        String action) {
-            this.permission = permission;
-            this.name = name;
-            this.action = action;
-        }
-
-        /**
-         * Calculates a hash code value for the object.  Objects
-         * which are equal will also have the same hashcode.
-         */
-        @Override
-        public int hashCode() {
-            return Objects.hash(permission, name, action);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this)
-                return true;
-
-            return obj instanceof PermissionEntry that
-                    && Objects.equals(this.permission, that.permission)
-                    && Objects.equals(this.name, that.name)
-                    && Objects.equals(this.action, that.action)
-                    && Objects.equals(this.signedBy, that.signedBy);
-        }
-
-        public void write(PrintWriter out) {
-            out.print("permission ");
-            out.print(permission);
-            if (name != null) {
-                out.print(" \"");
-
-                // ATTENTION: regex with double escaping,
-                // the normal forms look like:
-                // $name =~ s/\\/\\\\/g; and
-                // $name =~ s/\"/\\\"/g;
-                // and then in a java string, it's escaped again
-
-                out.print(name.replaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\\\""));
-                out.print('"');
-            }
-            if (action != null) {
-                out.print(", \"");
-                out.print(action);
-                out.print('"');
-            }
-            if (signedBy != null) {
-                out.print(", signedBy \"");
-                out.print(signedBy);
-                out.print('"');
-            }
-            out.println(";");
-        }
-    }
-
     /**
      * Each domain entry in the keystore domain configuration file is
      * represented by a DomainEntry object.
@@ -1312,13 +528,4 @@ public String getNonlocalizedMessage() {
                 localizedMsg.formatNonlocalized(source);
         }
     }
-
-    public static void main(String[] arg) throws Exception {
-        try (FileReader fr = new FileReader(arg[0]);
-             FileWriter fw = new FileWriter(arg[1])) {
-            PolicyParser pp = new PolicyParser(true);
-            pp.read(fr);
-            pp.write(fw);
-        }
-    }
 }
diff --git a/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java b/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java
deleted file mode 100644
index 3ce091c3586..00000000000
--- a/src/java.base/share/classes/sun/security/provider/PolicySpiFile.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.provider;
-
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.PolicySpi;
-import java.security.ProtectionDomain;
-import java.security.URIParameter;
-
-import java.net.MalformedURLException;
-
-/**
- * This class wraps the PolicyFile subclass implementation of Policy
- * inside a PolicySpi implementation that is available from the SUN provider
- * via the Policy.getInstance calls.
- *
- */
-@SuppressWarnings("removal")
-public final class PolicySpiFile extends PolicySpi {
-
-    private PolicyFile pf;
-
-    public PolicySpiFile(Policy.Parameters params) {
-
-        if (params == null) {
-            pf = new PolicyFile();
-        } else {
-            if (!(params instanceof URIParameter)) {
-                throw new IllegalArgumentException
-                        ("Unrecognized policy parameter: " + params);
-            }
-            URIParameter uriParam = (URIParameter)params;
-            try {
-                pf = new PolicyFile(uriParam.getURI().toURL());
-            } catch (MalformedURLException mue) {
-                throw new IllegalArgumentException("Invalid URIParameter", mue);
-            }
-        }
-    }
-
-    protected PermissionCollection engineGetPermissions(CodeSource codesource) {
-        return pf.getPermissions(codesource);
-    }
-
-    protected PermissionCollection engineGetPermissions(ProtectionDomain d) {
-        return pf.getPermissions(d);
-    }
-
-    protected boolean engineImplies(ProtectionDomain d, Permission p) {
-        return pf.implies(d, p);
-    }
-
-    protected void engineRefresh() {
-        pf.refresh();
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
index f036a411f1d..e597a5fa4f4 100644
--- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
+++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,8 +84,6 @@
  *   in RFC 5280. The ValidationAlgorithm attribute notes the
  *   specification that this provider implements.
  *
- * - JavaPolicy is the default file-based Policy type.
- *
  * - JavaLoginConfig is the default file-based LoginModule Configuration type.
  */
 
@@ -281,11 +279,6 @@ public final class SunEntries {
                 "sun.security.provider.certpath.IndexedCollectionCertStore",
                 attrs);
 
-        /*
-         * Policy
-         */
-        add(p, "Policy", "JavaPolicy", "sun.security.provider.PolicySpiFile");
-
         /*
          * Configuration
          */
diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index 58794e5dce8..ee19ff62a38 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -25,6 +25,7 @@
 
 package sun.security.ssl;
 
+import java.lang.invoke.MethodHandles;
 import java.net.Socket;
 import java.security.*;
 import java.security.cert.*;
@@ -51,6 +52,15 @@
 final class X509TrustManagerImpl extends X509ExtendedTrustManager
         implements X509TrustManager {
 
+    static {
+        // eagerly initialize to avoid pinning virtual thread during TLS handshake
+        try {
+            MethodHandles.lookup().ensureInitialized(AnchorCertificates.class);
+        } catch (IllegalAccessException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
     private final String validatorType;
 
     /**
diff --git a/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java
index 65e121421b8..9f344601e7e 100644
--- a/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
@@ -87,7 +87,6 @@ public class Debug {
     public static void Help() {
         System.err.println();
         System.err.println("all           turn on all debugging");
-        System.err.println("access        print all checkPermission results");
         System.err.println("certpath      PKIX CertPathBuilder and");
         System.err.println("              CertPathValidator debugging");
         System.err.println("combiner      SubjectDomainCombiner debugging");
@@ -100,7 +99,6 @@ public static void Help() {
         System.err.println("jca           JCA engine class debugging");
         System.err.println("keystore      KeyStore debugging");
         System.err.println("pcsc          Smartcard library debugging");
-        System.err.println("policy        loading and granting");
         System.err.println("provider      security provider debugging");
         System.err.println("pkcs11        PKCS11 session manager debugging");
         System.err.println("pkcs11keystore");
@@ -118,22 +116,6 @@ public static void Help() {
         System.err.println("+thread can be appended to any of above options to print");
         System.err.println("              thread and caller information for that debug option");
         System.err.println();
-        System.err.println("The following can be used with access:");
-        System.err.println();
-        System.err.println("stack         include stack trace");
-        System.err.println("domain        dump all domains in context");
-        System.err.println("failure       before throwing exception, dump stack");
-        System.err.println("              and domain that didn't have permission");
-        System.err.println();
-        System.err.println("The following can be used with stack and domain:");
-        System.err.println();
-        System.err.println("permission=<classname>");
-        System.err.println("              only dump output if specified permission");
-        System.err.println("              is being checked");
-        System.err.println("codebase=<URL>");
-        System.err.println("              only dump output if specified codebase");
-        System.err.println("              is being checked");
-        System.err.println();
         System.err.println("The following can be used with provider:");
         System.err.println();
         System.err.println("engine=<engines>");
diff --git a/src/java.base/share/classes/sun/security/util/Resources.java b/src/java.base/share/classes/sun/security/util/Resources.java
index 15bf07baa31..679e0ea6aa5 100644
--- a/src/java.base/share/classes/sun/security/util/Resources.java
+++ b/src/java.base/share/classes/sun/security/util/Resources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@ public class Resources extends java.util.ListResourceBundle {
 
         // javax.security.auth.Subject
         {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "invalid null AccessControlContext provided"},
         {"invalid.null.action.provided", "invalid null action provided"},
         {"invalid.null.Class.provided", "invalid null Class provided"},
         {"Subject.", "Subject:\n"},
@@ -90,40 +88,9 @@ public class Resources extends java.util.ListResourceBundle {
         {"Login.Failure.all.modules.ignored",
                 "Login Failure: all modules ignored"},
 
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: error parsing {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: error adding Permission, {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: error adding Entry:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "alias name not provided ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "unable to perform substitution on alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "substitution value, {0}, unsupported"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","type can't be null"},
-
         // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "keystorePasswordURL can not be specified without also specifying keystore"},
-        {"expected.keystore.type", "expected keystore type"},
-        {"expected.keystore.provider", "expected keystore provider"},
-        {"multiple.Codebase.expressions",
-                "multiple Codebase expressions"},
-        {"multiple.SignedBy.expressions","multiple SignedBy expressions"},
         {"duplicate.keystore.domain.name","duplicate keystore domain name: {0}"},
         {"duplicate.keystore.name","duplicate keystore name: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy has empty alias"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "can not specify Principal with a wildcard class without a wildcard name"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "expected codeBase or SignedBy or Principal"},
-        {"expected.permission.entry", "expected permission entry"},
         {"number.", "number "},
         {"expected.expect.read.end.of.file.",
                 "expected [{0}], read [end of file]"},
@@ -132,8 +99,6 @@ public class Resources extends java.util.ListResourceBundle {
         {"line.number.msg", "line {0}: {1}"},
         {"line.number.expected.expect.found.actual.",
                 "line {0}: expected [{1}], found [{2}]"},
-        {"null.principalClass.or.principalName",
-                "null principalClass or principalName"},
 
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
diff --git a/src/java.base/share/conf/security/java.policy b/src/java.base/share/conf/security/java.policy
deleted file mode 100644
index 88e8753dee2..00000000000
--- a/src/java.base/share/conf/security/java.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// This system policy file grants a set of default permissions to all domains
-// and can be configured to grant additional permissions to modules and other
-// code sources. The code source URL scheme for modules linked into a
-// run-time image is "jrt".
-//
-// For example, to grant permission to read the "foo" property to the module
-// "com.greetings", the grant entry is:
-//
-// grant codeBase "jrt:/com.greetings" {
-//     permission java.util.PropertyPermission "foo", "read";
-// };
-//
-
-// default permissions granted to all domains
-grant {
-    // allows anyone to listen on dynamic ports
-    permission java.net.SocketPermission "localhost:0", "listen";
-
-    // "standard" properties that can be read by anyone
-    permission java.util.PropertyPermission "java.version", "read";
-    permission java.util.PropertyPermission "java.vendor", "read";
-    permission java.util.PropertyPermission "java.vendor.url", "read";
-    permission java.util.PropertyPermission "java.class.version", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "line.separator", "read";
-    permission java.util.PropertyPermission
-                   "java.specification.version", "read";
-    permission java.util.PropertyPermission
-                   "java.specification.maintenance.version", "read";
-    permission java.util.PropertyPermission "java.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.specification.name", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.version", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.vendor", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.name", "read";
-    permission java.util.PropertyPermission "java.vm.version", "read";
-    permission java.util.PropertyPermission "java.vm.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.name", "read";
-};
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index 9d07cb85a47..1d329df0cfb 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -282,41 +282,19 @@ login.configuration.provider=sun.security.provider.ConfigFile
 #
 #login.config.url.1=file:${user.home}/.java.login.config
 
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object. The system class loader is used to
-# locate this class.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-#
-policy.url.1=file:${java.home}/conf/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# Controls whether or not properties are expanded in policy and login
-# configuration files. If set to false, properties (${...}) will not
-# be expanded in policy and login configuration files. If commented out or
-# set to an empty string, the default value is "false" for policy files and
-# "true" for login configuration files.
+# Controls whether or not properties are expanded in login configuration files.
+# If set to false, properties (${...}) will not be expanded in login
+# configuration files. If commented out or set to an empty string, the default
+# value is "true" for login configuration files.
 #
 policy.expandProperties=true
 
-# Controls whether or not an extra policy or login configuration file is
-# allowed to be passed on the command line with -Djava.security.policy=somefile
-# or -Djava.security.auth.login.config=somefile. If commented out or set to
-# an empty string, the default value is "false".
+# Controls whether or not an extra login configuration file is allowed to be
+# passed on the command line with -Djava.security.auth.login.config=somefile.
+# If commented out or set to an empty string, the default value is "false".
 #
 policy.allowSystemProperty=true
 
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission. Note: the default policy
-# provider (sun.security.provider.PolicyFile) does not support this property.
-#
-policy.ignoreIdentityScope=false
-
 #
 # Default keystore type.
 #
@@ -332,27 +310,6 @@ keystore.type=pkcs12
 #
 keystore.type.compat=true
 
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when passed to the
-# SecurityManager::checkPackageAccess method unless the corresponding
-# RuntimePermission("accessClassInPackage."+package) has been granted.
-#
-package.access=sun.misc.,\
-               sun.reflect.,\
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when passed to the
-# SecurityManager::checkPackageDefinition method unless the corresponding
-# RuntimePermission("defineClassInPackage."+package) has been granted.
-#
-# By default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.misc.,\
-                   sun.reflect.,\
-
 #
 # Determines whether this properties file can be appended to
 # or overridden on the command line via -Djava.security.properties
@@ -373,10 +330,7 @@ ssl.TrustManagerFactory.algorithm=PKIX
 # any positive value: the number of seconds to cache an address for
 # zero: do not cache
 #
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
+# The default behavior in this implementation is to cache for 30 seconds.
 #
 # NOTE: setting this to anything other than the default value can have
 #       serious security implications. Do not set it unless
diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
deleted file mode 100644
index d9bfdede978..00000000000
--- a/src/java.base/share/lib/security/default.policy
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Permissions required by modules stored in a run-time image and loaded
-// by the platform class loader.
-//
-// NOTE that this file is not intended to be modified. If additional
-// permissions need to be granted to the modules in this file, it is
-// recommended that they be configured in a separate policy file or
-// ${java.home}/conf/security/java.policy.
-//
-
-
-grant codeBase "jrt:/java.compiler" {
-    permission java.security.AllPermission;
-};
-
-
-grant codeBase "jrt:/java.net.http" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.ref";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.net.SocketPermission "*","connect,resolve";
-    // required if the HTTPClient is configured to use a local bind address
-    permission java.net.SocketPermission "localhost:*","listen,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-    permission java.util.PropertyPermission "*","read";
-    permission java.net.NetPermission "getProxySelector";
-};
-
-grant codeBase "jrt:/java.scripting" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/java.security.jgss" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/java.smartcardio" {
-    permission javax.smartcardio.CardPermission "*", "*";
-    permission java.lang.RuntimePermission "loadLibrary.j2pcsc";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.sun.security.jca";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.sun.security.util";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.jdk.internal.util";
-    permission java.util.PropertyPermission
-                   "javax.smartcardio.TerminalFactory.DefaultType", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "sun.arch.data.model", "read";
-    permission java.util.PropertyPermission
-                   "sun.security.smartcardio.library", "read";
-    permission java.util.PropertyPermission
-                   "sun.security.smartcardio.t0GetResponse", "read";
-    permission java.util.PropertyPermission
-                   "sun.security.smartcardio.t1GetResponse", "read";
-    permission java.util.PropertyPermission
-                   "sun.security.smartcardio.t1StripLe", "read";
-    // needed for looking up native PC/SC library
-    permission java.io.FilePermission "<<ALL FILES>>","read";
-    permission java.security.SecurityPermission "putProviderProperty.SunPCSC";
-    permission java.security.SecurityPermission
-                   "clearProviderProperties.SunPCSC";
-    permission java.security.SecurityPermission
-                   "removeProviderProperty.SunPCSC";
-};
-
-grant codeBase "jrt:/java.sql" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/java.sql.rowset" {
-    permission java.security.AllPermission;
-};
-
-
-grant codeBase "jrt:/java.xml.crypto" {
-    permission java.lang.RuntimePermission
-                   "getStackWalkerWithClassReference";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.sun.security.util";
-    permission java.util.PropertyPermission "*", "read";
-    permission java.security.SecurityPermission "putProviderProperty.XMLDSig";
-    permission java.security.SecurityPermission
-                   "clearProviderProperties.XMLDSig";
-    permission java.security.SecurityPermission
-                   "removeProviderProperty.XMLDSig";
-    permission java.security.SecurityPermission
-                   "com.sun.org.apache.xml.internal.security.register";
-    permission java.security.SecurityPermission
-                   "getProperty.jdk.xml.dsig.hereFunctionSupported";
-    permission java.security.SecurityPermission
-                   "getProperty.jdk.xml.dsig.secureValidationPolicy";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xml.internal.*";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xpath.internal";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xpath.internal.*";
-    permission java.io.FilePermission "<<ALL FILES>>","read";
-    permission java.net.SocketPermission "*", "connect,resolve";
-};
-
-
-grant codeBase "jrt:/jdk.accessibility" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.awt";
-};
-
-grant codeBase "jrt:/jdk.charsets" {
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.lang.RuntimePermission "charsetProvider";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.jdk.internal.access";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.jdk.internal.misc";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.jdk.internal.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.cs";
-};
-
-grant codeBase "jrt:/jdk.crypto.cryptoki" {
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.crypto.provider";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.access";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.sun.security.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";
-    permission java.lang.RuntimePermission "loadLibrary.j2pkcs11";
-    permission java.util.PropertyPermission "sun.security.pkcs11.allowSingleThreadedModules", "read";
-    permission java.util.PropertyPermission "sun.security.pkcs11.disableKeyExtraction", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read";
-    permission java.security.SecurityPermission "putProviderProperty.*";
-    permission java.security.SecurityPermission "clearProviderProperties.*";
-    permission java.security.SecurityPermission "removeProviderProperty.*";
-    permission java.security.SecurityPermission
-                   "getProperty.auth.login.defaultCallbackHandler";
-    permission java.security.SecurityPermission "authProvider.*";
-    // Needed for reading PKCS11 config file and NSS library check
-    permission java.io.FilePermission "<<ALL FILES>>", "read";
-};
-
-grant codeBase "jrt:/jdk.dynalink" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.httpserver" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.internal.le" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.graal.compiler" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.localedata" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.text.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.*";
-};
-
-grant codeBase "jrt:/jdk.naming.dns" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.scripting.nashorn" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.scripting.nashorn.shell" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.security.auth" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.security.jgss" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.zipfs" {
-    permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-    permission java.lang.RuntimePermission "fileSystemProvider";
-    permission java.lang.RuntimePermission "accessUserInformation";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "user.name", "read";
-};
-
-// permissions needed by applications using java.desktop module
-grant {
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.beans";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.beans.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.java.swing.plaf.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.apple.*";
-};
diff --git a/src/java.base/share/native/include/jni.h b/src/java.base/share/native/include/jni.h
index 6bbc71ded1f..1a31c38b3ce 100644
--- a/src/java.base/share/native/include/jni.h
+++ b/src/java.base/share/native/include/jni.h
@@ -48,6 +48,8 @@
 extern "C" {
 #endif
 
+#define JNICALL
+
 /*
  * JNI Types
  */
diff --git a/src/java.base/share/native/libjava/AccessController.c b/src/java.base/share/native/libjava/AccessController.c
deleted file mode 100644
index 3fb85be9ccb..00000000000
--- a/src/java.base/share/native/libjava/AccessController.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*-
- *      Implementation of class java.security.AccessController
- *
- */
-
-#include <string.h>
-
-#include "jni.h"
-#include "jvm.h"
-#include "java_security_AccessController.h"
-
-JNIEXPORT jobject JNICALL
-Java_java_security_AccessController_getProtectionDomain(
-                                                              JNIEnv *env,
-                                                              jclass cls,
-                                                              jclass caller)
-{
-    return JVM_GetProtectionDomain(env, caller);
-}
-
-JNIEXPORT jobject JNICALL
-Java_java_security_AccessController_getStackAccessControlContext(
-                                                              JNIEnv *env,
-                                                              jobject this)
-{
-    return JVM_GetStackAccessControlContext(env, this);
-}
-
-
-JNIEXPORT jobject JNICALL
-Java_java_security_AccessController_getInheritedAccessControlContext(
-                                                              JNIEnv *env,
-                                                              jobject this)
-{
-    return JVM_GetInheritedAccessControlContext(env, this);
-}
-
-JNIEXPORT void JNICALL
-Java_java_security_AccessController_ensureMaterializedForStackWalk(
-                                                              JNIEnv *env,
-                                                              jclass cls,
-                                                              jobject value)
-{
-    JVM_EnsureMaterializedForStackWalk(env, value);
-}
diff --git a/src/java.base/share/native/libjava/NativeLibraries.c b/src/java.base/share/native/libjava/NativeLibraries.c
index 22986306017..df5ff343d61 100644
--- a/src/java.base/share/native/libjava/NativeLibraries.c
+++ b/src/java.base/share/native/libjava/NativeLibraries.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@ static jboolean initIDs(JNIEnv *env)
     return JNI_TRUE;
 }
 
-
 /*
  * Support for finding JNI_On(Un)Load_<lib_name> if it exists.
  * If cname == NULL then just find normal JNI_On(Un)Load entry point
@@ -93,7 +92,11 @@ static void *findJniFunction(JNIEnv *env, void *handle,
             JNU_ThrowOutOfMemoryError(env, NULL);
             goto done;
         }
-        buildJniFunctionName(syms[i], cname, jniFunctionName);
+        strcpy(jniFunctionName, syms[i]);
+        if (cname != NULL) {
+            strcat(jniFunctionName, "_");
+            strcat(jniFunctionName, cname);
+        }
         entryName = JVM_FindLibraryEntry(handle, jniFunctionName);
         free(jniFunctionName);
         if(entryName) {
diff --git a/src/java.base/share/native/libjava/SecurityManager.c b/src/java.base/share/native/libjava/SecurityManager.c
deleted file mode 100644
index f5550c23af3..00000000000
--- a/src/java.base/share/native/libjava/SecurityManager.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-
-#include "java_lang_SecurityManager.h"
-#include "java_lang_ClassLoader.h"
-
-/*
- * Make sure a security manager instance is initialized.
- * TRUE means OK, FALSE means not.
- */
-static jboolean
-check(JNIEnv *env, jobject this)
-{
-    static jfieldID initField = 0;
-    jboolean initialized = JNI_FALSE;
-
-    if (initField == 0) {
-        jclass clazz = (*env)->FindClass(env, "java/lang/SecurityManager");
-        if (clazz == 0) {
-            (*env)->ExceptionClear(env);
-            return JNI_FALSE;
-        }
-        initField = (*env)->GetFieldID(env, clazz, "initialized", "Z");
-        if (initField == 0) {
-            (*env)->ExceptionClear(env);
-            return JNI_FALSE;
-        }
-    }
-    initialized = (*env)->GetBooleanField(env, this, initField);
-
-    if (initialized == JNI_TRUE) {
-        return JNI_TRUE;
-    } else {
-        jclass securityException =
-            (*env)->FindClass(env, "java/lang/SecurityException");
-        if (securityException != 0) {
-            (*env)->ThrowNew(env, securityException,
-                             "security manager not initialized.");
-        }
-        return JNI_FALSE;
-    }
-}
-
-JNIEXPORT jobjectArray JNICALL
-Java_java_lang_SecurityManager_getClassContext(JNIEnv *env, jobject this)
-{
-    if (!check(env, this)) {
-        return NULL;            /* exception */
-    }
-
-    return JVM_GetClassContext(env);
-}
diff --git a/src/java.base/share/native/libjava/Thread.c b/src/java.base/share/native/libjava/Thread.c
index fe9f2c91d0c..4ac30638bc2 100644
--- a/src/java.base/share/native/libjava/Thread.c
+++ b/src/java.base/share/native/libjava/Thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/native/libjava/VirtualThread.c b/src/java.base/share/native/libjava/VirtualThread.c
index f9d1d4996fc..3cacf89e752 100644
--- a/src/java.base/share/native/libjava/VirtualThread.c
+++ b/src/java.base/share/native/libjava/VirtualThread.c
@@ -28,7 +28,7 @@
 #include "jvm.h"
 #include "java_lang_VirtualThread.h"
 
-#define THREAD "Ljava/lang/Thread;"
+#define STR  "Ljava/lang/String;"
 #define VIRTUAL_THREAD  "Ljava/lang/VirtualThread;"
 
 static JNINativeMethod methods[] = {
@@ -37,6 +37,8 @@ static JNINativeMethod methods[] = {
     { "notifyJvmtiMount",          "(Z)V", (void *)&JVM_VirtualThreadMount },
     { "notifyJvmtiUnmount",        "(Z)V", (void *)&JVM_VirtualThreadUnmount },
     { "notifyJvmtiDisableSuspend", "(Z)V", (void *)&JVM_VirtualThreadDisableSuspend },
+    { "postPinnedEvent",           "(" STR ")V", (void *)&JVM_VirtualThreadPinnedEvent },
+    { "takeVirtualThreadListToUnblock", "()" VIRTUAL_THREAD, (void *)&JVM_TakeVirtualThreadListToUnblock},
 };
 
 JNIEXPORT void JNICALL
diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h
index 3c73e90d62c..89414697328 100644
--- a/src/java.base/share/native/libjava/jni_util.h
+++ b/src/java.base/share/native/libjava/jni_util.h
@@ -356,9 +356,6 @@ JNIEXPORT void InitializeEncoding(JNIEnv *env, const char *name);
 
 void* getProcessHandle();
 
-void buildJniFunctionName(const char *sym, const char *cname,
-                          char *jniEntryName);
-
 jstring getLastErrorString(JNIEnv *env);
 
 JNIEXPORT int JNICALL
diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index 0bb1daed28a..4f9a6426dff 100644
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -1198,9 +1198,6 @@ ParseArguments(int *pargc, char ***pargv,
                    JLI_StrCmp(arg, "-cp") == 0) {
             REPORT_ERROR (has_arg_any_len, ARG_ERROR1, arg);
             SetClassPath(value);
-            if (mode != LM_SOURCE) {
-                mode = LM_CLASS;
-            }
         } else if (JLI_StrCmp(arg, "--list-modules") == 0) {
             listModules = JNI_TRUE;
         } else if (JLI_StrCmp(arg, "--show-resolved-modules") == 0) {
@@ -1355,11 +1352,12 @@ ParseArguments(int *pargc, char ***pargv,
             *pret = 1;
         }
     } else if (mode == LM_UNKNOWN) {
-        /* default to LM_CLASS if -m, -jar and -cp options are
-         * not specified */
         if (!_have_classpath) {
             SetClassPath(".");
         }
+        /* If neither of -m, -jar, --source option is set, then the
+         * launcher mode is LM_UNKNOWN. In such cases, we determine the
+         * mode as LM_CLASS or LM_SOURCE per the input file. */
         mode = IsSourceFile(arg) ? LM_SOURCE : LM_CLASS;
     } else if (mode == LM_CLASS && IsSourceFile(arg)) {
         /* override LM_CLASS mode if given a source file */
diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java
index da4874b0181..7b5d27f1cc1 100644
--- a/src/java.base/unix/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/unix/classes/java/lang/ProcessImpl.java
@@ -42,14 +42,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import jdk.internal.access.JavaIOFileDescriptorAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.OperatingSystem;
 import jdk.internal.util.StaticProperty;
-import sun.security.action.GetPropertyAction;
 
 /**
  * java.lang.Process subclass in the UNIX environment.
@@ -95,7 +91,7 @@ private static enum LaunchMechanism {
      * @throws Error if the requested launch mechanism is not found or valid
      */
     private static LaunchMechanism launchMechanism() {
-        String s = GetPropertyAction.privilegedGetProperty("jdk.lang.Process.launchMechanism");
+        String s = System.getProperty("jdk.lang.Process.launchMechanism");
         if (s == null) {
             return LaunchMechanism.POSIX_SPAWN;
         }
@@ -282,7 +278,6 @@ private native int forkAndExec(int mode, byte[] helperpath,
                                    boolean redirectErrorStream)
         throws IOException;
 
-    @SuppressWarnings("removal")
     private ProcessImpl(final byte[] prog,
                 final byte[] argBlock, final int argc,
                 final byte[] envBlock, final int envc,
@@ -302,14 +297,7 @@ private ProcessImpl(final byte[] prog,
                           redirectErrorStream);
         processHandle = ProcessHandleImpl.getInternal(pid);
 
-        try {
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                initStreams(fds, forceNullOutputStream);
-                return null;
-            });
-        } catch (PrivilegedActionException ex) {
-            throw (IOException) ex.getCause();
-        }
+        initStreams(fds, forceNullOutputStream);
     }
 
     static FileDescriptor newFileDescriptor(int fd) {
@@ -507,11 +495,6 @@ public CompletableFuture<Process> onExit() {
 
     @Override
     public ProcessHandle toHandle() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         return processHandle;
     }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template b/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
index 82807148224..7d2e73ea915 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,11 +139,13 @@ class UnixConstants {
 #endif
 
     // flags used with openat/unlinkat/etc.
-#if defined(AT_SYMLINK_NOFOLLOW) && defined(AT_REMOVEDIR)
+#if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) && defined(AT_REMOVEDIR)
+    static final int PREFIX_AT_FDCWD = AT_FDCWD;
     static final int PREFIX_AT_SYMLINK_NOFOLLOW = AT_SYMLINK_NOFOLLOW;
     static final int PREFIX_AT_REMOVEDIR = AT_REMOVEDIR;
 #else
     // not supported (dummy values will not be used at runtime).
+    static final int PREFIX_AT_FDCWD = 00;
     static final int PREFIX_AT_SYMLINK_NOFOLLOW = 00;
     static final int PREFIX_AT_REMOVEDIR = 00;
 #endif
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
index 94e0f91e812..033deee2f4f 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,13 +76,16 @@ public void setTimes(FileTime lastModifiedTime,
             boolean useFutimes = false;
             boolean useFutimens = false;
             boolean useLutimes = false;
+            boolean useUtimensat = false;
             int fd = -1;
             try {
                 if (!followLinks) {
-                    useLutimes = lutimesSupported() &&
-                        UnixFileAttributes.get(file, false).isSymbolicLink();
+                    // these path-based syscalls also work if following links
+                    if (!(useUtimensat = utimensatSupported())) {
+                        useLutimes = lutimesSupported();
+                    }
                 }
-                if (!useLutimes) {
+                if (!useUtimensat && !useLutimes) {
                     fd = file.openForAttributeAccess(followLinks);
                     if (fd != -1) {
                         haveFd = true;
@@ -92,8 +95,8 @@ public void setTimes(FileTime lastModifiedTime,
                     }
                 }
             } catch (UnixException x) {
-                if (!(x.errno() == UnixConstants.ENXIO ||
-                     (x.errno() == UnixConstants.ELOOP && useLutimes))) {
+                if (!(x.errno() == ENXIO ||
+                     (x.errno() == ELOOP && (useUtimensat || useLutimes)))) {
                     x.rethrowAsIOException(file);
                 }
             }
@@ -117,7 +120,7 @@ public void setTimes(FileTime lastModifiedTime,
                 }
 
                 // update times
-                TimeUnit timeUnit = useFutimens ?
+                TimeUnit timeUnit = (useFutimens || useUtimensat) ?
                     TimeUnit.NANOSECONDS : TimeUnit.MICROSECONDS;
                 long modValue = lastModifiedTime.to(timeUnit);
                 long accessValue= lastAccessTime.to(timeUnit);
@@ -130,13 +133,16 @@ public void setTimes(FileTime lastModifiedTime,
                         futimes(fd, accessValue, modValue);
                     } else if (useLutimes) {
                         lutimes(file, accessValue, modValue);
+                    } else if (useUtimensat) {
+                        utimensat(AT_FDCWD, file, accessValue, modValue,
+                                  followLinks ? 0 : AT_SYMLINK_NOFOLLOW);
                     } else {
                         utimes(file, accessValue, modValue);
                     }
                 } catch (UnixException x) {
                     // if futimes/utimes fails with EINVAL and one/both of the times is
                     // negative then we adjust the value to the epoch and retry.
-                    if (x.errno() == UnixConstants.EINVAL &&
+                    if (x.errno() == EINVAL &&
                         (modValue < 0L || accessValue < 0L)) {
                         retry = true;
                     } else {
@@ -153,6 +159,9 @@ public void setTimes(FileTime lastModifiedTime,
                             futimes(fd, accessValue, modValue);
                         } else if (useLutimes) {
                             lutimes(file, accessValue, modValue);
+                        } else if (useUtimensat) {
+                            utimensat(AT_FDCWD, file, accessValue, modValue,
+                                      followLinks ? 0 : AT_SYMLINK_NOFOLLOW);
                         } else {
                             utimes(file, accessValue, modValue);
                         }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
index ab8975c6d12..d6d2b9fdcd7 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -391,6 +391,20 @@ static void lutimes(UnixPath path, long times0, long times1)
     private static native void lutimes0(long pathAddress, long times0, long times1)
         throws UnixException;
 
+    /**
+     * utimensat(int fd, const char* path,
+     *           const struct timeval times[2], int flags)
+     */
+    static void utimensat(int fd, UnixPath path, long times0, long times1, int flags)
+        throws UnixException
+    {
+        try (NativeBuffer buffer = copyToNativeBuffer(path)) {
+            utimensat0(fd, buffer.address(), times0, times1, flags);
+        }
+    }
+    private static native void utimensat0(int fd, long pathAddress, long times0, long times1, int flags)
+        throws UnixException;
+
     /**
      * DIR *opendir(const char* dirname)
      */
@@ -557,7 +571,8 @@ static native int flistxattr(int filedes, long listAddress, int size)
     private static final int SUPPORTS_FUTIMES       = 1 << 2;
     private static final int SUPPORTS_FUTIMENS      = 1 << 3;
     private static final int SUPPORTS_LUTIMES       = 1 << 4;
-    private static final int SUPPORTS_XATTR         = 1 << 5;
+    private static final int SUPPORTS_UTIMENSAT     = 1 << 5;
+    private static final int SUPPORTS_XATTR         = 1 << 6;
     private static final int SUPPORTS_BIRTHTIME     = 1 << 16; // other features
     private static final int capabilities;
 
@@ -589,6 +604,13 @@ static boolean lutimesSupported() {
         return (capabilities & SUPPORTS_LUTIMES) != 0;
     }
 
+    /**
+     * Supports utimensat
+     */
+    static boolean utimensatSupported() {
+        return (capabilities & SUPPORTS_UTIMENSAT) != 0;
+    }
+
     /**
      * Supports file birth (creation) time attribute
      */
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
index 41528a55e37..e814dde3229 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,7 +194,7 @@ public int read(String name, ByteBuffer dst) throws IOException {
                 int n = read(name, address, rem);
 
                 // copy from buffer into backing array
-                int off = dst.arrayOffset() + pos + Unsafe.ARRAY_BYTE_BASE_OFFSET;
+                long off = dst.arrayOffset() + pos + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET;
                 unsafe.copyMemory(null, address, dst.array(), off, n);
                 dst.position(pos + n);
 
@@ -257,7 +257,7 @@ public int write(String name, ByteBuffer src) throws IOException {
 
                 if (src.hasArray()) {
                     // copy from backing array into buffer
-                    int off = src.arrayOffset() + pos + Unsafe.ARRAY_BYTE_BASE_OFFSET;
+                    long off = src.arrayOffset() + pos + (long) Unsafe.ARRAY_BYTE_BASE_OFFSET;
                     unsafe.copyMemory(src.array(), off, null, address, rem);
                 } else {
                     // backing array not accessible so transfer via temporary array
diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
index 6e583da7147..b4ed87e0c48 100644
--- a/src/java.base/unix/native/include/jni_md.h
+++ b/src/java.base/unix/native/include/jni_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,6 @@
   #define JNIIMPORT
 #endif
 
-#define JNICALL
-
 typedef int jint;
 #ifdef _LP64
 typedef long jlong;
diff --git a/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c
index 32b477aa7ac..7195b3defdf 100644
--- a/src/java.base/unix/native/libjava/jni_util_md.c
+++ b/src/java.base/unix/native/libjava/jni_util_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,15 +51,6 @@ void* getProcessHandle() {
     return procHandle;
 }
 
-void buildJniFunctionName(const char *sym, const char *cname,
-                          char *jniEntryName) {
-    strcpy(jniEntryName, sym);
-    if (cname != NULL) {
-        strcat(jniEntryName, "_");
-        strcat(jniEntryName, cname);
-    }
-}
-
 jstring
 getLastErrorString(JNIEnv *env)
 {
diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
index 9a68a12c219..aa46a2470a1 100644
--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
@@ -211,6 +211,8 @@ typedef DIR* fdopendir_func(int);
 #if defined(__linux__)
 typedef int statx_func(int dirfd, const char *restrict pathname, int flags,
                        unsigned int mask, struct my_statx *restrict statxbuf);
+typedef int utimensat_func(int dirfd, const char *pathname,
+                           const struct timespec[2], int flags);
 #endif
 
 static openat_func* my_openat_func = NULL;
@@ -223,6 +225,7 @@ static lutimes_func* my_lutimes_func = NULL;
 static fdopendir_func* my_fdopendir_func = NULL;
 #if defined(__linux__)
 static statx_func* my_statx_func = NULL;
+static utimensat_func* my_utimensat_func = NULL;
 #endif
 
 /**
@@ -432,6 +435,10 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
     if (my_statx_func != NULL) {
         capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME;
     }
+    my_utimensat_func = (utimensat_func*) dlsym(RTLD_DEFAULT, "utimensat");
+    if (my_utimensat_func != NULL) {
+        capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_UTIMENSAT;
+    }
 #endif
 
     /* supports extended attributes */
@@ -976,6 +983,34 @@ Java_sun_nio_fs_UnixNativeDispatcher_lutimes0(JNIEnv* env, jclass this,
     }
 }
 
+JNIEXPORT void JNICALL
+Java_sun_nio_fs_UnixNativeDispatcher_utimensat0(JNIEnv* env, jclass this,
+    jint fd, jlong pathAddress, jlong accessTime, jlong modificationTime, jint flags) {
+#if defined(__linux__)
+    int err;
+    struct timespec times[2];
+    const char* path = (const char*)jlong_to_ptr(pathAddress);
+
+    times[0].tv_sec = accessTime / 1000000000;
+    times[0].tv_nsec = accessTime % 1000000000;
+
+    times[1].tv_sec = modificationTime / 1000000000;
+    times[1].tv_nsec = modificationTime % 1000000000;
+
+    if (my_utimensat_func == NULL) {
+        JNU_ThrowInternalError(env, "my_utimensat_func is NULL");
+        return;
+    }
+    RESTARTABLE((*my_utimensat_func)(fd, path, &times[0], flags), err);
+
+    if (err == -1) {
+        throwUnixException(env, errno);
+    }
+#else
+    JNU_ThrowInternalError(env, "should not reach here");
+#endif
+}
+
 JNIEXPORT jlong JNICALL
 Java_sun_nio_fs_UnixNativeDispatcher_opendir0(JNIEnv* env, jclass this,
     jlong pathAddress)
diff --git a/src/java.base/windows/classes/java/lang/ProcessImpl.java b/src/java.base/windows/classes/java/lang/ProcessImpl.java
index fd0d5b03b0c..967693dcbc3 100644
--- a/src/java.base/windows/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/windows/classes/java/lang/ProcessImpl.java
@@ -35,8 +35,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.ProcessBuilder.Redirect;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
@@ -48,7 +46,6 @@
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.ref.CleanerFactory;
 import jdk.internal.misc.Blocker;
-import sun.security.action.GetPropertyAction;
 
 /* This class is for the exclusive use of ProcessBuilder.start() to
  * create new processes.
@@ -71,25 +68,15 @@ final class ProcessImpl extends Process {
      * to append to a file does not open the file in a manner that guarantees
      * that writes by the child process will be atomic.
      */
-    @SuppressWarnings("removal")
     private static FileOutputStream newFileOutputStream(File f, boolean append)
         throws IOException
     {
         if (append) {
             String path = f.getPath();
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-                sm.checkWrite(path);
             long handle = openForAtomicAppend(path);
             final FileDescriptor fd = new FileDescriptor();
             fdAccess.setHandle(fd, handle);
-            return AccessController.doPrivileged(
-                new PrivilegedAction<FileOutputStream>() {
-                    public FileOutputStream run() {
-                        return new FileOutputStream(fd);
-                    }
-                }
-            );
+            return new FileOutputStream(fd);
         } else {
             return new FileOutputStream(f);
         }
@@ -424,7 +411,6 @@ private static int countLeadingBackslash(int verificationType,
     private InputStream stdout_stream;
     private InputStream stderr_stream;
 
-    @SuppressWarnings("removal")
     private ProcessImpl(String cmd[],
                         final String envblock,
                         final String path,
@@ -434,13 +420,10 @@ private ProcessImpl(String cmd[],
         throws IOException
     {
         String cmdstr;
-        final SecurityManager security = System.getSecurityManager();
-        final String value = GetPropertyAction.
-                privilegedGetProperty("jdk.lang.Process.allowAmbiguousCommands",
-                        (security == null ? "true" : "false"));
+        final String value = System.getProperty("jdk.lang.Process.allowAmbiguousCommands", "true");
         final boolean allowAmbiguousCommands = !"false".equalsIgnoreCase(value);
 
-        if (allowAmbiguousCommands && security == null) {
+        if (allowAmbiguousCommands) {
             // Legacy mode.
 
             // Normalize path if possible.
@@ -478,10 +461,6 @@ private ProcessImpl(String cmd[],
                 // Parse the command line again.
                 cmd = getTokensFromCommand(join.toString());
                 executablePath = getExecutablePath(cmd[0]);
-
-                // Check new executable name once more
-                if (security != null)
-                    security.checkExec(executablePath);
             }
 
             // Quotation protects from interpretation of the [path] argument as
@@ -505,39 +484,34 @@ private ProcessImpl(String cmd[],
 
         processHandle = ProcessHandleImpl.getInternal(getProcessId0(handle));
 
-        java.security.AccessController.doPrivileged(
-        new java.security.PrivilegedAction<Void>() {
-        public Void run() {
-            if (stdHandles[0] == -1L)
-                stdin_stream = ProcessBuilder.NullOutputStream.INSTANCE;
-            else {
-                FileDescriptor stdin_fd = new FileDescriptor();
-                fdAccess.setHandle(stdin_fd, stdHandles[0]);
-                fdAccess.registerCleanup(stdin_fd);
-                stdin_stream = new BufferedOutputStream(
-                    new PipeOutputStream(stdin_fd));
-            }
-
-            if (stdHandles[1] == -1L || forceNullOutputStream)
-                stdout_stream = ProcessBuilder.NullInputStream.INSTANCE;
-            else {
-                FileDescriptor stdout_fd = new FileDescriptor();
-                fdAccess.setHandle(stdout_fd, stdHandles[1]);
-                fdAccess.registerCleanup(stdout_fd);
-                stdout_stream = new BufferedInputStream(
-                    new PipeInputStream(stdout_fd));
-            }
+        if (stdHandles[0] == -1L)
+            stdin_stream = ProcessBuilder.NullOutputStream.INSTANCE;
+        else {
+            FileDescriptor stdin_fd = new FileDescriptor();
+            fdAccess.setHandle(stdin_fd, stdHandles[0]);
+            fdAccess.registerCleanup(stdin_fd);
+            stdin_stream = new BufferedOutputStream(
+                new PipeOutputStream(stdin_fd));
+        }
 
-            if (stdHandles[2] == -1L)
-                stderr_stream = ProcessBuilder.NullInputStream.INSTANCE;
-            else {
-                FileDescriptor stderr_fd = new FileDescriptor();
-                fdAccess.setHandle(stderr_fd, stdHandles[2]);
-                fdAccess.registerCleanup(stderr_fd);
-                stderr_stream = new PipeInputStream(stderr_fd);
-            }
+        if (stdHandles[1] == -1L || forceNullOutputStream)
+            stdout_stream = ProcessBuilder.NullInputStream.INSTANCE;
+        else {
+            FileDescriptor stdout_fd = new FileDescriptor();
+            fdAccess.setHandle(stdout_fd, stdHandles[1]);
+            fdAccess.registerCleanup(stdout_fd);
+            stdout_stream = new BufferedInputStream(
+                new PipeInputStream(stdout_fd));
+        }
 
-            return null; }});
+        if (stdHandles[2] == -1L)
+            stderr_stream = ProcessBuilder.NullInputStream.INSTANCE;
+        else {
+            FileDescriptor stderr_fd = new FileDescriptor();
+            fdAccess.setHandle(stderr_fd, stdHandles[2]);
+            fdAccess.registerCleanup(stderr_fd);
+            stderr_stream = new PipeInputStream(stderr_fd);
+        }
     }
 
     public OutputStream getOutputStream() {
@@ -632,11 +606,6 @@ public CompletableFuture<Process> onExit() {
 
     @Override
     public ProcessHandle toHandle() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("manageProcess"));
-        }
         return processHandle;
     }
 
diff --git a/src/java.base/windows/lib/security/default.policy b/src/java.base/windows/lib/security/default.policy
deleted file mode 100644
index 2af809a7a08..00000000000
--- a/src/java.base/windows/lib/security/default.policy
+++ /dev/null
@@ -1,16 +0,0 @@
-grant codeBase "jrt:/jdk.accessibility" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "jrt:/jdk.crypto.mscapi" {
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.sun.security.*";
-    permission java.lang.RuntimePermission "loadLibrary.sunmscapi";
-    permission java.security.SecurityPermission "putProviderProperty.SunMSCAPI";
-    permission java.security.SecurityPermission
-                   "clearProviderProperties.SunMSCAPI";
-    permission java.security.SecurityPermission
-                   "removeProviderProperty.SunMSCAPI";
-    permission java.security.SecurityPermission "authProvider.SunMSCAPI";
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/src/java.base/windows/native/include/jni_md.h b/src/java.base/windows/native/include/jni_md.h
index f795421937e..6d217733d82 100644
--- a/src/java.base/windows/native/include/jni_md.h
+++ b/src/java.base/windows/native/include/jni_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
   #define JNIEXPORT __declspec(dllexport)
 #endif
 #define JNIIMPORT __declspec(dllimport)
-#define JNICALL __stdcall
 
 typedef int jint;
 typedef long long jlong;
diff --git a/src/java.base/windows/native/libjava/gdefs_md.h b/src/java.base/windows/native/libjava/gdefs_md.h
index 24cc95ff0e7..d7c0e6552a3 100644
--- a/src/java.base/windows/native/libjava/gdefs_md.h
+++ b/src/java.base/windows/native/libjava/gdefs_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,3 @@
  */
 
 #include <stddef.h>
-#ifndef _WIN64
-typedef int intptr_t;
-typedef unsigned int uintptr_t;
-typedef unsigned long DWORD_PTR, *PDWORD_PTR;
-#endif
diff --git a/src/java.base/windows/native/libjava/java_props_md.c b/src/java.base/windows/native/libjava/java_props_md.c
index d26d6df1aff..03d0acdae1e 100644
--- a/src/java.base/windows/native/libjava/java_props_md.c
+++ b/src/java.base/windows/native/libjava/java_props_md.c
@@ -552,8 +552,6 @@ GetJavaProperties(JNIEnv* env)
         sprops.os_version = _strdup(buf);
 #if defined(_M_AMD64)
         sprops.os_arch = "amd64";
-#elif defined(_X86_)
-        sprops.os_arch = "x86";
 #elif defined(_M_ARM64)
         sprops.os_arch = "aarch64";
 #else
diff --git a/src/java.base/windows/native/libjava/jlong_md.h b/src/java.base/windows/native/libjava/jlong_md.h
index 0e3da8f4947..a5db712b0b0 100644
--- a/src/java.base/windows/native/libjava/jlong_md.h
+++ b/src/java.base/windows/native/libjava/jlong_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,15 +63,8 @@
 /* For static variables initialized to zero */
 #define jlong_zero_init ((jlong) 0)
 
-#ifdef _WIN64
 #define jlong_to_ptr(a) ((void*)(a))
 #define ptr_to_jlong(a) ((jlong)(a))
-#else
-/* Double casting to avoid warning messages looking for casting of */
-/* smaller sizes into pointers */
-#define jlong_to_ptr(a) ((void*)(int)(a))
-#define ptr_to_jlong(a) ((jlong)(int)(a))
-#endif
 
 #define jint_to_jlong(a)        ((jlong)(a))
 #define jlong_to_jint(a)        ((jint)(a))
diff --git a/src/java.base/windows/native/libjava/jni_util_md.c b/src/java.base/windows/native/libjava/jni_util_md.c
index 9c64a339aad..672f719bc81 100644
--- a/src/java.base/windows/native/libjava/jni_util_md.c
+++ b/src/java.base/windows/native/libjava/jni_util_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,34 +35,6 @@ void* getProcessHandle() {
     return (void*)GetModuleHandle(NULL);
 }
 
-/*
- * Windows symbols can be simple like JNI_OnLoad or __stdcall format
- * like _JNI_OnLoad@8. We need to handle both.
- */
-void buildJniFunctionName(const char *sym, const char *cname,
-                          char *jniEntryName) {
-    if (cname != NULL) {
-        char *p = strrchr(sym, '@');
-        if (p != NULL && p != sym) {
-            // sym == _JNI_OnLoad@8
-            strncpy(jniEntryName, sym, (p - sym));
-            jniEntryName[(p-sym)] = '\0';
-            // jniEntryName == _JNI_OnLoad
-            strcat(jniEntryName, "_");
-            strcat(jniEntryName, cname);
-            strcat(jniEntryName, p);
-            //jniEntryName == _JNI_OnLoad_cname@8
-        } else {
-            strcpy(jniEntryName, sym);
-            strcat(jniEntryName, "_");
-            strcat(jniEntryName, cname);
-        }
-    } else {
-        strcpy(jniEntryName, sym);
-    }
-    return;
-}
-
 jstring
 getLastErrorString(JNIEnv *env) {
 
diff --git a/src/java.base/windows/native/libjli/java_md.c b/src/java.base/windows/native/libjli/java_md.c
index a1012bcc4f9..c4d38a02831 100644
--- a/src/java.base/windows/native/libjli/java_md.c
+++ b/src/java.base/windows/native/libjli/java_md.c
@@ -681,7 +681,7 @@ void* SplashProcAddress(const char* name) {
 /*
  * Signature adapter for _beginthreadex().
  */
-static unsigned __stdcall ThreadJavaMain(void* args) {
+static unsigned ThreadJavaMain(void* args) {
     return (unsigned)JavaMain(args);
 }
 
diff --git a/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c b/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
index 96a3f5ad5c1..deea97dcceb 100644
--- a/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
+++ b/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,9 +69,7 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
     static struct timeval zerotime = {0, 0};
     int read_count = 0, write_count = 0, except_count = 0;
 
-#ifdef _WIN64
     int resultbuf[FD_SETSIZE + 1];
-#endif
 
     if (timeout == 0) {
         tv = &zerotime;
@@ -121,7 +119,6 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
     /* Return selected sockets. */
     /* Each Java array consists of sockets count followed by sockets list */
 
-#ifdef _WIN64
     resultbuf[0] = readfds->fd_count;
     for (i = 0; i < (int)readfds->fd_count; i++) {
         resultbuf[i + 1] = (int)readfds->fd_array[i];
@@ -142,15 +139,7 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
     }
     (*env)->SetIntArrayRegion(env, returnExceptFds, 0,
                               exceptfds->fd_count + 1, resultbuf);
-#else
-    (*env)->SetIntArrayRegion(env, returnReadFds, 0,
-                              readfds->fd_count + 1, (jint *)readfds);
 
-    (*env)->SetIntArrayRegion(env, returnWriteFds, 0,
-                              writefds->fd_count + 1, (jint *)writefds);
-    (*env)->SetIntArrayRegion(env, returnExceptFds, 0,
-                              exceptfds->fd_count + 1, (jint *)exceptfds);
-#endif
     return 0;
 }
 
diff --git a/src/java.base/windows/native/libnio/ch/nio_util.h b/src/java.base/windows/native/libnio/ch/nio_util.h
index b90e0ac63d5..e7bef3d39cb 100644
--- a/src/java.base/windows/native/libnio/ch/nio_util.h
+++ b/src/java.base/windows/native/libnio/ch/nio_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,26 +47,14 @@ jint convertReturnVal(JNIEnv *env, jint n, jboolean r);
 jlong convertLongReturnVal(JNIEnv *env, jlong n, jboolean r);
 jboolean purgeOutstandingICMP(JNIEnv *env, jclass clazz, jint fd);
 
-#ifdef _WIN64
-
 struct iovec {
     jlong  iov_base;
     jint  iov_len;
 };
 
-#else
-
-struct iovec {
-    jint  iov_base;
-    jint  iov_len;
-};
-
-#endif
-
 /* Defined in UnixDomainSockets.c */
 
 jbyteArray sockaddrToUnixAddressBytes(JNIEnv *env, struct sockaddr_un *sa, socklen_t len);
 
 jint unixSocketAddressToSockaddr(JNIEnv *env, jbyteArray uaddr,
                                 struct sockaddr_un *sa, int *len);
-
diff --git a/src/java.compiler/share/classes/javax/tools/FileObject.java b/src/java.compiler/share/classes/javax/tools/FileObject.java
index 89a8499bf51..5a7dbec83e4 100644
--- a/src/java.compiler/share/classes/javax/tools/FileObject.java
+++ b/src/java.compiler/share/classes/javax/tools/FileObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,6 @@
  * example, a file object can be used to represent regular files,
  * memory cache, or data in databases.
  *
- * <p>All methods in this interface might throw a SecurityException if
- * a security exception occurs.
- *
  * <p>Unless explicitly allowed, all methods in this interface might
  * throw a NullPointerException if given a {@code null} argument.
  *
diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
index 9db757f05a2..1cff1c35770 100644
--- a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
@@ -60,7 +60,6 @@ protected ForwardingJavaFileManager(M fileManager) {
     }
 
     /**
-     * @throws SecurityException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
      */
     @Override
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
index da2a3b534ac..ef9b0be21a2 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
@@ -86,8 +86,6 @@
  *     URI.create(relativeName).normalize().getPath().equals(relativeName)
  *     }
  *
- * <p>All methods in this interface might throw a SecurityException.
- *
  * <p>An object of this interface is not required to support
  * multi-threaded access, that is, be synchronized.  However, it must
  * support concurrent access to different file objects created by this
@@ -188,8 +186,6 @@ default boolean isModuleOrientedLocation() {
      * @return a class loader for the given location; or {@code null}
      * if loading plug-ins from the given location is disabled or if
      * the location is not known
-     * @throws SecurityException if a class loader can not be created
-     * in the current security context
      * @throws IllegalStateException if {@link #close} has been called
      * and this file manager cannot be reopened
      * @throws IllegalArgumentException if the location is a module-oriented location
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
index 0cac57a3176..77a176b6d5b 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,6 @@
  * File abstraction for tools operating on Java programming language
  * source and class files.
  *
- * <p>All methods in this interface might throw a SecurityException if
- * a security exception occurs.
- *
  * <p>Unless explicitly allowed, all methods in this interface might
  * throw a NullPointerException if given a {@code null} argument.
  *
diff --git a/src/java.desktop/share/classes/java/applet/Applet.java b/src/java.desktop/share/classes/java/applet/Applet.java
index 1d0e25e1177..c68605a9b64 100644
--- a/src/java.desktop/share/classes/java/applet/Applet.java
+++ b/src/java.desktop/share/classes/java/applet/Applet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,13 +123,8 @@ private void readObject(ObjectInputStream s)
 
     /**
      * Sets this applet's stub. This is done automatically by the system.
-     * <p>
-     * If there is a security manager, its {@code checkPermission} method is
-     * called with the {@code AWTPermission("setAppletStub")} permission if a
-     * stub has already been set.
      *
      * @param  stub the new stub
-     * @throws SecurityException if the caller cannot set the stub
      */
     public final void setStub(AppletStub stub) {
         if (this.stub != null) {
diff --git a/src/java.desktop/share/classes/java/awt/AWTPermission.java b/src/java.desktop/share/classes/java/awt/AWTPermission.java
index 7b0e68e3e89..53a5ebfa204 100644
--- a/src/java.desktop/share/classes/java/awt/AWTPermission.java
+++ b/src/java.desktop/share/classes/java/awt/AWTPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,133 +34,9 @@
  * no actions list; you either have the named permission
  * or you don't.
  *
- * <P>
- * The target name is the name of the AWT permission (see below). The naming
- * convention follows the hierarchical property naming convention.
- * Also, an asterisk could be used to represent all AWT permissions.
- *
- * <P>
- * The following table lists all the possible {@code AWTPermission}
- * target names, and for each provides a description of what the
- * permission allows and a discussion of the risks of granting code
- * the permission.
- *
- * <table class="striped">
- * <caption>AWTPermission target names, descriptions, and associated risks
- * </caption>
- * <thead>
- *   <tr>
- *     <th scope="col">Permission Target Name
- *     <th scope="col">What the Permission Allows
- *     <th scope="col">Risks of Allowing this Permission
- * </thead>
- * <tbody>
- *   <tr>
- *     <th scope="row">accessClipboard
- *     <td>Posting and retrieval of information to and from the AWT clipboard
- *     <td>This would allow malfeasant code to share potentially sensitive or
- *     confidential information.
- *   <tr>
- *     <th scope="row">accessEventQueue
- *     <td>Access to the AWT event queue
- *     <td>After retrieving the AWT event queue, malicious code may peek at and
- *     even remove existing events from its event queue, as well as post bogus
- *     events which may purposefully cause the application or applet to
- *     misbehave in an insecure manner.
- *   <tr>
- *     <th scope="row">accessSystemTray
- *     <td>Access to the AWT SystemTray instance
- *     <td>This would allow malicious code to add tray icons to the system tray.
- *     First, such an icon may look like the icon of some known application
- *     (such as a firewall or anti-virus) and order a user to do something
- *     unsafe (with help of balloon messages). Second, the system tray may be
- *     glutted with tray icons so that no one could add a tray icon anymore.
- *   <tr>
- *     <th scope="row">createRobot
- *     <td>Create java.awt.Robot objects
- *     <td>The java.awt.Robot object allows code to generate native-level mouse
- *     and keyboard events as well as read the screen. It could allow malicious
- *     code to control the system, run other programs, read the display, and
- *     deny mouse and keyboard access to the user.
- *   <tr>
- *     <th scope="row">fullScreenExclusive
- *     <td>Enter full-screen exclusive mode
- *     <td>Entering full-screen exclusive mode allows direct access to low-level
- *     graphics card memory. This could be used to spoof the system, since the
- *     program is in direct control of rendering. Depending on the
- *     implementation, the security warning may not be shown for the windows
- *     used to enter the full-screen exclusive mode (assuming that the
- *     {@code fullScreenExclusive} permission has been granted to this
- *     application). Note that this behavior does not mean that the
- *     {@code showWindowWithoutWarningBanner} permission will be automatically
- *     granted to the application which has the {@code fullScreenExclusive}
- *     permission: non-full-screen windows will continue to be shown with the
- *     security warning.
- *   <tr>
- *     <th scope="row">listenToAllAWTEvents
- *     <td>Listen to all AWT events, system-wide
- *     <td>After adding an AWT event listener, malicious code may scan all AWT
- *     events dispatched in the system, allowing it to read all user input (such
- *     as passwords). Each AWT event listener is called from within the context
- *     of that event queue's EventDispatchThread, so if the accessEventQueue
- *     permission is also enabled, malicious code could modify the contents of
- *     AWT event queues system-wide, causing the application or applet to
- *     misbehave in an insecure manner.
- *   <tr>
- *     <th scope="row">readDisplayPixels
- *     <td>Readback of pixels from the display screen
- *     <td>Interfaces such as the java.awt.Composite interface or the
- *     java.awt.Robot class allow arbitrary code to examine pixels on the
- *     display enable malicious code to snoop on the activities of the user.
- *   <tr>
- *     <th scope="row">replaceKeyboardFocusManager
- *     <td>Sets the {@code KeyboardFocusManager} for a particular thread.
- *     <td>When {@code SecurityManager} is installed, the invoking thread must
- *     be granted this permission in order to replace the current
- *     {@code KeyboardFocusManager}. If permission is not granted, a
- *     {@code SecurityException} will be thrown.
- *   <tr>
- *     <th scope="row">setAppletStub
- *     <td>Setting the stub which implements Applet container services
- *     <td>Malicious code could set an applet's stub and result in unexpected
- *     behavior or denial of service to an applet.
- *   <tr>
- *     <th scope="row">setWindowAlwaysOnTop
- *     <td>Setting always-on-top property of the window:
- *     {@link Window#setAlwaysOnTop}
- *     <td>The malicious window might make itself look and behave like a real
- *     full desktop, so that information entered by the unsuspecting user is
- *     captured and subsequently misused
- *   <tr>
- *     <th scope="row">showWindowWithoutWarningBanner
- *     <td>Display of a window without also displaying a banner warning that the
- *     window was created by an applet
- *     <td>Without this warning, an applet may pop up windows without the user
- *     knowing that they belong to an applet. Since users may make
- *     security-sensitive decisions based on whether or not the window belongs
- *     to an applet (entering a username and password into a dialog box, for
- *     example), disabling this warning banner may allow applets to trick the
- *     user into entering such information.
- *   <tr>
- *     <th scope="row">toolkitModality
- *     <td>Creating {@link Dialog.ModalityType#TOOLKIT_MODAL TOOLKIT_MODAL}
- *     dialogs and setting the
- *     {@link Dialog.ModalExclusionType#TOOLKIT_EXCLUDE TOOLKIT_EXCLUDE} window
- *     property.
- *     <td>When a toolkit-modal dialog is shown from an applet, it blocks all
- *     other applets in the browser. When launching applications from Java Web
- *     Start, its windows (such as the security dialog) may also be blocked by
- *     toolkit-modal dialogs, shown from these applications.
- *   <tr>
- *     <th scope="row">watchMousePointer
- *     <td>Getting the information about the mouse pointer position at any time
- *     <td>Constantly watching the mouse pointer, an applet can make guesses
- *     about what the user is doing, i.e. moving the mouse to the lower left
- *     corner of the screen most likely means that the user is about to launch
- *     an application. If a virtual keypad is used so that keyboard is emulated
- *     using the mouse, an applet may guess what is being typed.
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see java.security.BasicPermission
  * @see java.security.Permission
diff --git a/src/java.desktop/share/classes/java/awt/Desktop.java b/src/java.desktop/share/classes/java/awt/Desktop.java
index 1abba965d8b..025889755b8 100644
--- a/src/java.desktop/share/classes/java/awt/Desktop.java
+++ b/src/java.desktop/share/classes/java/awt/Desktop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,9 +356,6 @@ public boolean isSupported(Action action) {
     /**
      * Checks if the file is a valid file and readable.
      *
-     * @throws SecurityException If a security manager exists and its
-     *         {@link SecurityManager#checkRead(java.lang.String)} method
-     *         denies read access to the file
      * @throws NullPointerException if file is null
      * @throws IllegalArgumentException if file doesn't exist
      */
@@ -413,13 +410,6 @@ private void checkAWTPermission() {
      * does not support the {@link Desktop.Action#OPEN} action
      * @throws IOException if the specified file has no associated
      * application or the associated application fails to be launched
-     * @throws SecurityException if a security manager exists and its
-     * {@link java.lang.SecurityManager#checkRead(java.lang.String)}
-     * method denies read access to the file, or it denies the
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
-     * @see java.awt.AWTPermission
      */
     public void open(File file) throws IOException {
         file = new File(file.getPath());
@@ -443,15 +433,6 @@ public void open(File file) throws IOException {
      * does not support the {@link Desktop.Action#EDIT} action
      * @throws IOException if the specified file has no associated
      * editor, or the associated application fails to be launched
-     * @throws SecurityException if a security manager exists and its
-     * {@link java.lang.SecurityManager#checkRead(java.lang.String)}
-     * method denies read access to the file, or {@link
-     * java.lang.SecurityManager#checkWrite(java.lang.String)} method
-     * denies write access to the file, or it denies the
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
-     * @see java.awt.AWTPermission
      */
     public void edit(File file) throws IOException {
         file = new File(file.getPath());
@@ -479,12 +460,6 @@ public void edit(File file) throws IOException {
      *         does not support the {@link Desktop.Action#PRINT} action
      * @throws IOException if the specified file has no associated
      * application that can be used to print it
-     * @throws SecurityException if a security manager exists and its
-     * {@link java.lang.SecurityManager#checkRead(java.lang.String)}
-     * method denies read access to the file, or its {@link
-     * java.lang.SecurityManager#checkPrintJobAccess()} method denies
-     * the permission to print the file, or the calling thread is not
-     * allowed to create a subprocess
      */
     public void print(File file) throws IOException {
         file = new File(file.getPath());
@@ -517,13 +492,7 @@ public void print(File file) throws IOException {
      * @throws IOException if the user default browser is not found,
      * or it fails to be launched, or the default handler application
      * failed to be launched
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
      * @see java.net.URI
-     * @see java.awt.AWTPermission
      */
     public void browse(URI uri) throws IOException {
         checkAWTPermission();
@@ -541,12 +510,6 @@ public void browse(URI uri) throws IOException {
      * does not support the {@link Desktop.Action#MAIL} action
      * @throws IOException if the user default mail client is not
      * found, or it fails to be launched
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
-     * @see java.awt.AWTPermission
      */
     public void mail() throws IOException {
         checkAWTPermission();
@@ -582,15 +545,9 @@ public void mail() throws IOException {
      * does not support the {@link Desktop.Action#MAIL} action
      * @throws IOException if the user default mail client is not
      * found or fails to be launched
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
      * @spec https://www.rfc-editor.org/info/rfc2368
      *      RFC 2368: The mailto URL scheme
      * @see java.net.URI
-     * @see java.awt.AWTPermission
      */
     public  void mail(URI mailtoURI) throws IOException {
         checkAWTPermission();
@@ -640,11 +597,6 @@ private void checkQuitPermission() {
      *
      * @param listener listener
      *
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")}
-     * permission
-     *
      * @see java.awt.desktop.AppForegroundListener
      * @see java.awt.desktop.AppHiddenListener
      * @see java.awt.desktop.AppReopenedListener
@@ -667,11 +619,6 @@ public void addAppEventListener(final SystemEventListener listener) {
      *
      * @param listener listener
      *
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")}
-     * permission
-     *
      * @see java.awt.desktop.AppForegroundListener
      * @see java.awt.desktop.AppHiddenListener
      * @see java.awt.desktop.AppReopenedListener
@@ -694,10 +641,6 @@ public void removeAppEventListener(final SystemEventListener listener) {
      * @param aboutHandler the handler to respond to the
      * {@link java.awt.desktop.AboutHandler#handleAbout(AboutEvent)} message
      *
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")}
-     * permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_ABOUT} action
      *
@@ -719,9 +662,6 @@ public void setAboutHandler(final AboutHandler aboutHandler) {
      * @param preferencesHandler the handler to respond to the
      * {@link PreferencesHandler#handlePreferences(PreferencesEvent)}
      *
-     * @throws SecurityException if a security manager exists and it
-     * denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_PREFERENCES} action
      * @since 9
@@ -746,12 +686,6 @@ public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {
      *
      * @param openFileHandler handler
      *
-     * @throws SecurityException if a security manager exists and its
-     * {@link java.lang.SecurityManager#checkRead(java.lang.String)}
-     * method denies read access to the files, or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_OPEN_FILE} action
      * @since 9
@@ -777,10 +711,6 @@ public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {
      * {@code Info.plist}.
      *
      * @param printFileHandler handler
-     * @throws SecurityException if a security manager exists and its
-     * {@link java.lang.SecurityManager#checkPrintJobAccess()} method denies
-     * the permission to print or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_PRINT_FILE} action
      * @since 9
@@ -814,9 +744,6 @@ public void setPrintFileHandler(final PrintFilesHandler printFileHandler) {
      *
      * @param openURIHandler handler
      *
-     * {@code RuntimePermission("canProcessApplicationEvents")}
-     * permission, or the calling thread is not allowed to create a
-     * subprocess
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_OPEN_URI} action
      * @since 9
@@ -837,9 +764,6 @@ public void setOpenURIHandler(final OpenURIHandler openURIHandler) {
      * @param quitHandler the handler that is called when the application is
      * asked to quit
      *
-     * @throws SecurityException if a security manager exists and it
-     * will not allow the caller to invoke {@code System.exit} or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_QUIT_HANDLER} action
      * @since 9
@@ -857,11 +781,6 @@ public void setQuitHandler(final QuitHandler quitHandler) {
      *
      * @param strategy the way this application should be shutdown
      *
-     * @throws SecurityException if a security manager exists and it
-     * will not allow the caller to invoke {@code System.exit} or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
-     * @throws UnsupportedOperationException if the current platform
-     * does not support the {@link Desktop.Action#APP_QUIT_STRATEGY} action
      * @see QuitStrategy
      * @since 9
      */
@@ -886,9 +805,6 @@ public void setQuitStrategy(final QuitStrategy strategy) {
      * E.g. user-initiated Cmd-Q, logout, restart, or shutdown requests will
      * effectively "kill -KILL" your application.
      *
-     * @throws SecurityException if a security manager exists and it
-     * will not allow the caller to invoke {@code System.exit} or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_SUDDEN_TERMINATION} action
      * @see #disableSuddenTermination()
@@ -907,9 +823,6 @@ public void enableSuddenTermination() {
      * Call this method to indicate that your application has unsaved state, and
      * may not be terminated without notification.
      *
-     * @throws SecurityException if a security manager exists and it
-     * will not allow the caller to invoke {@code System.exit} or it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_SUDDEN_TERMINATION} action
      * @see #enableSuddenTermination()
@@ -927,8 +840,6 @@ public void disableSuddenTermination() {
      *
      * @param allWindows if all windows of this application should be moved to
      * the foreground, or only the foremost one
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_REQUEST_FOREGROUND} action
      * @since 9
@@ -946,12 +857,6 @@ public void requestForeground(final boolean allWindows) {
      * application if a Help Book has been added to the application bundler
      * and registered in the Info.plist with CFBundleHelpBookFolder
      *
-     * @throws SecurityException if a security manager exists and it denies the
-     *         {@code RuntimePermission("canProcessApplicationEvents")}
-     *         permission, or it denies the
-     *         {@code AWTPermission("showWindowWithoutWarningBanner")}
-     *         permission, or the calling thread is not allowed to create a
-     *         subprocess
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_HELP_VIEWER} action
      * @since 9
@@ -968,8 +873,6 @@ public void openHelpViewer() {
      * Sets the default menu bar to use when there are no active frames.
      *
      * @param menuBar to use when no other frames are active
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Desktop.Action#APP_MENU_BAR} action
      * @since 9
@@ -993,12 +896,6 @@ public void setDefaultMenuBar(final JMenuBar menuBar) {
      * Opens a folder containing the {@code file} and selects it
      * in a default system file manager.
      * @param file the file
-     * @throws SecurityException If a security manager exists and its
-     *         {@link SecurityManager#checkRead(java.lang.String)} method
-     *         denies read access to the file or to its parent, or it denies the
-     *         {@code AWTPermission("showWindowWithoutWarningBanner")}
-     *         permission, or the calling thread is not allowed to create a
-     *         subprocess
      * @throws UnsupportedOperationException if the current platform
      *         does not support the {@link Desktop.Action#BROWSE_FILE_DIR} action
      * @throws NullPointerException if {@code file} is {@code null}
@@ -1024,9 +921,6 @@ public void browseFileDirectory(File file) {
      *
      * @param file the file
      * @return returns true if successfully moved the file to the trash.
-     * @throws SecurityException If a security manager exists and its
-     *         {@link SecurityManager#checkDelete(java.lang.String)} method
-     *         denies deletion of the file
      * @throws UnsupportedOperationException if the current platform
      *         does not support the {@link Desktop.Action#MOVE_TO_TRASH} action
      * @throws NullPointerException if {@code file} is {@code null}
diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java
index f3ffee2c2fd..a0d22fbb327 100644
--- a/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/src/java.desktop/share/classes/java/awt/Dialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,13 +181,6 @@ public static enum ModalityType {
          * toolkit; thus, a toolkit-modal dialog displayed by an applet may affect
          * other applets and all windows of the browser instance which embeds the
          * Java runtime environment for this toolkit.
-         * Special {@code AWTPermission} "toolkitModality" must be granted to use
-         * toolkit-modal dialogs. If a {@code TOOLKIT_MODAL} dialog is being created
-         * and this permission is not granted, a {@code SecurityException} will be
-         * thrown, and no dialog will be created. If a modality type is being changed
-         * to {@code TOOLKIT_MODAL} and this permission is not granted, a
-         * {@code SecurityException} will be thrown, and the modality type will
-         * be left unchanged.
          */
         TOOLKIT_MODAL
     }
@@ -264,11 +257,6 @@ public static enum ModalExclusionType {
          * won't be blocked by  application-modal or toolkit-modal dialogs. Also,
          * it isn't blocked by document-modal dialogs from outside of its
          * child hierarchy.
-         * The "toolkitModality" {@code AWTPermission} must be granted
-         * for this exclusion. If an exclusion property is being changed to
-         * {@code TOOLKIT_EXCLUDE} and this permission is not granted, a
-         * {@code SecurityException} will be thrown, and the exclusion
-         * property will be left unchanged.
          */
         TOOLKIT_EXCLUDE
     }
@@ -624,8 +612,6 @@ public Dialog(Window owner, String title) {
      *    {@code GraphicsConfiguration} is not from a screen device
      * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if the calling thread does not have permission
-     *    to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
@@ -659,8 +645,6 @@ public Dialog(Window owner, ModalityType modalityType) {
      *     {@code GraphicsConfiguration} is not from a screen device
      * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if the calling thread does not have permission
-     *     to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
@@ -710,8 +694,6 @@ public Dialog(Window owner, String title, ModalityType modalityType) {
      *     is not from a screen device
      * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if the calling thread does not have permission
-     *     to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
@@ -847,8 +829,6 @@ public ModalityType getModalityType() {
      * @param type specifies whether dialog blocks input to other
      *     windows when shown. {@code null} value and unsupported modality
      *     types are equivalent to {@code MODELESS}
-     * @throws SecurityException if the calling thread does not have permission
-     *     to create modal dialogs with the given {@code modalityType}
      *
      * @see       java.awt.Dialog#getModalityType
      * @see       java.awt.Toolkit#isModalityTypeSupported
diff --git a/src/java.desktop/share/classes/java/awt/Font.java b/src/java.desktop/share/classes/java/awt/Font.java
index cbcd1f473e9..ff5c29a2758 100644
--- a/src/java.desktop/share/classes/java/awt/Font.java
+++ b/src/java.desktop/share/classes/java/awt/Font.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1235,8 +1235,6 @@ public Void run() {
      * @throws IOException if the {@code fontFile} cannot be read.
      * @throws FontFormatException if {@code fontFile} does
      *     not contain the required font tables for the specified format.
-     * @throws SecurityException if the executing code does not have
-     * permission to read from the file.
      * @see GraphicsEnvironment#registerFont(Font)
      * @since 1.5
      */
@@ -1612,8 +1610,7 @@ public boolean hasLayoutAttributes() {
      * obtained.  The {@code String} value of this property is then
      * interpreted as a {@code Font} object according to the
      * specification of {@code Font.decode(String)}
-     * If the specified property is not found, or the executing code does
-     * not have permission to read the property, null is returned instead.
+     * If the specified property is not found, null is returned instead.
      *
      * @param nm the property name
      * @return a {@code Font} object that the property name
@@ -1781,8 +1778,7 @@ public static Font decode(String str) {
      * <p>
      * The property value should be one of the forms accepted by
      * {@code Font.decode(String)}
-     * If the specified property is not found, or the executing code does not
-     * have permission to read the property, the {@code font}
+     * If the specified property is not found, the {@code font}
      * argument is returned instead.
      * @param nm the case-insensitive property name
      * @param font a default {@code Font} to return if property
diff --git a/src/java.desktop/share/classes/java/awt/Graphics2D.java b/src/java.desktop/share/classes/java/awt/Graphics2D.java
index 0f06fa48ad6..e2965193f33 100644
--- a/src/java.desktop/share/classes/java/awt/Graphics2D.java
+++ b/src/java.desktop/share/classes/java/awt/Graphics2D.java
@@ -836,25 +836,11 @@ public abstract boolean hit(Rectangle rect,
      * and {@code fill}.  It specifies how new pixels are to be combined
      * with the existing pixels on the graphics device during the rendering
      * process.
-     * <p>If this {@code Graphics2D} context is drawing to a
-     * {@code Component} on the display screen and the
-     * {@code Composite} is a custom object rather than an
-     * instance of the {@code AlphaComposite} class, and if
-     * there is a security manager, its {@code checkPermission}
-     * method is called with an {@code AWTPermission("readDisplayPixels")}
-     * permission.
-     * @throws SecurityException
-     *         if a custom {@code Composite} object is being
-     *         used to render to the screen and a security manager
-     *         is set and its {@code checkPermission} method
-     *         does not allow the operation.
      * @param comp the {@code Composite} object to be used for rendering
      * @see java.awt.Graphics#setXORMode
      * @see java.awt.Graphics#setPaintMode
      * @see #getComposite
      * @see AlphaComposite
-     * @see SecurityManager#checkPermission
-     * @see java.awt.AWTPermission
      */
     public abstract void setComposite(Composite comp);
 
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
index b5c5a7b54fb..ed331e4915a 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, 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
@@ -208,14 +208,8 @@ public static enum WindowTranslucency {
     /**
      * Returns {@code true} if this {@code GraphicsDevice}
      * supports full-screen exclusive mode.
-     * If a SecurityManager is installed, its
-     * {@code checkPermission} method will be called
-     * with {@code AWTPermission("fullScreenExclusive")}.
-     * {@code isFullScreenSupported} returns true only if
-     * that permission is granted.
      * @return whether full-screen exclusive mode is available for
      * this graphics device
-     * @see java.awt.AWTPermission
      * @since 1.4
      */
     public boolean isFullScreenSupported() {
diff --git a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
index d3547094843..0ca86f3433b 100644
--- a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
+++ b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -223,22 +223,12 @@ public static KeyboardFocusManager getCurrentKeyboardFocusManager() {
      * Sets the current KeyboardFocusManager instance for the calling thread's
      * context. If null is specified, then the current KeyboardFocusManager
      * is replaced with a new instance of DefaultKeyboardFocusManager.
-     * <p>
-     * If a SecurityManager is installed, the calling thread must be granted
-     * the AWTPermission "replaceKeyboardFocusManager" in order to replace the
-     * the current KeyboardFocusManager. If this permission is not granted,
-     * this method will throw a SecurityException, and the current
-     * KeyboardFocusManager will be unchanged.
      *
      * @param newManager the new KeyboardFocusManager for this thread's context
      * @see #getCurrentKeyboardFocusManager
      * @see DefaultKeyboardFocusManager
-     * @throws SecurityException if the calling thread does not have permission
-     *         to replace the current KeyboardFocusManager
      */
-    public static void setCurrentKeyboardFocusManager(
-        KeyboardFocusManager newManager) throws SecurityException
-    {
+    public static void setCurrentKeyboardFocusManager(KeyboardFocusManager newManager) {
         checkReplaceKFMPermission();
 
         KeyboardFocusManager oldManager = null;
@@ -479,20 +469,12 @@ public Component getFocusOwner() {
      * traversal keys will not be delivered if focus traversal keys are enabled
      * for the focus owner. In addition, KeyEventDispatchers may retarget or
      * consume KeyEvents before they reach the focus owner.
-     * <p>
-     * This method will throw a SecurityException if this KeyboardFocusManager
-     * is not the current KeyboardFocusManager for the calling thread's
-     * context.
      *
      * @return the focus owner
      * @see #getFocusOwner
      * @see #setGlobalFocusOwner
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected Component getGlobalFocusOwner() throws SecurityException {
+    protected Component getGlobalFocusOwner() {
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
             return focusOwner;
@@ -520,14 +502,8 @@ protected Component getGlobalFocusOwner() throws SecurityException {
      * @see Component#requestFocus()
      * @see Component#requestFocusInWindow()
      * @see Component#isFocusable
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected void setGlobalFocusOwner(Component focusOwner)
-        throws SecurityException
-    {
+    protected void setGlobalFocusOwner(Component focusOwner) {
         Component oldFocusOwner = null;
         boolean shouldFire = false;
 
@@ -602,11 +578,6 @@ public void clearFocusOwner() {
      * explicitly via a call to {@code requestFocus()}. This operation
      * does not change the focused or active Windows.
      * <p>
-     * If a SecurityManager is installed, the calling thread must be granted
-     * the "replaceKeyboardFocusManager" AWTPermission. If this permission is
-     * not granted, this method will throw a SecurityException, and the current
-     * focus owner will not be cleared.
-     * <p>
      * This method is intended to be used only by KeyboardFocusManager set as
      * current KeyboardFocusManager for the calling thread's context. It is not
      * for general client use.
@@ -614,12 +585,8 @@ public void clearFocusOwner() {
      * @see KeyboardFocusManager#clearFocusOwner
      * @see Component#requestFocus()
      * @see java.awt.event.FocusEvent#FOCUS_LOST
-     * @throws SecurityException if the calling thread does not have
-     *         "replaceKeyboardFocusManager" permission
      */
-    public void clearGlobalFocusOwner()
-        throws SecurityException
-    {
+    public void clearGlobalFocusOwner() {
         checkReplaceKFMPermission();
         if (!GraphicsEnvironment.isHeadless()) {
             // Toolkit must be fully initialized, otherwise
@@ -699,14 +666,8 @@ public Component getPermanentFocusOwner() {
      * @return the permanent focus owner
      * @see #getPermanentFocusOwner
      * @see #setGlobalPermanentFocusOwner
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected Component getGlobalPermanentFocusOwner()
-        throws SecurityException
-    {
+    protected Component getGlobalPermanentFocusOwner() {
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
             return permanentFocusOwner;
@@ -735,14 +696,8 @@ protected Component getGlobalPermanentFocusOwner()
      * @see Component#requestFocus()
      * @see Component#requestFocusInWindow()
      * @see Component#isFocusable
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected void setGlobalPermanentFocusOwner(Component permanentFocusOwner)
-        throws SecurityException
-    {
+    protected void setGlobalPermanentFocusOwner(Component permanentFocusOwner) {
         Component oldPermanentFocusOwner = null;
         boolean shouldFire = false;
 
@@ -806,12 +761,8 @@ public Window getFocusedWindow() {
      * @return the focused Window
      * @see #getFocusedWindow
      * @see #setGlobalFocusedWindow
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected Window getGlobalFocusedWindow() throws SecurityException {
+    protected Window getGlobalFocusedWindow() {
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
             return focusedWindow;
@@ -836,14 +787,8 @@ protected Window getGlobalFocusedWindow() throws SecurityException {
      * @see Component#requestFocus()
      * @see Component#requestFocusInWindow()
      * @see Window#isFocusableWindow
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected void setGlobalFocusedWindow(Window focusedWindow)
-        throws SecurityException
-    {
+    protected void setGlobalFocusedWindow(Window focusedWindow) {
         Window oldFocusedWindow = null;
         boolean shouldFire = false;
 
@@ -908,12 +853,8 @@ public Window getActiveWindow() {
      * @return the active Window
      * @see #getActiveWindow
      * @see #setGlobalActiveWindow
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected Window getGlobalActiveWindow() throws SecurityException {
+    protected Window getGlobalActiveWindow() {
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
             return activeWindow;
@@ -939,14 +880,8 @@ protected Window getGlobalActiveWindow() throws SecurityException {
      * @see #getGlobalActiveWindow
      * @see Component#requestFocus()
      * @see Component#requestFocusInWindow()
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected void setGlobalActiveWindow(Window activeWindow)
-        throws SecurityException
-    {
+    protected void setGlobalActiveWindow(Window activeWindow) {
         Window oldActiveWindow;
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
@@ -1223,14 +1158,8 @@ public Container getCurrentFocusCycleRoot() {
      *         root is not a member of the calling thread's context
      * @see #getCurrentFocusCycleRoot
      * @see #setGlobalCurrentFocusCycleRoot
-     * @throws SecurityException if this KeyboardFocusManager is not the
-     *         current KeyboardFocusManager for the calling thread's context
-     *         and if the calling thread does not have "replaceKeyboardFocusManager"
-     *         permission
      */
-    protected Container getGlobalCurrentFocusCycleRoot()
-        throws SecurityException
-    {
+    protected Container getGlobalCurrentFocusCycleRoot() {
         synchronized (KeyboardFocusManager.class) {
             checkKFMSecurity();
             return currentFocusCycleRoot;
@@ -1244,23 +1173,14 @@ protected Container getGlobalCurrentFocusCycleRoot()
      * In that case, the current focus cycle root is used to differentiate
      * among the possibilities.
      * <p>
-     * If a SecurityManager is installed, the calling thread must be granted
-     * the "replaceKeyboardFocusManager" AWTPermission. If this permission is
-     * not granted, this method will throw a SecurityException, and the current
-     * focus cycle root will not be changed.
-     * <p>
      * This method is intended to be used only by KeyboardFocusManagers and
      * focus implementations. It is not for general client use.
      *
      * @param newFocusCycleRoot the new focus cycle root
      * @see #getCurrentFocusCycleRoot
      * @see #getGlobalCurrentFocusCycleRoot
-     * @throws SecurityException if the calling thread does not have
-     *         "replaceKeyboardFocusManager" permission
      */
-    public void setGlobalCurrentFocusCycleRoot(Container newFocusCycleRoot)
-        throws SecurityException
-    {
+    public void setGlobalCurrentFocusCycleRoot(Container newFocusCycleRoot) {
         checkReplaceKFMPermission();
 
         Container oldFocusCycleRoot;
diff --git a/src/java.desktop/share/classes/java/awt/MouseInfo.java b/src/java.desktop/share/classes/java/awt/MouseInfo.java
index 3dd115e0724..3081e376cdc 100644
--- a/src/java.desktop/share/classes/java/awt/MouseInfo.java
+++ b/src/java.desktop/share/classes/java/awt/MouseInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,18 +56,8 @@ private MouseInfo() {
      * of the {@code GraphicsDevice}. See {@link GraphicsConfiguration}
      * for more information about the virtual screen devices.
      * On systems without a mouse, returns {@code null}.
-     * <p>
-     * If there is a security manager, its {@code checkPermission} method
-     * is called with an {@code AWTPermission("watchMousePointer")}
-     * permission before creating and returning a {@code PointerInfo}
-     * object. This may result in a {@code SecurityException}.
      *
      * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
-     * @throws SecurityException if a security manager exists and its
-     *            {@code checkPermission} method doesn't allow the operation
-     * @see       GraphicsConfiguration
-     * @see       SecurityManager#checkPermission
-     * @see       java.awt.AWTPermission
      * @return    location of the mouse pointer
      * @since     1.5
      */
diff --git a/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java
index 2054954fee3..95ea477beb3 100644
--- a/src/java.desktop/share/classes/java/awt/Robot.java
+++ b/src/java.desktop/share/classes/java/awt/Robot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,10 +124,7 @@ public class Robot {
      * @throws  AWTException if the platform configuration does not allow
      * low-level input control.  This exception is always thrown when
      * GraphicsEnvironment.isHeadless() returns true
-     * @throws  SecurityException if {@code createRobot} permission is not granted
      * @see     java.awt.GraphicsEnvironment#isHeadless
-     * @see     SecurityManager#checkPermission
-     * @see     AWTPermission
      */
     public Robot() throws AWTException {
         checkHeadless();
@@ -156,11 +153,8 @@ public Robot() throws AWTException {
      * GraphicsEnvironment.isHeadless() returns true.
      * @throws  IllegalArgumentException if {@code screen} is not a screen
      *          GraphicsDevice.
-     * @throws  SecurityException if {@code createRobot} permission is not granted
      * @see     java.awt.GraphicsEnvironment#isHeadless
      * @see     GraphicsDevice
-     * @see     SecurityManager#checkPermission
-     * @see     AWTPermission
      */
     public Robot(GraphicsDevice screen) throws AWTException {
         checkHeadless();
@@ -438,8 +432,7 @@ private static void checkKeycodeArgument(int keycode) {
      *
      * @param   x       X position of pixel
      * @param   y       Y position of pixel
-     * @throws  SecurityException if {@code readDisplayPixels} permission
-     *          is not granted, or access to the screen is denied
+     * @throws  SecurityException if access to the screen is denied
      *          by the desktop environment
      * @return  Color of the pixel
      */
@@ -467,11 +460,8 @@ public synchronized Color getPixelColor(int x, int y) {
      * @return  The captured image
      * @throws  IllegalArgumentException if {@code screenRect} width and height
      *          are not greater than zero
-     * @throws  SecurityException if {@code readDisplayPixels} permission
-     *          is not granted, or access to the screen is denied
+     * @throws  SecurityException if access to the screen is denied
      *          by the desktop environment
-     * @see     SecurityManager#checkPermission
-     * @see     AWTPermission
      */
     public synchronized BufferedImage createScreenCapture(Rectangle screenRect) {
         return createCompatibleImage(screenRect, false)[0];
@@ -513,11 +503,8 @@ public synchronized BufferedImage createScreenCapture(Rectangle screenRect) {
      * @return  The captured image
      * @throws  IllegalArgumentException if {@code screenRect} width and height
      *          are not greater than zero
-     * @throws  SecurityException if {@code readDisplayPixels} permission
-     *          is not granted, or access to the screen is denied
+     * @throws  SecurityException if access to the screen is denied
      *          by the desktop environment
-     * @see     SecurityManager#checkPermission
-     * @see     AWTPermission
      *
      * @since 9
      */
diff --git a/src/java.desktop/share/classes/java/awt/SystemTray.java b/src/java.desktop/share/classes/java/awt/SystemTray.java
index e99c9baeecd..990985e7b44 100644
--- a/src/java.desktop/share/classes/java/awt/SystemTray.java
+++ b/src/java.desktop/share/classes/java/awt/SystemTray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,24 +149,15 @@ private SystemTray() {
      * supported.  You may use the {@link #isSupported} method to
      * check if the system tray is supported.
      *
-     * <p>If a SecurityManager is installed, the AWTPermission
-     * {@code accessSystemTray} must be granted in order to get the
-     * {@code SystemTray} instance. Otherwise this method will throw a
-     * SecurityException.
-     *
      * @return the {@code SystemTray} instance that represents
      * the desktop's tray area
      * @throws UnsupportedOperationException if the system tray isn't
      * supported by the current platform
      * @throws HeadlessException if
      * {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if {@code accessSystemTray} permission
-     * is not granted
      * @see #add(TrayIcon)
      * @see TrayIcon
      * @see #isSupported
-     * @see SecurityManager#checkPermission
-     * @see AWTPermission
      */
     public static SystemTray getSystemTray() {
         checkSystemTrayAllowed();
diff --git a/src/java.desktop/share/classes/java/awt/Taskbar.java b/src/java.desktop/share/classes/java/awt/Taskbar.java
index d9b95554ad3..8922c7380b0 100644
--- a/src/java.desktop/share/classes/java/awt/Taskbar.java
+++ b/src/java.desktop/share/classes/java/awt/Taskbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,8 +261,6 @@ public static boolean isTaskbarSupported(){
      *
      * @param enabled disables this request if false
      * @param critical if this is an important request
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#USER_ATTENTION} feature
      */
@@ -280,8 +278,6 @@ public void requestUserAttention(final boolean enabled, final boolean critical)
      * of window type, platform, and implementation.
      *
      * @param w window
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#USER_ATTENTION_WINDOW} feature
      */
@@ -296,8 +292,6 @@ public void requestWindowUserAttention(Window w) {
      * in the task area.
      *
      * @param menu the PopupMenu to attach to this application
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#MENU} feature
      */
@@ -311,8 +305,6 @@ public void setMenu(final PopupMenu menu) {
      * Gets PopupMenu used to add items to this application's icon in system task area.
      *
      * @return the PopupMenu
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#MENU} feature
      */
@@ -326,8 +318,6 @@ public PopupMenu getMenu() {
      * Requests the system to change this application's icon to the provided {@code image}.
      *
      * @param image to change
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#ICON_IMAGE} feature
      */
@@ -345,8 +335,6 @@ public void setIconImage(final Image image) {
      * but should be visually similar.
      *
      * @return an image of this application's icon
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#ICON_IMAGE} feature
      */
@@ -367,8 +355,6 @@ public Image getIconImage() {
      *
      * Passing {@code null} as parameter hides the badge.
      * @param badge label to affix to the icon
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#ICON_BADGE_NUMBER}
      * or {@link Taskbar.Feature#ICON_BADGE_TEXT} feature
@@ -390,8 +376,6 @@ public void setIconBadge(final String badge) {
      *
      * @param w window to update
      * @param badge image to affix to the icon
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#ICON_BADGE_IMAGE_WINDOW} feature
      */
@@ -408,8 +392,6 @@ public void setWindowIconBadge(Window w, final Image badge) {
      * Affixes a small system-provided progress bar to this application's icon.
      *
      * @param value from 0 to 100, other to disable progress indication
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#PROGRESS_VALUE} feature
      */
@@ -440,8 +422,6 @@ public void setProgressValue(int value) {
      * @param value from 0 to 100, other to switch to {@link State#OFF} state
      *              and disable progress indication
      * @see #setWindowProgressState(java.awt.Window, State)
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#PROGRESS_VALUE_WINDOW} feature
      */
@@ -474,8 +454,6 @@ public void setWindowProgressValue(Window w, int value) {
      * @see State#ERROR
      * @see State#INDETERMINATE
      * @see #setWindowProgressValue(java.awt.Window, int)
-     * @throws SecurityException if a security manager exists and it denies the
-     * {@code RuntimePermission("canProcessApplicationEvents")} permission.
      * @throws UnsupportedOperationException if the current platform
      * does not support the {@link Taskbar.Feature#PROGRESS_STATE_WINDOW} feature
      */
diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index cf6260e9bda..19b0ab9019a 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -623,17 +623,10 @@ public static synchronized Toolkit getDefaultToolkit() {
      * Previously loaded image data can be manually discarded by
      * calling the {@link Image#flush flush} method on the
      * returned {@code Image}.
-     * <p>
-     * This method first checks if there is a security manager installed.
-     * If so, the method calls the security manager's
-     * {@code checkRead} method with the file specified to ensure
-     * that the access to the image is allowed.
      * @param     filename   the name of a file containing pixel data
      *                         in a recognized file format.
      * @return    an image which gets its pixel data from
      *                         the specified file.
-     * @throws SecurityException  if a security manager exists and its
-     *                            checkRead method doesn't allow the operation.
      * @see #createImage(java.lang.String)
      */
     public abstract Image getImage(String filename);
@@ -658,20 +651,9 @@ public static synchronized Toolkit getDefaultToolkit() {
      * Previously loaded image data can be manually discarded by
      * calling the {@link Image#flush flush} method on the
      * returned {@code Image}.
-     * <p>
-     * This method first checks if there is a security manager installed.
-     * If so, the method calls the security manager's
-     * {@code checkPermission} method with the corresponding
-     * permission to ensure that the access to the image is allowed.
-     * If the connection to the specified URL requires
-     * either {@code URLPermission} or {@code SocketPermission},
-     * then {@code URLPermission} is used for security checks.
      * @param     url   the URL to use in fetching the pixel data.
      * @return    an image which gets its pixel data from
      *                         the specified URL.
-     * @throws SecurityException  if a security manager exists and its
-     *                            checkPermission method doesn't allow
-     *                            the operation.
      * @see #createImage(java.net.URL)
      */
     public abstract Image getImage(URL url);
@@ -680,17 +662,10 @@ public static synchronized Toolkit getDefaultToolkit() {
      * Returns an image which gets pixel data from the specified file.
      * The returned Image is a new object which will not be shared
      * with any other caller of this method or its getImage variant.
-     * <p>
-     * This method first checks if there is a security manager installed.
-     * If so, the method calls the security manager's
-     * {@code checkRead} method with the specified file to ensure
-     * that the image creation is allowed.
      * @param     filename   the name of a file containing pixel data
      *                         in a recognized file format.
      * @return    an image which gets its pixel data from
      *                         the specified file.
-     * @throws SecurityException  if a security manager exists and its
-     *                            checkRead method doesn't allow the operation.
      * @see #getImage(java.lang.String)
      */
     public abstract Image createImage(String filename);
@@ -699,20 +674,9 @@ public static synchronized Toolkit getDefaultToolkit() {
      * Returns an image which gets pixel data from the specified URL.
      * The returned Image is a new object which will not be shared
      * with any other caller of this method or its getImage variant.
-     * <p>
-     * This method first checks if there is a security manager installed.
-     * If so, the method calls the security manager's
-     * {@code checkPermission} method with the corresponding
-     * permission to ensure that the image creation is allowed.
-     * If the connection to the specified URL requires
-     * either {@code URLPermission} or {@code SocketPermission},
-     * then {@code URLPermission} is used for security checks.
      * @param     url   the URL to use in fetching the pixel data.
      * @return    an image which gets its pixel data from
      *                         the specified URL.
-     * @throws SecurityException  if a security manager exists and its
-     *                            checkPermission method doesn't allow
-     *                            the operation.
      * @see #getImage(java.net.URL)
      */
     public abstract Image createImage(URL url);
@@ -841,15 +805,6 @@ public abstract Image createImage(byte[] imagedata,
     /**
      * Gets a {@code PrintJob} object which is the result of initiating
      * a print operation on the toolkit's platform.
-     * <p>
-     * Each actual implementation of this method should first check if there
-     * is a security manager installed. If there is, the method should call
-     * the security manager's {@code checkPrintJobAccess} method to
-     * ensure initiation of a print operation is allowed. If the default
-     * implementation of {@code checkPrintJobAccess} is used (that is,
-     * that method is not overridden), then this results in a call to the
-     * security manager's {@code checkPermission} method with a
-     * {@code RuntimePermission("queuePrintJob")} permission.
      *
      * @param   frame the parent of the print dialog. May not be null.
      * @param   jobtitle the title of the PrintJob. A null title is equivalent
@@ -864,11 +819,8 @@ public abstract Image createImage(byte[] imagedata,
      * @return  a {@code PrintJob} object, or {@code null} if the
      *          user cancelled the print job.
      * @throws  NullPointerException if frame is null
-     * @throws  SecurityException if this thread is not allowed to initiate a
-     *          print job request
      * @see     java.awt.GraphicsEnvironment#isHeadless
      * @see     java.awt.PrintJob
-     * @see     java.lang.RuntimePermission
      * @since   1.1
      */
     public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
@@ -877,15 +829,6 @@ public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
     /**
      * Gets a {@code PrintJob} object which is the result of initiating
      * a print operation on the toolkit's platform.
-     * <p>
-     * Each actual implementation of this method should first check if there
-     * is a security manager installed. If there is, the method should call
-     * the security manager's {@code checkPrintJobAccess} method to
-     * ensure initiation of a print operation is allowed. If the default
-     * implementation of {@code checkPrintJobAccess} is used (that is,
-     * that method is not overridden), then this results in a call to the
-     * security manager's {@code checkPermission} method with a
-     * {@code RuntimePermission("queuePrintJob")} permission.
      *
      * @param   frame the parent of the print dialog. May not be null.
      * @param   jobtitle the title of the PrintJob. A null title is equivalent
@@ -913,12 +856,8 @@ public abstract PrintJob getPrintJob(Frame frame, String jobtitle,
      *          opportunity to select a file and proceed with printing.
      *          The dialog will ensure that the selected output file
      *          is valid before returning from this method.
-     * @throws  SecurityException if this thread is not allowed to initiate a
-     *          print job request, or if jobAttributes specifies print to file,
-     *          and this thread is not allowed to access the file system
      * @see     java.awt.PrintJob
      * @see     java.awt.GraphicsEnvironment#isHeadless
-     * @see     java.lang.RuntimePermission
      * @see     java.awt.JobAttributes
      * @see     java.awt.PageAttributes
      * @since   1.3
@@ -966,11 +905,6 @@ public PrintJob getPrintJob(Frame frame, String jobtitle,
      * Because of this, support for
      * {@code DataFlavor.plainTextFlavor}, and equivalent flavors, is
      * <b>deprecated</b>.
-     * <p>
-     * Each actual implementation of this method should first check if there
-     * is a security manager installed. If there is, the method should call
-     * the security manager's {@link SecurityManager#checkPermission
-     * checkPermission} method to check {@code AWTPermission("accessClipboard")}.
      *
      * @return    the system Clipboard
      * @throws HeadlessException if GraphicsEnvironment.isHeadless()
@@ -981,7 +915,6 @@ public PrintJob getPrintJob(Frame frame, String jobtitle,
      * @see       java.awt.datatransfer.DataFlavor#stringFlavor
      * @see       java.awt.datatransfer.DataFlavor#plainTextFlavor
      * @see       java.io.Reader
-     * @see       java.awt.AWTPermission
      * @since     1.1
      */
     public abstract Clipboard getSystemClipboard()
@@ -1011,11 +944,6 @@ public abstract Clipboard getSystemClipboard()
      * On those platforms, this method will return {@code null}. In such a
      * case, an application is absolved from its responsibility to update the
      * system selection {@code Clipboard} as described above.
-     * <p>
-     * Each actual implementation of this method should first check if there
-     * is a security manager installed. If there is, the method should call
-     * the security manager's {@link SecurityManager#checkPermission
-     * checkPermission} method to check {@code AWTPermission("accessClipboard")}.
      *
      * @return the system selection as a {@code Clipboard}, or
      *         {@code null} if the native platform does not support a
@@ -1029,7 +957,6 @@ public abstract Clipboard getSystemClipboard()
      * @see java.awt.event.FocusEvent#FOCUS_LOST
      * @see TextComponent
      * @see javax.swing.text.JTextComponent
-     * @see AWTPermission
      * @see GraphicsEnvironment#isHeadless
      * @since 1.4
      */
@@ -1457,15 +1384,7 @@ public static String getProperty(String key, String defaultValue) {
      * therefore not assume that the EventQueue instance returned
      * by this method will be shared by other applets or the system.
      *
-     * <p> If there is a security manager then its
-     * {@link SecurityManager#checkPermission checkPermission} method
-     * is called to check {@code AWTPermission("accessEventQueue")}.
-     *
      * @return    the {@code EventQueue} object
-     * @throws  SecurityException
-     *          if a security manager is set and it denies access to
-     *          the {@code EventQueue}
-     * @see     java.awt.AWTPermission
     */
     public final EventQueue getSystemEventQueue() {
         @SuppressWarnings("removal")
@@ -1772,11 +1691,6 @@ private static AWTEventListener deProxyAWTEventListener(AWTEventListener l)
      * Adds an AWTEventListener to receive all AWTEvents dispatched
      * system-wide that conform to the given {@code eventMask}.
      * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with an
-     * {@code AWTPermission("listenToAllAWTEvents")} permission.
-     * This may result in a SecurityException.
-     * <p>
      * {@code eventMask} is a bitmask of event types to receive.
      * It is constructed by bitwise OR-ing together the event masks
      * defined in {@code AWTEvent}.
@@ -1790,14 +1704,9 @@ private static AWTEventListener deProxyAWTEventListener(AWTEventListener l)
      *
      * @param    listener   the event listener.
      * @param    eventMask  the bitmask of event types to receive
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow the operation.
      * @see      #removeAWTEventListener
      * @see      #getAWTEventListeners
-     * @see      SecurityManager#checkPermission
      * @see      java.awt.AWTEvent
-     * @see      java.awt.AWTPermission
      * @see      java.awt.event.AWTEventListener
      * @see      java.awt.event.AWTEventListenerProxy
      * @since    1.2
@@ -1847,11 +1756,6 @@ public void addAWTEventListener(AWTEventListener listener, long eventMask) {
     /**
      * Removes an AWTEventListener from receiving dispatched AWTEvents.
      * <p>
-     * First, if there is a security manager, its {@code checkPermission}
-     * method is called with an
-     * {@code AWTPermission("listenToAllAWTEvents")} permission.
-     * This may result in a SecurityException.
-     * <p>
      * Note:  event listener use is not recommended for normal
      * application use, but are intended solely to support special
      * purpose facilities including support for accessibility,
@@ -1860,14 +1764,9 @@ public void addAWTEventListener(AWTEventListener listener, long eventMask) {
      * If listener is null, no exception is thrown and no action is performed.
      *
      * @param    listener   the event listener.
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow the operation.
      * @see      #addAWTEventListener
      * @see      #getAWTEventListeners
-     * @see      SecurityManager#checkPermission
      * @see      java.awt.AWTEvent
-     * @see      java.awt.AWTPermission
      * @see      java.awt.event.AWTEventListener
      * @see      java.awt.event.AWTEventListenerProxy
      * @since    1.2
@@ -1919,10 +1818,6 @@ synchronized int countAWTEventListeners(long eventMask) {
     /**
      * Returns an array of all the {@code AWTEventListener}s
      * registered on this toolkit.
-     * If there is a security manager, its {@code checkPermission}
-     * method is called with an
-     * {@code AWTPermission("listenToAllAWTEvents")} permission.
-     * This may result in a SecurityException.
      * Listeners can be returned
      * within {@code AWTEventListenerProxy} objects, which also contain
      * the event mask for the given listener.
@@ -1931,14 +1826,9 @@ synchronized int countAWTEventListeners(long eventMask) {
      *
      * @return all of the {@code AWTEventListener}s or an empty
      *         array if no listeners are currently registered
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow the operation.
      * @see      #addAWTEventListener
      * @see      #removeAWTEventListener
-     * @see      SecurityManager#checkPermission
      * @see      java.awt.AWTEvent
-     * @see      java.awt.AWTPermission
      * @see      java.awt.event.AWTEventListener
      * @see      java.awt.event.AWTEventListenerProxy
      * @since 1.4
@@ -1969,10 +1859,6 @@ public AWTEventListener[] getAWTEventListeners() {
      * Returns an array of all the {@code AWTEventListener}s
      * registered on this toolkit which listen to all of the event
      * types specified in the {@code eventMask} argument.
-     * If there is a security manager, its {@code checkPermission}
-     * method is called with an
-     * {@code AWTPermission("listenToAllAWTEvents")} permission.
-     * This may result in a SecurityException.
      * Listeners can be returned
      * within {@code AWTEventListenerProxy} objects, which also contain
      * the event mask for the given listener.
@@ -1984,14 +1870,9 @@ public AWTEventListener[] getAWTEventListeners() {
      *         on this toolkit for the specified
      *         event types, or an empty array if no such listeners
      *         are currently registered
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow the operation.
      * @see      #addAWTEventListener
      * @see      #removeAWTEventListener
-     * @see      SecurityManager#checkPermission
      * @see      java.awt.AWTEvent
-     * @see      java.awt.AWTPermission
      * @see      java.awt.event.AWTEventListener
      * @see      java.awt.event.AWTEventListenerProxy
      * @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/TrayIcon.java b/src/java.desktop/share/classes/java/awt/TrayIcon.java
index f6091c37da8..cabb5dac3cf 100644
--- a/src/java.desktop/share/classes/java/awt/TrayIcon.java
+++ b/src/java.desktop/share/classes/java/awt/TrayIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,11 +66,6 @@
  * ActionEvent}.  On some platforms, this occurs when the user selects
  * the tray icon using either the mouse or keyboard.
  *
- * <p>If a SecurityManager is installed, the AWTPermission
- * {@code accessSystemTray} must be granted in order to create
- * a {@code TrayIcon}. Otherwise the constructor will throw a
- * SecurityException.
- *
  * <p> See the {@link SystemTray} class overview for an example on how
  * to use the {@code TrayIcon} API.
  *
@@ -167,13 +162,9 @@ private TrayIcon()
      * supported by the current platform
      * @throws HeadlessException if
      * {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if {@code accessSystemTray} permission
-     * is not granted
      * @see SystemTray#add(TrayIcon)
      * @see TrayIcon#TrayIcon(Image, String, PopupMenu)
      * @see TrayIcon#TrayIcon(Image, String)
-     * @see SecurityManager#checkPermission
-     * @see AWTPermission
      */
     public TrayIcon(Image image) {
         this();
@@ -196,13 +187,9 @@ public TrayIcon(Image image) {
      * supported by the current platform
      * @throws HeadlessException if
      * {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if {@code accessSystemTray} permission
-     * is not granted
      * @see SystemTray#add(TrayIcon)
      * @see TrayIcon#TrayIcon(Image)
      * @see TrayIcon#TrayIcon(Image, String, PopupMenu)
-     * @see SecurityManager#checkPermission
-     * @see AWTPermission
      */
     public TrayIcon(Image image, String tooltip) {
         this(image);
@@ -223,16 +210,12 @@ public TrayIcon(Image image, String tooltip) {
      * supported by the current platform
      * @throws HeadlessException if
      * {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException if {@code accessSystemTray} permission
-     * is not granted
      * @see SystemTray#add(TrayIcon)
      * @see TrayIcon#TrayIcon(Image, String)
      * @see TrayIcon#TrayIcon(Image)
      * @see PopupMenu
      * @see MouseListener
      * @see #addMouseListener(MouseListener)
-     * @see SecurityManager#checkPermission
-     * @see AWTPermission
      */
     public TrayIcon(Image image, String tooltip, PopupMenu popup) {
         this(image, tooltip);
diff --git a/src/java.desktop/share/classes/java/awt/Window.java b/src/java.desktop/share/classes/java/awt/Window.java
index c5d876b9bde..a1e9d48d9d4 100644
--- a/src/java.desktop/share/classes/java/awt/Window.java
+++ b/src/java.desktop/share/classes/java/awt/Window.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -558,11 +558,6 @@ private void init(GraphicsConfiguration gc) {
      * Constructs a new, initially invisible window with the specified
      * {@code Frame} as its owner. The window will not be focusable
      * unless its owner is showing on the screen.
-     * <p>
-     * If there is a security manager set, it is invoked to check
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}.
-     * If that check fails with a {@code SecurityException} then a warning
-     * banner is created.
      *
      * @param owner the {@code Frame} to act as owner or {@code null}
      *    if this window has no owner
@@ -585,11 +580,6 @@ public Window(Frame owner) {
      * {@code Window} as its owner. This window will not be focusable
      * unless its nearest owning {@code Frame} or {@code Dialog}
      * is showing on the screen.
-     * <p>
-     * If there is a security manager set, it is invoked to check
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}.
-     * If that check fails with a {@code SecurityException} then a
-     * warning banner is created.
      *
      * @param owner the {@code Window} to act as owner or
      *     {@code null} if this window has no owner
@@ -616,11 +606,6 @@ public Window(Window owner) {
      * of a screen device. The Window will not be focusable unless
      * its nearest owning {@code Frame} or {@code Dialog}
      * is showing on the screen.
-     * <p>
-     * If there is a security manager set, it is invoked to check
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}. If that
-     * check fails with a {@code SecurityException} then a warning banner
-     * is created.
      *
      * @param owner the window to act as owner or {@code null}
      *     if this window has no owner
@@ -1382,18 +1367,10 @@ public Toolkit getToolkit() {
 
     /**
      * Gets the warning string that is displayed with this window.
-     * If this window is insecure, the warning string is displayed
-     * somewhere in the visible area of the window. A window is
-     * insecure if there is a security manager and the security
-     * manager denies
-     * {@code AWTPermission("showWindowWithoutWarningBanner")}.
      * <p>
-     * If the window is secure, then {@code getWarningString}
-     * returns {@code null}. If the window is insecure, this
-     * method checks for the system property
-     * {@code awt.appletWarning}
-     * and returns the string value of that property.
-     * @return    the warning string for this window.
+     * Warning strings are no longer applicable,
+     * so this method always returns {@code null}.
+     * @return    null
      */
     public final String getWarningString() {
         return warningString;
@@ -1684,9 +1661,6 @@ Window getDocumentRoot() {
      * @param exclusionType the modal exclusion type for this window; a {@code null}
      *     value is equivalent to {@link Dialog.ModalExclusionType#NO_EXCLUDE
      *     NO_EXCLUDE}
-     * @throws SecurityException if the calling thread does not have permission
-     *     to set the modal exclusion property to the window with the given
-     *     {@code exclusionType}
      * @see java.awt.Dialog.ModalExclusionType
      * @see java.awt.Window#getModalExclusionType
      * @see java.awt.Toolkit#isModalExclusionTypeSupported
@@ -2232,29 +2206,19 @@ void postProcessKeyEvent(KeyEvent e) {
      * {@link Window#isAlwaysOnTopSupported()}.  If always-on-top mode
      * isn't supported for this window or this window's toolkit does not
      * support always-on-top windows, calling this method has no effect.
-     * <p>
-     * If a SecurityManager is installed, the calling thread must be
-     * granted the AWTPermission "setWindowAlwaysOnTop" in
-     * order to set the value of this property. If this
-     * permission is not granted, this method will throw a
-     * SecurityException, and the current value of the property will
-     * be left unchanged.
      *
      * @param alwaysOnTop true if the window should always be above other
      *        windows
-     * @throws SecurityException if the calling thread does not have
-     *         permission to set the value of always-on-top property
      *
      * @see #isAlwaysOnTop
      * @see #toFront
      * @see #toBack
-     * @see AWTPermission
      * @see #isAlwaysOnTopSupported
      * @see #getToolkit
      * @see Toolkit#isAlwaysOnTopSupported
      * @since 1.5
      */
-    public final void setAlwaysOnTop(boolean alwaysOnTop) throws SecurityException {
+    public final void setAlwaysOnTop(boolean alwaysOnTop) {
         @SuppressWarnings("removal")
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
index b7faab518f9..b4e71b3c839 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -859,8 +859,6 @@ public static ICC_Profile getInstance(int cspace) {
      *         error occurs while reading the file
      * @throws IllegalArgumentException If the file does not contain valid ICC
      *         Profile data
-     * @throws SecurityException If a security manager is installed and it does
-     *         not permit read access to the given file
      * @throws NullPointerException if {@code fileName} is {@code null}
      */
     public static ICC_Profile getInstance(String fileName) throws IOException {
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
index 9d77ab56a9f..340863a1c7a 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -55,8 +55,7 @@ <h2>Auto-shutdown</h2>
 <ul>
   <li> All the threads that are not daemon threads terminate.
   <li> Some thread invokes the <code>exit</code> method of class
-  <code>Runtime</code> or class <code>System</code>, and the exit
-  operation is permitted by the security manager.
+  <code>Runtime</code> or class <code>System</code>.
 </ul>
 <p>
 This implies that if an application doesn't start any threads itself,
diff --git a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
index ddf565f3ce3..0d2d2d76b53 100644
--- a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
+++ b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,10 +62,6 @@ public abstract class PrinterJob {
      * should ensure that the array returned from
      * {@link #lookupPrintServices() lookupPrintServices} is not empty.
      * @return a new {@code PrinterJob}.
-     *
-     * @throws  SecurityException if a security manager exists and its
-     *          {@link java.lang.SecurityManager#checkPrintJobAccess}
-     *          method disallows this thread from creating a print job request
      */
     public static PrinterJob getPrinterJob() {
         @SuppressWarnings("removal")
@@ -562,8 +558,6 @@ public void print(PrintRequestAttributeSet attributes)
     /**
      * Gets the name of the printing user.
      * @return the name of the printing user
-     * @throws SecurityException if a security manager exists and
-     *         PropertyPermission - user.name is not given in the policy file
      */
     public abstract String getUserName();
 
diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index cd42aaaa33e..247f6982471 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -434,21 +434,10 @@ public static boolean isGuiAvailable() {
      * Used to indicate whether of not we are running in an application
      * builder environment.
      *
-     * <p>Note that this method is security checked
-     * and is not available to (for example) untrusted applets.
-     * More specifically, if there is a security manager,
-     * its {@code checkPropertiesAccess}
-     * method is called. This could result in a SecurityException.
-     *
      * @param isDesignTime  True if we're in an application builder tool.
-     * @throws  SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow setting
-     *              of system properties.
-     * @see SecurityManager#checkPropertiesAccess
      */
 
-    public static void setDesignTime(boolean isDesignTime)
-                        throws SecurityException {
+    public static void setDesignTime(boolean isDesignTime) {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -461,21 +450,10 @@ public static void setDesignTime(boolean isDesignTime)
      * Used to indicate whether of not we are running in an environment
      * where GUI interaction is available.
      *
-     * <p>Note that this method is security checked
-     * and is not available to (for example) untrusted applets.
-     * More specifically, if there is a security manager,
-     * its {@code checkPropertiesAccess}
-     * method is called. This could result in a SecurityException.
-     *
      * @param isGuiAvailable  True if GUI interaction is available.
-     * @throws  SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow setting
-     *              of system properties.
-     * @see SecurityManager#checkPropertiesAccess
      */
 
-    public static void setGuiAvailable(boolean isGuiAvailable)
-                        throws SecurityException {
+    public static void setGuiAvailable(boolean isGuiAvailable) {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
diff --git a/src/java.desktop/share/classes/java/beans/Expression.java b/src/java.desktop/share/classes/java/beans/Expression.java
index f661990ec58..21e9e4a4dc0 100644
--- a/src/java.desktop/share/classes/java/beans/Expression.java
+++ b/src/java.desktop/share/classes/java/beans/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,8 +109,6 @@ public Expression(Object value, Object target, String methodName, Object[] argum
      * @throws NullPointerException if the value of the {@code target} or
      *                              {@code methodName} property is {@code null}
      * @throws NoSuchMethodException if a matching method is not found
-     * @throws SecurityException if a security manager exists and
-     *                           it denies the method invocation
      * @throws Exception that is thrown by the invoked method
      *
      * @see java.lang.reflect.Method
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
index 8b99813a323..29d783eeac6 100644
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,14 +335,7 @@ public static String[] getBeanInfoSearchPath() {
      *          this method is undefined if parameter path
      *          is null.
      *
-     * <p>First, if there is a security manager, its {@code checkPropertiesAccess}
-     * method is called. This could result in a SecurityException.
-     *
      * @param path  Array of package names.
-     * @throws  SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow setting
-     *              of system properties.
-     * @see SecurityManager#checkPropertiesAccess
      */
 
     public static void setBeanInfoSearchPath(String[] path) {
diff --git a/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java b/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
index a692c921421..d6cb76e058c 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,17 +66,9 @@ public PropertyEditorManager() {}
      * Thus this method can be used to cancel the registration.
      * The registration is canceled automatically
      * if either the target or editor class is unloaded.
-     * <p>
-     * If there is a security manager, its {@code checkPropertiesAccess}
-     * method is called. This could result in a {@linkplain SecurityException}.
      *
      * @param targetType   the class object of the type to be edited
      * @param editorClass  the class object of the editor class
-     * @throws SecurityException  if a security manager exists and
-     *                            its {@code checkPropertiesAccess} method
-     *                            doesn't allow setting of system properties
-     *
-     * @see SecurityManager#checkPropertiesAccess
      */
     public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
         @SuppressWarnings("removal")
@@ -114,14 +106,7 @@ public static String[] getEditorSearchPath() {
      * Change the list of package names that will be used for
      *          finding property editors.
      *
-     * <p>First, if there is a security manager, its {@code checkPropertiesAccess}
-     * method is called. This could result in a SecurityException.
-     *
      * @param path  Array of package names.
-     * @throws  SecurityException  if a security manager exists and its
-     *             {@code checkPropertiesAccess} method doesn't allow setting
-     *              of system properties.
-     * @see SecurityManager#checkPropertiesAccess
      */
     public static void setEditorSearchPath(String[] path) {
         @SuppressWarnings("removal")
diff --git a/src/java.desktop/share/classes/java/beans/Statement.java b/src/java.desktop/share/classes/java/beans/Statement.java
index bd17a0e44d6..d079a0b24a9 100644
--- a/src/java.desktop/share/classes/java/beans/Statement.java
+++ b/src/java.desktop/share/classes/java/beans/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,8 +166,6 @@ public Object[] getArguments() {
      * @throws NullPointerException if the value of the {@code target} or
      *                              {@code methodName} property is {@code null}
      * @throws NoSuchMethodException if a matching method is not found
-     * @throws SecurityException if a security manager exists and
-     *                           it denies the method invocation
      * @throws Exception that is thrown by the invoked method
      *
      * @see java.lang.reflect.Method
diff --git a/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java b/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java
index 3842340449b..abf6f471916 100644
--- a/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java
+++ b/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,6 @@ public abstract class AccessibilityProvider {
 
     /**
      * Initializes a new accessibility provider.
-     *
-     * @throws SecurityException If a security manager has been installed and it
-     *         denies {@link RuntimePermission} {@code "accessibilityProvider"}
      */
     protected AccessibilityProvider() {
         // Use a permission check when calling a private constructor to check
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageIO.java b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
index b40b48b2af3..b11641c82ca 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageIO.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -277,8 +277,6 @@ public static boolean getUseCache() {
      *
      * @see File#createTempFile(String, String, File)
      *
-     * @throws SecurityException if the security manager denies
-     * access to the directory.
      * @throws IllegalArgumentException if {@code cacheDir} is
      * non-{@code null} but is not a directory.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
index ef127ddfa2e..8395077b233 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,6 @@ public class FileImageInputStream extends ImageInputStreamImpl {
      *
      * @throws IllegalArgumentException if {@code f} is
      * {@code null}.
-     * @throws SecurityException if a security manager exists
-     * and does not allow read access to the file.
      * @throws FileNotFoundException if {@code f} is a
      * directory or cannot be opened for reading for any other reason.
      * @throws IOException if an I/O error occurs.
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
index 96d84ef652f..45c447ccada 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,8 +57,6 @@ public class FileImageOutputStream extends ImageOutputStreamImpl {
      *
      * @throws IllegalArgumentException if {@code f} is
      * {@code null}.
-     * @throws SecurityException if a security manager exists
-     * and does not allow write access to the file.
      * @throws FileNotFoundException if {@code f} does not denote
      * a regular file or it cannot be opened for reading and writing for any
      * other reason.
diff --git a/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
index c44b986ee9d..2931a1cbae0 100644
--- a/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
+++ b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,19 +49,6 @@
  * methods are implemented by a service provider in a subclass and the
  * unification of the results from all installed lookup classes are reported by
  * the static methods of this class when called by the application.
- * <p>
- * A {@code PrintServiceLookup} implementor is recommended to check for the
- * {@code SecurityManager.checkPrintJobAccess()} to deny access to untrusted
- * code. Following this recommended policy means that untrusted code may not be
- * able to locate any print services. Downloaded applets are the most common
- * example of untrusted code.
- * <p>
- * This check is made on a per lookup service basis to allow flexibility in the
- * policy to reflect the needs of different lookup services.
- * <p>
- * Services which are registered by {@link #registerService(PrintService)} will
- * not be included in lookup results if a security manager is installed and its
- * {@code checkPrintJobAccess()} method denies access.
  */
 public abstract class PrintServiceLookup {
 
diff --git a/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java b/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
index 335ff97a921..6439729afd2 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,8 +117,6 @@ public interface MidiDevice extends AutoCloseable {
      *
      * @throws MidiUnavailableException thrown if the device cannot be opened
      *         due to resource restrictions
-     * @throws SecurityException thrown if the device cannot be opened due to
-     *         security restrictions
      * @see #close
      * @see #isOpen
      */
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java
index c4aeac1d14e..296360a6550 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,45 +33,13 @@
  * system resources. An {@code AudioPermission} contains a target name but no
  * actions list; you either have the named permission or you don't.
  * <p>
- * The target name is the name of the audio permission (see the table below).
+ * The target name is the name of the audio permission.
  * The names follow the hierarchical property-naming convention. Also, an
  * asterisk can be used to represent all the audio permissions.
- * <p>
- * The following table lists the possible {@code AudioPermission} target names.
- * For each name, the table provides a description of exactly what that
- * permission allows, as well as a discussion of the risks of granting code the
- * permission.
  *
- * <table class="striped">
- * <caption>Permission target name, what the permission allows, and associated
- * risks</caption>
- * <thead>
- *   <tr>
- *     <th scope="col">Permission Target Name
- *     <th scope="col">What the Permission Allows
- *     <th scope="col">Risks of Allowing this Permission
- * </thead>
- * <tbody>
- *   <tr>
- *     <th scope="row">play
- *     <td>Audio playback through the audio device or devices on the system.
- *     Allows the application to obtain and manipulate lines and mixers for
- *     audio playback (rendering).
- *     <td>In some cases use of this permission may affect other
- *     applications because the audio from one line may be mixed with other
- *     audio being played on the system, or because manipulation of a mixer
- *     affects the audio for all lines using that mixer.
- *   <tr>
- *     <th scope="row">record
- *     <td>Audio recording through the audio device or devices on the system.
- *     Allows the application to obtain and manipulate lines and mixers for
- *     audio recording (capture).
- *     <td>In some cases use of this permission may affect other applications
- *     because manipulation of a mixer affects the audio for all lines using
- *     that mixer. This permission can enable an applet or application to
- *     eavesdrop on a user.
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @author Kara Kytle
  * @since 1.3
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
index 21cb21a6162..71e6af44b60 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -187,8 +187,6 @@ public static Mixer.Info[] getMixerInfo() {
      * @param  info a {@code Mixer.Info} object representing the desired mixer,
      *         or {@code null} for the system default mixer
      * @return the requested mixer
-     * @throws SecurityException if the requested mixer is unavailable because
-     *         of security restrictions
      * @throws IllegalArgumentException if the info object does not represent a
      *         mixer installed on the system
      * @see #getMixerInfo
@@ -344,8 +342,6 @@ public static boolean isLineSupported(Line.Info info) {
      * @return a line of the requested kind
      * @throws LineUnavailableException if a matching line is not available due
      *         to resource restrictions
-     * @throws SecurityException if a matching line is not available due to
-     *         security restrictions
      * @throws IllegalArgumentException if the system does not support at least
      *         one line matching the specified {@code Line.Info} object through
      *         any installed mixer
@@ -443,8 +439,6 @@ public static Line getLine(Line.Info info) throws LineUnavailableException {
      * @return the desired clip object
      * @throws LineUnavailableException if a clip object is not available due to
      *         resource restrictions
-     * @throws SecurityException if a clip object is not available due to
-     *         security restrictions
      * @throws IllegalArgumentException if the system does not support at least
      *         one clip instance through any installed mixer
      * @see #getClip(Mixer.Info)
@@ -474,8 +468,6 @@ public static Clip getClip() throws LineUnavailableException{
      * @return a clip object from the specified mixer
      * @throws LineUnavailableException if a clip is not available from this
      *         mixer due to resource restrictions
-     * @throws SecurityException if a clip is not available from this mixer due
-     *         to security restrictions
      * @throws IllegalArgumentException if the system does not support at least
      *         one clip through the specified mixer
      * @see #getClip()
@@ -518,8 +510,6 @@ public static Clip getClip(Mixer.Info mixerInfo) throws LineUnavailableException
      * @return the desired {@code SourceDataLine} object
      * @throws LineUnavailableException if a matching source data line is not
      *         available due to resource restrictions
-     * @throws SecurityException if a matching source data line is not available
-     *         due to security restrictions
      * @throws IllegalArgumentException if the system does not support at least
      *         one source data line supporting the specified audio format
      *         through any installed mixer
@@ -554,8 +544,6 @@ public static SourceDataLine getSourceDataLine(AudioFormat format)
      * @return the desired {@code SourceDataLine} object
      * @throws LineUnavailableException if a matching source data line is not
      *         available from the specified mixer due to resource restrictions
-     * @throws SecurityException if a matching source data line is not available
-     *         from the specified mixer due to security restrictions
      * @throws IllegalArgumentException if the specified mixer does not support
      *         at least one source data line supporting the specified audio
      *         format
@@ -597,13 +585,10 @@ public static SourceDataLine getSourceDataLine(AudioFormat format,
      * @return the desired {@code TargetDataLine} object
      * @throws LineUnavailableException if a matching target data line is not
      *         available due to resource restrictions
-     * @throws SecurityException if a matching target data line is not available
-     *         due to security restrictions
      * @throws IllegalArgumentException if the system does not support at least
      *         one target data line supporting the specified audio format
      *         through any installed mixer
      * @see #getTargetDataLine(AudioFormat, Mixer.Info)
-     * @see AudioPermission
      * @since 1.5
      */
     public static TargetDataLine getTargetDataLine(AudioFormat format)
@@ -635,13 +620,10 @@ public static TargetDataLine getTargetDataLine(AudioFormat format)
      * @return the desired {@code TargetDataLine} object
      * @throws LineUnavailableException if a matching target data line is not
      *         available from the specified mixer due to resource restrictions
-     * @throws SecurityException if a matching target data line is not available
-     *         from the specified mixer due to security restrictions
      * @throws IllegalArgumentException if the specified mixer does not support
      *         at least one target data line supporting the specified audio
      *         format
      * @see #getTargetDataLine(AudioFormat)
-     * @see AudioPermission
      * @since 1.5
      */
     public static TargetDataLine getTargetDataLine(AudioFormat format,
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/Clip.java b/src/java.desktop/share/classes/javax/sound/sampled/Clip.java
index 3257eadf0f4..4875a350ebf 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/Clip.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/Clip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,8 +86,6 @@ public interface Clip extends DataLine {
      *         integral number of sample frames, or if {@code format} is not
      *         fully specified or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #close
      * @see #isOpen
      * @see LineListener
@@ -118,8 +116,6 @@ void open(AudioFormat format, byte[] data, int offset, int bufferSize)
      * @throws IllegalArgumentException if the stream's audio format is not
      *         fully specified or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #close
      * @see #isOpen
      * @see LineListener
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/Line.java b/src/java.desktop/share/classes/javax/sound/sampled/Line.java
index e6b9452d5ca..4341f30da9b 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/Line.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/Line.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,10 +57,6 @@
  * event, what type of event it was ({@code OPEN}, {@code CLOSE}, {@code START},
  * or {@code STOP}), and how many sample frames the line had processed at the
  * time the event occurred.
- * <p>
- * Certain line operations, such as open and close, can generate security
- * exceptions if invoked by unprivileged code when the line is a shared audio
- * resource.
  *
  * @author Kara Kytle
  * @see LineEvent
@@ -108,8 +104,6 @@ public interface Line extends AutoCloseable {
      *         instance
      * @throws LineUnavailableException if the line cannot be opened due to
      *         resource restrictions
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #close
      * @see #isOpen
      * @see LineEvent
@@ -124,8 +118,6 @@ public interface Line extends AutoCloseable {
      * can be released. If this operation succeeds, the line is marked closed
      * and a {@code CLOSE} event is dispatched to the line's listeners.
      *
-     * @throws SecurityException if the line cannot be closed due to security
-     *         restrictions
      * @see #open
      * @see #isOpen
      * @see LineEvent
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java b/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java
index fb09f7e2c3d..585b0fb31a0 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/Mixer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,8 +135,6 @@ public interface Mixer extends Line {
      *         to resource restrictions
      * @throws IllegalArgumentException if this mixer does not support any lines
      *         matching the description
-     * @throws SecurityException if a matching line is not available due to
-     *         security restrictions
      */
     Line getLine(Line.Info info) throws LineUnavailableException;
 
@@ -171,8 +169,6 @@ public interface Mixer extends Line {
      * @return the source lines currently open to the mixer. If no source lines
      *         are currently open to this mixer, an array of length 0 is
      *         returned.
-     * @throws SecurityException if the matching lines are not available due to
-     *         security restrictions
      */
     Line[] getSourceLines();
 
@@ -182,8 +178,6 @@ public interface Mixer extends Line {
      * @return target lines currently open from the mixer. If no target lines
      *         are currently open from this mixer, an array of length 0 is
      *         returned.
-     * @throws SecurityException if the matching lines are not available due to
-     *         security restrictions
      */
     Line[] getTargetLines();
 
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java b/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java
index b42d544bb82..0b3b55bdb54 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/SourceDataLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,8 +93,6 @@ public interface SourceDataLine extends DataLine {
      *         integral number of sample frames, or if {@code format} is not
      *         fully specified or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #open(AudioFormat)
      * @see Line#open
      * @see Line#close
@@ -129,8 +127,6 @@ void open(AudioFormat format, int bufferSize)
      * @throws IllegalArgumentException if {@code format} is not fully specified
      *         or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #open(AudioFormat, int)
      * @see Line#open
      * @see Line#close
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java b/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java
index 944c8e03d92..0bdb324a8e0 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/TargetDataLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,8 +87,6 @@ public interface TargetDataLine extends DataLine {
      *         integral number of sample frames, or if {@code format} is not
      *         fully specified or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #open(AudioFormat)
      * @see Line#open
      * @see Line#close
@@ -122,8 +120,6 @@ public interface TargetDataLine extends DataLine {
      * @throws IllegalArgumentException if {@code format} is not fully specified
      *         or invalid
      * @throws IllegalStateException if the line is already open
-     * @throws SecurityException if the line cannot be opened due to security
-     *         restrictions
      * @see #open(AudioFormat, int)
      * @see Line#open
      * @see Line#close
diff --git a/src/java.desktop/share/classes/javax/swing/FocusManager.java b/src/java.desktop/share/classes/javax/swing/FocusManager.java
index 104039397b9..9aa923efafb 100644
--- a/src/java.desktop/share/classes/javax/swing/FocusManager.java
+++ b/src/java.desktop/share/classes/javax/swing/FocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,25 +92,13 @@ public static FocusManager getCurrentManager() {
      * specified, then the current <code>KeyboardFocusManager</code>
      * is replaced with a new instance of
      * <code>DefaultKeyboardFocusManager</code>.
-     * <p>
-     * If a <code>SecurityManager</code> is installed,
-     * the calling thread must be granted the <code>AWTPermission</code>
-     * "replaceKeyboardFocusManager" in order to replace
-     * the current <code>KeyboardFocusManager</code>.
-     * If this permission is not granted,
-     * this method will throw a <code>SecurityException</code>,
-     * and the current <code>KeyboardFocusManager</code> will be unchanged.
      *
      * @param aFocusManager the new <code>KeyboardFocusManager</code>
      *     for this thread's context
      * @see #getCurrentManager
      * @see java.awt.DefaultKeyboardFocusManager
-     * @throws SecurityException if the calling thread does not have permission
-     *         to replace the current <code>KeyboardFocusManager</code>
      */
-    public static void setCurrentManager(FocusManager aFocusManager)
-        throws SecurityException
-    {
+    public static void setCurrentManager(FocusManager aFocusManager) {
         // Note: This method is not backward-compatible with 1.3 and earlier
         // releases. It now throws a SecurityException in an applet, whereas
         // in previous releases, it did not. This issue was discussed at
diff --git a/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java
index d81ad00504f..99d6385cd7c 100644
--- a/src/java.desktop/share/classes/javax/swing/JDialog.java
+++ b/src/java.desktop/share/classes/javax/swing/JDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -513,9 +513,6 @@ public JDialog(Window owner) {
      *     if the {@code owner}'s {@code GraphicsConfiguration} is not from a screen device
      * @throws HeadlessException
      *     when {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException
-     *     if the calling thread does not have permission to create modal dialogs
-     *     with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
@@ -580,9 +577,6 @@ public JDialog(Window owner, String title) {
      *     if the {@code owner}'s {@code GraphicsConfiguration} is not from a screen device
      * @throws HeadlessException
      *     when {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException
-     *     if the calling thread does not have permission to create modal dialogs
-     *     with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
@@ -625,9 +619,6 @@ public JDialog(Window owner, String title, Dialog.ModalityType modalityType) {
      *     if the {@code owner}'s {@code GraphicsConfiguration} is not from a screen device
      * @throws HeadlessException
      *     when {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @throws SecurityException
-     *     if the calling thread does not have permission to create modal dialogs
-     *     with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
      * @see java.awt.Dialog#setModal
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index 7c04ae87956..1e4c9a1bf76 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,10 +362,6 @@ protected void processWindowEvent(final WindowEvent e) {
      * @see #addWindowListener
      * @see #getDefaultCloseOperation
      * @see WindowConstants
-     * @throws  SecurityException
-     *        if <code>EXIT_ON_CLOSE</code> has been specified and the
-     *        <code>SecurityManager</code> will
-     *        not allow the caller to invoke <code>System.exit</code>
      * @see        java.lang.Runtime#exit(int)
      */
     @BeanProperty(preferred = true, enumerationValues = {
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index fc780a9ce2c..179e06c4ebd 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -6153,8 +6153,6 @@ public void propertyChange(PropertyChangeEvent ev) {
      * occurs on the default printer.
      *
      * @return true, unless printing is cancelled by the user
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      * @throws PrinterException if an error in the print system causes the job
      *                          to be aborted
      * @see #print(JTable.PrintMode, MessageFormat, MessageFormat,
@@ -6179,8 +6177,6 @@ public boolean print() throws PrinterException {
      *
      * @param  printMode        the printing mode that the printable should use
      * @return true, unless printing is cancelled by the user
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      * @throws PrinterException if an error in the print system causes the job
      *                          to be aborted
      * @see #print(JTable.PrintMode, MessageFormat, MessageFormat,
@@ -6211,8 +6207,6 @@ public boolean print(PrintMode printMode) throws PrinterException {
      *                          to be used in printing a footer,
      *                          or null for none
      * @return true, unless printing is cancelled by the user
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      * @throws PrinterException if an error in the print system causes the job
      *                          to be aborted
      * @see #print(JTable.PrintMode, MessageFormat, MessageFormat,
@@ -6253,8 +6247,6 @@ public boolean print(PrintMode printMode,
      *                           dialog or run interactively, and
      *                           <code>GraphicsEnvironment.isHeadless</code>
      *                           returns <code>true</code>
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      * @throws PrinterException if an error in the print system causes the job
      *                          to be aborted
      * @see #print(JTable.PrintMode, MessageFormat, MessageFormat,
@@ -6348,9 +6340,6 @@ public boolean print(PrintMode printMode,
      *                           dialog or run interactively, and
      *                           <code>GraphicsEnvironment.isHeadless</code>
      *                           returns <code>true</code>
-     * @throws  SecurityException if a security manager exists and its
-     *          {@link java.lang.SecurityManager#checkPrintJobAccess}
-     *          method disallows this thread from creating a print job request
      * @throws PrinterException if an error in the print system causes the job
      *                          to be aborted
      * @see #getPrintable
diff --git a/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java
index fe23e1d21e0..4bed87dc562 100644
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -446,9 +446,7 @@ public static LookAndFeelInfo[] getInstalledLookAndFeels() {
      * @see #getInstalledLookAndFeels
      * @throws NullPointerException if {@code infos} is {@code null}
      */
-    public static void setInstalledLookAndFeels(LookAndFeelInfo[] infos)
-        throws SecurityException
-    {
+    public static void setInstalledLookAndFeels(LookAndFeelInfo[] infos) {
         maybeInitialize();
         LookAndFeelInfo[] newInfos = new LookAndFeelInfo[infos.length];
         System.arraycopy(infos, 0, newInfos, 0, infos.length);
diff --git a/src/java.desktop/share/classes/javax/swing/WindowConstants.java b/src/java.desktop/share/classes/javax/swing/WindowConstants.java
index 511f22ba7c8..519b8fbce1a 100644
--- a/src/java.desktop/share/classes/javax/swing/WindowConstants.java
+++ b/src/java.desktop/share/classes/javax/swing/WindowConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,10 +71,7 @@ public interface WindowConstants
     public static final int DISPOSE_ON_CLOSE = 2;
 
     /**
-     * The exit application default window close operation. Attempting
-     * to set this on Windows that support this, such as
-     * <code>JFrame</code>, may throw a <code>SecurityException</code> based
-     * on the <code>SecurityManager</code>.
+     * The exit application default window close operation.
      * It is recommended you only use this in an application.
      *
      * @since 1.4
diff --git a/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
index 19ad986402a..cfe90a8ec8c 100644
--- a/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
+++ b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -675,8 +675,6 @@ public final File[] getChooserShortcutPanelFiles() {
      * @param file a file
      * @return whether this is a link
      * @throws NullPointerException if {@code file} equals {@code null}
-     * @throws SecurityException if the caller does not have necessary
-     *                           permissions
      * @see #getLinkLocation(File)
      * @since 9
      */
@@ -701,8 +699,6 @@ public boolean isLink(File file) {
      * @return the linked file or {@code null}.
      * @throws FileNotFoundException if the linked file does not exist
      * @throws NullPointerException if {@code file} equals {@code null}
-     * @throws SecurityException if the caller does not have necessary
-     *                           permissions
      * @since 9
      */
     public File getLinkLocation(File file) throws FileNotFoundException {
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index 1a11f5c6e37..21e2b6115e3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2124,8 +2124,6 @@ public boolean getScrollableTracksViewportHeight() {
      * @return {@code true}, unless printing is canceled by the user
      * @throws PrinterException if an error in the print system causes the job
      *         to be aborted
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      *
      * @see #print(MessageFormat, MessageFormat, boolean, PrintService, PrintRequestAttributeSet, boolean)
      *
@@ -2154,8 +2152,6 @@ public boolean print() throws PrinterException {
      * @return {@code true}, unless printing is canceled by the user
      * @throws PrinterException if an error in the print system causes the job
      *         to be aborted
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      *
      * @see #print(MessageFormat, MessageFormat, boolean, PrintService, PrintRequestAttributeSet, boolean)
      * @see java.text.MessageFormat
@@ -2266,8 +2262,6 @@ public boolean print(final MessageFormat headerFormat,
      * @return {@code true}, unless printing is canceled by the user
      * @throws PrinterException if an error in the print system causes the job
      *         to be aborted
-     * @throws SecurityException if this thread is not allowed to
-     *                           initiate a print job request
      *
      * @see #getPrintable
      * @see java.text.MessageFormat
diff --git a/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c b/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c
index 333231c508f..4f973a7037d 100644
--- a/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c
+++ b/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -849,16 +849,6 @@ PCPathDone(PathConsumerVec *consumer)
     return oom;
 }
 
-/*
- * REMIND: CDECL needed for WIN32 "qsort"
- */
-
-#ifdef _WIN32
-#define CDECL __cdecl
-#else
-#define CDECL
-#endif
-
 #define SUBDIVIDE_MAX   10
 #define MAX_FLAT_SQ     (1.0 * 1.0)
 #define GROW_SIZE       20
@@ -1171,7 +1161,7 @@ subdivideCubic(pathData *pd, int level,
     return appendSegment(pd, x0, y0, x3, y3);
 }
 
-static int CDECL
+static int
 sortSegmentsByLeadingY(const void *elem1, const void *elem2)
 {
     segmentData *seg1 = *(segmentData **)elem1;
diff --git a/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp b/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
index fad778dac4e..ec5a1b4c54e 100644
--- a/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
@@ -41,53 +41,53 @@
 #define GREEN_SHIFT 8
 
 
-typedef HRESULT(__stdcall *PFNCLOSETHEMEDATA)(HTHEME hTheme);
+typedef HRESULT(*PFNCLOSETHEMEDATA)(HTHEME hTheme);
 
-typedef HRESULT(__stdcall *PFNDRAWTHEMEBACKGROUND)(HTHEME hTheme, HDC hdc,
+typedef HRESULT(*PFNDRAWTHEMEBACKGROUND)(HTHEME hTheme, HDC hdc,
         int iPartId, int iStateId, const RECT *pRect,  const RECT *pClipRect);
 
-typedef HTHEME(__stdcall *PFNOPENTHEMEDATA)(HWND hwnd, LPCWSTR pszClassList);
-typedef HTHEME(__stdcall *PFNOPENTHEMEDATAFORDPI)(HWND hwnd, LPCWSTR pszClassList, UINT dpi);
+typedef HTHEME(*PFNOPENTHEMEDATA)(HWND hwnd, LPCWSTR pszClassList);
+typedef HTHEME(*PFNOPENTHEMEDATAFORDPI)(HWND hwnd, LPCWSTR pszClassList, UINT dpi);
 
-typedef HRESULT (__stdcall *PFNDRAWTHEMETEXT)(HTHEME hTheme, HDC hdc,
+typedef HRESULT (*PFNDRAWTHEMETEXT)(HTHEME hTheme, HDC hdc,
           int iPartId, int iStateId, LPCWSTR pszText, int iCharCount,
           DWORD dwTextFlags, DWORD dwTextFlags2, const RECT *pRect);
 
-typedef HRESULT (__stdcall *PFNGETTHEMEBACKGROUNDCONTENTRECT)(HTHEME hTheme,
+typedef HRESULT (*PFNGETTHEMEBACKGROUNDCONTENTRECT)(HTHEME hTheme,
         HDC hdc, int iPartId, int iStateId,  const RECT *pBoundingRect,
         RECT *pContentRect);
 
-typedef HRESULT (__stdcall *PFNGETTHEMEMARGINS)(HTHEME hTheme,
+typedef HRESULT (*PFNGETTHEMEMARGINS)(HTHEME hTheme,
         OPTIONAL HDC hdc, int iPartId, int iStateId, int iPropId,
         OPTIONAL RECT *prc, OUT MARGINS *pMargins);
 
-typedef BOOL (__stdcall *PFNISTHEMEPARTDEFINED)(HTHEME hTheme, int iPartId, int iStateId);
+typedef BOOL (*PFNISTHEMEPARTDEFINED)(HTHEME hTheme, int iPartId, int iStateId);
 
-typedef HRESULT (__stdcall *PFNGETTHEMEBOOL)(HTHEME hTheme, int iPartId,
+typedef HRESULT (*PFNGETTHEMEBOOL)(HTHEME hTheme, int iPartId,
         int iStateId, int iPropId, BOOL *pfVal);
 
-typedef BOOL (__stdcall *PFNGETTHEMESYSBOOL)(HTHEME hTheme, int iPropId);
+typedef BOOL (*PFNGETTHEMESYSBOOL)(HTHEME hTheme, int iPropId);
 
-typedef HRESULT (__stdcall *PFNGETTHEMECOLOR)(HTHEME hTheme, int iPartId,
+typedef HRESULT (*PFNGETTHEMECOLOR)(HTHEME hTheme, int iPartId,
         int iStateId, int iPropId, COLORREF *pColor);
 
-typedef HRESULT (__stdcall *PFNGETTHEMEENUMVALUE)(HTHEME hTheme, int iPartId,
+typedef HRESULT (*PFNGETTHEMEENUMVALUE)(HTHEME hTheme, int iPartId,
         int iStateId, int iPropId, int *val);
-typedef HRESULT (__stdcall *PFNGETTHEMEINT)(HTHEME hTheme, int iPartId,
+typedef HRESULT (*PFNGETTHEMEINT)(HTHEME hTheme, int iPartId,
         int iStateId, int iPropId, int *val);
-typedef HRESULT (__stdcall *PFNGETTHEMEPARTSIZE)(HTHEME hTheme, HDC hdc,
+typedef HRESULT (*PFNGETTHEMEPARTSIZE)(HTHEME hTheme, HDC hdc,
         int iPartId, int iStateId, RECT *prc, THEMESIZE eSize, SIZE *size);
 
-typedef HRESULT (__stdcall *PFNGETTHEMEPOSITION)(HTHEME hTheme, int iPartId,
+typedef HRESULT (*PFNGETTHEMEPOSITION)(HTHEME hTheme, int iPartId,
         int iStateId, int propID, POINT *point);
 
-typedef HRESULT(__stdcall *PFNSETWINDOWTHEME)(HWND hwnd, LPCWSTR pszSubAppName,
+typedef HRESULT(*PFNSETWINDOWTHEME)(HWND hwnd, LPCWSTR pszSubAppName,
             LPCWSTR pszSubIdList);
 
-typedef BOOL (__stdcall *PFNISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)
+typedef BOOL (*PFNISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)
              (HTHEME hTheme, int iPartId, int iStateId);
 
-typedef HRESULT (__stdcall *PFNGETTHEMETRANSITIONDURATION)
+typedef HRESULT (*PFNGETTHEMETRANSITIONDURATION)
                 (HTHEME hTheme, int iPartId, int iStateIdFrom, int iStateIdTo,
                  int iPropId, DWORD *pdwDuration);
 
diff --git a/src/java.desktop/windows/native/libawt/windows/alloc.h b/src/java.desktop/windows/native/libawt/windows/alloc.h
index 4c92c12cbca..a5796df40b1 100644
--- a/src/java.desktop/windows/native/libawt/windows/alloc.h
+++ b/src/java.desktop/windows/native/libawt/windows/alloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ void handle_bad_alloc(void);
     void *safe_Malloc_outofmem(size_t size, const char *, int);
     void *safe_Calloc_outofmem(size_t num, size_t size, const char *, int);
     void *safe_Realloc_outofmem(void *memblock, size_t size, const char *, int);
-    void * CDECL operator new(size_t size, const char *, int);
+    void * operator new(size_t size, const char *, int);
 
     #define safe_Malloc(size) \
         safe_Malloc_outofmem(size, __FILE__, __LINE__)
diff --git a/src/java.desktop/windows/native/libawt/windows/awt.h b/src/java.desktop/windows/native/libawt/windows/awt.h
index 3703bfbb0cb..b6289dcae68 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt.h
@@ -154,15 +154,6 @@ typedef AwtObject* PDATA;
                                                      JNI_TRUE)
 /*  /NEW JNI */
 
-/*
- * IS_WIN64 returns TRUE on 64-bit Itanium
- */
-#if defined (_WIN64)
-    #define IS_WIN64 TRUE
-#else
-    #define IS_WIN64 FALSE
-#endif
-
 /*
  * IS_WIN2000 returns TRUE on 2000, XP and Vista
  * IS_WINXP returns TRUE on XP and Vista
@@ -195,35 +186,6 @@ extern JavaVM *jvm;
 #define JNU_GetStringPlatformChars(env, x, y) reinterpret_cast<LPCWSTR>(env->GetStringChars(x, y))
 #define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, reinterpret_cast<const jchar*>(y))
 
-/*
- * Itanium symbols needed for 64-bit compilation.
- * These are defined in winuser.h in the August 2001 MSDN update.
- */
-#ifndef GCLP_HBRBACKGROUND
-    #ifdef _WIN64
-        #error Macros for GetClassLongPtr, etc. are for 32-bit windows only
-    #endif /* !_WIN64 */
-    #define GetClassLongPtr GetClassLong
-    #define SetClassLongPtr SetClassLong
-    #define GCLP_HBRBACKGROUND GCL_HBRBACKGROUND
-    #define GCLP_HCURSOR GCL_HCURSOR
-    #define GCLP_HICON GCL_HICON
-    #define GCLP_HICONSM GCL_HICONSM
-    #define GCLP_HMODULE GCL_HMODULE
-    #define GCLP_MENUNAME GCL_MENUNAME
-    #define GCLP_WNDPROC GCL_WNDPROC
-    #define GetWindowLongPtr GetWindowLong
-    #define SetWindowLongPtr SetWindowLong
-    #define GWLP_WNDPROC GWL_WNDPROC
-    #define GWLP_HINSTANCE GWL_HINSTANCE
-    #define GWLP_HWNDPARENT GWL_HWNDPARENT
-    #define GWLP_ID GWL_ID
-    #define GWLP_USERDATA GWL_USERDATA
-    #define DWLP_DLGPROC DWL_DLGPROC
-    #define DWLP_MSGRESULT DWL_MSGRESULT
-    #define DWLP_USER DWL_USER
-#endif /* !GCLP_HBRBACKGROUND */
-
 /*
  * macros for saving and restoring FPU control word
  * NOTE: float.h must be defined if using these macros
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
index 3b8043385a1..b6e8b2c2e0e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
@@ -160,11 +160,7 @@ void AwtDebugSupport::AssertCallback(const char * expr, const char * file, int l
 
     // if clicked Yes, break into the debugger
     if ( ret == IDYES ) {
-        # if defined(_M_IX86)
-            _asm { int 3 };
-        # else
-            DebugBreak();
-        # endif
+        DebugBreak();
     }
     // otherwise, try to continue execution
 }
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp
index 2c67b65cc41..a329f5b84b3 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp
@@ -71,8 +71,8 @@ typedef std::map<FORMATETC, STGMEDIUM> CDataMap;
                           java_awt_event_InputEvent_BUTTON3_DOWN_MASK)
 
 extern "C" {
-DWORD __cdecl convertActionsToDROPEFFECT(jint actions);
-jint  __cdecl convertDROPEFFECTToActions(DWORD effects);
+DWORD convertActionsToDROPEFFECT(jint actions);
+jint  convertDROPEFFECTToActions(DWORD effects);
 }
 
 class PictureDragHelper
@@ -525,8 +525,7 @@ void AwtDragSource::SetCursor(jobject cursor) {
  * MatchFormatEtc
  */
 
-HRESULT __stdcall
-AwtDragSource::MatchFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn,
+HRESULT AwtDragSource::MatchFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn,
                               FORMATETC *cacheEnt) {
     TRY;
 
@@ -586,7 +585,7 @@ AwtDragSource::MatchFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn,
  * QueryInterface
  */
 
-HRESULT __stdcall AwtDragSource::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
+HRESULT AwtDragSource::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
     TRY;
 
     if (riid == IID_IUnknown) {
@@ -613,7 +612,7 @@ HRESULT __stdcall AwtDragSource::QueryInterface(REFIID riid, void __RPC_FAR *__R
  * AddRef
  */
 
-ULONG __stdcall AwtDragSource::AddRef() {
+ULONG AwtDragSource::AddRef() {
     return (ULONG)++m_refs;
 }
 
@@ -621,7 +620,7 @@ ULONG __stdcall AwtDragSource::AddRef() {
  * Release
  */
 
-ULONG __stdcall AwtDragSource::Release() {
+ULONG AwtDragSource::Release() {
     int refs;
 
     if ((refs = --m_refs) == 0) delete this;
@@ -633,7 +632,7 @@ ULONG __stdcall AwtDragSource::Release() {
  * QueryContinueDrag
  */
 
-HRESULT __stdcall  AwtDragSource::QueryContinueDrag(BOOL fEscapeKeyPressed, DWORD grfKeyState) {
+HRESULT AwtDragSource::QueryContinueDrag(BOOL fEscapeKeyPressed, DWORD grfKeyState) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
 
@@ -687,7 +686,7 @@ HRESULT __stdcall  AwtDragSource::QueryContinueDrag(BOOL fEscapeKeyPressed, DWOR
  * GiveFeedback
  */
 
-HRESULT __stdcall  AwtDragSource::GiveFeedback(DWORD dwEffect) {
+HRESULT AwtDragSource::GiveFeedback(DWORD dwEffect) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
 
@@ -766,7 +765,7 @@ HRESULT __stdcall  AwtDragSource::GiveFeedback(DWORD dwEffect) {
  * GetData
  */
 
-HRESULT __stdcall AwtDragSource::GetData(FORMATETC __RPC_FAR *pFormatEtc,
+HRESULT AwtDragSource::GetData(FORMATETC __RPC_FAR *pFormatEtc,
                                          STGMEDIUM __RPC_FAR *pmedium) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
@@ -941,7 +940,7 @@ HRESULT __stdcall AwtDragSource::GetData(FORMATETC __RPC_FAR *pFormatEtc,
  * GetDataHere
  */
 
-HRESULT __stdcall AwtDragSource::GetDataHere(FORMATETC __RPC_FAR *pFormatEtc,
+HRESULT AwtDragSource::GetDataHere(FORMATETC __RPC_FAR *pFormatEtc,
                                              STGMEDIUM __RPC_FAR *pmedium) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
@@ -1045,7 +1044,7 @@ HRESULT __stdcall AwtDragSource::GetDataHere(FORMATETC __RPC_FAR *pFormatEtc,
  * QueryGetData
  */
 
-HRESULT __stdcall  AwtDragSource::QueryGetData(FORMATETC __RPC_FAR *pFormatEtc) {
+HRESULT AwtDragSource::QueryGetData(FORMATETC __RPC_FAR *pFormatEtc) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
 
@@ -1059,7 +1058,7 @@ HRESULT __stdcall  AwtDragSource::QueryGetData(FORMATETC __RPC_FAR *pFormatEtc)
  * GetCanonicalFormatEtc
  */
 
-HRESULT __stdcall  AwtDragSource::GetCanonicalFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC __RPC_FAR *pFormatEtcOut) {
+HRESULT AwtDragSource::GetCanonicalFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC __RPC_FAR *pFormatEtcOut) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
 
@@ -1080,7 +1079,7 @@ HRESULT __stdcall  AwtDragSource::GetCanonicalFormatEtc(FORMATETC __RPC_FAR *pFo
  * SetData
  */
 
-HRESULT __stdcall AwtDragSource::SetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium, BOOL fRelease) {
+HRESULT AwtDragSource::SetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium, BOOL fRelease) {
     AwtToolkit::GetInstance().eventNumber++;
     if (pFormatEtc->cfFormat == CF_PERFORMEDDROPEFFECT && pmedium->tymed == TYMED_HGLOBAL) {
         m_dwPerformedDropEffect = *(DWORD*)::GlobalLock(pmedium->hGlobal);
@@ -1103,7 +1102,7 @@ HRESULT __stdcall AwtDragSource::SetData(FORMATETC __RPC_FAR *pFormatEtc, STGMED
  * EnumFormatEtc
  */
 
-HRESULT __stdcall  AwtDragSource::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC *__RPC_FAR *ppenumFormatEtc) {
+HRESULT AwtDragSource::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC *__RPC_FAR *ppenumFormatEtc) {
     AwtToolkit::GetInstance().eventNumber++;
     TRY;
 
@@ -1117,7 +1116,7 @@ HRESULT __stdcall  AwtDragSource::EnumFormatEtc(DWORD dwDirection, IEnumFORMATET
  * DAdvise
  */
 
-HRESULT __stdcall  AwtDragSource::DAdvise(FORMATETC __RPC_FAR *pFormatEtc, DWORD advf, IAdviseSink __RPC_FAR *pAdvSink, DWORD __RPC_FAR *pdwConnection) {
+HRESULT AwtDragSource::DAdvise(FORMATETC __RPC_FAR *pFormatEtc, DWORD advf, IAdviseSink __RPC_FAR *pAdvSink, DWORD __RPC_FAR *pdwConnection) {
     AwtToolkit::GetInstance().eventNumber++;
     return E_NOTIMPL;
 }
@@ -1126,7 +1125,7 @@ HRESULT __stdcall  AwtDragSource::DAdvise(FORMATETC __RPC_FAR *pFormatEtc, DWORD
  * DUnadvise
  */
 
-HRESULT __stdcall  AwtDragSource::DUnadvise(DWORD dwConnection) {
+HRESULT AwtDragSource::DUnadvise(DWORD dwConnection) {
     AwtToolkit::GetInstance().eventNumber++;
     return OLE_E_ADVISENOTSUPPORTED;
 }
@@ -1135,7 +1134,7 @@ HRESULT __stdcall  AwtDragSource::DUnadvise(DWORD dwConnection) {
  * EnumAdvise
  */
 
-HRESULT __stdcall  AwtDragSource::EnumDAdvise(IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise) {
+HRESULT AwtDragSource::EnumDAdvise(IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise) {
     AwtToolkit::GetInstance().eventNumber++;
     return OLE_E_ADVISENOTSUPPORTED;
 }
@@ -1143,7 +1142,7 @@ HRESULT __stdcall  AwtDragSource::EnumDAdvise(IEnumSTATDATA __RPC_FAR *__RPC_FAR
 const UINT AwtDragSource::PROCESS_ID_FORMAT =
     ::RegisterClipboardFormat(TEXT("_SUNW_JAVA_AWT_PROCESS_ID"));
 
-HRESULT __stdcall AwtDragSource::GetProcessId(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium) {
+HRESULT AwtDragSource::GetProcessId(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium) {
     AwtToolkit::GetInstance().eventNumber++;
     if ((pFormatEtc->tymed & TYMED_HGLOBAL) == 0) {
         return DV_E_TYMED;
@@ -1294,7 +1293,7 @@ AwtDragSource::ADSIEnumFormatEtc::~ADSIEnumFormatEtc() {
  * QueryInterface
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
+HRESULT AwtDragSource::ADSIEnumFormatEtc::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
     TRY;
 
     if (riid == IID_IUnknown) {
@@ -1317,7 +1316,7 @@ HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::QueryInterface(REFIID riid,
  * AddRef
  */
 
-ULONG __stdcall  AwtDragSource::ADSIEnumFormatEtc::AddRef(void) {
+ULONG AwtDragSource::ADSIEnumFormatEtc::AddRef(void) {
     return (ULONG)++m_refs;
 }
 
@@ -1325,7 +1324,7 @@ ULONG __stdcall  AwtDragSource::ADSIEnumFormatEtc::AddRef(void) {
  * Release
  */
 
-ULONG __stdcall  AwtDragSource::ADSIEnumFormatEtc::Release(void) {
+ULONG AwtDragSource::ADSIEnumFormatEtc::Release(void) {
     int refs;
 
     if ((refs = --m_refs) == 0) delete this;
@@ -1337,7 +1336,7 @@ ULONG __stdcall  AwtDragSource::ADSIEnumFormatEtc::Release(void) {
  * Next
  */
 
-HRESULT _stdcall AwtDragSource::ADSIEnumFormatEtc::Next(ULONG celt, FORMATETC __RPC_FAR *rgelt, ULONG __RPC_FAR *pceltFetched) {
+HRESULT AwtDragSource::ADSIEnumFormatEtc::Next(ULONG celt, FORMATETC __RPC_FAR *rgelt, ULONG __RPC_FAR *pceltFetched) {
     TRY;
 
     unsigned int len = m_parent->getNTypes();
@@ -1359,7 +1358,7 @@ HRESULT _stdcall AwtDragSource::ADSIEnumFormatEtc::Next(ULONG celt, FORMATETC __
  * Skip
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::Skip(ULONG celt) {
+HRESULT AwtDragSource::ADSIEnumFormatEtc::Skip(ULONG celt) {
     TRY;
 
     unsigned int len = m_parent->getNTypes();
@@ -1382,7 +1381,7 @@ HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::Skip(ULONG celt) {
  * Reset
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::Reset(void) {
+HRESULT AwtDragSource::ADSIEnumFormatEtc::Reset(void) {
     m_idx = 0;
 
     return S_OK;
@@ -1392,7 +1391,7 @@ HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::Reset(void) {
  * Clone
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIEnumFormatEtc::Clone(IEnumFORMATETC  __RPC_FAR *__RPC_FAR *ppenum) {
+HRESULT AwtDragSource::ADSIEnumFormatEtc::Clone(IEnumFORMATETC  __RPC_FAR *__RPC_FAR *ppenum) {
     TRY;
 
     *ppenum = new ADSIEnumFormatEtc(m_parent);
@@ -1484,7 +1483,7 @@ AwtDragSource::ADSIStreamProxy::~ADSIStreamProxy() {
  * QueryInterface
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
+HRESULT AwtDragSource::ADSIStreamProxy::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
     TRY;
 
     if (riid == IID_IUnknown) {
@@ -1507,7 +1506,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::QueryInterface(REFIID riid, v
  * AddRef
  */
 
-ULONG __stdcall  AwtDragSource::ADSIStreamProxy::AddRef(void) {
+ULONG AwtDragSource::ADSIStreamProxy::AddRef(void) {
     return (ULONG)++m_refs;
 }
 
@@ -1515,7 +1514,7 @@ ULONG __stdcall  AwtDragSource::ADSIStreamProxy::AddRef(void) {
  * Release
  */
 
-ULONG __stdcall  AwtDragSource::ADSIStreamProxy::Release(void) {
+ULONG AwtDragSource::ADSIStreamProxy::Release(void) {
     int refs;
 
     if ((refs = --m_refs) == 0) delete this;
@@ -1527,7 +1526,7 @@ ULONG __stdcall  AwtDragSource::ADSIStreamProxy::Release(void) {
  * Read
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead) {
+HRESULT AwtDragSource::ADSIStreamProxy::Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead) {
     TRY;
 
     unsigned int rem  = m_blen - m_off;
@@ -1552,7 +1551,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Read(void __RPC_FAR *pv, ULON
  * Write
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Write(const void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbWritten) {
+HRESULT AwtDragSource::ADSIStreamProxy::Write(const void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbWritten) {
     TRY;
 
     if (pcbWritten != (ULONG __RPC_FAR *)NULL) {
@@ -1570,7 +1569,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Write(const void __RPC_FAR *p
  * Seek
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER __RPC_FAR *plibNewPosition) {
+HRESULT AwtDragSource::ADSIStreamProxy::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER __RPC_FAR *plibNewPosition) {
     TRY;
 
     if (dlibMove.HighPart != 0) return STG_E_INVALIDPOINTER;
@@ -1618,7 +1617,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Seek(LARGE_INTEGER dlibMove,
  * SetSize
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::SetSize(ULARGE_INTEGER libNewSize) {
+HRESULT AwtDragSource::ADSIStreamProxy::SetSize(ULARGE_INTEGER libNewSize) {
     return STG_E_INVALIDFUNCTION;
 }
 
@@ -1626,7 +1625,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::SetSize(ULARGE_INTEGER libNew
  * CopyTo
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::CopyTo(IStream __RPC_FAR *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER __RPC_FAR *pcbRead, ULARGE_INTEGER __RPC_FAR *pcbWritten) {
+HRESULT AwtDragSource::ADSIStreamProxy::CopyTo(IStream __RPC_FAR *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER __RPC_FAR *pcbRead, ULARGE_INTEGER __RPC_FAR *pcbWritten) {
     TRY;
 
     ULONG written = 0;
@@ -1659,7 +1658,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::CopyTo(IStream __RPC_FAR *pst
  * Commit
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Commit(DWORD grfCommitFlags) {
+HRESULT AwtDragSource::ADSIStreamProxy::Commit(DWORD grfCommitFlags) {
     return S_OK;
 }
 
@@ -1667,7 +1666,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Commit(DWORD grfCommitFlags)
  * Revert
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Revert() {
+HRESULT AwtDragSource::ADSIStreamProxy::Revert() {
     return S_OK;
 }
 
@@ -1675,7 +1674,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Revert() {
  * LockRegion
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
+HRESULT AwtDragSource::ADSIStreamProxy::LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
     return STG_E_INVALIDFUNCTION;
 }
 
@@ -1683,7 +1682,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::LockRegion(ULARGE_INTEGER lib
  * UnlockRegion
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
+HRESULT AwtDragSource::ADSIStreamProxy::UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
     return STG_E_INVALIDFUNCTION;
 }
 
@@ -1691,7 +1690,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::UnlockRegion(ULARGE_INTEGER l
  * Stat
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Stat(STATSTG __RPC_FAR *pstatstg, DWORD grfStatFlag) {
+HRESULT AwtDragSource::ADSIStreamProxy::Stat(STATSTG __RPC_FAR *pstatstg, DWORD grfStatFlag) {
     TRY;
 
     *pstatstg = m_statstg;
@@ -1707,7 +1706,7 @@ HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Stat(STATSTG __RPC_FAR *pstat
  * Clone
  */
 
-HRESULT __stdcall  AwtDragSource::ADSIStreamProxy::Clone(IStream __RPC_FAR *__RPC_FAR *ppstm) {
+HRESULT AwtDragSource::ADSIStreamProxy::Clone(IStream __RPC_FAR *__RPC_FAR *ppstm) {
     TRY;
 
     *ppstm = new ADSIStreamProxy(this);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h
index 6b22b46cd7c..ba41d81da82 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h
@@ -53,33 +53,33 @@ class AwtDragSource : virtual public IDropSource, virtual public IDataObject {
 
         // IUnknown
 
-        virtual HRESULT __stdcall QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
+        virtual HRESULT QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
 
-        virtual ULONG   __stdcall AddRef(void);
-        virtual ULONG   __stdcall Release(void);
+        virtual ULONG   AddRef(void);
+        virtual ULONG   Release(void);
 
         // IDropSource
 
-        virtual HRESULT __stdcall QueryContinueDrag(BOOL fEscapeKeyPressed, DWORD grfKeyState);
+        virtual HRESULT QueryContinueDrag(BOOL fEscapeKeyPressed, DWORD grfKeyState);
 
-        virtual HRESULT __stdcall GiveFeedback(DWORD dwEffect);
+        virtual HRESULT GiveFeedback(DWORD dwEffect);
 
         // IDataObject
 
-        virtual HRESULT __stdcall GetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
-        virtual HRESULT __stdcall GetDataHere(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
+        virtual HRESULT GetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
+        virtual HRESULT GetDataHere(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
 
-        virtual HRESULT __stdcall QueryGetData(FORMATETC __RPC_FAR *pFormatEtc);
+        virtual HRESULT QueryGetData(FORMATETC __RPC_FAR *pFormatEtc);
 
-        virtual HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC __RPC_FAR *pFormatEtcOut);
+        virtual HRESULT GetCanonicalFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC __RPC_FAR *pFormatEtcOut);
 
-        virtual HRESULT __stdcall SetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium, BOOL fRelease);
+        virtual HRESULT SetData(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium, BOOL fRelease);
 
-        virtual HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC *__RPC_FAR *ppenumFormatEtc);
+        virtual HRESULT EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC *__RPC_FAR *ppenumFormatEtc);
 
-        virtual HRESULT __stdcall DAdvise(FORMATETC __RPC_FAR *pFormatEtc, DWORD advf, IAdviseSink __RPC_FAR *pAdvSink, DWORD __RPC_FAR *pdwConnection);
-        virtual HRESULT __stdcall DUnadvise(DWORD dwConnection);
-        virtual HRESULT __stdcall EnumDAdvise(IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise);
+        virtual HRESULT DAdvise(FORMATETC __RPC_FAR *pFormatEtc, DWORD advf, IAdviseSink __RPC_FAR *pAdvSink, DWORD __RPC_FAR *pdwConnection);
+        virtual HRESULT DUnadvise(DWORD dwConnection);
+        virtual HRESULT EnumDAdvise(IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise);
 
 
         // AwtDragSource
@@ -104,7 +104,7 @@ class AwtDragSource : virtual public IDropSource, virtual public IDataObject {
 
         INLINE void Signal() { ::ReleaseMutex(m_mutex); }
 
-        virtual HRESULT __stdcall GetProcessId(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
+        virtual HRESULT GetProcessId(FORMATETC __RPC_FAR *pFormatEtc, STGMEDIUM __RPC_FAR *pmedium);
 
     protected:
         INLINE void WaitUntilSignalled(BOOL retain) {
@@ -117,14 +117,14 @@ class AwtDragSource : virtual public IDropSource, virtual public IDataObject {
 
         static void _DoDragDrop(void* param);
 
-        HRESULT __stdcall MatchFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC *cacheEnt);
+        HRESULT MatchFormatEtc(FORMATETC __RPC_FAR *pFormatEtcIn, FORMATETC *cacheEnt);
 
    private:
 
         void LoadCache(jlongArray formats);
         void UnloadCache();
 
-        static int __cdecl _compar(const void *, const void *);
+        static int _compar(const void *, const void *);
 
         static void call_dSCenter(JNIEnv* env, jobject self, jint targetActions,
                                   jint modifiers, POINT pt);
@@ -151,17 +151,17 @@ class AwtDragSource : virtual public IDropSource, virtual public IDataObject {
 
                 // IUnknown
 
-                virtual HRESULT __stdcall QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
+                virtual HRESULT QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
 
-                virtual ULONG   __stdcall AddRef(void);
-                virtual ULONG   __stdcall Release(void);
+                virtual ULONG   AddRef(void);
+                virtual ULONG   Release(void);
 
                 // IEnumFORMATETC
 
-                virtual HRESULT _stdcall Next(ULONG celt, FORMATETC __RPC_FAR *rgelt, ULONG __RPC_FAR *pceltFetched);
-                virtual HRESULT _stdcall Skip(ULONG celt);
-                virtual HRESULT _stdcall Reset();
-                virtual HRESULT _stdcall Clone(IEnumFORMATETC __RPC_FAR *__RPC_FAR *ppenum);
+                virtual HRESULT Next(ULONG celt, FORMATETC __RPC_FAR *rgelt, ULONG __RPC_FAR *pceltFetched);
+                virtual HRESULT Skip(ULONG celt);
+                virtual HRESULT Reset();
+                virtual HRESULT Clone(IEnumFORMATETC __RPC_FAR *__RPC_FAR *ppenum);
 
             private:
                 AwtDragSource*  m_parent;
@@ -181,35 +181,35 @@ class AwtDragSource : virtual public IDropSource, virtual public IDataObject {
 
                 // IUnknown
 
-                virtual HRESULT __stdcall QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
+                virtual HRESULT QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
 
-                virtual ULONG   __stdcall AddRef(void);
-                virtual ULONG   __stdcall Release(void);
+                virtual ULONG   AddRef(void);
+                virtual ULONG   Release(void);
 
                 // IStream
 
 
-                virtual  HRESULT __stdcall Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead);
+                virtual  HRESULT Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead);
 
-                virtual  HRESULT __stdcall Write(const void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbWritten);
+                virtual  HRESULT Write(const void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbWritten);
 
-                virtual  HRESULT __stdcall Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER __RPC_FAR *plibNewPosition);
+                virtual  HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER __RPC_FAR *plibNewPosition);
 
-                virtual HRESULT __stdcall SetSize(ULARGE_INTEGER libNewSize);
+                virtual HRESULT SetSize(ULARGE_INTEGER libNewSize);
 
-                virtual  HRESULT __stdcall CopyTo(IStream __RPC_FAR *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER __RPC_FAR *pcbRead, ULARGE_INTEGER __RPC_FAR *pcbWritten);
+                virtual  HRESULT CopyTo(IStream __RPC_FAR *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER __RPC_FAR *pcbRead, ULARGE_INTEGER __RPC_FAR *pcbWritten);
 
-                virtual HRESULT __stdcall Commit(DWORD grfCommitFlags);
+                virtual HRESULT Commit(DWORD grfCommitFlags);
 
-                virtual HRESULT __stdcall Revert();
+                virtual HRESULT Revert();
 
-                virtual HRESULT __stdcall LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+                virtual HRESULT LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
 
-                virtual HRESULT __stdcall UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+                virtual HRESULT UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
 
-                virtual HRESULT __stdcall Stat(STATSTG __RPC_FAR *pstatstg, DWORD grfStatFlag);
+                virtual HRESULT Stat(STATSTG __RPC_FAR *pstatstg, DWORD grfStatFlag);
 
-                virtual HRESULT __stdcall Clone(IStream __RPC_FAR *__RPC_FAR *ppstm);
+                virtual HRESULT Clone(IStream __RPC_FAR *__RPC_FAR *ppstm);
             protected:
                 AwtDragSource*   m_parent;
 
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
index b33a45a4b07..55d1ecad70f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,9 +42,9 @@
 // forwards
 
 extern "C" {
-    DWORD __cdecl convertActionsToDROPEFFECT(jint actions);
-    jint  __cdecl convertDROPEFFECTToActions(DWORD effects);
-    DWORD __cdecl mapModsToDROPEFFECT(DWORD, DWORD);
+    DWORD convertActionsToDROPEFFECT(jint actions);
+    jint  convertDROPEFFECTToActions(DWORD effects);
+    DWORD mapModsToDROPEFFECT(DWORD, DWORD);
 } // extern "C"
 
 
@@ -95,7 +95,7 @@ AwtDropTarget::~AwtDropTarget() {
  * QueryInterface
  */
 
-HRESULT __stdcall AwtDropTarget::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
+HRESULT AwtDropTarget::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) {
     if ( IID_IUnknown == riid ||
          IID_IDropTarget == riid )
     {
@@ -111,7 +111,7 @@ HRESULT __stdcall AwtDropTarget::QueryInterface(REFIID riid, void __RPC_FAR *__R
  * AddRef
  */
 
-ULONG __stdcall AwtDropTarget::AddRef() {
+ULONG AwtDropTarget::AddRef() {
     return (ULONG)++m_refs;
 }
 
@@ -119,7 +119,7 @@ ULONG __stdcall AwtDropTarget::AddRef() {
  * Release
  */
 
-ULONG __stdcall AwtDropTarget::Release() {
+ULONG AwtDropTarget::Release() {
     int refs;
 
     if ((refs = --m_refs) == 0) delete this;
@@ -141,7 +141,7 @@ static void ScaleDown(POINT &cp, HWND m_window) {
  * DragEnter
  */
 
-HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
+HRESULT AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
     TRY;
     AwtToolkit::GetInstance().isDnDTargetActive = TRUE;
     if (NULL != m_pIDropTargetHelper) {
@@ -225,7 +225,7 @@ HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWOR
  * DragOver
  */
 
-HRESULT __stdcall AwtDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
+HRESULT AwtDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
     TRY;
     if (NULL != m_pIDropTargetHelper) {
         m_pIDropTargetHelper->DragOver(
@@ -282,7 +282,7 @@ HRESULT __stdcall AwtDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __
  * DragLeave
  */
 
-HRESULT __stdcall AwtDropTarget::DragLeave() {
+HRESULT AwtDropTarget::DragLeave() {
     TRY_NO_VERIFY;
     if (NULL != m_pIDropTargetHelper) {
         m_pIDropTargetHelper->DragLeave();
@@ -323,7 +323,7 @@ HRESULT __stdcall AwtDropTarget::DragLeave() {
  * Drop
  */
 
-HRESULT __stdcall AwtDropTarget::Drop(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
+HRESULT AwtDropTarget::Drop(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) {
     TRY;
     if (NULL != m_pIDropTargetHelper) {
         m_pIDropTargetHelper->Drop(
@@ -1003,7 +1003,7 @@ jobject AwtDropTarget::GetData(jlong fmt)
  *
  */
 
-int __cdecl AwtDropTarget::_compar(const void* first, const void* second) {
+int AwtDropTarget::_compar(const void* first, const void* second) {
     FORMATETC *fp = (FORMATETC *)first;
     FORMATETC *sp = (FORMATETC *)second;
 
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h
index 865c016698b..fc500965315 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,18 +49,18 @@ class AwtDropTarget : virtual public IDropTarget {
 
         // IUnknown
 
-        virtual HRESULT __stdcall QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
+        virtual HRESULT QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
 
-        virtual ULONG   __stdcall AddRef(void);
-        virtual ULONG   __stdcall Release(void);
+        virtual ULONG   AddRef(void);
+        virtual ULONG   Release(void);
 
         // IDropTarget
 
-        virtual HRESULT __stdcall DragEnter(IDataObject __RPC_FAR *pDataObject, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
-        virtual HRESULT __stdcall DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
-        virtual HRESULT __stdcall DragLeave(void);
+        virtual HRESULT DragEnter(IDataObject __RPC_FAR *pDataObject, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
+        virtual HRESULT DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
+        virtual HRESULT DragLeave(void);
 
-        virtual HRESULT __stdcall Drop(IDataObject __RPC_FAR *pDataObject, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
+        virtual HRESULT Drop(IDataObject __RPC_FAR *pDataObject, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect);
 
         // AwtDropTarget
 
@@ -186,7 +186,7 @@ class AwtDropTarget : virtual public IDropTarget {
 
         static const unsigned int CACHE_INCR;
 
-        static int __cdecl _compar(const void *, const void *);
+        static int _compar(const void *, const void *);
 };
 
 
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
index 5d7171addb4..b467a685516 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -2195,7 +2195,7 @@ bool AwtToolkit::PreloadThread::Terminate(bool wrongThread)
     return true;
 }
 
-bool AwtToolkit::PreloadThread::InvokeAndTerminate(void(_cdecl *fn)(void *), void *param)
+bool AwtToolkit::PreloadThread::InvokeAndTerminate(void(*fn)(void *), void *param)
 {
     CriticalSection::Lock lock(threadLock);
 
@@ -2225,7 +2225,7 @@ unsigned WINAPI AwtToolkit::PreloadThread::StaticThreadProc(void *param)
 
 unsigned AwtToolkit::PreloadThread::ThreadProc()
 {
-    void(_cdecl *_execFunc)(void *) = NULL;
+    void(*_execFunc)(void *) = NULL;
     void *_execParam = NULL;
     bool _wrongThread = false;
 
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
index 4a4b2bdcb3f..29485c8ba41 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
@@ -612,7 +612,7 @@ class AwtToolkit {
         //   false means termination on the application shutdown;
         // wrongThread is used as reInit parameter for action cleanup.
         bool Terminate(bool wrongThread);
-        bool InvokeAndTerminate(void(_cdecl *fn)(void *), void *param);
+        bool InvokeAndTerminate(void(*fn)(void *), void *param);
 
         // waits for the thread completion;
         // use the method after Terminate() only if Terminate() returned true
@@ -664,7 +664,7 @@ class AwtToolkit {
 
         // function/param to invoke (InvokeAndTerminate)
         // if execFunc == NULL => just terminate
-        void(_cdecl *execFunc)(void *);
+        void(*execFunc)(void *);
         void *execParam;
 
         // action chain
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_new.cpp b/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
index 1f61a37cfc7..e9cdd95fbb4 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@ void *safe_Realloc(void *memblock, size_t size) {
 // std::bad_alloc in an out of memory situation. Instead, VC++ 5.0 returns 0.
 //
 // This function can be safely removed when the problem is corrected.
-void * CDECL operator new(size_t size) {
+void * operator new(size_t size) {
     return safe_Malloc(size);
 }
 #endif
@@ -228,7 +228,7 @@ void *safe_Realloc_outofmem(void *memblock, size_t size, const char *file,
     return safe_Realloc(memblock, size);
 }
 
-void * CDECL operator new(size_t size, const char *file, int line) {
+void * operator new(size_t size, const char *file, int line) {
     rand_alloc_fail(file, line);
     return operator new(size);
 }
diff --git a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h
index 092c5e43e12..7ddd11a4aef 100644
--- a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h
+++ b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Charset_Util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,9 @@ extern "C" {
 #endif
 
 // NOTE: It's a caller responbility to free the allocated memory using delete[], just like in UnicodeToUTF8AndCopy function
-LPSTR _cdecl UnicodeToUTF8(const LPCWSTR lpAnsiStr);
+LPSTR UnicodeToUTF8(const LPCWSTR lpAnsiStr);
 
-void _cdecl UnicodeToUTF8AndCopy(LPSTR dest, LPCWSTR src, SIZE_T maxLength);
+void UnicodeToUTF8AndCopy(LPSTR dest, LPCWSTR src, SIZE_T maxLength);
 
 #ifdef __cplusplus
 }
diff --git a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp
index 1ca8d7a6676..e04b2351b15 100644
--- a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp
+++ b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_DirectSound.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -469,7 +469,7 @@ class DS_StartBufferHelper {
     } static data;
 
     /* StartThread function */
-    static DWORD WINAPI __stdcall ThreadProc(void *param);
+    static DWORD WINAPI ThreadProc(void *param);
 };
 
 /* StartBufferHelper class implementation
@@ -499,7 +499,7 @@ DS_StartBufferHelper::Data::~Data() {
     // - Windows will do during process shutdown
 }
 
-DWORD WINAPI __stdcall DS_StartBufferHelper::ThreadProc(void *param)
+DWORD WINAPI DS_StartBufferHelper::ThreadProc(void *param)
 {
     ::CoInitialize(NULL);
     while (1) {
diff --git a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp
index 91e1a50c661..12cfa82fda8 100644
--- a/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp
+++ b/src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_MidiIn.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,7 @@ class MidiIn_OpenHelper {
     } static data;
 
     /* StartThread function */
-    static DWORD WINAPI __stdcall ThreadProc(void *param);
+    static DWORD WINAPI ThreadProc(void *param);
 };
 
 /* MidiIn_OpenHelper class implementation
@@ -195,7 +195,7 @@ MidiIn_OpenHelper::Data::~Data() {
     // - Windows will do during process shutdown
 }
 
-DWORD WINAPI __stdcall MidiIn_OpenHelper::ThreadProc(void *param) {
+DWORD WINAPI MidiIn_OpenHelper::ThreadProc(void *param) {
     while (1) {
         // wait for something to do
         ::WaitForSingleObject(data.doEvent, INFINITE);
diff --git a/src/java.logging/share/classes/java/util/logging/FileHandler.java b/src/java.logging/share/classes/java/util/logging/FileHandler.java
index e4ab1d71b2b..b56f53adbb3 100644
--- a/src/java.logging/share/classes/java/util/logging/FileHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/FileHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -264,11 +264,9 @@ private void configure() {
      * entirely from {@code LogManager} properties (or their default values).
      *
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control"))}.
      * @throws  NullPointerException if pattern property is an empty String.
      */
-    public FileHandler() throws IOException, SecurityException {
+    public FileHandler() throws IOException {
         checkPermission();
         configure();
         // pattern will have been set by configure. check that it's not
@@ -292,11 +290,9 @@ public FileHandler() throws IOException, SecurityException {
      *
      * @param pattern  the name of the output file
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  IllegalArgumentException if pattern is an empty string
      */
-    public FileHandler(String pattern) throws IOException, SecurityException {
+    public FileHandler(String pattern) throws IOException {
         if (pattern.length() < 1 ) {
             throw new IllegalArgumentException();
         }
@@ -324,12 +320,9 @@ public FileHandler(String pattern) throws IOException, SecurityException {
      * @param pattern  the name of the output file
      * @param append  specifies append mode
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  IllegalArgumentException if pattern is an empty string
      */
-    public FileHandler(String pattern, boolean append) throws IOException,
-            SecurityException {
+    public FileHandler(String pattern, boolean append) throws IOException {
         if (pattern.length() < 1 ) {
             throw new IllegalArgumentException();
         }
@@ -360,13 +353,10 @@ public FileHandler(String pattern, boolean append) throws IOException,
      * @param limit  the maximum number of bytes to write to any one file
      * @param count  the number of files to use
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  IllegalArgumentException if {@code limit < 0}, or {@code count < 1}.
      * @throws  IllegalArgumentException if pattern is an empty string
      */
-    public FileHandler(String pattern, int limit, int count)
-                                        throws IOException, SecurityException {
+    public FileHandler(String pattern, int limit, int count) throws IOException {
         if (limit < 0 || count < 1 || pattern.length() < 1) {
             throw new IllegalArgumentException();
         }
@@ -398,14 +388,12 @@ public FileHandler(String pattern, int limit, int count)
      * @param count  the number of files to use
      * @param append  specifies append mode
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  IllegalArgumentException if {@code limit < 0}, or {@code count < 1}.
      * @throws  IllegalArgumentException if pattern is an empty string
      *
      */
     public FileHandler(String pattern, int limit, int count, boolean append)
-                                        throws IOException, SecurityException {
+                                        throws IOException {
         this(pattern, (long)limit, count, append);
     }
 
@@ -429,8 +417,6 @@ public FileHandler(String pattern, int limit, int count, boolean append)
      * @param count  the number of files to use
      * @param append  specifies append mode
      * @throws  IOException if there are IO problems opening the files.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  IllegalArgumentException if {@code limit < 0}, or {@code count < 1}.
      * @throws  IllegalArgumentException if pattern is an empty string
      *
@@ -814,12 +800,9 @@ public Object run() {
 
     /**
      * Close all the files.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
     @Override
-    public void close() throws SecurityException {
+    public void close() {
         if (tryUseLock()) {
             try {
                 close0();
diff --git a/src/java.logging/share/classes/java/util/logging/Handler.java b/src/java.logging/share/classes/java/util/logging/Handler.java
index cf7d9bc2256..e5fbc131de6 100644
--- a/src/java.logging/share/classes/java/util/logging/Handler.java
+++ b/src/java.logging/share/classes/java/util/logging/Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,11 +171,8 @@ void unlock() {
      * {@code Handler}.   After close has been called this {@code Handler}
      * should no longer be used.  Method calls may either be silently
      * ignored or may throw runtime exceptions.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    public abstract void close() throws SecurityException;
+    public abstract void close();
 
     /**
      * Set a {@code Formatter}.  This {@code Formatter} will be used
@@ -185,10 +182,8 @@ void unlock() {
      * which case the {@code Formatter} will be remembered, but not used.
      *
      * @param newFormatter the {@code Formatter} to use (may not be null)
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    public void setFormatter(Formatter newFormatter) throws SecurityException {
+    public void setFormatter(Formatter newFormatter) {
         if (tryUseLock()) {
             try {
                 setFormatter0(newFormatter);
@@ -223,13 +218,11 @@ public Formatter getFormatter() {
      *
      * @param encoding  The name of a supported character encoding.
      *        May be null, to indicate the default platform encoding.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  UnsupportedEncodingException if the named encoding is
      *          not supported.
      */
     public void setEncoding(String encoding)
-            throws SecurityException, java.io.UnsupportedEncodingException {
+            throws java.io.UnsupportedEncodingException {
         if (tryUseLock()) {
             try {
                 setEncoding0(encoding);
@@ -276,10 +269,8 @@ public String getEncoding() {
      * {@code LogRecord} should be published or discarded.
      *
      * @param   newFilter  a {@code Filter} object (may be null)
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    public void setFilter(Filter newFilter) throws SecurityException {
+    public void setFilter(Filter newFilter) {
         if (tryUseLock()) {
             try {
                 setFilter0(newFilter);
@@ -314,8 +305,6 @@ public Filter getFilter() {
      * errors occur while using this Handler.
      *
      * @param em  the new ErrorManager
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
     public void setErrorManager(ErrorManager em) {
         if (tryUseLock()) {
@@ -343,8 +332,6 @@ private void setErrorManager0(ErrorManager em) {
      * Retrieves the ErrorManager for this Handler.
      *
      * @return the ErrorManager for this Handler
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
     public ErrorManager getErrorManager() {
         checkPermission();
@@ -353,9 +340,7 @@ public ErrorManager getErrorManager() {
 
    /**
      * Protected convenience method to report an error to this Handler's
-     * ErrorManager.  Note that this method retrieves and uses the ErrorManager
-     * without doing a security check.  It can therefore be used in
-     * environments where the caller may be non-privileged.
+     * ErrorManager.
      *
      * @param msg    a descriptive string (may be null)
      * @param ex     an exception (may be null)
@@ -380,10 +365,8 @@ protected void reportError(String msg, Exception ex, int code) {
      * {@code Handlers}.
      *
      * @param newLevel   the new value for the log level
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    public void setLevel(Level newLevel) throws SecurityException {
+    public void setLevel(Level newLevel) {
         if (tryUseLock()) {
             try {
                 setLevel0(newLevel);
diff --git a/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java
index a757f909d29..59ab4bfcbce 100644
--- a/src/java.logging/share/classes/java/util/logging/LogManager.java
+++ b/src/java.logging/share/classes/java/util/logging/LogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1347,11 +1347,9 @@ public Enumeration<String> getLoggerNames() {
      * {@link #updateConfiguration(java.io.InputStream, java.util.function.Function)}
      * methods instead.
      *
-     * @throws   SecurityException  if a security manager exists and if
-     *              the caller does not have LoggingPermission("control").
      * @throws   IOException if there are IO problems reading the configuration.
      */
-    public void readConfiguration() throws IOException, SecurityException {
+    public void readConfiguration() throws IOException {
         checkPermission();
 
         // if a configuration class is specified, load it and use it.
@@ -1412,12 +1410,9 @@ String getConfigurationFileName() throws IOException {
      * {@link #updateConfiguration(java.io.InputStream, java.util.function.Function)
      * updateConfiguration(InputStream, Function)} method can be used to
      * properly update to a new configuration.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have LoggingPermission("control").
      */
 
-    public void reset() throws SecurityException {
+    public void reset() {
         checkPermission();
 
         List<CloseOnReset> persistent;
@@ -1553,13 +1548,11 @@ private String[] parseClassNames(String propertyName) {
      * method instead.
      *
      * @param ins  stream to read properties from
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have LoggingPermission("control").
      * @throws  IOException if there are problems reading from the stream,
      *             or the given stream is not in the
      *             {@linkplain java.util.Properties properties file} format.
      */
-    public void readConfiguration(InputStream ins) throws IOException, SecurityException {
+    public void readConfiguration(InputStream ins) throws IOException {
         checkPermission();
 
         // We don't want reset() and readConfiguration() to run
@@ -1853,12 +1846,6 @@ static ModType of(String previous, String next) {
      *   <br>A {@code null} value for <i>o</i> or <i>n</i> indicates that no
      *   value was present for <i>k</i> in the corresponding configuration.
      *
-     * @throws  SecurityException  if a security manager exists and if
-     *          the caller does not have LoggingPermission("control"), or
-     *          does not have the permissions required to set up the
-     *          configuration (e.g. open file specified for FileHandlers
-     *          etc...)
-     *
      * @throws  NullPointerException  if {@code mapper} returns a {@code null}
      *         function when invoked.
      *
@@ -2056,11 +2043,6 @@ public void updateConfiguration(Function<String, BiFunction<String,String,String
      *   <br>A {@code null} value for <i>o</i> or <i>n</i> indicates that no
      *   value was present for <i>k</i> in the corresponding configuration.
      *
-     * @throws  SecurityException if a security manager exists and if
-     *          the caller does not have LoggingPermission("control"), or
-     *          does not have the permissions required to set up the
-     *          configuration (e.g. open files specified for FileHandlers)
-     *
      * @throws  NullPointerException if {@code ins} is null or if
      *          {@code mapper} returns a null function when invoked.
      *
@@ -2439,25 +2421,16 @@ void checkPermission() {
     }
 
     /**
-     * Check that the current context is trusted to modify the logging
-     * configuration.  This requires LoggingPermission("control").
-     * <p>
-     * If the check fails we throw a SecurityException, otherwise
-     * we return normally.
+     * Does nothing.
      *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have LoggingPermission("control").
-     * @deprecated This method is only useful in conjunction with
-     *       {@linkplain SecurityManager the Security Manager}, which is
-     *       deprecated and subject to removal in a future release.
-     *       Consequently, this method is also deprecated and subject to
-     *       removal. There is no replacement for the Security Manager or this
-     *       method.
+     * @deprecated This method originally checked that the current context was
+     * trusted to modify the logging configuration. This method was only useful
+     * in conjunction with {@linkplain SecurityManager the Security Manager},
+     * which is no longer supported. There is no replacement for the Security
+     * Manager or this method.
      */
     @Deprecated(since="17", forRemoval=true)
-    public void checkAccess() throws SecurityException {
-        checkPermission();
-    }
+    public void checkAccess() { }
 
     // Nested class to represent a node in our tree of named loggers.
     private static class LogNode {
@@ -2611,8 +2584,6 @@ public static synchronized LoggingMXBean getLoggingMXBean() {
      * @param listener A configuration listener that will be invoked after the
      *        configuration changed.
      * @return This LogManager.
-     * @throws SecurityException if a security manager exists and if the
-     * caller does not have LoggingPermission("control").
      * @throws NullPointerException if the listener is null.
      *
      * @since 9
@@ -2642,8 +2613,6 @@ public LogManager addConfigurationListener(Runnable listener) {
      *
      * @param listener the configuration listener to remove.
      * @throws NullPointerException if the listener is null.
-     * @throws SecurityException if a security manager exists and if the
-     * caller does not have LoggingPermission("control").
      *
      * @since 9
      */
@@ -2704,9 +2673,6 @@ private LoggingProviderAccess() {
          *         or {@code module} is {@code null}.
          * @throws IllegalArgumentException if {@code manager} is not the default
          *         LogManager.
-         * @throws SecurityException if a security manager is present and the
-         *         calling code doesn't have the
-         *        {@link LoggingPermission LoggingPermission("demandLogger", null)}.
          */
         @Override
         public Logger demandLoggerFor(LogManager manager, String name, Module module) {
diff --git a/src/java.logging/share/classes/java/util/logging/Logger.java b/src/java.logging/share/classes/java/util/logging/Logger.java
index 04d1c1a9c33..3f192ba9612 100644
--- a/src/java.logging/share/classes/java/util/logging/Logger.java
+++ b/src/java.logging/share/classes/java/util/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -823,22 +823,19 @@ static Logger getPlatformLogger(String name) {
 
     /**
      * Create an anonymous Logger.  The newly created Logger is not
-     * registered in the LogManager namespace.  There will be no
-     * access checks on updates to the logger.
+     * registered in the LogManager namespace.
      * <p>
-     * This factory method is primarily intended for use from applets.
+     * This factory method was primarily intended for use from applets.
      * Because the resulting Logger is anonymous it can be kept private
-     * by the creating class.  This removes the need for normal security
-     * checks, which in turn allows untrusted applet code to update
-     * the control state of the Logger.  For example an applet can do
+     * by the creating class.  This removed the need for normal security
+     * checks, which in turn allowed untrusted applet code to update
+     * the control state of the Logger.  For example an applet could do
      * a setLevel or an addHandler on an anonymous Logger.
      * <p>
      * Even although the new logger is anonymous, it is configured
      * to have the root logger ("") as its parent.  This means that
      * by default it inherits its effective level and handlers
-     * from the root logger. Changing its parent via the
-     * {@link #setParent(java.util.logging.Logger) setParent} method
-     * will still require the security permission specified by that method.
+     * from the root logger.
      *
      * @return a newly created private Logger
      */
@@ -848,22 +845,19 @@ public static Logger getAnonymousLogger() {
 
     /**
      * Create an anonymous Logger.  The newly created Logger is not
-     * registered in the LogManager namespace.  There will be no
-     * access checks on updates to the logger.
+     * registered in the LogManager namespace.
      * <p>
-     * This factory method is primarily intended for use from applets.
+     * This factory method was primarily intended for use from applets.
      * Because the resulting Logger is anonymous it can be kept private
-     * by the creating class.  This removes the need for normal security
-     * checks, which in turn allows untrusted applet code to update
-     * the control state of the Logger.  For example an applet can do
+     * by the creating class.  This removed the need for normal security
+     * checks, which in turn allowed untrusted applet code to update
+     * the control state of the Logger.  For example an applet could do
      * a setLevel or an addHandler on an anonymous Logger.
      * <p>
      * Even although the new logger is anonymous, it is configured
      * to have the root logger ("") as its parent.  This means that
      * by default it inherits its effective level and handlers
-     * from the root logger.  Changing its parent via the
-     * {@link #setParent(java.util.logging.Logger) setParent} method
-     * will still require the security permission specified by that method.
+     * from the root logger.
      *
      * @param   resourceBundleName  name of ResourceBundle to be used for localizing
      *                          messages for this logger.
@@ -934,11 +928,8 @@ public String getResourceBundleName() {
      * be published.
      *
      * @param   newFilter  a filter object (may be null)
-     * @throws  SecurityException if a security manager exists,
-     *          this logger is not anonymous, and the caller
-     *          does not have LoggingPermission("control").
      */
-    public void setFilter(Filter newFilter) throws SecurityException {
+    public void setFilter(Filter newFilter) {
         checkPermission();
         config.setFilter(newFilter);
     }
@@ -1997,11 +1988,8 @@ public void finest(Supplier<String> msgSupplier) {
      * (non-null) level value.
      *
      * @param newLevel   the new value for the log level (may be null)
-     * @throws  SecurityException if a security manager exists,
-     *          this logger is not anonymous, and the caller
-     *          does not have LoggingPermission("control").
      */
-    public void setLevel(Level newLevel) throws SecurityException {
+    public void setLevel(Level newLevel) {
         checkPermission();
         synchronized (treeLock) {
             config.setLevelObject(newLevel);
@@ -2056,11 +2044,8 @@ public String getName() {
      * that essentially act as default handlers for all loggers.
      *
      * @param   handler a logging Handler
-     * @throws  SecurityException if a security manager exists,
-     *          this logger is not anonymous, and the caller
-     *          does not have LoggingPermission("control").
      */
-    public void addHandler(Handler handler) throws SecurityException {
+    public void addHandler(Handler handler) {
         Objects.requireNonNull(handler);
         checkPermission();
         config.addHandler(handler);
@@ -2072,11 +2057,8 @@ public void addHandler(Handler handler) throws SecurityException {
      * Returns silently if the given Handler is not found or is null
      *
      * @param   handler a logging Handler
-     * @throws  SecurityException if a security manager exists,
-     *          this logger is not anonymous, and the caller
-     *          does not have LoggingPermission("control").
      */
-    public void removeHandler(Handler handler) throws SecurityException {
+    public void removeHandler(Handler handler) {
         checkPermission();
         if (handler == null) {
             return;
@@ -2107,9 +2089,6 @@ Handler[] accessCheckedHandlers() {
      *
      * @param useParentHandlers   true if output is to be sent to the
      *          logger's parent.
-     * @throws  SecurityException if a security manager exists,
-     *          this logger is not anonymous, and the caller
-     *          does not have LoggingPermission("control").
      */
     public void setUseParentHandlers(boolean useParentHandlers) {
         checkPermission();
@@ -2318,9 +2297,6 @@ private synchronized void setupResourceInfo(String name,
      *         {@linkplain ResourceBundle#getBaseBundleName base name},
      *         or if this logger already has a resource bundle set but
      *         the given bundle has a different base name.
-     * @throws SecurityException if a security manager exists,
-     *         this logger is not anonymous, and the caller
-     *         does not have LoggingPermission("control").
      * @since 1.8
      */
     public void setResourceBundle(ResourceBundle bundle) {
@@ -2377,8 +2353,6 @@ public Logger getParent() {
      * It should not be called from application code.
      *
      * @param  parent   the new parent logger
-     * @throws  SecurityException  if a security manager exists and if
-     *          the caller does not have LoggingPermission("control").
      */
     public void setParent(Logger parent) {
         if (parent == null) {
diff --git a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
index 01eea1d0e1e..9c6347e1483 100644
--- a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
+++ b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,9 +110,6 @@ public interface LoggingMXBean {
      * @throws IllegalArgumentException if the specified logger
      * does not exist, or {@code levelName} is not a valid level name.
      *
-     * @throws SecurityException if a security manager exists and if
-     * the caller does not have LoggingPermission("control").
-     *
      * @see Logger#setLevel
      */
     public void setLoggerLevel(String loggerName, String levelName);
diff --git a/src/java.logging/share/classes/java/util/logging/LoggingPermission.java b/src/java.logging/share/classes/java/util/logging/LoggingPermission.java
index 8889496c48b..0784bf863eb 100644
--- a/src/java.logging/share/classes/java/util/logging/LoggingPermission.java
+++ b/src/java.logging/share/classes/java/util/logging/LoggingPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,12 @@
 import java.security.*;
 
 /**
- * The permission which the SecurityManager will check when code
- * that is running with a SecurityManager calls one of the logging
- * control methods (such as Logger.setLevel).
- * <p>
- * Currently there is only one named LoggingPermission.  This is "control"
- * and it grants the ability to control the logging configuration, for
- * example by adding or removing Handlers, by adding or removing Filters,
- * or by changing logging levels.
- * <p>
- * Programmers do not normally create LoggingPermission objects directly.
- * Instead they are created by the security policy code based on reading
- * the security policy file.
+ * This class is for logging permissions. Currently there is only one
+ * LoggingPermission named "control".
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  *
  * @since 1.4
diff --git a/src/java.logging/share/classes/java/util/logging/MemoryHandler.java b/src/java.logging/share/classes/java/util/logging/MemoryHandler.java
index e5716426078..f7d67b4cca2 100644
--- a/src/java.logging/share/classes/java/util/logging/MemoryHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/MemoryHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,12 +253,9 @@ public void flush() {
     /**
      * Close the {@code Handler} and free all associated resources.
      * This will also close the target {@code Handler}.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
     @Override
-    public void close() throws SecurityException {
+    public void close() {
         target.close();
         setLevel(Level.OFF);
     }
@@ -269,10 +266,8 @@ public void close() throws SecurityException {
      * the {@code pushLevel}, then {@code push} will be called.
      *
      * @param newLevel the new value of the {@code pushLevel}
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    public void setPushLevel(Level newLevel) throws SecurityException {
+    public void setPushLevel(Level newLevel) {
         if (tryUseLock()) {
             try {
                 setPushLevel0(newLevel);
diff --git a/src/java.logging/share/classes/java/util/logging/SocketHandler.java b/src/java.logging/share/classes/java/util/logging/SocketHandler.java
index edf53144451..570e074cd9d 100644
--- a/src/java.logging/share/classes/java/util/logging/SocketHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/SocketHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,12 +151,9 @@ private void connect() throws IOException {
 
     /**
      * Close this output stream.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
     @Override
-    public void close() throws SecurityException {
+    public void close() {
         if (tryUseLock()) {
             try {
                 close0();
diff --git a/src/java.logging/share/classes/java/util/logging/StreamHandler.java b/src/java.logging/share/classes/java/util/logging/StreamHandler.java
index 217587dfd7a..9dfcf293041 100644
--- a/src/java.logging/share/classes/java/util/logging/StreamHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/StreamHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,10 +119,8 @@ public StreamHandler(OutputStream out, Formatter formatter) {
      * Then the output stream is replaced with the new output stream.
      *
      * @param out   New output stream.  May not be null.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      */
-    protected void setOutputStream(OutputStream out) throws SecurityException {
+    protected void setOutputStream(OutputStream out) {
         if (tryUseLock()) {
             try {
                 setOutputStream0(out);
@@ -165,14 +163,12 @@ private void setOutputStream0(OutputStream out) throws SecurityException {
      *
      * @param encoding  The name of a supported character encoding.
      *        May be null, to indicate the default platform encoding.
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have {@code LoggingPermission("control")}.
      * @throws  UnsupportedEncodingException if the named encoding is
      *          not supported.
      */
     @Override
     public void setEncoding(String encoding)
-                        throws SecurityException, java.io.UnsupportedEncodingException {
+                        throws java.io.UnsupportedEncodingException {
         if (tryUseLock()) {
             try {
                 setEncoding0(encoding);
@@ -340,12 +336,9 @@ private void flushAndClose() throws SecurityException {
      * is closed.  In addition, if the {@code Formatter}'s "head" string has not
      * yet been written to the stream, it will be written before the
      * "tail" string.
-     *
-     * @throws  SecurityException  if a security manager exists and if
-     *             the caller does not have LoggingPermission("control").
      */
     @Override
-    public void close() throws SecurityException {
+    public void close() {
         if (tryUseLock()) {
             try {
                 flushAndClose();
diff --git a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
index 8dd0932020b..c3e4a5c5ff0 100644
--- a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
+++ b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,8 +35,7 @@
 import java.rmi.server.RemoteRef;
 
 
-@SuppressWarnings({"deprecation",
-                   "serial"}) // Externalizable class w/o no-arg c'tor
+@SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor
 public class ProxyRef implements RemoteRef {
     private static final long serialVersionUID = -6503061366316814723L;
 
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java
index 37b43b189eb..e73ed415fb7 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnection.java
@@ -155,7 +155,7 @@ public interface RMIConnection extends Closeable, Remote {
      * passed in parameter is null, the <code>ObjectName</code> passed
      * in parameter contains a pattern or no <code>ObjectName</code>
      * is specified for the MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -208,7 +208,7 @@ public ObjectInstance createMBean(String className,
      * passed in parameter is null, the <code>ObjectName</code> passed
      * in parameter contains a pattern or no <code>ObjectName</code>
      * is specified for the MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -268,7 +268,7 @@ public ObjectInstance createMBean(String className,
      * passed in parameter is null, the <code>ObjectName</code> passed
      * in parameter contains a pattern, or no <code>ObjectName</code>
      * is specified for the MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -332,7 +332,7 @@ public ObjectInstance createMBean(String className,
      * passed in parameter is null, the <code>ObjectName</code> passed
      * in parameter contains a pattern, or no <code>ObjectName</code>
      * is specified for the MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -369,7 +369,7 @@ public ObjectInstance createMBean(String className,
      * name in parameter is null or the MBean you are when trying to
      * unregister is the {@link javax.management.MBeanServerDelegate
      * MBeanServerDelegate} MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -397,9 +397,8 @@ public void unregisterMBean(ObjectName name, Subject delegationSubject)
      * @throws RuntimeOperationsException Wraps a
      * <code>java.lang.IllegalArgumentException</code>: The object
      * name in parameter is null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
-     * if any, does not have permission to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
      */
@@ -426,7 +425,7 @@ public ObjectInstance getObjectInstance(ObjectName name,
      * objects for the selected MBeans.  If no MBean satisfies the
      * query an empty list is returned.
      *
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -456,7 +455,7 @@ public ObjectInstance getObjectInstance(ObjectName name,
      * selected.  If no MBean satisfies the query, an empty list is
      * returned.
      *
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -480,7 +479,7 @@ public ObjectInstance getObjectInstance(ObjectName name,
      * @throws RuntimeOperationsException Wraps a
      * <code>java.lang.IllegalArgumentException</code>: The object
      * name in parameter is null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -496,7 +495,7 @@ public boolean isRegistered(ObjectName name, Subject delegationSubject)
      *
      * @return the number of MBeans registered.
      *
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -532,7 +531,7 @@ public Integer getMBeanCount(Subject delegationSubject)
      * null.
      * @throws RuntimeMBeanException Wraps a runtime exception thrown
      * by the MBean's getter.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -568,7 +567,7 @@ public Object getAttribute(ObjectName name,
      * @throws RuntimeOperationsException Wrap a
      * <code>java.lang.IllegalArgumentException</code>: The object
      * name in parameter is null or attributes in parameter is null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -611,7 +610,7 @@ public AttributeList getAttributes(ObjectName name,
      * <code>java.lang.IllegalArgumentException</code>: The object
      * name in parameter is null or the attribute in parameter is
      * null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -652,7 +651,7 @@ public void setAttribute(ObjectName name,
      * @throws RuntimeOperationsException Wraps a
      * <code>java.lang.IllegalArgumentException</code>: The object
      * name in parameter is null or attributes in parameter is null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -697,7 +696,7 @@ public AttributeList setAttributes(ObjectName name,
      * @throws ReflectionException Wraps a
      * <code>java.lang.Exception</code> thrown while trying to invoke
      * the method.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws RuntimeOperationsException Wraps an {@link
@@ -724,7 +723,7 @@ public Object invoke(ObjectName name,
      *
      * @return the default domain.
      *
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -740,7 +739,7 @@ public String getDefaultDomain(Subject delegationSubject)
      *
      * @return the list of domains.
      *
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -764,7 +763,7 @@ public String[] getDomains(Subject delegationSubject)
      * not found.
      * @throws ReflectionException An exception occurred when
      * trying to invoke the getMBeanInfo of a Dynamic MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws RuntimeOperationsException Wraps a
@@ -793,7 +792,7 @@ public MBeanInfo getMBeanInfo(ObjectName name, Subject delegationSubject)
      *
      * @throws InstanceNotFoundException The MBean specified is not
      * registered in the MBean server.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws RuntimeOperationsException Wraps a
@@ -836,7 +835,7 @@ public boolean isInstanceOf(ObjectName name,
      * <code>listener</code> exists but does not implement the
      * {@link javax.management.NotificationListener} interface,
      * or <code>name</code> or <code>listener</code> is null.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubject} is non-null.
@@ -866,7 +865,7 @@ public void addNotificationListener(ObjectName name,
      * does not match any of the registered MBeans.
      * @throws ListenerNotFoundException The listener is not
      * registered in the MBean.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws RuntimeOperationsException Wraps an {@link
@@ -907,7 +906,7 @@ public void removeNotificationListener(ObjectName name,
      * @throws ListenerNotFoundException The listener is not
      * registered in the MBean, or it is not registered with the given
      * filter and handback.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to perform this operation.
      * @throws IOException if a general communication exception occurred.
      * @throws RuntimeOperationsException Wraps an {@link
@@ -971,8 +970,8 @@ public void removeNotificationListener(ObjectName name,
      * not a <code>NotificationFilter</code>.
      * @throws InstanceNotFoundException if one of the
      * <code>names</code> does not correspond to any registered MBean.
-     * @throws SecurityException if, for one of the MBeans, the
-     * client does not have permission to add a listener.
+     * @throws SecurityException if, for one of the MBeans, the client is not
+     * authorized to add a listener.
      * @throws IOException if a general communication exception occurred.
      * @throws UnsupportedOperationException if {@code delegationSubjects}
      * is non-null and contains any non-null entries.
@@ -1010,7 +1009,7 @@ public Integer[] addNotificationListeners(ObjectName[] names,
      * not found on the server side.  This exception can happen if the
      * MBean discarded a listener for some reason other than a call to
      * <code>MBeanServer.removeNotificationListener</code>.
-     * @throws SecurityException if the client does not have permission
+     * @throws SecurityException if the client is not authorized
      * to remove the listeners.
      * @throws IOException if a general communication exception occurred.
      * @throws IllegalArgumentException if <code>ObjectName</code> or
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
index 047863d34ef..cb318dc65b2 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
@@ -46,13 +46,11 @@
 import javax.management.remote.JMXServerErrorException;
 import javax.management.remote.NotificationResult;
 import javax.security.auth.Subject;
-import jdk.internal.access.SharedSecrets;
 import sun.reflect.misc.ReflectUtil;
 
 import static javax.management.remote.rmi.RMIConnector.Util.cast;
 import com.sun.jmx.remote.internal.ServerCommunicatorAdmin;
 import com.sun.jmx.remote.internal.ServerNotifForwarder;
-import com.sun.jmx.remote.security.JMXSubjectDomainCombiner;
 import com.sun.jmx.remote.util.ClassLoaderWithRepository;
 import com.sun.jmx.remote.util.ClassLogger;
 import com.sun.jmx.remote.util.EnvHelp;
@@ -110,19 +108,6 @@ public RMIConnectionImpl(RMIServerImpl rmiServer,
         this.connectionId = connectionId;
         this.defaultClassLoader = defaultClassLoader;
         this.subject = subject;
-
-        if (subject == null) {
-            this.acc = null;
-        } else {
-            // An authenticated Subject was provided.
-            // Subject Delegation has been removed.
-            if (SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                // SM is allowed.  Will use ACC created with Subject:
-                this.acc = JMXSubjectDomainCombiner.getContext(subject);
-            } else {
-                this.acc = null;
-            }
-        }
         this.mbeanServer = rmiServer.getMBeanServer();
 
         final ClassLoader dcl = defaultClassLoader;
@@ -1298,20 +1283,10 @@ public NotificationResult run() {
                         return getServerNotifFwd().fetchNotifs(csn, t, mn);
                     }
             };
-            if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                // Modern case
-                if (subject == null) {
-                    return action.run();
-                } else {
-                    return Subject.doAs(subject, action);
-                }
+            if (subject == null) {
+                return action.run();
             } else {
-                // SM permitted
-                if (acc == null) {
-                    return action.run(); // No Subject or ACC
-                } else {
-                    return AccessController.doPrivileged(action, acc);
-                }
+                return Subject.doAs(subject, action);
             }
         } finally {
             serverCommunicatorAdmin.rspOutgoing();
@@ -1428,36 +1403,18 @@ private Object doPrivilegedOperation(final int operation,
         serverCommunicatorAdmin.reqIncoming();
         try {
             PrivilegedOperation op = new PrivilegedOperation(operation, params);
-            if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                // Modern case
-                if (subject == null) {
-                    try {
-                        return op.run();
-                    } catch (Exception e) {
-                        if (e instanceof RuntimeException) {
-                            throw (RuntimeException) e;
-                        } else {
-                            throw new PrivilegedActionException(e);
-                        }
+            if (subject == null) {
+                try {
+                    return op.run();
+                } catch (Exception e) {
+                    if (e instanceof RuntimeException) {
+                        throw (RuntimeException) e;
+                    } else {
+                        throw new PrivilegedActionException(e);
                     }
-                } else {
-                    return Subject.doAs(subject, op);
                 }
             } else {
-                // SM permitted
-                if (acc == null) {
-                    try {
-                        return op.run();
-                    } catch (Exception e) {
-                        if (e instanceof RuntimeException) {
-                            throw (RuntimeException) e;
-                        } else {
-                            throw new PrivilegedActionException(e);
-                        }
-                    }
-                } else {
-                    return AccessController.doPrivileged(op, acc);
-                }
+                return Subject.doAs(subject, op);
             }
         } catch (Error e) {
             throw new JMXServerErrorException(e.toString(),e);
@@ -1623,22 +1580,10 @@ private <T> T unwrap(final MarshalledObject<?> mo,
         try {
             final ClassLoader old = AccessController.doPrivileged(new SetCcl(cl));
             try {
-                if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                    // Modern case
-                    if (subject != null) {
-                        return Subject.doAs(subject, (PrivilegedExceptionAction<T>) () -> wrappedClass.cast(mo.get()));
-                    } else {
-                        return wrappedClass.cast(mo.get());
-                    }
+                if (subject != null) {
+                    return Subject.doAs(subject, (PrivilegedExceptionAction<T>) () -> wrappedClass.cast(mo.get()));
                 } else {
-                    // SM permitted
-                    if (acc != null) {
-                        return AccessController.doPrivileged(
-                                (PrivilegedExceptionAction<T>) () ->
-                                        wrappedClass.cast(mo.get()), acc);
-                    } else {
-                        return wrappedClass.cast(mo.get());
-                    }
+                    return wrappedClass.cast(mo.get());
                 }
             } finally {
                 AccessController.doPrivileged(new SetCcl(old));
@@ -1755,9 +1700,6 @@ private static void checkNonNull(String what, Object x) {
 
     private final Subject subject;
 
-    @SuppressWarnings("removal")
-    private final AccessControlContext acc;
-
     private final RMIServerImpl rmiServer;
 
     private final MBeanServer mbeanServer;
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl_Stub.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl_Stub.java
index a22b374fe2b..708350587c3 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl_Stub.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIServerImpl_Stub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  *
  * @since 1.5
  */
-@SuppressWarnings({"deprecation", "rawtypes", "unchecked"})
+@SuppressWarnings({"deprecation", "rawtypes"})
 public final class RMIServerImpl_Stub
         extends java.rmi.server.RemoteStub
         implements javax.management.remote.rmi.RMIServer {
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
index c4837c8ea89..f5925a25d35 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
@@ -100,7 +100,7 @@ public MBeanServerDelegateImpl () {
         super();
         delegateInfo =
             new MBeanInfo("javax.management.MBeanServerDelegate",
-                          "Represents  the MBean server from the management "+
+                          "Represents the MBean server from the management "+
                           "point of view.",
                           MBeanServerDelegateImpl.attributeInfos, null,
                           null,getNotificationInfo());
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
index 7ea1e485869..dd557523e65 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
@@ -162,14 +162,26 @@ public void removeNotificationListener(ObjectName name,
                 connectionId, name, getSubject());
         }
 
+        // 6238731: set the default domain if no domain is set.
+        ObjectName nn = name;
+        if (name.getDomain() == null || name.getDomain().isEmpty()) {
+            try {
+                nn = ObjectName.getInstance(mbeanServer.getDefaultDomain(),
+                                            name.getKeyPropertyList());
+            } catch (MalformedObjectNameException mfoe) {
+                // impossible, but...
+                throw new IOException(mfoe.getMessage(), mfoe);
+            }
+        }
+
         Exception re = null;
         for (int i = 0 ; i < listenerIDs.length ; i++) {
             try {
-                removeNotificationListener(name, listenerIDs[i]);
+                removeNotificationListener(nn, listenerIDs[i]);
             } catch (Exception e) {
                 // Give back the first exception
                 //
-                if (re != null) {
+                if (re == null) {
                     re = e;
                 }
             }
@@ -343,7 +355,6 @@ public void terminate() {
     //----------------
     // PRIVATE METHODS
     //----------------
-    @SuppressWarnings("removal")
     private Subject getSubject() {
         return Subject.current();
     }
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java b/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
index 77e7eab041b..bb5d5e88ff3 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -445,7 +445,6 @@ public boolean logout() throws LoginException {
      * @param usePasswdFromSharedState a flag to tell this method whether
      *          to retrieve the password from the sharedState.
      */
-    @SuppressWarnings("unchecked")  // sharedState used as Map<String,Object>
     private void attemptAuthentication(boolean usePasswdFromSharedState)
         throws LoginException {
 
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
index bc14b6ad3f2..24e7cc77766 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
@@ -27,10 +27,7 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
 import java.security.Principal;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +39,6 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.security.auth.Subject;
-import jdk.internal.access.SharedSecrets;
 
 /**
  * <p>An object of this class implements the MBeanServerAccessController
@@ -301,19 +297,8 @@ private static Properties propertiesFromFile(String fname)
         }
     }
 
-    @SuppressWarnings("removal")
     private synchronized void checkAccess(AccessType requiredAccess, String arg) {
-        Subject s = null;
-        if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-            s = Subject.current();
-        } else {
-            final AccessControlContext acc = AccessController.getContext();
-            s = AccessController.doPrivileged(new PrivilegedAction<>() {
-                        public Subject run() {
-                            return Subject.getSubject(acc);
-                        }
-                });
-        }
+        final Subject s = Subject.current();
         if (s == null) return; /* security has not been enabled */
         final Set<Principal> principals = s.getPrincipals();
         String newPropertyValue = null;
diff --git a/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java b/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java
index 0525d552b7b..f24cd5386de 100644
--- a/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,10 +104,6 @@ public interface ClassLoadingMXBean extends PlatformManagedObject {
      *
      * @param value {@code true} to enable the verbose output;
      *              {@code false} to disable.
-     *
-     * @throws  java.lang.SecurityException if a security manager
-     *          exists and the caller does not have
-     *          ManagementPermission("control").
      */
     public void setVerbose(boolean value);
 
diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index a95102cd125..03bbcead194 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -245,8 +245,7 @@
  * @author  Mandy Chung
  * @since   1.5
  */
-@SuppressWarnings({"removal",
-                   "doclint:reference"}) // cross-module links
+@SuppressWarnings("doclint:reference") // cross-module links
 public class ManagementFactory {
     // A class with only static fields and methods.
     private ManagementFactory() {};
@@ -466,10 +465,6 @@ public static List<GarbageCollectorMXBean> getGarbageCollectorMXBeans() {
      *         MXBeans are registered into the platform {@code MBeanServer}
      *         at the first time this method is called.
      *
-     * @throws SecurityException if there is a security manager
-     * and the caller does not have the permission required by
-     * {@link javax.management.MBeanServerFactory#createMBeanServer}.
-     *
      * @see javax.management.MBeanServerFactory
      * @see javax.management.MBeanServerFactory#createMBeanServer
      */
diff --git a/src/java.management/share/classes/java/lang/management/ManagementPermission.java b/src/java.management/share/classes/java/lang/management/ManagementPermission.java
index 525cc350ac4..2dbee65e5cb 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementPermission.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,58 +26,11 @@
 package java.lang.management;
 
 /**
- * The permission which the SecurityManager will check when code
- * that is running with a SecurityManager calls methods defined
- * in the management interface for the Java platform.
- * <P>
- * The following table
- * provides a summary description of what the permission allows,
- * and discusses the risks of granting code the permission.
+ * This class is for management permissions.
  *
- * <table class="striped">
- * <caption style="display:none">Table shows permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody style="text=align:left">
- *
- * <tr>
- *   <th scope="row">control</th>
- *   <td>Ability to control the runtime characteristics of the Java virtual
- *       machine, for example, enabling and disabling the verbose output for
- *       the class loading or memory system, setting the threshold of a memory
- *       pool, and enabling and disabling the thread contention monitoring
- *       support. Some actions controlled by this permission can disclose
- *       information about the running application, like the -verbose:class
- *       flag.
- *   </td>
- *   <td>This allows an attacker to control the runtime characteristics
- *       of the Java virtual machine and cause the system to misbehave. An
- *       attacker can also access some information related to the running
- *       application.
- *   </td>
- * </tr>
- * <tr>
- *   <th scope="row">monitor</th>
- *   <td>Ability to retrieve runtime information about
- *       the Java virtual machine such as thread
- *       stack trace, a list of all loaded class names, and input arguments
- *       to the Java virtual machine.</td>
- *   <td>This allows malicious code to monitor runtime information and
- *       uncover vulnerabilities.</td>
- * </tr>
- *
- * </tbody>
- * </table>
- *
- * <p>
- * Programmers do not normally create ManagementPermission objects directly.
- * Instead they are created by the security policy code based on reading
- * the security policy file.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @author  Mandy Chung
  * @since   1.5
diff --git a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
index f17e5e8077a..2c982e1ce9c 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -288,10 +288,6 @@ public interface MemoryMXBean extends PlatformManagedObject {
      *
      * @param value {@code true} to enable verbose output;
      *              {@code false} to disable.
-     *
-     * @throws java.lang.SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
      */
     public void setVerbose(boolean value);
 
diff --git a/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
index 2d94c4d2239..cfae2cdd333 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -429,10 +429,6 @@ public interface MemoryPoolMXBean extends PlatformManagedObject {
     /**
      * Resets the peak memory usage statistic of this memory pool
      * to the current memory usage.
-     *
-     * @throws java.lang.SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
      */
     public void resetPeakUsage();
 
@@ -488,10 +484,6 @@ public interface MemoryPoolMXBean extends PlatformManagedObject {
      * @throws UnsupportedOperationException if this memory pool
      *         does not support a usage threshold.
      *
-     * @throws java.lang.SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #isUsageThresholdSupported
      * @see <a href="#UsageThreshold">Usage threshold</a>
      */
@@ -567,10 +559,6 @@ public interface MemoryPoolMXBean extends PlatformManagedObject {
      * @throws UnsupportedOperationException if this memory pool
      *         does not support a collection usage threshold.
      *
-     * @throws java.lang.SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #isCollectionUsageThresholdSupported
      * @see <a href="#CollectionThreshold">Collection usage threshold</a>
      */
diff --git a/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java b/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java
index 3646e1bb8b2..b85e95c31bc 100644
--- a/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,11 +67,6 @@ public interface OperatingSystemMXBean extends PlatformManagedObject {
      *
      * @return the operating system name.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     <code>checkPropertiesAccess</code> method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getName();
@@ -82,11 +77,6 @@ public interface OperatingSystemMXBean extends PlatformManagedObject {
      *
      * @return the operating system architecture.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     <code>checkPropertiesAccess</code> method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getArch();
@@ -97,11 +87,6 @@ public interface OperatingSystemMXBean extends PlatformManagedObject {
      *
      * @return the operating system version.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     <code>checkPropertiesAccess</code> method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getVersion();
diff --git a/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java b/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
index 3a50dc20958..2573e4b65ef 100644
--- a/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,9 +109,6 @@ public interface PlatformLoggingMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if the specified logger
      * does not exist, or {@code levelName} is not a valid level name.
      *
-     * @throws SecurityException if a security manager exists and if
-     * the caller does not have LoggingPermission("control").
-     *
      * @see java.logging/java.util.logging.Logger#setLevel
      */
     void setLoggerLevel(String loggerName, String levelName);
diff --git a/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java b/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
index 2318a660c9d..30a399ad6a1 100644
--- a/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,11 +99,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine implementation name.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getVmName();
@@ -115,11 +110,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine implementation vendor.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getVmVendor();
@@ -131,11 +121,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine implementation version.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getVmVersion();
@@ -147,11 +132,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine specification name.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getSpecName();
@@ -163,11 +143,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine specification vendor.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getSpecVendor();
@@ -179,11 +154,6 @@ public default long getPid() {
      *
      * @return the Java virtual machine specification version.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getSpecVersion();
@@ -210,11 +180,6 @@ public default long getPid() {
      *
      * @return the Java class path.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getClassPath();
@@ -230,11 +195,6 @@ public default long getPid() {
      *
      * @return the Java library path.
      *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to this system property.
-     * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
      * @see java.lang.System#getProperty
      */
     public String getLibraryPath();
@@ -267,10 +227,6 @@ public default long getPid() {
      *
      * @throws java.lang.UnsupportedOperationException
      *     if the Java virtual machine does not support this operation.
-     *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and the caller does not have
-     *     ManagementPermission("monitor").
      */
     public String getBootClassPath();
 
@@ -296,10 +252,6 @@ public default long getPid() {
      *
      * @return a list of {@code String} objects; each element
      * is an argument passed to the Java virtual machine.
-     *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and the caller does not have
-     *     ManagementPermission("monitor").
      */
     public java.util.List<String> getInputArguments();
 
@@ -352,11 +304,6 @@ public default long getPid() {
      * </table>
      *
      * @return a map of names and values of all system properties.
-     *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and its
-     *     {@code checkPropertiesAccess} method doesn't allow access
-     *     to the system properties.
      */
     public java.util.Map<String, String> getSystemProperties();
 }
diff --git a/src/java.management/share/classes/java/lang/management/ThreadMXBean.java b/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
index 52437adc6b3..357263c49fa 100644
--- a/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,10 +169,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * may have been terminated when this method returns.
      *
      * @return an array of {@code long}, each is a thread ID.
-     *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      */
     public long[] getAllThreadIds();
 
@@ -209,9 +205,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * is not alive, or it does not exist.
      *
      * @throws IllegalArgumentException if {@code id <= 0}.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      */
     public ThreadInfo getThreadInfo(long id);
 
@@ -247,9 +240,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      *
      * @throws IllegalArgumentException if any element in the input array
      *         {@code ids} is {@code <= 0}.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      */
     public ThreadInfo[] getThreadInfo(long[] ids);
 
@@ -294,10 +284,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      *
      * @throws IllegalArgumentException if {@code id <= 0}.
      * @throws IllegalArgumentException if {@code maxDepth is negative}.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
-     *
      */
     public ThreadInfo getThreadInfo(long id, int maxDepth);
 
@@ -347,10 +333,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if {@code maxDepth is negative}.
      * @throws IllegalArgumentException if any element in the input array
      *      {@code ids} is {@code <= 0}.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
-     *
      */
     public ThreadInfo[] getThreadInfo(long[] ids, int maxDepth);
 
@@ -387,10 +369,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * @throws UnsupportedOperationException if the Java
      * virtual machine does not support thread contention monitoring.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #isThreadContentionMonitoringSupported
      */
     public void setThreadContentionMonitoringEnabled(boolean enable);
@@ -582,10 +560,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * virtual machine does not support CPU time measurement for
      * any threads nor for the current thread.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #isThreadCpuTimeSupported
      * @see #isCurrentThreadCpuTimeSupported
      */
@@ -618,10 +592,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * @return an array of IDs of the platform threads that are monitor
      * deadlocked, if any; {@code null} otherwise.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
-     *
      * @see #findDeadlockedThreads
      */
     public long[] findMonitorDeadlockedThreads();
@@ -630,10 +600,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * Resets the peak thread count to the current number of
      * live platform threads.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #getPeakThreadCount
      * @see #getThreadCount
      */
@@ -655,9 +621,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * deadlocked waiting for object monitors or ownable synchronizers, if any;
      * {@code null} otherwise.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      * @throws UnsupportedOperationException if the Java virtual
      * machine does not support monitoring of ownable synchronizer usage.
      *
@@ -717,9 +680,6 @@ public interface ThreadMXBean extends PlatformManagedObject {
      * information about a thread whose ID is in the corresponding
      * element of the input array of IDs.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      * @throws UnsupportedOperationException
      *         <ul>
      *           <li>if {@code lockedMonitors} is {@code true} but
@@ -807,9 +767,6 @@ public ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors,
      * element of the input array of IDs.
      *
      * @throws IllegalArgumentException if {@code maxDepth} is negative.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      * @throws UnsupportedOperationException
      *         <ul>
      *           <li>if {@code lockedMonitors} is {@code true} but
@@ -849,9 +806,6 @@ public default ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors,
      *
      * @return an array of {@link ThreadInfo} for all live platform threads.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      * @throws UnsupportedOperationException
      *         <ul>
      *           <li>if {@code lockedMonitors} is {@code true} but
@@ -899,9 +853,6 @@ public default ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors,
      * @return an array of {@link ThreadInfo} for all live platform threads.
      *
      * @throws IllegalArgumentException if {@code maxDepth} is negative.
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("monitor").
      * @throws UnsupportedOperationException
      *         <ul>
      *           <li>if {@code lockedMonitors} is {@code true} but
diff --git a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
index 62904495c6d..4ed9b6a33b7 100644
--- a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
+++ b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ public class BadAttributeValueExpException extends Exception   {
      * @serial A string representation of the attribute that originated this exception.
      * For example, the string value can be the return of {@code attribute.toString()}.
      */
-    @SuppressWarnings("serial") // See handling in constructor and readObject
     private String val;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/MBeanPermission.java b/src/java.management/share/classes/javax/management/MBeanPermission.java
index 467715ae512..46717846cb3 100644
--- a/src/java.management/share/classes/javax/management/MBeanPermission.java
+++ b/src/java.management/share/classes/javax/management/MBeanPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,6 +158,10 @@
  * <p>In a comma-separated list of actions, spaces are allowed before
  * and after each action.
  *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  * @since 1.5
  */
 public class MBeanPermission extends Permission {
diff --git a/src/java.management/share/classes/javax/management/MBeanServer.java b/src/java.management/share/classes/javax/management/MBeanServer.java
index 488c9615515..efecf0def02 100644
--- a/src/java.management/share/classes/javax/management/MBeanServer.java
+++ b/src/java.management/share/classes/javax/management/MBeanServer.java
@@ -61,191 +61,9 @@
  * <CODE>ObjectName</CODE> is: <BR>
  * <CODE>JMImplementation:type=MBeanServerDelegate</CODE>.</p>
  *
- * <p>An object obtained from the {@link
- * MBeanServerFactory#createMBeanServer(String) createMBeanServer} or
- * {@link MBeanServerFactory#newMBeanServer(String) newMBeanServer}
- * methods of the {@link MBeanServerFactory} class applies security
- * checks to its methods, as follows.</p>
- *
- * <p>First, if there is no security manager ({@link
- * System#getSecurityManager()} is null), then an implementation of
- * this interface is free not to make any checks.</p>
- *
- * <p>Assuming that there is a security manager, or that the
- * implementation chooses to make checks anyway, the checks are made
- * as detailed below.  In what follows, and unless otherwise specified,
- * {@code className} is the
- * string returned by {@link MBeanInfo#getClassName()} for the target
- * MBean.</p>
- *
- * <p>If a security check fails, the method throws {@link
- * SecurityException}.</p>
- *
- * <p>For methods that can throw {@link InstanceNotFoundException},
- * this exception is thrown for a non-existent MBean, regardless of
- * permissions.  This is because a non-existent MBean has no
- * <code>className</code>.</p>
- *
- * <ul>
- *
- * <li><p>For the {@link #invoke invoke} method, the caller's
- * permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, operationName, name, "invoke")}.</p>
- *
- * <li><p>For the {@link #getAttribute getAttribute} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, attribute, name, "getAttribute")}.</p>
- *
- * <li><p>For the {@link #getAttributes getAttributes} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "getAttribute")}.
- * Additionally, for each attribute <em>a</em> in the {@link
- * AttributeList}, if the caller's permissions do not imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, <em>a</em>, name, "getAttribute")}, the
- * MBean server will behave as if that attribute had not been in the
- * supplied list.</p>
- *
- * <li><p>For the {@link #setAttribute setAttribute} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, attrName, name, "setAttribute")}, where
- * <code>attrName</code> is {@link Attribute#getName()
- * attribute.getName()}.</p>
- *
- * <li><p>For the {@link #setAttributes setAttributes} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "setAttribute")}.
- * Additionally, for each attribute <em>a</em> in the {@link
- * AttributeList}, if the caller's permissions do not imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, <em>a</em>, name, "setAttribute")}, the
- * MBean server will behave as if that attribute had not been in the
- * supplied list.</p>
- *
- * <li><p>For the <code>addNotificationListener</code> methods,
- * the caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name,
- * "addNotificationListener")}.</p>
- *
- * <li><p>For the <code>removeNotificationListener</code> methods,
- * the caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name,
- * "removeNotificationListener")}.</p>
- *
- * <li><p>For the {@link #getMBeanInfo getMBeanInfo} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "getMBeanInfo")}.</p>
- *
- * <li><p>For the {@link #getObjectInstance getObjectInstance} method,
- * the caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "getObjectInstance")}.</p>
- *
- * <li><p>For the {@link #isInstanceOf isInstanceOf} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "isInstanceOf")}.</p>
- *
- * <li><p>For the {@link #queryMBeans queryMBeans} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(null, null, null, "queryMBeans")}.
- * Additionally, for each MBean <em>n</em> that matches <code>name</code>,
- * if the caller's permissions do not imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, <em>n</em>, "queryMBeans")}, the
- * MBean server will behave as if that MBean did not exist.</p>
- *
- * <p>Certain query elements perform operations on the MBean server.
- * If the caller does not have the required permissions for a given
- * MBean, that MBean will not be included in the result of the query.
- * The standard query elements that are affected are {@link
- * Query#attr(String)}, {@link Query#attr(String,String)}, and {@link
- * Query#classattr()}.</p>
- *
- * <li><p>For the {@link #queryNames queryNames} method, the checks
- * are the same as for <code>queryMBeans</code> except that
- * <code>"queryNames"</code> is used instead of
- * <code>"queryMBeans"</code> in the <code>MBeanPermission</code>
- * objects.  Note that a <code>"queryMBeans"</code> permission implies
- * the corresponding <code>"queryNames"</code> permission.</p>
- *
- * <li><p>For the {@link #getDomains getDomains} method, the caller's
- * permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(null, null, null, "getDomains")}.  Additionally,
- * for each domain <var>d</var> in the returned array, if the caller's
- * permissions do not imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(null, null, new ObjectName("<var>d</var>:x=x"),
- * "getDomains")}, the domain is eliminated from the array.  Here,
- * <code>x=x</code> is any <var>key=value</var> pair, needed to
- * satisfy ObjectName's constructor but not otherwise relevant.</p>
- *
- * <li><p>For the {@link #getClassLoader getClassLoader} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, loaderName,
- * "getClassLoader")}.</p>
- *
- * <li><p>For the {@link #getClassLoaderFor getClassLoaderFor} method,
- * the caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, mbeanName,
- * "getClassLoaderFor")}.</p>
- *
- * <li><p>For the {@link #getClassLoaderRepository
- * getClassLoaderRepository} method, the caller's permissions must
- * imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(null, null, null, "getClassLoaderRepository")}.</p>
- *
- * <li><p>For the deprecated <code>deserialize</code> methods, the
- * required permissions are the same as for the methods that replace
- * them.</p>
- *
- * <li><p>For the <code>instantiate</code> methods, the caller's
- * permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, null, "instantiate")},
- * where {@code className} is the name of the class which is to
- * be instantiated.</p>
- *
- * <li><p>For the {@link #registerMBean registerMBean} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "registerMBean")}.
- *
- * <p>If the <code>MBeanPermission</code> check succeeds, the MBean's
- * class is validated by checking that its {@link
- * java.security.ProtectionDomain ProtectionDomain} implies {@link
- * MBeanTrustPermission#MBeanTrustPermission(String)
- * MBeanTrustPermission("register")}.</p>
- *
- * <p>Finally, if the <code>name</code> argument is null, another
- * <code>MBeanPermission</code> check is made using the
- * <code>ObjectName</code> returned by {@link
- * MBeanRegistration#preRegister MBeanRegistration.preRegister}.</p>
- *
- * <li><p>For the <code>createMBean</code> methods, the caller's
- * permissions must imply the permissions needed by the equivalent
- * <code>instantiate</code> followed by
- * <code>registerMBean</code>.</p>
- *
- * <li><p>For the {@link #unregisterMBean unregisterMBean} method,
- * the caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(className, null, name, "unregisterMBean")}.</p>
- *
- * </ul>
+ * <p>Methods of {@code MBeanServer} and its subclasses may throw
+ * {@link SecurityException} if the implementation doesn't authorize
+ * access to the underlying resource.
  *
  * @since 1.5
  */
diff --git a/src/java.management/share/classes/javax/management/MBeanServerDelegate.java b/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
index 443e9a7a06c..6e089f4164d 100644
--- a/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
+++ b/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
@@ -31,7 +31,7 @@
 import com.sun.jmx.mbeanserver.Util;
 
 /**
- * Represents  the MBean server from the management point of view.
+ * Represents the MBean server from the management point of view.
  * The MBeanServerDelegate MBean emits the MBeanServerNotifications when
  * an MBean is registered/unregistered in the MBean server.
  *
diff --git a/src/java.management/share/classes/javax/management/MBeanServerFactory.java b/src/java.management/share/classes/javax/management/MBeanServerFactory.java
index e25a927e883..21f20e23991 100644
--- a/src/java.management/share/classes/javax/management/MBeanServerFactory.java
+++ b/src/java.management/share/classes/javax/management/MBeanServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,9 +144,6 @@ private MBeanServerFactory() {
      * <code>createMBeanServer</code> methods, or if
      * <code>releaseMBeanServer</code> was already called on it.
      *
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("releaseMBeanServer")</code>.
      */
     public static void releaseMBeanServer(MBeanServer mbeanServer) {
         checkPermission("releaseMBeanServer");
@@ -171,10 +168,6 @@ public static void releaseMBeanServer(MBeanServer mbeanServer) {
      *
      * @return the newly created MBeanServer.
      *
-     * @exception SecurityException if there is a SecurityManager and the
-     * caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("createMBeanServer")</code>.
-     *
      * @exception JMRuntimeException if the property
      * <code>javax.management.builder.initial</code> exists but the
      * class it names cannot be instantiated through a public
@@ -208,10 +201,6 @@ public static MBeanServer createMBeanServer() {
      *
      * @return the newly created MBeanServer.
      *
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("createMBeanServer")</code>.
-     *
      * @exception JMRuntimeException if the property
      * <code>javax.management.builder.initial</code> exists but the
      * class it names cannot be instantiated through a public
@@ -252,10 +241,6 @@ public static MBeanServer createMBeanServer(String domain)  {
      *
      * @return the newly created MBeanServer.
      *
-     * @exception SecurityException if there is a SecurityManager and the
-     * caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("newMBeanServer")</code>.
-     *
      * @exception JMRuntimeException if the property
      * <code>javax.management.builder.initial</code> exists but the
      * class it names cannot be instantiated through a public
@@ -291,10 +276,6 @@ public static MBeanServer newMBeanServer() {
      *
      * @return the newly created MBeanServer.
      *
-     * @exception SecurityException if there is a SecurityManager and the
-     * caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("newMBeanServer")</code>.
-     *
      * @exception JMRuntimeException if the property
      * <code>javax.management.builder.initial</code> exists but the
      * class it names cannot be instantiated through a public
@@ -350,10 +331,6 @@ public static MBeanServer newMBeanServer(String domain)  {
      * <code>MBeanServerId</code> attribute of its delegate MBean.
      *
      * @return A list of MBeanServer objects.
-     *
-     * @exception SecurityException if there is a SecurityManager and the
-     * caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("findMBeanServer")</code>.
      */
     public static synchronized
             ArrayList<MBeanServer> findMBeanServer(String agentId) {
@@ -382,9 +359,6 @@ ArrayList<MBeanServer> findMBeanServer(String agentId) {
      * was implemented in JMX 1.1 - where the possibility to use
      * <code>null</code> was deprecated.
      * @return The Class Loader Repository used by the given MBeanServer.
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not include or imply <code>{@link
-     * MBeanPermission}("getClassLoaderRepository")</code>.
      *
      * @exception NullPointerException if <code>server</code> is null.
      *
diff --git a/src/java.management/share/classes/javax/management/MBeanServerPermission.java b/src/java.management/share/classes/javax/management/MBeanServerPermission.java
index 53e8f3659fc..dc77d605912 100644
--- a/src/java.management/share/classes/javax/management/MBeanServerPermission.java
+++ b/src/java.management/share/classes/javax/management/MBeanServerPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,10 @@
     <code>MBeanServerPermission("createMBeanServer")</code> implies
     <code>MBeanServerPermission("newMBeanServer")</code>.
  *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  * @since 1.5
  */
 public class MBeanServerPermission extends BasicPermission {
diff --git a/src/java.management/share/classes/javax/management/MBeanTrustPermission.java b/src/java.management/share/classes/javax/management/MBeanTrustPermission.java
index 20ad8ab496a..d961fe47193 100644
--- a/src/java.management/share/classes/javax/management/MBeanTrustPermission.java
+++ b/src/java.management/share/classes/javax/management/MBeanTrustPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,10 +40,10 @@
  * Only the null value or the empty string are allowed for the action
  * to allow the policy object to create the permissions specified in
  * the policy file.
- * <p>
- * If a signer, or codesource is granted this permission, then it is
- * considered a trusted source for MBeans. Only MBeans from trusted
- * sources may be registered in the MBeanServer.
+ *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.5
  */
diff --git a/src/java.management/share/classes/javax/management/Notification.java b/src/java.management/share/classes/javax/management/Notification.java
index 80cf4b464d2..337628aeec8 100644
--- a/src/java.management/share/classes/javax/management/Notification.java
+++ b/src/java.management/share/classes/javax/management/Notification.java
@@ -59,7 +59,7 @@ public class Notification extends EventObject {
     /**
      * @serialField type String The notification type.
      *              A string expressed in a dot notation similar to Java properties.
-     *              An example of a notification type is network.alarm.router
+     *              An example of a notification type is com.sun.management.gc.notification
      * @serialField sequenceNumber long The notification sequence number.
      *              A serial number which identify particular instance
      *              of notification in the context of the notification source.
@@ -83,7 +83,7 @@ public class Notification extends EventObject {
     /**
      * @serial The notification type.
      *         A string expressed in a dot notation similar to Java properties.
-     *         An example of a notification type is network.alarm.router
+     *         An example of a notification type is com.sun.management.gc.notification
      */
     private String type;
 
@@ -239,7 +239,7 @@ public void setSequenceNumber(long sequenceNumber) {
      * @return The notification type. It's a string expressed in a dot notation
      * similar to Java properties. It is recommended that the notification type
      * should follow the reverse-domain-name convention used by Java package
-     * names.  An example of a notification type is com.example.alarm.router.
+     * names.  An example of a notification type is com.sun.management.gc.notification
      */
     public String getType() {
         return type ;
diff --git a/src/java.management/share/classes/javax/management/monitor/Monitor.java b/src/java.management/share/classes/javax/management/monitor/Monitor.java
index 2ccb96b8db6..151855c3495 100644
--- a/src/java.management/share/classes/javax/management/monitor/Monitor.java
+++ b/src/java.management/share/classes/javax/management/monitor/Monitor.java
@@ -61,7 +61,6 @@
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
 import javax.security.auth.Subject;
-import jdk.internal.access.SharedSecrets;
 import static javax.management.monitor.MonitorNotification.*;
 
 /**
@@ -716,14 +715,10 @@ void doStart() {
             //
             cleanupIsComplexTypeAttribute();
 
-            // Cache the Subject or AccessControlContext of the Monitor.start() caller.
+            // Cache the Subject of the Monitor.start() caller.
             // The monitor tasks will be executed within this context.
             //
-            if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                subject = Subject.current();
-            } else {
-                acc = AccessController.getContext();
-            }
+            subject = Subject.current();
 
             // Start the scheduler.
             //
@@ -1521,11 +1516,9 @@ public Future<?> submit() {
         public void run() {
             final ScheduledFuture<?> sf;
             final Subject s;
-            final AccessControlContext ac;
             synchronized (Monitor.this) {
                 sf = Monitor.this.schedulerFuture;
                 s  = Monitor.this.subject;
-                ac = Monitor.this.acc;
             }
             PrivilegedAction<Void> action = new PrivilegedAction<>() {
                 public Void run() {
@@ -1541,19 +1534,10 @@ public Void run() {
                     return null;
                 }
             };
-            if (!SharedSecrets.getJavaLangAccess().allowSecurityManager()) {
-                // No SecurityManager permitted:
-                if (s == null) {
-                    action.run();
-                } else {
-                    Subject.doAs(s, action);
-                }
+            if (s == null) {
+                action.run();
             } else {
-                if (ac == null) {
-                    throw new SecurityException("AccessControlContext cannot be null");
-                }
-                // ACC means SM is permitted.
-                AccessController.doPrivileged(action, ac);
+                Subject.doAs(s, action);
             }
             synchronized (Monitor.this) {
                 if (Monitor.this.isActive() &&
diff --git a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
index 614fc4d64ee..c02e7c54ade 100644
--- a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
+++ b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,7 +162,6 @@ public class MonitorNotification extends javax.management.Notification {
     /**
      * @serial Monitor notification observed object.
      */
-    @SuppressWarnings("serial") // Not statically typed as Serializable
     private ObjectName observedObject = null;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
index 4597f0cca89..c8a6ca2f07a 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,6 @@ public class OpenMBeanAttributeInfoSupport
     /**
      * @serial The open mbean attribute's <i>open type</i>
      */
-    @SuppressWarnings("serial") // Not statically typed as Serializable
     private OpenType<?> openType;
 
     /**
@@ -565,7 +564,7 @@ static void check(OpenMBeanParameterInfo info) throws OpenDataException {
 
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     static int compare(Object x, Object y) {
         return ((Comparable) x).compareTo(y);
     }
@@ -938,7 +937,7 @@ public boolean isValue(Object obj) {
         return isValue(this, obj);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})  // cast to Comparable
+    @SuppressWarnings("unchecked")  // cast to Comparable
     static boolean isValue(OpenMBeanParameterInfo info, Object obj) {
         if (info.hasDefaultValue() && obj == null)
             return true;
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
index 454f089650d..8def9d38cc5 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@ public class OpenMBeanParameterInfoSupport
     /**
      * @serial The open mbean parameter's <i>open type</i>
      */
-    @SuppressWarnings("serial") // Not statically typed as Serializable
     private OpenType<?>    openType;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
index 44f41a1a629..00f255f394b 100644
--- a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -612,7 +612,6 @@ public Set<Object> keySet() {
      * @return a collection view ({@code Collection<CompositeData>}) of
      * the values contained in this {@code TabularDataSupport} instance.
      */
-    @SuppressWarnings("unchecked")  // historical confusion about the return type
     public Collection<Object> values() {
 
         return Util.cast(dataMap.values());
@@ -648,7 +647,6 @@ public Collection<Object> values() {
      * of the mappings contained in this map.
      * @see java.util.Map.Entry
      */
-    @SuppressWarnings("unchecked")  // historical confusion about the return type
     public Set<Map.Entry<Object,Object>> entrySet() {
 
         return Util.cast(dataMap.entrySet());
diff --git a/src/java.management/share/classes/javax/management/relation/RoleList.java b/src/java.management/share/classes/javax/management/relation/RoleList.java
index 7477634177c..fbbc3df6436 100644
--- a/src/java.management/share/classes/javax/management/relation/RoleList.java
+++ b/src/java.management/share/classes/javax/management/relation/RoleList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,7 +134,6 @@ public RoleList(List<Role> list) throws IllegalArgumentException {
      *
      * @since 1.6
      */
-    @SuppressWarnings("unchecked")
     public List<Role> asList() {
         if (!typeSafe) {
             if (tainted)
diff --git a/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java b/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java
index c69d318776c..dae506e5e5f 100644
--- a/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java
+++ b/src/java.management/share/classes/javax/management/relation/RoleUnresolvedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,7 +134,6 @@ public RoleUnresolvedList(List<RoleUnresolved> list)
      *
      * @since 1.6
      */
-    @SuppressWarnings("unchecked")
     public List<RoleUnresolved> asList() {
         if (!typeSafe) {
             if (tainted)
diff --git a/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java b/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java
index 0ba100ec8b2..b7bb5a3dc8c 100644
--- a/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java
+++ b/src/java.management/share/classes/javax/management/remote/JMXConnectionNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -159,12 +159,7 @@ public JMXConnectionNotification(String type,
                                      long sequenceNumber,
                                      String message,
                                      Object userData) {
-        /* We don't know whether the parent class (Notification) will
-           throw an exception if the type or source is null, because
-           JMX 1.2 doesn't specify that.  So we make sure it is not
-           null, in case it would throw the wrong exception
-           (e.g. IllegalArgumentException instead of
-           NullPointerException).  Likewise for the sequence number.  */
+        // Do not pass null source to super, as EventObject will throw IllegalArgumentException.
         super((String) nonNull(type),
               nonNull(source),
               Math.max(0, sequenceNumber),
diff --git a/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java b/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java
index 50d793207b3..e2346e92bd5 100644
--- a/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java
+++ b/src/java.management/share/classes/javax/management/remote/SubjectDelegationPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,10 @@
  * <code>delegate</code> of the concrete principal class
  * <code>javax.management.remote.JMXPrincipal</code>.</p>
  *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  * @since 1.5
  */
 public final class SubjectDelegationPermission extends BasicPermission {
diff --git a/src/java.management/share/classes/javax/management/timer/Timer.java b/src/java.management/share/classes/javax/management/timer/Timer.java
index 71bdbd0f7da..24054b8baac 100644
--- a/src/java.management/share/classes/javax/management/timer/Timer.java
+++ b/src/java.management/share/classes/javax/management/timer/Timer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1154,7 +1154,6 @@ private synchronized void updateTimerTable(Integer notifID) {
      *
      * @param notification The TimerAlarmClock notification.
      */
-    @SuppressWarnings("deprecation")
     void notifyAlarmClock(TimerAlarmClockNotification notification) {
 
         TimerNotification timerNotification = null;
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
index fce6d932735..48f015d5393 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Locale;
+import java.util.Set;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.concurrent.locks.ReentrantLock;
@@ -86,32 +87,23 @@ public final class LdapClient implements PooledConnection {
     static final boolean caseIgnore = true;
 
     // Default list of binary attributes
-    private static final Hashtable<String, Boolean> defaultBinaryAttrs =
-            new Hashtable<>(23,0.75f);
-    static {
-        defaultBinaryAttrs.put("userpassword", Boolean.TRUE);      //2.5.4.35
-        defaultBinaryAttrs.put("javaserializeddata", Boolean.TRUE);
-                                                //1.3.6.1.4.1.42.2.27.4.1.8
-        defaultBinaryAttrs.put("javaserializedobject", Boolean.TRUE);
-                                                // 1.3.6.1.4.1.42.2.27.4.1.2
-        defaultBinaryAttrs.put("jpegphoto", Boolean.TRUE);
-                                                //0.9.2342.19200300.100.1.60
-        defaultBinaryAttrs.put("audio", Boolean.TRUE);  //0.9.2342.19200300.100.1.55
-        defaultBinaryAttrs.put("thumbnailphoto", Boolean.TRUE);
-                                                //1.3.6.1.4.1.1466.101.120.35
-        defaultBinaryAttrs.put("thumbnaillogo", Boolean.TRUE);
-                                                //1.3.6.1.4.1.1466.101.120.36
-        defaultBinaryAttrs.put("usercertificate", Boolean.TRUE);     //2.5.4.36
-        defaultBinaryAttrs.put("cacertificate", Boolean.TRUE);       //2.5.4.37
-        defaultBinaryAttrs.put("certificaterevocationlist", Boolean.TRUE);
-                                                //2.5.4.39
-        defaultBinaryAttrs.put("authorityrevocationlist", Boolean.TRUE); //2.5.4.38
-        defaultBinaryAttrs.put("crosscertificatepair", Boolean.TRUE);    //2.5.4.40
-        defaultBinaryAttrs.put("photo", Boolean.TRUE);   //0.9.2342.19200300.100.1.7
-        defaultBinaryAttrs.put("personalsignature", Boolean.TRUE);
-                                                //0.9.2342.19200300.100.1.53
-        defaultBinaryAttrs.put("x500uniqueidentifier", Boolean.TRUE); //2.5.4.45
-    }
+    private static final Set<String> defaultBinaryAttrs = Set.of(
+            "userpassword",             //2.5.4.35
+            "javaserializeddata",       //1.3.6.1.4.1.42.2.27.4.1.8
+            "javaserializedobject",     //1.3.6.1.4.1.42.2.27.4.1.2
+            "jpegphoto",                //0.9.2342.19200300.100.1.60
+            "audio",                    //0.9.2342.19200300.100.1.55
+            "thumbnailphoto",           //1.3.6.1.4.1.1466.101.120.35
+            "thumbnaillogo",            //1.3.6.1.4.1.1466.101.120.36
+            "usercertificate",          //2.5.4.36
+            "cacertificate",            //2.5.4.37
+            "certificaterevocationlist",//2.5.4.39
+            "authorityrevocationlist",  //2.5.4.38
+            "crosscertificatepair",     //2.5.4.40
+            "photo",                    //0.9.2342.19200300.100.1.7
+            "personalsignature",        //0.9.2342.19200300.100.1.53
+            "x500uniqueidentifier"      //2.5.4.45
+    );
 
     private static final String DISCONNECT_OID = "1.3.6.1.4.1.1466.20036";
 
@@ -790,7 +782,7 @@ private boolean isBinaryValued(String attrid,
         String id = attrid.toLowerCase(Locale.ENGLISH);
 
         return id.contains(";binary") ||
-            defaultBinaryAttrs.containsKey(id) ||
+            defaultBinaryAttrs.contains(id) ||
             ((binaryAttrs != null) && (binaryAttrs.containsKey(id)));
     }
 
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java b/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java
index 1d7565e00e3..53a20b99594 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import jdk.internal.access.SharedSecrets;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -109,14 +107,8 @@ Class<?> loadClass(String className) throws ClassNotFoundException {
         return Class.forName(className, true, getContextClassLoader());
     }
 
-    @SuppressWarnings("removal")
     Thread createThread(Runnable r) {
-        AccessControlContext acc = AccessController.getContext();
-        // 4290486: doPrivileged is needed to create a thread in
-        // an environment that restricts "modifyThreadGroup".
-        PrivilegedAction<Thread> act =
-                () -> SharedSecrets.getJavaLangAccess().newThreadWithAcc(r, acc);
-        return AccessController.doPrivileged(act);
+        return new Thread(r);
     }
 
     @SuppressWarnings("removal")
diff --git a/src/java.naming/share/classes/javax/naming/ldap/spi/LdapDnsProvider.java b/src/java.naming/share/classes/javax/naming/ldap/spi/LdapDnsProvider.java
index e127dc11f7f..0cb240a891c 100644
--- a/src/java.naming/share/classes/javax/naming/ldap/spi/LdapDnsProvider.java
+++ b/src/java.naming/share/classes/javax/naming/ldap/spi/LdapDnsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,6 @@ public abstract class LdapDnsProvider {
 
     /**
      * Creates a new instance of {@code LdapDnsProvider}.
-     *
-     * @throws SecurityException if a security manager is present and its
-     *                           {@code checkPermission} method doesn't allow
-     *                           the {@code RuntimePermission("ldapDnsProvider")}.
      */
     protected LdapDnsProvider() {
         this(checkPermission());
diff --git a/src/java.naming/share/classes/javax/naming/spi/NamingManager.java b/src/java.naming/share/classes/javax/naming/spi/NamingManager.java
index c9953725365..c54080ba585 100644
--- a/src/java.naming/share/classes/javax/naming/spi/NamingManager.java
+++ b/src/java.naming/share/classes/javax/naming/spi/NamingManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,22 +89,15 @@ public class NamingManager {
      * setObjectFactoryBuilder() overrides this default policy by installing
      * an ObjectFactoryBuilder. Subsequent object factories will
      * be loaded and created using the installed builder.
-     *<p>
-     * The builder can only be installed if the executing thread is allowed
-     * (by the security manager's checkSetFactory() method) to do so.
-     * Once installed, the builder cannot be replaced.
      *
      * @param builder The factory builder to install. If null, no builder
      *                  is installed.
-     * @throws SecurityException builder cannot be installed
-     *         for security reasons.
      * @throws NamingException builder cannot be installed for
      *         a non-security-related reason.
      * @throws IllegalStateException If a factory has already been installed.
      * @see #getObjectInstance
      * @see ObjectFactory
      * @see ObjectFactoryBuilder
-     * @see java.lang.SecurityManager#checkSetFactory
      */
     public static void setObjectFactoryBuilder(
             ObjectFactoryBuilder builder) throws NamingException {
@@ -561,19 +554,12 @@ private static InitialContextFactory getFactory(String className) {
     /**
      * Sets the InitialContextFactory builder to be builder.
      *
-     *<p>
-     * The builder can only be installed if the executing thread is allowed by
-     * the security manager to do so. Once installed, the builder cannot
-     * be replaced.
      * @param builder The initial context factory builder to install. If null,
      *                no builder is set.
-     * @throws SecurityException builder cannot be installed for security
-     *         reasons.
      * @throws NamingException builder cannot be installed for
      *         a non-security-related reason.
      * @throws IllegalStateException If a builder was previous installed.
      * @see #hasInitialContextFactoryBuilder
-     * @see java.lang.SecurityManager#checkSetFactory
      */
     public static synchronized void setInitialContextFactoryBuilder(
         InitialContextFactoryBuilder builder)
diff --git a/src/java.net.http/share/classes/java/net/http/HttpClient.java b/src/java.net.http/share/classes/java/net/http/HttpClient.java
index fbe8010e806..c1269eed823 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpClient.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java
@@ -119,16 +119,6 @@
  *        .thenApply(HttpResponse::body)
  *        .thenAccept(System.out::println);  }
  *
- * <p> <a id="securitychecks"><b>Security checks</b></a>
- *
- * <p> If a security manager is present then security checks are performed by
- * the HTTP Client's sending methods. An appropriate {@link URLPermission} is
- * required to access the destination server, and proxy server if one has
- * been configured. The form of the {@code URLPermission} required to access a
- * proxy has a {@code method} parameter of {@code "CONNECT"} (for all kinds of
- * proxying) and a {@code URL} string of the form {@code "socket://host:port"}
- * where host and port specify the proxy's address.
- *
  * @apiNote
  * Resources allocated by the {@code HttpClient} may be
  * reclaimed early by {@linkplain #close() closing} the client.
@@ -175,19 +165,6 @@
  * prevent the resources allocated by the associated client from
  * being reclaimed by the garbage collector.
  *
- *
- * <p>
- * If an explicit {@linkplain HttpClient.Builder#executor(Executor)
- * executor} has not been set for an {@code HttpClient}, and a security manager
- * has been installed, then the default executor will execute asynchronous and
- * dependent tasks in a context that is granted no permissions. Custom
- * {@linkplain HttpRequest.BodyPublisher request body publishers}, {@linkplain
- * HttpResponse.BodyHandler response body handlers}, {@linkplain
- * BodySubscriber response body subscribers}, and {@linkplain
- * WebSocket.Listener WebSocket Listeners}, if executing operations that require
- * privileges, should do so within an appropriate {@linkplain
- * AccessController#doPrivileged(PrivilegedAction) privileged context}.
- *
  * @since 11
  */
 public abstract class HttpClient implements AutoCloseable {
@@ -325,9 +302,7 @@ public interface Builder {
          * HttpClient}.
          *
          * @implNote The default executor uses a thread pool, with a custom
-         * thread factory. If a security manager has been installed, the thread
-         * factory creates threads that run with an access control context that
-         * has no permissions.
+         * thread factory.
          *
          * @param executor the Executor
          * @return this builder
@@ -462,20 +437,12 @@ default Builder localAddress(InetAddress localAddr) {
          * Returns a new {@link HttpClient} built from the current state of this
          * builder.
          *
-         * @implSpec If the {@link #localAddress(InetAddress) local address} is a non-null
-         * address and a security manager is installed, then
-         * this method calls {@link SecurityManager#checkListen checkListen} to check that
-         * the caller has necessary permission to bind to that local address.
-         *
          * @return a new {@code HttpClient}
          *
          * @throws UncheckedIOException may be thrown if underlying IO resources required
          * by the implementation cannot be allocated. For instance,
          * if the implementation requires a {@link Selector}, and opening
          * one fails due to {@linkplain Selector#open() lack of necessary resources}.
-         * @throws SecurityException If a security manager has been installed and the
-         *         security manager's {@link SecurityManager#checkListen checkListen}
-         *         method disallows binding to the given address.
          */
         public HttpClient build();
     }
@@ -671,11 +638,6 @@ public enum Redirect {
      * @throws IllegalArgumentException if the {@code request} argument is not
      *         a request that could have been validly built as specified by {@link
      *         HttpRequest.Builder HttpRequest.Builder}.
-     * @throws SecurityException If a security manager has been installed
-     *          and it denies {@link java.net.URLPermission access} to the
-     *          URL in the given request, or proxy if one is configured.
-     *          See <a href="#securitychecks">security checks</a> for further
-     *          information.
      */
     public abstract <T> HttpResponse<T>
     send(HttpRequest request, HttpResponse.BodyHandler<T> responseBodyHandler)
@@ -715,11 +677,6 @@ public enum Redirect {
      * <ul>
      * <li>{@link IOException} - if an I/O error occurs when sending or receiving,
      *      or the client has {@linkplain ##closing shut down}.</li>
-     * <li>{@link SecurityException} - If a security manager has been installed
-     *          and it denies {@link java.net.URLPermission access} to the
-     *          URL in the given request, or proxy if one is configured.
-     *          See <a href="#securitychecks">security checks</a> for further
-     *          information.</li>
      * </ul>
      *
      * <p id="cancel"> The default {@code HttpClient} implementation returns
diff --git a/src/java.net.http/share/classes/java/net/http/HttpRequest.java b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
index a91cb935dc8..7ba6ed25b41 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpRequest.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -711,20 +711,9 @@ public static BodyPublisher ofByteArray(byte[] buf, int offset, int length) {
         /**
          * A request body publisher that takes data from the contents of a File.
          *
-         * <p> Security manager permission checks are performed in this factory
-         * method, when the {@code BodyPublisher} is created. Care must be taken
-         * that the {@code BodyPublisher} is not shared with untrusted code.
-         *
          * @param  path the path to the file containing the body
          * @return a BodyPublisher
          * @throws java.io.FileNotFoundException if the path is not found
-         * @throws SecurityException if
-         *         {@linkplain Files#newInputStream(Path, OpenOption...)
-         *         opening the file for reading} is denied:
-         *         in the case of the system-default file system provider,
-         *         and a security manager is installed,
-         *         {@link SecurityManager#checkRead(String) checkRead}
-         *         is invoked to check read access to the given file
          */
         public static BodyPublisher ofFile(Path path) throws FileNotFoundException {
             Objects.requireNonNull(path);
diff --git a/src/java.net.http/share/classes/java/net/http/HttpResponse.java b/src/java.net.http/share/classes/java/net/http/HttpResponse.java
index 08fcc894f9a..b9ea775532d 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpResponse.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpResponse.java
@@ -525,24 +525,11 @@ public static BodyHandler<String> ofString(Charset charset) {
          * been completely written to the file, and {@link #body()} returns a
          * reference to its {@link Path}.
          *
-         * <p> In the case of the default file system provider, security manager
-         * permission checks are performed in this factory method, when the
-         * {@code BodyHandler} is created. Otherwise,
-         * {@linkplain FileChannel#open(Path, OpenOption...) permission checks}
-         * may be performed asynchronously against the caller's context
-         * at file access time.
-         * Care must be taken that the {@code BodyHandler} is not shared with
-         * untrusted code.
-         *
          * @param  file the file to store the body in
          * @param  openOptions any options to use when opening/creating the file
          * @return a response body handler
          * @throws IllegalArgumentException if an invalid set of open options
          *         are specified
-         * @throws SecurityException in the case of the default file system
-         *         provider, and a security manager is installed,
-         *         {@link SecurityManager#checkWrite(String) checkWrite}
-         *         is invoked to check write access to the given file
          */
         public static BodyHandler<Path> ofFile(Path file, OpenOption... openOptions) {
             Objects.requireNonNull(file);
@@ -560,21 +547,8 @@ public static BodyHandler<Path> ofFile(Path file, OpenOption... openOptions) {
          *
          * <p> Equivalent to: {@code ofFile(file, CREATE, WRITE)}
          *
-         * <p> In the case of the default file system provider, security manager
-         * permission checks are performed in this factory method, when the
-         * {@code BodyHandler} is created. Otherwise,
-         * {@linkplain FileChannel#open(Path, OpenOption...) permission checks}
-         * may be performed asynchronously against the caller's context
-         * at file access time.
-         * Care must be taken that the {@code BodyHandler} is not shared with
-         * untrusted code.
-         *
          * @param  file the file to store the body in
          * @return a response body handler
-         * @throws SecurityException in the case of the default file system
-         *         provider, and a security manager is installed,
-         *         {@link SecurityManager#checkWrite(String) checkWrite}
-         *         is invoked to check write access to the given file
          */
         public static BodyHandler<Path> ofFile(Path file) {
             return BodyHandlers.ofFile(file, CREATE, WRITE);
@@ -597,10 +571,6 @@ public static BodyHandler<Path> ofFile(Path file) {
          * by the server. If the destination directory does not exist or cannot
          * be written to, then the response will fail with an {@link IOException}.
          *
-         * <p> Security manager permission checks are performed in this factory
-         * method, when the {@code BodyHandler} is created. Care must be taken
-         * that the {@code BodyHandler} is not shared with untrusted code.
-         *
          * @param  directory the directory to store the file in
          * @param  openOptions open options used when opening the file
          * @return a response body handler
@@ -608,15 +578,6 @@ public static BodyHandler<Path> ofFile(Path file) {
          *         is not of the default file system, is not a directory,
          *         is not writable, or if an invalid set of open options
          *         are specified
-         * @throws SecurityException in the case of the default file system
-         *         provider and a security manager has been installed,
-         *         and it denies
-         *         {@linkplain SecurityManager#checkRead(String) read access}
-         *         to the directory, or it denies
-         *         {@linkplain SecurityManager#checkWrite(String) write access}
-         *         to the directory, or it denies
-         *         {@linkplain SecurityManager#checkWrite(String) write access}
-         *         to the files within the directory.
          */
         public static BodyHandler<Path> ofFileDownload(Path directory,
                                                        OpenOption... openOptions) {
@@ -1137,24 +1098,11 @@ public static BodySubscriber<byte[]> ofByteArray() {
          * <p> The {@link HttpResponse} using this subscriber is available after
          * the entire response has been read.
          *
-         * <p> In the case of the default file system provider, security manager
-         * permission checks are performed in this factory method, when the
-         * {@code BodySubscriber} is created. Otherwise,
-         * {@linkplain FileChannel#open(Path, OpenOption...) permission checks}
-         * may be performed asynchronously against the caller's context
-         * at file access time.
-         * Care must be taken that the {@code BodySubscriber} is not shared with
-         * untrusted code.
-         *
          * @param  file the file to store the body in
          * @param  openOptions the list of options to open the file with
          * @return a body subscriber
          * @throws IllegalArgumentException if an invalid set of open options
          *         are specified
-         * @throws SecurityException in the case of the default file system
-         *         provider, and a security manager is installed,
-         *         {@link SecurityManager#checkWrite(String) checkWrite}
-         *         is invoked to check write access to the given file
          */
         public static BodySubscriber<Path> ofFile(Path file, OpenOption... openOptions) {
             Objects.requireNonNull(file);
@@ -1172,21 +1120,8 @@ public static BodySubscriber<Path> ofFile(Path file, OpenOption... openOptions)
          *
          * <p> Equivalent to: {@code ofFile(file, CREATE, WRITE)}
          *
-         * <p> In the case of the default file system provider, security manager
-         * permission checks are performed in this factory method, when the
-         * {@code BodySubscriber} is created. Otherwise,
-         * {@linkplain FileChannel#open(Path, OpenOption...) permission checks}
-         * may be performed asynchronously against the caller's context
-         * at file access time.
-         * Care must be taken that the {@code BodySubscriber} is not shared with
-         * untrusted code.
-         *
          * @param  file the file to store the body in
          * @return a body subscriber
-         * @throws SecurityException in the case of the default file system
-         *         provider, and a security manager is installed,
-         *         {@link SecurityManager#checkWrite(String) checkWrite}
-         *         is invoked to check write access to the given file
          */
         public static BodySubscriber<Path> ofFile(Path file) {
             return ofFile(file, CREATE, WRITE);
diff --git a/src/java.net.http/share/classes/java/net/http/WebSocket.java b/src/java.net.http/share/classes/java/net/http/WebSocket.java
index 83b0bf000a7..313847cf449 100644
--- a/src/java.net.http/share/classes/java/net/http/WebSocket.java
+++ b/src/java.net.http/share/classes/java/net/http/WebSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,12 +194,6 @@ interface Builder {
          *          the timeout
          * <li> {@link InterruptedException} -
          *          if the operation is interrupted
-         * <li> {@link SecurityException} -
-         *          if a security manager has been installed and it denies
-         *          {@link java.net.URLPermission access} to {@code uri}.
-         *          <a href="HttpClient.html#securitychecks">Security checks</a>
-         *          contains more information relating to the security context
-         *          in which the listener is invoked.
          * <li> {@link IllegalArgumentException} -
          *          if any of the arguments of this builder's methods are
          *          illegal
diff --git a/src/java.prefs/share/classes/java/util/prefs/Preferences.java b/src/java.prefs/share/classes/java/util/prefs/Preferences.java
index 662a340710f..d428261aac9 100644
--- a/src/java.prefs/share/classes/java/util/prefs/Preferences.java
+++ b/src/java.prefs/share/classes/java/util/prefs/Preferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,9 +362,6 @@ private static PreferencesFactory factory1() {
      * @return the user preference node associated with the package of which
      *         {@code c} is a member.
      * @throws NullPointerException if {@code c} is {@code null}.
-     * @throws SecurityException if a security manager is present and
-     *         it denies {@code RuntimePermission("preferences")}.
-     * @see    RuntimePermission
      */
     public static Preferences userNodeForPackage(Class<?> c) {
         return userRoot().node(nodeName(c));
@@ -406,9 +403,6 @@ public static Preferences userNodeForPackage(Class<?> c) {
      * @return the system preference node associated with the package of which
      *         {@code c} is a member.
      * @throws NullPointerException if {@code c} is {@code null}.
-     * @throws SecurityException if a security manager is present and
-     *         it denies {@code RuntimePermission("preferences")}.
-     * @see    RuntimePermission
      */
     public static Preferences systemNodeForPackage(Class<?> c) {
         return systemRoot().node(nodeName(c));
@@ -444,9 +438,6 @@ private static String nodeName(Class<?> c) {
      * Returns the root preference node for the calling user.
      *
      * @return the root preference node for the calling user.
-     * @throws SecurityException If a security manager is present and
-     *         it denies {@code RuntimePermission("preferences")}.
-     * @see    RuntimePermission
      */
     public static Preferences userRoot() {
         @SuppressWarnings("removal")
@@ -461,9 +452,6 @@ public static Preferences userRoot() {
      * Returns the root preference node for the system.
      *
      * @return the root preference node for the system.
-     * @throws SecurityException If a security manager is present and
-     *         it denies {@code RuntimePermission("preferences")}.
-     * @see    RuntimePermission
      */
     public static Preferences systemRoot() {
         @SuppressWarnings("removal")
@@ -1280,9 +1268,6 @@ public abstract void exportSubtree(OutputStream os)
      *         results in an {@code IOException}.
      * @throws InvalidPreferencesFormatException Data on input stream does not
      *         constitute a valid XML document with the mandated document type.
-     * @throws SecurityException If a security manager is present and
-     *         it denies {@code RuntimePermission("preferences")}.
-     * @see    RuntimePermission
      */
     public static void importPreferences(InputStream is)
         throws IOException, InvalidPreferencesFormatException
diff --git a/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java b/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java
index 83cc865a099..75777132e2b 100644
--- a/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java
+++ b/src/java.rmi/share/classes/java/rmi/RMISecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,39 +25,15 @@
 
 package java.rmi;
 
-import java.security.*;
-
 /**
- * {@code RMISecurityManager} implements a policy identical to the policy
- * implemented by {@link SecurityManager}. RMI applications
- * should use the {@code SecurityManager} class or another appropriate
- * {@code SecurityManager} implementation instead of this class. RMI's class
- * loader will download classes from remote locations only if a security
- * manager has been set.
- *
- * @implNote
- * <p>Applets typically run in a container that already has a security
- * manager, so there is generally no need for applets to set a security
- * manager. If you have a standalone application, you might need to set a
- * {@code SecurityManager} in order to enable class downloading. This can be
- * done by adding the following to your code. (It needs to be executed before
- * RMI can download code from remote hosts, so it most likely needs to appear
- * in the {@code main} method of your application.)
- *
- * <pre>{@code
- *    if (System.getSecurityManager() == null) {
- *        System.setSecurityManager(new SecurityManager());
- *    }
- * }</pre>
+ * RMISecurityManager was originally specified to allow an application implement
+ * a security policy identical to the policy implemented by {@link SecurityManager}.
+ * This feature no longer exists.
  *
  * @author  Roger Riggs
  * @author  Peter Jones
  * @since 1.1
- * @deprecated This class is only useful in conjunction with
- *       {@linkplain SecurityManager the Security Manager}, which is deprecated
- *       and subject to removal in a future release. Consequently, this class
- *       is also deprecated and subject to removal. There is no replacement for
- *       the Security Manager or this class.
+ * @deprecated There is no replacement for the Security Manager.
  */
 @SuppressWarnings("removal")
 @Deprecated(since="1.8", forRemoval = true)
@@ -65,6 +41,7 @@ public class RMISecurityManager extends SecurityManager {
 
     /**
      * Constructs a new {@code RMISecurityManager}.
+     *
      * @since 1.1
      */
     public RMISecurityManager() {
diff --git a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java
index c2877a11eb3..6736c33f0a0 100644
--- a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java
+++ b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,7 @@
  * the location from which an existing class should be loaded by
  * remote parties.  These methods are used by the RMI runtime when
  * marshalling and unmarshalling classes contained in the arguments
- * and return values of remote method calls, and they also may be
- * invoked directly by applications in order to mimic RMI's dynamic
- * class loading behavior.
+ * and return values of remote method calls.
  *
  * <p>The implementation of the following static methods
  *
@@ -324,14 +322,6 @@ public static Class<?> loadProxyClass(String codebase, String[] interfaces,
      * {@link RMIClassLoaderSpi#getClassLoader(String)} method
      * of the provider instance, passing <code>codebase</code> as the argument.
      *
-     * <p>If there is a security manager, its <code>checkPermission</code>
-     * method will be invoked with a
-     * <code>RuntimePermission("getClassLoader")</code> permission;
-     * this could result in a <code>SecurityException</code>.
-     * The provider implementation of this method may also perform further
-     * security checks to verify that the calling context has permission to
-     * connect to all of the URLs in the codebase URL path.
-     *
      * @param   codebase the list of URLs (space-separated) from which
      * the returned class loader will load classes from, or <code>null</code>
      *
@@ -343,15 +333,10 @@ public static Class<?> loadProxyClass(String codebase, String[] interfaces,
      * if <code>codebase</code> is <code>null</code> and a provider-specific
      * URL used to identify the class loader is invalid
      *
-     * @throws  SecurityException if there is a security manager and the
-     * invocation of its <code>checkPermission</code> method fails, or
-     * if the caller does not have permission to connect to all of the
-     * URLs in the codebase URL path
-     *
      * @since   1.3
      */
     public static ClassLoader getClassLoader(String codebase)
-        throws MalformedURLException, SecurityException
+        throws MalformedURLException
     {
         return provider.getClassLoader(codebase);
     }
@@ -403,11 +388,6 @@ public static String getClassAnnotation(Class<?> cl) {
      * will use the canonical instance of the default provider
      * as the service provider instance.
      *
-     * <p>If there is a security manager, its
-     * <code>checkPermission</code> method will be invoked with a
-     * <code>RuntimePermission("setFactory")</code> permission; this
-     * could result in a <code>SecurityException</code>.
-     *
      * <p>The default service provider instance implements
      * {@link RMIClassLoaderSpi} as follows:
      *
@@ -437,21 +417,7 @@ public static String getClassAnnotation(Class<?> cl) {
      * <li><p>Otherwise, if the class loader is an instance of
      * <code>URLClassLoader</code>, then the returned string is a
      * space-separated list of the external forms of the URLs returned
-     * by invoking the <code>getURLs</code> methods of the loader.  If
-     * the <code>URLClassLoader</code> was created by this provider to
-     * service an invocation of its <code>loadClass</code> or
-     * <code>loadProxyClass</code> methods, then no permissions are
-     * required to get the associated codebase string.  If it is an
-     * arbitrary other <code>URLClassLoader</code> instance, then if
-     * there is a security manager, its <code>checkPermission</code>
-     * method will be invoked once for each URL returned by the
-     * <code>getURLs</code> method, with the permission returned by
-     * invoking <code>openConnection().getPermission()</code> on each
-     * URL; if any of those invocations throws a
-     * <code>SecurityException</code> or an <code>IOException</code>,
-     * then the value of the <code>java.rmi.server.codebase</code>
-     * property (or possibly an earlier cached value) is returned, or
-     * <code>null</code> is returned if that property is not set.
+     * by invoking the <code>getURLs</code> methods of the loader.
      *
      * <li><p>Finally, if the class loader is not an instance of
      * <code>URLClassLoader</code>, then the value of the
@@ -464,38 +430,15 @@ public static String getClassAnnotation(Class<?> cl) {
      * <p>For the implementations of the methods described below,
      * which all take a <code>String</code> parameter named
      * <code>codebase</code> that is a space-separated list of URLs,
-     * each invocation has an associated <i>codebase loader</i> that
-     * is identified using the <code>codebase</code> argument in
-     * conjunction with the current thread's context class loader (see
-     * {@link Thread#getContextClassLoader()}).  When there is a
-     * security manager, this provider maintains an internal table of
-     * class loader instances (which are at least instances of {@link
-     * java.net.URLClassLoader}) keyed by the pair of their parent
-     * class loader and their codebase URL path (an ordered list of
-     * URLs).  If the <code>codebase</code> argument is <code>null</code>,
-     * the codebase URL path is the value of the system property
-     * <code>java.rmi.server.codebase</code> or possibly an
-     * earlier cached value.  For a given codebase URL path passed as the
-     * <code>codebase</code> argument to an invocation of one of the
-     * below methods in a given context, the codebase loader is the
-     * loader in the table with the specified codebase URL path and
-     * the current thread's context class loader as its parent.  If no
-     * such loader exists, then one is created and added to the table.
-     * The table does not maintain strong references to its contained
-     * loaders, in order to allow them and their defined classes to be
-     * garbage collected when not otherwise reachable.  In order to
-     * prevent arbitrary untrusted code from being implicitly loaded
-     * into a virtual machine with no security manager, if there is no
-     * security manager set, the codebase loader is just the current
-     * thread's context class loader (the supplied codebase URL path
-     * is ignored, so remote class loading is disabled).
+     * the <code>codebase</code> argument is ignored. Class loading
+     * proceeds using the the current thread's context class loader
+     * (see {@link Thread#getContextClassLoader()}), which is also
+     * considered to be the codebase loader, irrespective of any
+     * value passed as the <code>codebase</code> argument.
      *
      * <p>The <b>{@link RMIClassLoaderSpi#getClassLoader(String)
-     * getClassLoader}</b> method returns the codebase loader for the
-     * specified codebase URL path.  If there is a security manager,
-     * then if the calling context does not have permission to connect
-     * to all of the URLs in the codebase URL path, a
-     * <code>SecurityException</code> will be thrown.
+     * getClassLoader}</b> method returns the current thread's
+     * context class loader.
      *
      * <p>The <b>{@link
      * RMIClassLoaderSpi#loadClass(String,String,ClassLoader)
@@ -507,7 +450,7 @@ public static String getClassAnnotation(Class<?> cl) {
      * If the <code>defaultLoader</code> argument is
      * non-<code>null</code>, it first attempts to load the class with the
      * specified <code>name</code> using the
-     * <code>defaultLoader</code>, such as by evaluating
+     * <code>defaultLoader</code>, as if by evaluating
      *
      * <pre>
      *     Class.forName(name, false, defaultLoader)
@@ -519,12 +462,8 @@ public static String getClassAnnotation(Class<?> cl) {
      * thrown, that exception is thrown to the caller.
      *
      * <p>Next, the <code>loadClass</code> method attempts to load the
-     * class with the specified <code>name</code> using the codebase
-     * loader for the specified codebase URL path.
-     * If there is a security manager, then the calling context
-     * must have permission to connect to all of the URLs in the
-     * codebase URL path; otherwise, the current thread's context
-     * class loader will be used instead of the codebase loader.
+     * class with the specified <code>name</code> using the current
+     * thread's context class loader.
      *
      * </blockquote>
      *
@@ -596,9 +535,6 @@ public static String getClassAnnotation(Class<?> cl) {
      *
      * @return  the canonical instance of the default service provider
      *
-     * @throws  SecurityException if there is a security manager and the
-     * invocation of its <code>checkPermission</code> method fails
-     *
      * @since   1.4
      */
     public static RMIClassLoaderSpi getDefaultProviderInstance() {
@@ -611,20 +547,19 @@ public static RMIClassLoaderSpi getDefaultProviderInstance() {
     }
 
     /**
-     * Returns the security context of the given class loader.
+     * Always returns null.
      *
      * @param   loader a class loader from which to get the security context
      *
-     * @return  the security context
+     * @return  null
      *
-     * @deprecated no replacement.  As of the Java 2 platform v1.2, RMI no
-     * longer uses this method to obtain a class loader's security context.
-     * @see java.lang.SecurityManager#getSecurityContext()
+     * @deprecated no replacement. This method has no purpose in the absence
+     * of a Security Manager.
      */
     @Deprecated
     public static Object getSecurityContext(ClassLoader loader)
     {
-        return sun.rmi.server.LoaderHandler.getSecurityContext(loader);
+        return null;
     }
 
     /**
diff --git a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java
index fa4ffa728cf..1dfb1d3a755 100644
--- a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java
+++ b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,14 +151,6 @@ public abstract Class<?> loadProxyClass(String codebase,
      * Returns a class loader that loads classes from the given codebase
      * URL path.
      *
-     * <p>If there is a security manager, its <code>checkPermission</code>
-     * method will be invoked with a
-     * <code>RuntimePermission("getClassLoader")</code> permission;
-     * this could result in a <code>SecurityException</code>.
-     * The implementation of this method may also perform further security
-     * checks to verify that the calling context has permission to connect
-     * to all of the URLs in the codebase URL path.
-     *
      * @param   codebase the list of URLs (space-separated) from which
      * the returned class loader will load classes from, or <code>null</code>
      *
@@ -169,11 +161,6 @@ public abstract Class<?> loadProxyClass(String codebase,
      * non-<code>null</code> and contains an invalid URL, or
      * if <code>codebase</code> is <code>null</code> and a provider-specific
      * URL used to identify the class loader is invalid
-     *
-     * @throws  SecurityException if there is a security manager and the
-     * invocation of its <code>checkPermission</code> method fails, or
-     * if the caller does not have permission to connect to all of the
-     * URLs in the codebase URL path
      */
     public abstract ClassLoader getClassLoader(String codebase)
         throws MalformedURLException; // SecurityException
diff --git a/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java b/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java
index 0693992e958..fedc4b22d9b 100644
--- a/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java
+++ b/src/java.rmi/share/classes/java/rmi/server/RMISocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,16 +119,10 @@ public abstract ServerSocket createServerSocket(int port)
     /**
      * Set the global socket factory from which RMI gets sockets (if the
      * remote object is not associated with a specific client and/or server
-     * socket factory). The RMI socket factory can only be set once. Note: The
-     * RMISocketFactory may only be set if the current security manager allows
-     * setting a socket factory; if disallowed, a SecurityException will be
-     * thrown.
+     * socket factory). The RMI socket factory can only be set once.
      * @param fac the socket factory
      * @throws IOException if the RMI socket factory is already set
-     * @throws  SecurityException  if a security manager exists and its
-     *          <code>checkSetFactory</code> method doesn't allow the operation.
      * @see #getSocketFactory
-     * @see java.lang.SecurityManager#checkSetFactory()
      * @since 1.1
      */
     public static synchronized void setSocketFactory(RMISocketFactory fac)
@@ -180,15 +174,7 @@ public static synchronized RMISocketFactory getDefaultSocketFactory() {
      * and server socket creation fails, the RMI runtime does attempt to
      * recreate the server socket.
      *
-     * <p>If there is a security manager, this method first calls
-     * the security manager's <code>checkSetFactory</code> method
-     * to ensure the operation is allowed.
-     * This could result in a <code>SecurityException</code>.
-     *
-     * @param fh the failure handler
-     * @throws  SecurityException  if a security manager exists and its
-     *          <code>checkSetFactory</code> method doesn't allow the
-     *          operation.
+     * @param fh the failure handler.
      * @see #getFailureHandler
      * @see java.rmi.server.RMIFailureHandler#failure(Exception)
      * @since 1.1
diff --git a/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java b/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java
index a591b52a7a6..d9a737334da 100644
--- a/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java
+++ b/src/java.rmi/share/classes/java/rmi/server/RemoteServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,15 +81,7 @@ public static String getClientHost() throws ServerNotActiveException {
      * Log RMI calls to the output stream <code>out</code>. If
      * <code>out</code> is <code>null</code>, call logging is turned off.
      *
-     * <p>If there is a security manager, its
-     * <code>checkPermission</code> method will be invoked with a
-     * <code>java.util.logging.LoggingPermission("control")</code>
-     * permission; this could result in a <code>SecurityException</code>.
-     *
      * @param   out the output stream to which RMI calls should be logged
-     * @throws  SecurityException  if there is a security manager and
-     *          the invocation of its <code>checkPermission</code> method
-     *          fails
      * @see #getLog
      * @since 1.1
      */
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
index 9fcc9354fcc..91bb92d9833 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
+++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.io.ObjectInputFilter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.PrivilegedAction;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -37,7 +36,6 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.io.File;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.net.*;
 import java.rmi.*;
@@ -46,15 +44,6 @@
 import java.rmi.registry.Registry;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Policy;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.ProtectionDomain;
 import java.text.MessageFormat;
 
 import jdk.internal.access.SharedSecrets;
@@ -115,15 +104,12 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
      * The registryFilter created from the value of the {@code "sun.rmi.registry.registryFilter"}
      * property.
      */
-    @SuppressWarnings("removal")
-    private static final ObjectInputFilter registryFilter =
-            AccessController.doPrivileged((PrivilegedAction<ObjectInputFilter>)RegistryImpl::initRegistryFilter);
+    private static final ObjectInputFilter registryFilter = initRegistryFilter();
 
     /**
      * Initialize the registryFilter from the security properties or system property; if any
      * @return an ObjectInputFilter, or null
      */
-    @SuppressWarnings("deprecation")
     private static ObjectInputFilter initRegistryFilter() {
         ObjectInputFilter filter = null;
         String props = System.getProperty(REGISTRY_FILTER_PROPNAME);
@@ -157,56 +143,24 @@ public RegistryImpl(int port,
      * Construct a new RegistryImpl on the specified port with the
      * given custom socket factory pair and ObjectInputFilter.
      */
-    @SuppressWarnings("removal")
     public RegistryImpl(int port,
                         RMIClientSocketFactory csf,
                         RMIServerSocketFactory ssf,
                         ObjectInputFilter serialFilter)
         throws RemoteException
     {
-        if (port == Registry.REGISTRY_PORT && System.getSecurityManager() != null) {
-            // grant permission for default port only.
-            try {
-                AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                    public Void run() throws RemoteException {
-                        LiveRef lref = new LiveRef(id, port, csf, ssf);
-                        setup(new UnicastServerRef2(lref, serialFilter));
-                        return null;
-                    }
-                }, null, new SocketPermission("localhost:"+port, "listen,accept"));
-            } catch (PrivilegedActionException pae) {
-                throw (RemoteException)pae.getException();
-            }
-        } else {
-            LiveRef lref = new LiveRef(id, port, csf, ssf);
-            setup(new UnicastServerRef2(lref, serialFilter));
-        }
+        LiveRef lref = new LiveRef(id, port, csf, ssf);
+        setup(new UnicastServerRef2(lref, serialFilter));
     }
 
     /**
      * Construct a new RegistryImpl on the specified port.
      */
-    @SuppressWarnings("removal")
     public RegistryImpl(int port)
         throws RemoteException
     {
-        if (port == Registry.REGISTRY_PORT && System.getSecurityManager() != null) {
-            // grant permission for default port only.
-            try {
-                AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                    public Void run() throws RemoteException {
-                        LiveRef lref = new LiveRef(id, port);
-                        setup(new UnicastServerRef(lref, RegistryImpl::registryFilter));
-                        return null;
-                    }
-                }, null, new SocketPermission("localhost:"+port, "listen,accept"));
-            } catch (PrivilegedActionException pae) {
-                throw (RemoteException)pae.getException();
-            }
-        } else {
-            LiveRef lref = new LiveRef(id, port);
-            setup(new UnicastServerRef(lref, RegistryImpl::registryFilter));
-        }
+        LiveRef lref = new LiveRef(id, port);
+        setup(new UnicastServerRef(lref, RegistryImpl::registryFilter));
     }
 
     /*
@@ -316,21 +270,8 @@ public static void checkAccess(String op) throws AccessException {
             /*
              * Get client host that this registry operation was made from.
              */
-            final String clientHostName = getClientHost();
-            InetAddress clientHost;
-
-            try {
-                clientHost = java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedExceptionAction<InetAddress>() {
-                        public InetAddress run()
-                            throws java.net.UnknownHostException
-                        {
-                            return InetAddress.getByName(clientHostName);
-                        }
-                    });
-            } catch (PrivilegedActionException pae) {
-                throw (java.net.UnknownHostException) pae.getException();
-            }
+            String clientHostName = getClientHost();
+            InetAddress clientHost = InetAddress.getByName(clientHostName);
 
             // if client not yet seen, make sure client allowed access
             if (allowedAccessCache.get(clientHost) == null) {
@@ -341,27 +282,16 @@ public InetAddress run()
                 }
 
                 try {
-                    final InetAddress finalClientHost = clientHost;
-
-                    java.security.AccessController.doPrivileged(
-                        new java.security.PrivilegedExceptionAction<Void>() {
-                            public Void run() throws java.io.IOException {
-                                /*
-                                 * if a ServerSocket can be bound to the client's
-                                 * address then that address must be local
-                                 */
-                                (new ServerSocket(0, 10, finalClientHost)).close();
-                                allowedAccessCache.put(finalClientHost,
-                                                       finalClientHost);
-                                return null;
-                            }
-                    });
-                } catch (PrivilegedActionException pae) {
-                    // must have been an IOException
-
+                    /*
+                     * if a ServerSocket can be bound to the client's
+                     * address then that address must be local
+                     */
+                    (new ServerSocket(0, 10, clientHost)).close();
+                    allowedAccessCache.put(clientHost, clientHost);
+                } catch (IOException ioe) {
                     throw new AccessException(
                         op + " disallowed; origin " +
-                        clientHost + " is non-local host");
+                        clientHost + " is non-local host", ioe);
                 }
             }
         } catch (ServerNotActiveException ex) {
@@ -491,14 +421,7 @@ private static ObjectInputFilter.Status registryFilter(ObjectInputFilter.FilterI
      * @exception RemoteException If remote operation failed.
      * @since 9
      */
-    @SuppressWarnings("removal")
     public static RegistryImpl createRegistry(int regPort) throws RemoteException {
-        // Create and install the security manager if one is not installed
-        // already.
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         /*
          * Fix bugid 4147561: When JDK tools are executed, the value of
          * the CLASSPATH environment variable for the shell in which they
@@ -528,19 +451,7 @@ public static RegistryImpl createRegistry(int regPort) throws RemoteException {
 
         Thread.currentThread().setContextClassLoader(cl);
 
-        RegistryImpl registryImpl = null;
-        try {
-            registryImpl = AccessController.doPrivileged(
-                new PrivilegedExceptionAction<RegistryImpl>() {
-                    public RegistryImpl run() throws RemoteException {
-                        return new RegistryImpl(regPort);
-                    }
-                }, getAccessControlContext(regPort));
-        } catch (PrivilegedActionException ex) {
-            throw (RemoteException) ex.getException();
-        }
-
-        return registryImpl;
+        return new RegistryImpl(regPort);
     }
 
     /**
@@ -574,49 +485,4 @@ public static void main(String args[])
         }
         System.exit(1);
     }
-
-    /**
-     * Generates an AccessControlContext with minimal permissions.
-     * The approach used here is taken from the similar method
-     * getAccessControlContext() in the sun.applet.AppletPanel class.
-     */
-    @SuppressWarnings("removal")
-    private static AccessControlContext getAccessControlContext(int port) {
-        // begin with permissions granted to all code in current policy
-        PermissionCollection perms = AccessController.doPrivileged(
-            new java.security.PrivilegedAction<PermissionCollection>() {
-                public PermissionCollection run() {
-                    CodeSource codesource = new CodeSource(null,
-                        (java.security.cert.Certificate[]) null);
-                    Policy p = java.security.Policy.getPolicy();
-                    if (p != null) {
-                        return p.getPermissions(codesource);
-                    } else {
-                        return new Permissions();
-                    }
-                }
-            });
-
-        /*
-         * Anyone can connect to the registry and the registry can connect
-         * to and possibly download stubs from anywhere. Downloaded stubs and
-         * related classes themselves are more tightly limited by RMI.
-         */
-        perms.add(new SocketPermission("*", "connect,accept"));
-        perms.add(new SocketPermission("localhost:"+port, "listen,accept"));
-
-        perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*"));
-        perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
-
-        perms.add(new FilePermission("<<ALL FILES>>", "read"));
-
-        /*
-         * Create an AccessControlContext that consists of a single
-         * protection domain with only the permissions calculated above.
-         */
-        ProtectionDomain pd = new ProtectionDomain(
-            new CodeSource(null,
-                (java.security.cert.Certificate[]) null), perms);
-        return new AccessControlContext(new ProtectionDomain[] { pd });
-    }
 }
diff --git a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
index 7e840a86906..438e8de766d 100644
--- a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
+++ b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,38 +25,19 @@
 
 package sun.rmi.server;
 
-import java.io.File;
-import java.io.FilePermission;
-import java.io.IOException;
-import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.net.JarURLConnection;
 import java.net.MalformedURLException;
-import java.net.SocketPermission;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.rmi.server.LogStream;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.WeakHashMap;
-import sun.reflect.misc.ReflectUtil;
 import sun.rmi.runtime.Log;
 
 /**
@@ -71,10 +52,7 @@
 public final class LoaderHandler {
 
     /** RMI class loader log level */
-    @SuppressWarnings("removal")
-    static final int logLevel = LogStream.parseLevel(
-        java.security.AccessController.doPrivileged(
-            (PrivilegedAction<String>) () -> System.getProperty("sun.rmi.loader.logLevel")));
+    static final int logLevel = LogStream.parseLevel(System.getProperty("sun.rmi.loader.logLevel"));
 
     /* loader system log */
     static final Log loaderLog =
@@ -86,9 +64,7 @@ public final class LoaderHandler {
      */
     private static String codebaseProperty = null;
     static {
-        @SuppressWarnings("removal")
-        String prop = java.security.AccessController.doPrivileged(
-            (PrivilegedAction<String>) () -> System.getProperty("java.rmi.server.codebase"));
+        String prop = System.getProperty("java.rmi.server.codebase");
         if (prop != null && prop.trim().length() > 0) {
             codebaseProperty = prop;
         }
@@ -109,19 +85,6 @@ public final class LoaderHandler {
         }
     }
 
-    /**
-     * table mapping codebase URL path and context class loader pairs
-     * to class loader instances.  Entries hold class loaders with weak
-     * references, so this table does not prevent loaders from being
-     * garbage collected.
-     */
-    private static final HashMap<LoaderKey, LoaderEntry> loaderTable
-        = new HashMap<>(5);
-
-    /** reference queue for cleared class loader entries */
-    private static final ReferenceQueue<Loader> refQueue
-        = new ReferenceQueue<>();
-
     /*
      * Disallow anyone from creating one of these.
      */
@@ -174,7 +137,7 @@ public static Class<?> loadClass(String codebase, String name,
 
         if (defaultLoader != null) {
             try {
-                Class<?> c = loadClassForName(name, false, defaultLoader);
+                Class<?> c = Class.forName(name, false, defaultLoader);
                 if (loaderLog.isLoggable(Log.VERBOSE)) {
                     loaderLog.log(Log.VERBOSE,
                         "class \"" + name + "\" found via defaultLoader, " +
@@ -231,51 +194,10 @@ public static String getClassAnnotation(Class<?> cl) {
          * such a notion (i.e., if it is a URLClassLoader or subclass).
          */
         String annotation = null;
-        if (loader instanceof Loader) {
-            /*
-             * If the class loader is one of our RMI class loaders, we have
-             * already computed the class annotation string, and no
-             * permissions are required to know the URLs.
-             */
-            annotation = ((Loader) loader).getClassAnnotation();
-
-        } else if (loader instanceof URLClassLoader) {
-            try {
-                URL[] urls = ((URLClassLoader) loader).getURLs();
-                if (urls != null) {
-                    /*
-                     * If the class loader is not one of our RMI class loaders,
-                     * we must verify that the current access control context
-                     * has permission to know all of these URLs.
-                     */
-                    @SuppressWarnings("removal")
-                    SecurityManager sm = System.getSecurityManager();
-                    if (sm != null) {
-                        Permissions perms = new Permissions();
-                        for (int i = 0; i < urls.length; i++) {
-                            Permission p =
-                                urls[i].openConnection().getPermission();
-                            if (p != null) {
-                                if (!perms.implies(p)) {
-                                    sm.checkPermission(p);
-                                    perms.add(p);
-                                }
-                            }
-                        }
-                    }
-
-                    annotation = urlsToPath(urls);
-                }
-            } catch (SecurityException | IOException e) {
-                /*
-                 * SecurityException: If access was denied to the knowledge of
-                 * the class loader's URLs, fall back to the default behavior.
-                 *
-                 * IOException: This shouldn't happen, although it is declared
-                 * to be thrown by openConnection() and getPermission().  If it
-                 * does happen, forget about this class loader's URLs and
-                 * fall back to the default behavior.
-                 */
+        if (loader instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) loader).getURLs();
+            if (urls != null) {
+                annotation = urlsToPath(urls);
             }
         }
 
@@ -287,67 +209,19 @@ public static String getClassAnnotation(Class<?> cl) {
     }
 
     /**
-     * Returns a classloader that loads classes from the given codebase URL
-     * path.  The parent classloader of the returned classloader is the
-     * context class loader.
+     * Returns the thread context classloader. The codebase argument is ignored.
      */
     public static ClassLoader getClassLoader(String codebase)
         throws MalformedURLException
     {
-        ClassLoader parent = getRMIContextClassLoader();
-
-        URL[] urls;
+        URL[] urls; // ignored, used only for URL syntax checking
         if (codebase != null) {
             urls = pathToURLs(codebase);
         } else {
             urls = getDefaultCodebaseURLs();
         }
 
-        /*
-         * If there is a security manager, the current access control
-         * context must have the "getClassLoader" RuntimePermission.
-         */
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("getClassLoader"));
-        } else {
-            /*
-             * But if no security manager is set, disable access to
-             * RMI class loaders and simply return the parent loader.
-             */
-            return parent;
-        }
-
-        Loader loader = lookupLoader(urls, parent);
-
-        /*
-         * Verify that the caller has permission to access this loader.
-         */
-        if (loader != null) {
-            loader.checkPermissions();
-        }
-
-        return loader;
-    }
-
-    /**
-     * Return the security context of the given class loader.
-     */
-    public static Object getSecurityContext(ClassLoader loader) {
-        /*
-         * REMIND: This is a bogus JDK1.1-compatible implementation.
-         * This method should never be called by application code anyway
-         * (hence the deprecation), but should it do something different
-         * and perhaps more useful, like return a String or a URL[]?
-         */
-        if (loader instanceof Loader) {
-            URL[] urls = ((Loader) loader).getURLs();
-            if (urls.length > 0) {
-                return urls[0];
-            }
-        }
-        return null;
+        return Thread.currentThread().getContextClassLoader();
     }
 
     /**
@@ -365,109 +239,37 @@ public static void registerCodebaseLoader(ClassLoader loader) {
     private static Class<?> loadClass(URL[] urls, String name)
         throws ClassNotFoundException
     {
-        ClassLoader parent = getRMIContextClassLoader();
+        ClassLoader parent = Thread.currentThread().getContextClassLoader();
         if (loaderLog.isLoggable(Log.VERBOSE)) {
             loaderLog.log(Log.VERBOSE,
                 "(thread context class loader: " + parent + ")");
         }
 
         /*
-         * If no security manager is set, disable access to RMI class
+         * There is no security manager, so disable access to RMI class
          * loaders and simply delegate request to the parent loader
          * (see bugid 4140511).
          */
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            try {
-                Class<?> c = Class.forName(name, false, parent);
-                if (loaderLog.isLoggable(Log.VERBOSE)) {
-                    loaderLog.log(Log.VERBOSE,
-                        "class \"" + name + "\" found via " +
-                        "thread context class loader " +
-                        "(no security manager: codebase disabled), " +
-                        "defined by " + c.getClassLoader());
-                }
-                return c;
-            } catch (ClassNotFoundException e) {
-                if (loaderLog.isLoggable(Log.BRIEF)) {
-                    loaderLog.log(Log.BRIEF,
-                        "class \"" + name + "\" not found via " +
-                        "thread context class loader " +
-                        "(no security manager: codebase disabled)", e);
-                }
-                throw new ClassNotFoundException(e.getMessage() +
-                    " (no security manager: RMI class loader disabled)",
-                    e.getException());
-            }
-        }
-
-        /*
-         * Get or create the RMI class loader for this codebase URL path
-         * and parent class loader pair.
-         */
-        Loader loader = lookupLoader(urls, parent);
-
         try {
-            if (loader != null) {
-                /*
-                 * Verify that the caller has permission to access this loader.
-                 */
-                loader.checkPermissions();
-            }
-        } catch (SecurityException e) {
-            /*
-             * If the current access control context does not have permission
-             * to access all of the URLs in the codebase path, wrap the
-             * resulting security exception in a ClassNotFoundException, so
-             * the caller can handle this outcome just like any other class
-             * loading failure (see bugid 4146529).
-             */
-            try {
-                /*
-                 * But first, check to see if the named class could have been
-                 * resolved without the security-offending codebase anyway;
-                 * if so, return successfully (see bugids 4191926 & 4349670).
-                 */
-                Class<?> c = loadClassForName(name, false, parent);
-                if (loaderLog.isLoggable(Log.VERBOSE)) {
-                    loaderLog.log(Log.VERBOSE,
-                        "class \"" + name + "\" found via " +
-                        "thread context class loader " +
-                        "(access to codebase denied), " +
-                        "defined by " + c.getClassLoader());
-                }
-                return c;
-            } catch (ClassNotFoundException unimportant) {
-                /*
-                 * Presumably the security exception is the more important
-                 * exception to report in this case.
-                 */
-                if (loaderLog.isLoggable(Log.BRIEF)) {
-                    loaderLog.log(Log.BRIEF,
-                        "class \"" + name + "\" not found via " +
-                        "thread context class loader " +
-                        "(access to codebase denied)", e);
-                }
-                throw new ClassNotFoundException(
-                    "access to class loader denied", e);
-            }
-        }
-
-        try {
-            Class<?> c = loadClassForName(name, false, loader);
+            Class<?> c = Class.forName(name, false, parent);
             if (loaderLog.isLoggable(Log.VERBOSE)) {
                 loaderLog.log(Log.VERBOSE,
-                    "class \"" + name + "\" " + "found via codebase, " +
+                    "class \"" + name + "\" found via " +
+                    "thread context class loader " +
+                    "(no security manager: codebase disabled), " +
                     "defined by " + c.getClassLoader());
             }
             return c;
         } catch (ClassNotFoundException e) {
             if (loaderLog.isLoggable(Log.BRIEF)) {
                 loaderLog.log(Log.BRIEF,
-                    "class \"" + name + "\" not found via codebase", e);
+                    "class \"" + name + "\" not found via " +
+                    "thread context class loader " +
+                    "(no security manager: codebase disabled)", e);
             }
-            throw e;
+            throw new ClassNotFoundException(e.getMessage() +
+                " (no security manager: RMI class loader disabled)",
+                e.getException());
         }
     }
 
@@ -522,7 +324,7 @@ public static Class<?> loadProxyClass(String codebase, String[] interfaces,
          * class loader of the non-public interfaces.  No other
          * attempt to define the proxy class will be made.
          */
-        ClassLoader parent = getRMIContextClassLoader();
+        ClassLoader parent = Thread.currentThread().getContextClassLoader();
         if (loaderLog.isLoggable(Log.VERBOSE)) {
             loaderLog.log(Log.VERBOSE,
                 "(thread context class loader: " + parent + ")");
@@ -536,96 +338,27 @@ public static Class<?> loadProxyClass(String codebase, String[] interfaces,
         }
 
         /*
-         * If no security manager is set, disable access to RMI class
-         * loaders and use the would-de parent instead.
+         * There is no security manager, so disable access to RMI class
+         * loaders and use the would-be parent instead.
          */
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            try {
-                Class<?> c = loadProxyClass(interfaces, defaultLoader, parent,
-                                         false);
-                if (loaderLog.isLoggable(Log.VERBOSE)) {
-                    loaderLog.log(Log.VERBOSE,
-                        "(no security manager: codebase disabled) " +
-                        "proxy class defined by " + c.getClassLoader());
-                }
-                return c;
-            } catch (ClassNotFoundException e) {
-                if (loaderLog.isLoggable(Log.BRIEF)) {
-                    loaderLog.log(Log.BRIEF,
-                        "(no security manager: codebase disabled) " +
-                        "proxy class resolution failed", e);
-                }
-                throw new ClassNotFoundException(e.getMessage() +
-                    " (no security manager: RMI class loader disabled)",
-                    e.getException());
-            }
-        }
-
-        /*
-         * Get or create the RMI class loader for this codebase URL path
-         * and parent class loader pair.
-         */
-        Loader loader = lookupLoader(urls, parent);
-
-        try {
-            if (loader != null) {
-                /*
-                 * Verify that the caller has permission to access this loader.
-                 */
-                loader.checkPermissions();
-            }
-        } catch (SecurityException e) {
-            /*
-             * If the current access control context does not have permission
-             * to access all of the URLs in the codebase path, wrap the
-             * resulting security exception in a ClassNotFoundException, so
-             * the caller can handle this outcome just like any other class
-             * loading failure (see bugid 4146529).
-             */
-            try {
-                /*
-                 * But first, check to see if the proxy class could have been
-                 * resolved without the security-offending codebase anyway;
-                 * if so, return successfully (see bugids 4191926 & 4349670).
-                 */
-                Class<?> c = loadProxyClass(interfaces, defaultLoader, parent,
-                                            false);
-                if (loaderLog.isLoggable(Log.VERBOSE)) {
-                    loaderLog.log(Log.VERBOSE,
-                        "(access to codebase denied) " +
-                        "proxy class defined by " + c.getClassLoader());
-                }
-                return c;
-            } catch (ClassNotFoundException unimportant) {
-                /*
-                 * Presumably the security exception is the more important
-                 * exception to report in this case.
-                 */
-                if (loaderLog.isLoggable(Log.BRIEF)) {
-                    loaderLog.log(Log.BRIEF,
-                        "(access to codebase denied) " +
-                        "proxy class resolution failed", e);
-                }
-                throw new ClassNotFoundException(
-                    "access to class loader denied", e);
-            }
-        }
-
         try {
-            Class<?> c = loadProxyClass(interfaces, defaultLoader, loader, true);
+            Class<?> c = loadProxyClass(interfaces, defaultLoader, parent,
+                                     false);
             if (loaderLog.isLoggable(Log.VERBOSE)) {
                 loaderLog.log(Log.VERBOSE,
-                              "proxy class defined by " + c.getClassLoader());
+                    "(no security manager: codebase disabled) " +
+                    "proxy class defined by " + c.getClassLoader());
             }
             return c;
         } catch (ClassNotFoundException e) {
             if (loaderLog.isLoggable(Log.BRIEF)) {
                 loaderLog.log(Log.BRIEF,
-                              "proxy class resolution failed", e);
+                    "(no security manager: codebase disabled) " +
+                    "proxy class resolution failed", e);
             }
-            throw e;
+            throw new ClassNotFoundException(e.getMessage() +
+                " (no security manager: RMI class loader disabled)",
+                e.getException());
         }
     }
 
@@ -734,7 +467,7 @@ private static ClassLoader loadProxyInterfaces(String[] interfaces,
 
         for (int i = 0; i < interfaces.length; i++) {
             Class<?> cl =
-                (classObjs[i] = loadClassForName(interfaces[i], false, loader));
+                (classObjs[i] = Class.forName(interfaces[i], false, loader));
 
             if (!Modifier.isPublic(cl.getModifiers())) {
                 ClassLoader current = cl.getClassLoader();
@@ -809,427 +542,4 @@ private static String urlsToPath(URL[] urls) {
             return path.toString();
         }
     }
-
-    /**
-     * Return the class loader to be used as the parent for an RMI class
-     * loader used in the current execution context.
-     */
-    private static ClassLoader getRMIContextClassLoader() {
-        /*
-         * The current implementation simply uses the current thread's
-         * context class loader.
-         */
-        return Thread.currentThread().getContextClassLoader();
-    }
-
-    /**
-     * Look up the RMI class loader for the given codebase URL path
-     * and the given parent class loader.  A new class loader instance
-     * will be created and returned if no match is found.
-     */
-    @SuppressWarnings("removal")
-    private static Loader lookupLoader(final URL[] urls,
-                                       final ClassLoader parent)
-    {
-        /*
-         * If the requested codebase URL path is empty, the supplied
-         * parent class loader will be sufficient.
-         *
-         * REMIND: To be conservative, this optimization is commented out
-         * for now so that it does not open a security hole in the future
-         * by providing untrusted code with direct access to the public
-         * loadClass() method of a class loader instance that it cannot
-         * get a reference to.  (It's an unlikely optimization anyway.)
-         *
-         * if (urls.length == 0) {
-         *     return parent;
-         * }
-         */
-
-        LoaderEntry entry;
-        Loader loader;
-
-        synchronized (LoaderHandler.class) {
-            /*
-             * Take this opportunity to remove from the table entries
-             * whose weak references have been cleared.
-             */
-            while ((entry = (LoaderEntry) refQueue.poll()) != null) {
-                if (!entry.removed) {   // ignore entries removed below
-                    loaderTable.remove(entry.key);
-                }
-            }
-
-            /*
-             * Look up the codebase URL path and parent class loader pair
-             * in the table of RMI class loaders.
-             */
-            LoaderKey key = new LoaderKey(urls, parent);
-            entry = loaderTable.get(key);
-
-            if (entry == null || (loader = entry.get()) == null) {
-                /*
-                 * If entry was in table but it's weak reference was cleared,
-                 * remove it from the table and mark it as explicitly cleared,
-                 * so that new matching entry that we put in the table will
-                 * not be erroneously removed when this entry is processed
-                 * from the weak reference queue.
-                 */
-                if (entry != null) {
-                    loaderTable.remove(key);
-                    entry.removed = true;
-                }
-
-                /*
-                 * A matching loader was not found, so create a new class
-                 * loader instance for the requested codebase URL path and
-                 * parent class loader.  The instance is created within an
-                 * access control context restricted to the permissions
-                 * necessary to load classes from its codebase URL path.
-                 */
-                AccessControlContext acc = getLoaderAccessControlContext(urls);
-                loader = java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedAction<Loader>() {
-                        public Loader run() {
-                            return new Loader(urls, parent);
-                        }
-                    }, acc);
-
-                /*
-                 * Finally, create an entry to hold the new loader with a
-                 * weak reference and store it in the table with the key.
-                 */
-                entry = new LoaderEntry(key, loader);
-                loaderTable.put(key, entry);
-            }
-        }
-
-        return loader;
-    }
-
-    /**
-     * LoaderKey holds a codebase URL path and parent class loader pair
-     * used to look up RMI class loader instances in its class loader cache.
-     */
-    private static class LoaderKey {
-
-        private URL[] urls;
-
-        private ClassLoader parent;
-
-        private int hashValue;
-
-        public LoaderKey(URL[] urls, ClassLoader parent) {
-            this.urls = urls;
-            this.parent = parent;
-
-            if (parent != null) {
-                hashValue = parent.hashCode();
-            }
-            for (int i = 0; i < urls.length; i++) {
-                hashValue ^= urls[i].hashCode();
-            }
-        }
-
-        public int hashCode() {
-            return hashValue;
-        }
-
-        public boolean equals(Object obj) {
-            if (obj instanceof LoaderKey) {
-                LoaderKey other = (LoaderKey) obj;
-                if (parent != other.parent) {
-                    return false;
-                }
-                if (urls == other.urls) {
-                    return true;
-                }
-                if (urls.length != other.urls.length) {
-                    return false;
-                }
-                for (int i = 0; i < urls.length; i++) {
-                    if (!urls[i].equals(other.urls[i])) {
-                        return false;
-                    }
-                }
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * LoaderEntry contains a weak reference to an RMIClassLoader.  The
-     * weak reference is registered with the private static "refQueue"
-     * queue.  The entry contains the codebase URL path and parent class
-     * loader key for the loader so that the mapping can be removed from
-     * the table efficiently when the weak reference is cleared.
-     */
-    private static class LoaderEntry extends WeakReference<Loader> {
-
-        public LoaderKey key;
-
-        /**
-         * set to true if the entry has been removed from the table
-         * because it has been replaced, so it should not be attempted
-         * to be removed again
-         */
-        public boolean removed = false;
-
-        public LoaderEntry(LoaderKey key, Loader loader) {
-            super(loader, refQueue);
-            this.key = key;
-        }
-    }
-
-    /**
-     * Return the access control context that a loader for the given
-     * codebase URL path should execute with.
-     */
-    @SuppressWarnings("removal")
-    private static AccessControlContext getLoaderAccessControlContext(
-        URL[] urls)
-    {
-        /*
-         * The approach used here is taken from the similar method
-         * getAccessControlContext() in the sun.applet.AppletPanel class.
-         */
-        // begin with permissions granted to all code in current policy
-        PermissionCollection perms =
-            java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<PermissionCollection>() {
-                public PermissionCollection run() {
-                    CodeSource codesource = new CodeSource(null,
-                        (java.security.cert.Certificate[]) null);
-                    Policy p = java.security.Policy.getPolicy();
-                    if (p != null) {
-                        return p.getPermissions(codesource);
-                    } else {
-                        return new Permissions();
-                    }
-                }
-            });
-
-        // createClassLoader permission needed to create loader in context
-        perms.add(new RuntimePermission("createClassLoader"));
-
-        // add permissions to read any "java.*" property
-        perms.add(new java.util.PropertyPermission("java.*","read"));
-
-        // add permissions reuiqred to load from codebase URL path
-        addPermissionsForURLs(urls, perms, true);
-
-        /*
-         * Create an AccessControlContext that consists of a single
-         * protection domain with only the permissions calculated above.
-         */
-        ProtectionDomain pd = new ProtectionDomain(
-            new CodeSource((urls.length > 0 ? urls[0] : null),
-                (java.security.cert.Certificate[]) null),
-            perms);
-        return new AccessControlContext(new ProtectionDomain[] { pd });
-    }
-
-    /**
-     * Adds to the specified permission collection the permissions
-     * necessary to load classes from a loader with the specified URL
-     * path; if "forLoader" is true, also adds URL-specific
-     * permissions necessary for the security context that such a
-     * loader operates within, such as permissions necessary for
-     * granting automatic permissions to classes defined by the
-     * loader.  A given permission is only added to the collection if
-     * it is not already implied by the collection.
-     */
-    private static void addPermissionsForURLs(URL[] urls,
-                                             PermissionCollection perms,
-                                             boolean forLoader)
-    {
-        for (int i = 0; i < urls.length; i++) {
-            URL url = urls[i];
-            try {
-                URLConnection urlConnection = url.openConnection();
-                Permission p = urlConnection.getPermission();
-                if (p != null) {
-                    if (p instanceof FilePermission) {
-                        /*
-                         * If the codebase is a file, the permission required
-                         * to actually read classes from the codebase URL is
-                         * the permission to read all files beneath the last
-                         * directory in the file path, either because JAR
-                         * files can refer to other JAR files in the same
-                         * directory, or because permission to read a
-                         * directory is not implied by permission to read the
-                         * contents of a directory, which all that might be
-                         * granted.
-                         */
-                        String path = p.getName();
-                        int endIndex = path.lastIndexOf(File.separatorChar);
-                        if (endIndex != -1) {
-                            path = path.substring(0, endIndex+1);
-                            if (path.endsWith(File.separator)) {
-                                path += "-";
-                            }
-                            Permission p2 = new FilePermission(path, "read");
-                            if (!perms.implies(p2)) {
-                                perms.add(p2);
-                            }
-                            perms.add(new FilePermission(path, "read"));
-                        } else {
-                            /*
-                             * No directory separator: use permission to
-                             * read the file.
-                             */
-                            if (!perms.implies(p)) {
-                                perms.add(p);
-                            }
-                        }
-                    } else {
-                        if (!perms.implies(p)) {
-                            perms.add(p);
-                        }
-
-                        /*
-                         * If the purpose of these permissions is to grant
-                         * them to an instance of a URLClassLoader subclass,
-                         * we must add permission to connect to and accept
-                         * from the host of non-"file:" URLs, otherwise the
-                         * getPermissions() method of URLClassLoader will
-                         * throw a security exception.
-                         */
-                        if (forLoader) {
-                            // get URL with meaningful host component
-                            URL hostURL = url;
-                            for (URLConnection conn = urlConnection;
-                                 conn instanceof JarURLConnection;)
-                            {
-                                hostURL =
-                                    ((JarURLConnection) conn).getJarFileURL();
-                                conn = hostURL.openConnection();
-                            }
-                            String host = hostURL.getHost();
-                            if (host != null &&
-                                p.implies(new SocketPermission(host,
-                                                               "resolve")))
-                            {
-                                Permission p2 =
-                                    new SocketPermission(host,
-                                                         "connect,accept");
-                                if (!perms.implies(p2)) {
-                                    perms.add(p2);
-                                }
-                            }
-                        }
-                    }
-                }
-            } catch (IOException e) {
-                /*
-                 * This shouldn't happen, although it is declared to be
-                 * thrown by openConnection() and getPermission().  If it
-                 * does, don't bother granting or requiring any permissions
-                 * for this URL.
-                 */
-            }
-        }
-    }
-
-    /**
-     * Loader is the actual class of the RMI class loaders created
-     * by the RMIClassLoader static methods.
-     */
-    private static class Loader extends URLClassLoader {
-
-        /** parent class loader, kept here as an optimization */
-        private ClassLoader parent;
-
-        /** string form of loader's codebase URL path, also an optimization */
-        private String annotation;
-
-        /** permissions required to access loader through public API */
-        private Permissions permissions;
-
-        private Loader(URL[] urls, ClassLoader parent) {
-            super(urls, parent);
-            this.parent = parent;
-
-            /*
-             * Precompute the permissions required to access the loader.
-             */
-            permissions = new Permissions();
-            addPermissionsForURLs(urls, permissions, false);
-
-            /*
-             * Caching the value of class annotation string here assumes
-             * that the protected method addURL() is never called on this
-             * class loader.
-             */
-            annotation = urlsToPath(urls);
-        }
-
-        /**
-         * Return the string to be annotated with all classes loaded from
-         * this class loader.
-         */
-        public String getClassAnnotation() {
-            return annotation;
-        }
-
-        /**
-         * Check that the current access control context has all of the
-         * permissions necessary to load classes from this loader.
-         */
-        private void checkPermissions() {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {           // should never be null?
-                Enumeration<Permission> enum_ = permissions.elements();
-                while (enum_.hasMoreElements()) {
-                    sm.checkPermission(enum_.nextElement());
-                }
-            }
-        }
-
-        /**
-         * Return the permissions to be granted to code loaded from the
-         * given code source.
-         */
-        protected PermissionCollection getPermissions(CodeSource codesource) {
-            PermissionCollection perms = super.getPermissions(codesource);
-            /*
-             * Grant the same permissions that URLClassLoader would grant.
-             */
-            return perms;
-        }
-
-        /**
-         * Return a string representation of this loader (useful for
-         * debugging).
-         */
-        public String toString() {
-            return super.toString() + "[\"" + annotation + "\"]";
-        }
-
-        @Override
-        protected Class<?> loadClass(String name, boolean resolve)
-                throws ClassNotFoundException {
-            if (parent == null) {
-                ReflectUtil.checkPackageAccess(name);
-            }
-            return super.loadClass(name, resolve);
-        }
-
-
-    }
-
-    private static Class<?> loadClassForName(String name,
-                                              boolean initialize,
-                                              ClassLoader loader)
-            throws ClassNotFoundException
-    {
-        if (loader == null) {
-            ReflectUtil.checkPackageAccess(name);
-        }
-        return Class.forName(name, initialize, loader);
-    }
-
 }
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
index 6ed86a74182..b2a14bf6164 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * This class is used to restrict the usage of the Kerberos
- * delegation model, ie: forwardable and proxiable tickets.
+ * This class is for Kerberos delegation permissions.
  * <p>
  * The target name of this {@code Permission} specifies a pair of
  * kerberos service principals. The first is the subordinate service principal
@@ -43,20 +42,10 @@
  * interact with on behalf of the initiating KerberosPrincipal. This
  * latter service principal is specified to restrict the use of a
  * proxiable ticket.
- * <p>
- * For example, to specify the "host" service use of a forwardable TGT the
- * target permission is specified as follows:
- *
- * <pre>
- *  DelegationPermission("\"host/foo.example.com@EXAMPLE.COM\" \"krbtgt/EXAMPLE.COM@EXAMPLE.COM\"");
- * </pre>
- * <p>
- * To give the "backup" service a proxiable nfs service ticket the target permission
- * might be specified:
  *
- * <pre>
- *  DelegationPermission("\"backup/bar.example.com@EXAMPLE.COM\" \"nfs/home.EXAMPLE.COM@EXAMPLE.COM\"");
- * </pre>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.4
  */
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java
index 71aaddda9de..d49446a5163 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java
@@ -61,15 +61,6 @@
  * A Kerberos service using a keytab to read secret keys should use
  * the {@link KeyTab} class, where latest keys can be read when needed.<p>
  *
- * It might be necessary for the application to be granted a
- * {@link javax.security.auth.PrivateCredentialPermission
- * PrivateCredentialPermission} if it needs to access the {@code KerberosKey}
- * instance from a Subject. This permission is not needed when the
- * application depends on the default JGSS Kerberos mechanism to access the
- * {@code KerberosKey}. In that case, however, the application will need an
- * appropriate
- * {@link javax.security.auth.kerberos.ServicePermission ServicePermission}.<p>
- *
  * When creating a {@code KerberosKey} using the
  * {@link #KerberosKey(KerberosPrincipal, char[], String)} constructor,
  * an implementation may accept non-IANA algorithm names (For example,
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
index e6df67ff1f4..9a59428f62e 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,24 +119,12 @@ public final class KerberosPrincipal
      * or change the default realm by setting the java.security.krb5.realm
      * system property may be ignored.
      *
-     * <p>Additionally, if a security manager is
-     * installed, a {@link ServicePermission} must be granted and the service
-     * principal of the permission must minimally be inside the
-     * {@code KerberosPrincipal}'s realm. For example, if the result of
-     * {@code new KerberosPrincipal("user")} is {@code user@EXAMPLE.COM},
-     * then a {@code ServicePermission} with service principal
-     * {@code host/www.example.com@EXAMPLE.COM} (and any action)
-     * must be granted.
-     *
      * @param name the principal name
      * @throws IllegalArgumentException if name is improperly
      * formatted, if name is null, or if name does not contain
      * the realm to use and the default realm is not specified
      * in either a Kerberos configuration file or via the
      * java.security.krb5.realm system property.
-     * @throws SecurityException if a security manager is installed and
-     * {@code name} does not contain the realm to use, and a proper
-     * {@link ServicePermission} as described above is not granted.
      */
     public KerberosPrincipal(String name) {
         this(name, KRB_NT_PRINCIPAL);
@@ -168,15 +156,6 @@ public KerberosPrincipal(String name) {
      * or change the default realm by setting the java.security.krb5.realm
      * system property may be ignored.
      *
-     * <p>Additionally, if a security manager is
-     * installed, a {@link ServicePermission} must be granted and the service
-     * principal of the permission must minimally be inside the
-     * {@code KerberosPrincipal}'s realm. For example, if the result of
-     * {@code new KerberosPrincipal("user")} is {@code user@EXAMPLE.COM},
-     * then a {@code ServicePermission} with service principal
-     * {@code host/www.example.com@EXAMPLE.COM} (and any action)
-     * must be granted.
-     *
      * @param name the principal name
      * @param nameType the name type of the principal
      * @throws IllegalArgumentException if name is improperly
@@ -184,9 +163,6 @@ public KerberosPrincipal(String name) {
      * or if name does not contain the realm to use and the default
      * realm is not specified in either a Kerberos configuration
      * file or via the java.security.krb5.realm system property.
-     * @throws SecurityException if a security manager is installed and
-     * {@code name} does not contain the realm to use, and a proper
-     * {@link ServicePermission} as described above is not granted.
      */
 
     public KerberosPrincipal(String name, int nameType) {
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java
index d661df6f016..d82337c3e2e 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,16 +52,7 @@
  * directly communicating with the KDC. During the commit phase of the JAAS
  * authentication process, the JAAS login module should instantiate this
  * class and store the instance in the private credential set of a
- * {@link javax.security.auth.Subject Subject}.<p>
- *
- * It might be necessary for the application to be granted a
- * {@link javax.security.auth.PrivateCredentialPermission
- * PrivateCredentialPermission} if it needs to access a {@code KerberosTicket}
- * instance from a {@code Subject}. This permission is not needed when the
- * application depends on the default JGSS Kerberos mechanism to access the
- * {@code KerberosTicket}. In that case, however, the application will need an
- * appropriate
- * {@link javax.security.auth.kerberos.ServicePermission ServicePermission}.
+ * {@link javax.security.auth.Subject Subject}.
  * <p>
  * Note that this class is applicable to both ticket granting tickets and
  * other regular service tickets. A ticket granting ticket is just a
@@ -71,7 +62,6 @@
  * all tickets after logout.
  *
  * @see javax.security.auth.Subject
- * @see javax.security.auth.PrivateCredentialPermission
  * @see javax.security.auth.login.LoginContext
  * @see org.ietf.jgss.GSSCredential
  * @see org.ietf.jgss.GSSManager
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java
index 5ece73a5a58..b58029ed0af 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,14 +56,6 @@
  * unknown principal, which means, its {@link #isBound()} returns true and
  * {@link #getPrincipal()} returns null.
  * <p>
- * It might be necessary for the application to be granted a
- * {@link javax.security.auth.PrivateCredentialPermission
- * PrivateCredentialPermission} if it needs to access the {@code KeyTab}
- * instance from a {@code Subject}. This permission is not needed when the
- * application depends on the default JGSS Kerberos mechanism to access the
- * {@code KeyTab}. In that case, however, the application will need an appropriate
- * {@link javax.security.auth.kerberos.ServicePermission ServicePermission}.
- * <p>
  * The keytab file format is described at
  * <a href="http://www.ioplex.com/utilities/keytab.txt">
  * http://www.ioplex.com/utilities/keytab.txt</a>.
@@ -272,8 +264,6 @@ sun.security.krb5.internal.ktab.KeyTab takeSnapshot() {
      * @return the keys (never null, may be empty)
      * @throws NullPointerException if the {@code principal}
      * argument is null
-     * @throws SecurityException if a security manager exists and the read
-     * access to the keytab file is not permitted
      */
     public KerberosKey[] getKeys(KerberosPrincipal principal) {
         try {
@@ -308,8 +298,6 @@ EncryptionKey[] getEncryptionKeys(PrincipalName principal) {
      * keytab file.
      *
      * @return true if the keytab file exists; false otherwise.
-     * @throws SecurityException if a security manager exists and the read
-     * access to the keytab file is not permitted
      */
     public boolean exists() {
         return !takeSnapshot().isMissing();
diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java
index d30b6c292f8..df45b4c72da 100644
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java
@@ -32,17 +32,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * This class is used to protect Kerberos services and the
- * credentials necessary to access those services. There is a one to
- * one mapping of a service principal and the credentials necessary
- * to access the service. Therefore, granting access to a service
- * principal implicitly grants access to the credential necessary to
- * establish a security context with the service principal. This
- * applies regardless of whether the credentials are in a cache
- * or acquired via an exchange with the KDC. The credential can
- * be either a ticket granting ticket, a service ticket or a secret
- * key from a key table.
- * <p>
  * A ServicePermission contains a service principal name and
  * a list of actions which specify the context the credential can be
  * used within.
@@ -53,16 +42,6 @@
  * principal. This name is treated in a case sensitive manner.
  * An asterisk may appear by itself, to signify any service principal.
  * <p>
- * Granting this permission implies that the caller can use a cached
- * credential (TGT, service ticket or secret key) within the context
- * designated by the action. In the case of the TGT, granting this
- * permission also implies that the TGT can be obtained by an
- * Authentication Service exchange.
- * <p>
- * Granting this permission also implies creating {@link KerberosPrincipal}
- * or {@link org.ietf.jgss.GSSName GSSName} without providing a Kerberos
- * realm, as long as the permission's service principal is in this realm.
- * <p>
  * The possible actions are:
  *
  * <pre>
@@ -75,26 +54,9 @@
  *                            principal.
  * </pre>
  *
- * For example, to specify the permission to access to the TGT to
- * initiate a security context the permission is constructed as follows:
- *
- * <pre>
- *     ServicePermission("krbtgt/EXAMPLE.COM@EXAMPLE.COM", "initiate");
- * </pre>
- * <p>
- * To obtain a service ticket to initiate a context with the "host"
- * service the permission is constructed as follows:
- * <pre>
- *     ServicePermission("host/foo.example.com@EXAMPLE.COM", "initiate");
- * </pre>
- * <p>
- * For a Kerberized server the action is "accept". For example, the permission
- * necessary to access and use the secret key of the  Kerberized "host"
- * service (telnet and the likes)  would be constructed as follows:
- *
- * <pre>
- *     ServicePermission("host/foo.example.com@EXAMPLE.COM", "accept");
- * </pre>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.4
  */
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
index d229635820a..deed9dfae71 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,11 +94,6 @@
  * <code>GSSContext</code> among several threads unless some application
  * level synchronization is in place.<p>
  *
- * Finally, different mechanism providers might place different security
- * restrictions on using GSS-API contexts. These will be documented by the
- * mechanism provider. The application will need to ensure that it has the
- * appropriate permissions if such checks are made in the mechanism layer.<p>
- *
  * The stream-based methods of {@code GSSContext} have been deprecated in
  * Java SE 11. These methods have also been removed from
  * <a href="https://tools.ietf.org/html/rfc8353">
@@ -244,12 +239,7 @@ public interface GSSContext {
      * return a token for the peer, and <code>isEstablished</code> return
      * <code>true</code> also. This indicates that the token needs to be sent
      * to the peer, but the local end of the context is now fully
-     * established.<p>
-     *
-     * Some mechanism providers might require that the caller be granted
-     * permission to initiate a security context. A failed permission check
-     * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.
+     * established.
      *
      * @return a byte[] containing the token to be sent to the
      * peer. <code>null</code> indicates that no token is generated.
@@ -310,11 +300,6 @@ byte[] initSecContext(byte inputBuf[], int offset, int len)
      * byte array based {@link #initSecContext(byte[], int, int)
      * initSecContext}.<p>
      *
-     * Some mechanism providers might require that the caller be granted
-     * permission to initiate a security context. A failed permission check
-     * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.<p>
-     *
      * The following example code demonstrates how this method might be
      * used:
      * <pre>
@@ -383,11 +368,6 @@ int initSecContext(InputStream inStream,
      * sent to the peer, but the local end of the context is now fully
      * established.<p>
      *
-     * Some mechanism providers might require that the caller be granted
-     * permission to accept a security context. A failed permission check
-     * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.<p>
-     *
      * The following example code demonstrates how this method might be
      * used:
      * <pre>
@@ -460,11 +440,6 @@ byte[] acceptSecContext(byte inToken[], int offset, int len)
      * array based {@link #acceptSecContext(byte[], int, int)
      * acceptSecContext}.<p>
      *
-     * Some mechanism providers might require that the caller be granted
-     * permission to accept a security context. A failed permission check
-     * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.<p>
-     *
      * The following example code demonstrates how this method might be
      * used:
      * <pre>
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
index 8294cdb84e4..394c695c1bd 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -345,15 +345,7 @@ public abstract GSSName createName(byte[] name, Oid nameType, Oid mech)
     /**
      * Factory method for acquiring default credentials.  This will cause
      * the GSS-API to use system specific defaults for the set of mechanisms,
-     * name, and lifetime.<p>
-     *
-     * GSS-API mechanism providers must impose a local access-control
-     * policy on callers to prevent unauthorized callers from acquiring
-     * credentials to which they are not entitled. The kinds of permissions
-     * needed by different mechanism providers will be documented on a
-     * per-mechanism basis. A failed permission check might cause a {@link
-     * java.lang.SecurityException SecurityException} to be thrown from
-     * this method.
+     * name, and lifetime.
      *
      * @param usage The intended usage for this credential object. The value
      * of this parameter must be one of:
@@ -381,14 +373,6 @@ public abstract GSSCredential createCredential (int usage)
     /**
      * Factory method for acquiring a single mechanism credential.<p>
      *
-     * GSS-API mechanism providers must impose a local access-control
-     * policy on callers to prevent unauthorized callers from acquiring
-     * credentials to which they are not entitled. The kinds of permissions
-     * needed by different mechanism providers will be documented on a
-     * per-mechanism basis. A failed permission check might cause a {@link
-     * java.lang.SecurityException SecurityException} to be thrown from
-     * this method. <p>
-     *
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanisms, thus applications should be prepared to call
      * {@link GSSCredential#getRemainingLifetime() getRemainingLifetime}
@@ -436,14 +420,6 @@ public abstract GSSCredential createCredential (GSSName name,
      * credentials succeeded, the caller should use the {@link
      * GSSCredential#getMechs() GSSCredential.getMechs} method.<p>
      *
-     * GSS-API mechanism providers must impose a local access-control
-     * policy on callers to prevent unauthorized callers from acquiring
-     * credentials to which they are not entitled. The kinds of permissions
-     * needed by different mechanism providers will be documented on a
-     * per-mechanism basis. A failed permission check might cause a {@link
-     * java.lang.SecurityException SecurityException} to be thrown from
-     * this method.<p>
-     *
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanisms, thus applications should be prepared to call
      * {@link GSSCredential#getRemainingLifetime() getRemainingLifetime}
@@ -487,12 +463,7 @@ public abstract GSSCredential createCredential(GSSName name,
 
     /**
      * Factory method for creating a context on the initiator's
-     * side.
-     *
-     * Some mechanism providers might require that the caller be granted
-     * permission to initiate a security context. A failed permission check
-     * might cause a {@link java.lang.SecurityException SecurityException}
-     * to be thrown from this method.<p>
+     * side.<p>
      *
      * Non-default values for lifetime cannot always be honored by the
      * underlying mechanism, thus applications should be prepared to call
@@ -532,11 +503,6 @@ public abstract GSSContext createContext(GSSName peer, Oid mech,
     * context's properties will be determined from the input token supplied
     * to the accept method.
     *
-    * Some mechanism providers might require that the caller be granted
-    * permission to accept a security context. A failed permission check
-    * might cause a {@link java.lang.SecurityException SecurityException}
-    * to be thrown from this method.
-    *
     * @param myCred the credentials for the acceptor.  Use
     * <code>null</code> to act as a default acceptor principal.
     * @return an unestablished GSSContext
@@ -567,11 +533,6 @@ public abstract GSSContext createContext(GSSCredential myCred)
      * <code>GSSException</code> with the error
      * code {@link GSSException#UNAVAILABLE GSSException.UNAVAILABLE}.
      *
-     * Some mechanism providers might require that the caller be granted
-     * permission to initiate or accept a security context. A failed
-     * permission check might cause a {@link java.lang.SecurityException
-     * SecurityException} to be thrown from this method.
-     *
      * @param interProcessToken the token previously emitted from the
      * export method.
      * @return the previously established GSSContext
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java
index 7248a122eb4..b0fd4181047 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,17 +81,6 @@
  *                      GSSName.NT_EXPORT_NAME);
  *
  * </pre>
- * If a security manager is installed, in order to create a {@code GSSName}
- * that contains a Kerberos name element without providing its realm,
- * a {@link javax.security.auth.kerberos.ServicePermission ServicePermission}
- * must be granted and the service principal of the permission must minimally
- * be inside the Kerberos name element's realm. For example, if the result of
- * {@link GSSManager#createName(String, Oid) createName("user", NT_USER_NAME)}
- * contains a Kerberos name element {@code user@EXAMPLE.COM}, then
- * a {@code ServicePermission} with service principal
- * {@code host/www.example.com@EXAMPLE.COM} (and any action) must be granted.
- * Otherwise, the creation will throw a {@link GSSException} containing the
- * {@code GSSException.FAILURE} error code.
  *
  * @see #export()
  * @see #equals(GSSName)
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java b/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java
index 12cd0debefd..af8b1569965 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
  *
  * This model has the advantage that credential management
  * is simple and predictable from the applications point of view.  An
- * application, given the right permissions, can purge the credentials in
+ * application can purge the credentials in
  * the Subject or renew them using standard Java API's.  If it purged
  * the credentials, it would be sure that the JGSS mechanism would fail,
  * or if it renewed a time based credential it would be sure that a JGSS
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
index f44c3468dfe..00284c5ce51 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,13 +123,6 @@ public Object getObject() throws SerialException {
      * @return an array of <code>Field</code> objects
      * @throws SerialException if an error is encountered accessing
      * the serialized object
-     * @throws  SecurityException  If a security manager, <i>s</i>, is present
-     * and the caller's class loader is not the same as or an
-     * ancestor of the class loader for the class of the
-     * {@linkplain #getObject object} being serialized
-     * and invocation of {@link SecurityManager#checkPackageAccess
-     * s.checkPackageAccess()} denies access to the package
-     * of that class.
      * @see Class#getFields
      */
     @CallerSensitive
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 8a71a29e8a6..90dea7760fb 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -620,20 +620,9 @@ public static Enumeration<SyncProvider> getRegisteredProviders()
      * <code>SyncProvider</code> implementations can log their events to
      * this object and the application can retrieve a handle to this
      * object using the <code>getLogger</code> method.
-     * <p>
-     * This method checks to see that there is an {@code SQLPermission}
-     * object  which grants the permission {@code setSyncFactory}
-     * before allowing the method to succeed.  If a
-     * {@code SecurityManager} exists and its
-     * {@code checkPermission} method denies calling {@code setLogger},
-     * this method throws a
-     * {@code java.lang.SecurityException}.
      *
      * @param logger A Logger object instance
-     * @throws java.lang.SecurityException if a security manager exists and its
-     *   {@code checkPermission} method denies calling {@code setLogger}
      * @throws NullPointerException if the logger is null
-     * @see SecurityManager#checkPermission
      */
     public static void setLogger(Logger logger) {
 
@@ -655,23 +644,11 @@ public static void setLogger(Logger logger) {
      * <code>SyncProvider</code> implementations can log their events
      * to this object and the application can retrieve a handle to this
      * object using the <code>getLogger</code> method.
-     * <p>
-     * This method checks to see that there is an {@code SQLPermission}
-     * object  which grants the permission {@code setSyncFactory}
-     * before allowing the method to succeed.  If a
-     * {@code SecurityManager} exists and its
-     * {@code checkPermission} method denies calling {@code setLogger},
-     * this method throws a
-     * {@code java.lang.SecurityException}.
      *
      * @param logger a Logger object instance
      * @param level a Level object instance indicating the degree of logging
      * required
-     * @throws java.lang.SecurityException if a security manager exists and its
-     *   {@code checkPermission} method denies calling {@code setLogger}
      * @throws NullPointerException if the logger is null
-     * @see SecurityManager#checkPermission
-     * @see LoggingPermission
      */
     public static void setLogger(Logger logger, Level level) {
         // singleton
@@ -709,20 +686,9 @@ public static Logger getLogger() throws SyncFactoryException {
     /**
      * Sets the initial JNDI context from which SyncProvider implementations
      * can be retrieved from a JNDI namespace
-     * <p>
-     *  This method checks to see that there is an {@code SQLPermission}
-     * object  which grants the permission {@code setSyncFactory}
-     * before allowing the method to succeed.  If a
-     * {@code SecurityManager} exists and its
-     * {@code checkPermission} method denies calling {@code setJNDIContext},
-     * this method throws a
-     * {@code java.lang.SecurityException}.
      *
      * @param ctx a valid JNDI context
      * @throws SyncFactoryException if the supplied JNDI context is null
-     * @throws java.lang.SecurityException if a security manager exists and its
-     *  {@code checkPermission} method denies calling {@code setJNDIContext}
-     * @see SecurityManager#checkPermission
      */
     public static synchronized void setJNDIContext(javax.naming.Context ctx)
             throws SyncFactoryException {
diff --git a/src/java.sql/share/classes/java/sql/Connection.java b/src/java.sql/share/classes/java/sql/Connection.java
index f2d1d48f6d3..f1de63bd51b 100644
--- a/src/java.sql/share/classes/java/sql/Connection.java
+++ b/src/java.sql/share/classes/java/sql/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1354,20 +1354,10 @@ Struct createStruct(String typeName, Object[] attributes)
      * {@code abort} method returns, the connection will have been marked as
      * closed and the {@code Executor} that was passed as a parameter to abort
      * may still be executing tasks to release resources.
-     * <p>
-     * This method checks to see that there is an {@code SQLPermission}
-     * object before allowing the method to proceed.  If a
-     * {@code SecurityManager} exists and its
-     * {@code checkPermission} method denies calling {@code abort},
-     * this method throws a
-     * {@code java.lang.SecurityException}.
      * @param executor  The {@code Executor}  implementation which will
      * be used by {@code abort}.
      * @throws java.sql.SQLException if a database access error occurs or
-     * the {@code executor} is {@code null},
-     * @throws java.lang.SecurityException if a security manager exists and its
-     *    {@code checkPermission} method denies calling {@code abort}
-     * @see SecurityManager#checkPermission
+     * the {@code executor} is {@code null}
      * @see Executor
      * @since 1.7
      */
@@ -1429,14 +1419,6 @@ Struct createStruct(String typeName, Object[] attributes)
      * When the driver determines that the {@code setNetworkTimeout} timeout
      * value has expired, the JDBC driver marks the connection
      * closed and releases any resources held by the connection.
-     * <p>
-     *
-     * This method checks to see that there is an {@code SQLPermission}
-     * object before allowing the method to proceed.  If a
-     * {@code SecurityManager} exists and its
-     * {@code checkPermission} method denies calling
-     * {@code setNetworkTimeout}, this method throws a
-     * {@code java.lang.SecurityException}.
      *
      * @param executor  The {@code Executor}  implementation which will
      * be used by {@code setNetworkTimeout}.
@@ -1451,12 +1433,8 @@ Struct createStruct(String typeName, Object[] attributes)
      * method is called on a closed connection,
      * the {@code executor} is {@code null},
      * or the value specified for {@code seconds} is less than 0.
-     * @throws java.lang.SecurityException if a security manager exists and its
-     *    {@code checkPermission} method denies calling
-     * {@code setNetworkTimeout}.
      * @throws SQLFeatureNotSupportedException if the JDBC driver does not support
      * this method
-     * @see SecurityManager#checkPermission
      * @see Statement#setQueryTimeout
      * @see #getNetworkTimeout
      * @see #abort
diff --git a/src/java.sql/share/classes/java/sql/DriverManager.java b/src/java.sql/share/classes/java/sql/DriverManager.java
index 93bc5972cff..918d0692a1a 100644
--- a/src/java.sql/share/classes/java/sql/DriverManager.java
+++ b/src/java.sql/share/classes/java/sql/DriverManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,16 +133,9 @@ public static java.io.PrintWriter getLogWriter() {
     /**
      * Sets the logging/tracing {@code PrintWriter} object
      * that is used by the {@code DriverManager} and all drivers.
-     *<P>
-     * If a security manager exists, its {@code checkPermission}
-     * method is first called with a {@code SQLPermission("setLog")}
-     * permission to check that the caller is allowed to call {@code setLogWriter}.
      *
      * @param out the new logging/tracing {@code PrintStream} object;
      *      {@code null} to disable logging and tracing
-     * @throws SecurityException if a security manager exists and its
-     * {@code checkPermission} method denies permission to set the log writer.
-     * @see SecurityManager#checkPermission
      * @see #getLogWriter
      * @since 1.2
      */
@@ -357,10 +350,6 @@ public static void registerDriver(java.sql.Driver driver,
      * If a {@code null} value is specified for the driver to be removed, then no
      * action is taken.
      * <p>
-     * If a security manager exists, its {@code checkPermission}
-     * method is first called with a {@code SQLPermission("deregisterDriver")}
-     * permission to check that the caller is allowed to deregister a JDBC Driver.
-     * <p>
      * If the specified driver is not found in the list of registered drivers,
      * then no action is taken.  If the driver was found, it will be removed
      * from the list of registered drivers.
@@ -371,10 +360,6 @@ public static void registerDriver(java.sql.Driver driver,
      *
      * @param driver the JDBC Driver to remove
      * @throws SQLException if a database access error occurs
-     * @throws SecurityException if a security manager exists and its
-     * {@code checkPermission} method denies permission to deregister a driver.
-     *
-     * @see SecurityManager#checkPermission
      */
     @CallerSensitive
     public static void deregisterDriver(Driver driver) throws SQLException {
@@ -485,16 +470,9 @@ public static int getLoginTimeout() {
      * Sets the logging/tracing PrintStream that is used
      * by the {@code DriverManager}
      * and all drivers.
-     *<P>
-     * If a security manager exists, its {@code checkPermission}
-     * method is first called with a {@code SQLPermission("setLog")}
-     * permission to check that the caller is allowed to call {@code setLogStream}.
      *
      * @param out the new logging/tracing PrintStream; to disable, set to {@code null}
      * @deprecated Use {@code setLogWriter}
-     * @throws SecurityException if a security manager exists and its
-     * {@code checkPermission} method denies permission to set the log stream.
-     * @see SecurityManager#checkPermission
      * @see #getLogStream
      */
     @Deprecated(since="1.2")
diff --git a/src/java.sql/share/classes/java/sql/SQLPermission.java b/src/java.sql/share/classes/java/sql/SQLPermission.java
index 9390d700694..863037502e5 100644
--- a/src/java.sql/share/classes/java/sql/SQLPermission.java
+++ b/src/java.sql/share/classes/java/sql/SQLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,19 +29,6 @@
 import java.security.*;
 
 /**
- * The permission for which the {@code SecurityManager} will check
- * when code that is running an application with a
- * {@code SecurityManager} enabled, calls the
- * {@code DriverManager.deregisterDriver} method,
- * {@code DriverManager.setLogWriter} method,
- * {@code DriverManager.setLogStream} (deprecated) method,
- * {@code SyncFactory.setJNDIContext} method,
- * {@code SyncFactory.setLogger} method,
- * {@code Connection.setNetworkTimeout} method,
- * or the {@code Connection.abort} method.
- * If there is no {@code SQLPermission} object, these methods
- * throw a {@code java.lang.SecurityException} as a runtime exception.
- * <P>
  * A {@code SQLPermission} object contains
  * a name (also referred to as a "target name") but no actions
  * list; there is either a named permission or there is not.
@@ -52,63 +39,10 @@
  * signify a wildcard match. For example: {@code loadLibrary.*}
  * and {@code *} signify a wildcard match,
  * while {@code *loadLibrary} and {@code a*b} do not.
- * <P>
- * The following table lists all the possible {@code SQLPermission} target names.
- * The table gives a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
  *
- *
- * <table class="striped">
- * <caption style="display:none">permission target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- *
- * <tbody>
- * <tr>
- *   <th scope="row">setLog</th>
- *   <td>Setting of the logging stream</td>
- *   <td>This is a dangerous permission to grant.
- * The contents of the log may contain usernames and passwords,
- * SQL statements, and SQL data.</td>
- * </tr>
- * <tr>
- * <th scope="row">callAbort</th>
- *   <td>Allows the invocation of the {@code Connection} method
- *   {@code abort}</td>
- *   <td>Permits an application to terminate a physical connection to a
- *  database.</td>
- * </tr>
- * <tr>
- * <th scope="row">setSyncFactory</th>
- *   <td>Allows the invocation of the {@code SyncFactory} methods
- *   {@code setJNDIContext} and {@code setLogger}</td>
- *   <td>Permits an application to specify the JNDI context from which the
- *   {@code SyncProvider} implementations can be retrieved from and the logging
- *   object to be used by the {@code SyncProvider} implementation.</td>
- * </tr>
- *
- * <tr>
- * <th scope="row">setNetworkTimeout</th>
- *   <td>Allows the invocation of the {@code Connection} method
- *   {@code setNetworkTimeout}</td>
- *   <td>Permits an application to specify the maximum period a
- * {@code Connection} or
- * objects created from the {@code Connection}
- * will wait for the database to reply to any one request.</td>
- * <tr>
- * <th scope="row">deregisterDriver</th>
- *   <td>Allows the invocation of the {@code DriverManager}
- * method {@code deregisterDriver}</td>
- *   <td>Permits an application to remove a JDBC driver from the list of
- * registered Drivers and release its resources.</td>
- * </tr>
- * </tbody>
- * </table>
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 1.3
  * @see java.security.BasicPermission
@@ -130,7 +64,6 @@ public final class SQLPermission extends BasicPermission {
      *  {@code deregisterDriver}, or {@code setNetworkTimeout}
      * @throws NullPointerException if {@code name} is {@code null}.
      * @throws IllegalArgumentException if {@code name} is empty.
-
      */
 
     public SQLPermission(String name) {
@@ -149,7 +82,6 @@ public SQLPermission(String name) {
      * @param actions should be {@code null}
      * @throws NullPointerException if {@code name} is {@code null}.
      * @throws IllegalArgumentException if {@code name} is empty.
-
      */
 
     public SQLPermission(String name, String actions) {
diff --git a/src/java.sql/share/classes/java/sql/package-info.java b/src/java.sql/share/classes/java/sql/package-info.java
index 146100f74ca..495119effac 100644
--- a/src/java.sql/share/classes/java/sql/package-info.java
+++ b/src/java.sql/share/classes/java/sql/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,12 +90,6 @@
  * some variation in drivers and the features they support. Always
  * check your driver's documentation to see whether it supports a feature before
  * you try to use it.
- * <P>
- * <b>NOTE:</b> The class {@code SQLPermission} was added in the
- * Java 2 SDK, Standard Edition,
- * version 1.3 release. This class is used to prevent unauthorized
- * access to the logging stream associated with the {@code DriverManager},
- * which may contain information such as table names, column data, and so on.
  *
  * <h2>What the {@code java.sql} Package Contains</h2>
  * The {@code java.sql} package contains API for the following:
@@ -103,10 +97,6 @@
  *   <LI>Making a connection with a database via the {@code DriverManager} facility
  *   <UL>
  *       <LI>{@code DriverManager} class -- makes a connection with a driver
- *       <LI>{@code SQLPermission} class -- provides permission when code
- *                   running within a Security Manager, such as an applet,
- *                   attempts to set up a logging stream through the
- *                   {@code DriverManager}
  *       <LI>{@code Driver} interface -- provides the API for registering
  *              and connecting drivers based on JDBC technology ("JDBC drivers");
  *              generally used only by the {@code DriverManager} class
diff --git a/src/java.xml/share/classes/javax/xml/XMLConstants.java b/src/java.xml/share/classes/javax/xml/XMLConstants.java
index 172b752664f..e98b3587c99 100644
--- a/src/java.xml/share/classes/javax/xml/XMLConstants.java
+++ b/src/java.xml/share/classes/javax/xml/XMLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -232,10 +232,6 @@ private XMLConstants() {
          *     ignoring security issues such as limits on XML constructs to avoid conditions such as denial of service attacks.
          *   </li>
          * </ul>
-         *
-         * @implNote
-         * when the Java Security Manager is present, the JDK sets the value of
-         * this feature to true and does not allow it to be turned off.
          */
         public static final String FEATURE_SECURE_PROCESSING = "http://javax.xml.XMLConstants/feature/secure-processing";
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java
index 7491410a0af..41336526e13 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,6 @@ private CatalogManager() {
      * @throws IllegalArgumentException if either the URIs are not absolute
      * or do not have a URL protocol handler for the URI scheme
      * @throws CatalogException If an error occurs while parsing the catalog
-     * @throws SecurityException if access to the resource is denied by the security manager
      */
     public static Catalog catalog(CatalogFeatures features, URI... uris) {
         Util.validateUrisSyntax(uris);
@@ -141,7 +140,6 @@ public static CatalogResolver catalogResolver(Catalog catalog, CatalogResolver.N
      * @throws IllegalArgumentException if either the URIs are not absolute
      * or do not have a URL protocol handler for the URI scheme
      * @throws CatalogException If an error occurs while parsing the catalog
-     * @throws SecurityException if access to the resource is denied by the security manager
      */
     public static CatalogResolver catalogResolver(CatalogFeatures features, URI... uris) {
         Catalog catalog = catalog(features, uris);
diff --git a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
index 935c0180635..64dd32f7261 100644
--- a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
+++ b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,8 +141,8 @@ typedef struct EVENT_STRUCT
 
 
 #include <process.h>
-#define THREAD_PROC unsigned int __stdcall
-typedef unsigned int (__stdcall *THREAD_ROUTINE)(LPVOID lpThreadParameter);
+#define THREAD_PROC unsigned int
+typedef unsigned int (*THREAD_ROUTINE)(LPVOID lpThreadParameter);
 
 static HANDLE BeginThread(THREAD_ROUTINE thread_func,DWORD *id,DWORD param)
 {
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java
index 2860bcc1a63..a69742e27c0 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,56 +26,13 @@
 package com.sun.tools.attach;
 
 /**
- * When a {@link java.lang.SecurityManager SecurityManager} set, this
- * is the permission which will be checked when code invokes {@link
- * VirtualMachine#attach VirtualMachine.attach} to attach to a target virtual
- * machine.
- * This permission is also checked when an {@link
- * com.sun.tools.attach.spi.AttachProvider AttachProvider} is created.
- *
- * <p> An <code>AttachPermission</code> object contains a name (also referred
+ * An <code>AttachPermission</code> object contains a name (also referred
  * to as a "target name") but no actions list; you either have the
  * named permission or you don't.
- * The following table provides a summary description of what the
- * permission allows, and discusses the risks of granting code the
- * permission.
- *
- * <table class="striped"><caption style="display:none">Table shows permission
- * target name, what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- * <tbody>
- * <tr>
- *   <th scope="row">attachVirtualMachine</th>
- *   <td>Ability to attach to another Java virtual machine and load agents
- *       into that VM.
- *   </td>
- *   <td>This allows an attacker to control the target VM which can potentially
- *       cause it to misbehave.
- *   </td>
- * </tr>
  *
- * <tr>
- *   <th scope="row">createAttachProvider</th>
- *   <td>Ability to create an <code>AttachProvider</code> instance.
- *   </td>
- *   <td>This allows an attacker to create an AttachProvider which can
- *       potentially be used to attach to other Java virtual machines.
- *   </td>
- * </tr>
- * </tbody>
- *
- * </table>
-
- * <p>
- * Programmers do not normally create AttachPermission objects directly.
- * Instead they are created by the security policy code based on reading
- * the security policy file.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @see com.sun.tools.attach.VirtualMachine
  * @see com.sun.tools.attach.spi.AttachProvider
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java b/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
index 3136e5f407b..f283f9e08a8 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,12 +174,6 @@ public static List<VirtualMachineDescriptor> list() {
      *
      * @return  A VirtualMachine representing the target VM.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          {@code ("attachVirtualMachine")}, or another permission
-     *          required by the implementation.
-     *
      * @throws  AttachNotSupportedException
      *          If the {@code attachVirtualmachine} method of all installed
      *          providers throws {@code AttachNotSupportedException}, or
@@ -227,12 +221,6 @@ public static VirtualMachine attach(String id)
      *
      * @return  A VirtualMachine representing the target VM.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          {@code ("attachVirtualMachine")}, or another permission
-     *          required by the implementation.
-     *
      * @throws  AttachNotSupportedException
      *          If the attach provider's {@code attachVirtualmachine}
      *          throws {@code AttachNotSupportedException}.
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java b/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java
index 7920b2d0f01..da3f61e49ce 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,11 +82,6 @@ public abstract class AttachProvider {
 
     /**
      * Initializes a new instance of this class.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          ("{@code createAttachProvider}")
      */
     protected AttachProvider() {
         @SuppressWarnings("removal")
@@ -132,12 +127,6 @@ protected AttachProvider() {
      *
      * @return  VirtualMachine representing the target virtual machine.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          ("{@code attachVirtualMachine}"), or other permission
-     *          required by the implementation.
-     *
      * @throws  AttachNotSupportedException
      *          If the identifier cannot be parsed, or it corresponds to
      *          to a Java virtual machine that does not exist, or it
@@ -168,12 +157,6 @@ public abstract VirtualMachine attachVirtualMachine(String id)
      *
      * @return  VirtualMachine representing the target virtual machine.
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link com.sun.tools.attach.AttachPermission AttachPermission}
-     *          ("{@code attachVirtualMachine}"), or other permission
-     *          required by the implementation.
-     *
      * @throws  AttachNotSupportedException
      *          If the descriptor's
      *          {@link com.sun.tools.attach.VirtualMachineDescriptor#provider() provider()}
diff --git a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
index 7a436ef85c2..dc1b0f6e79a 100644
--- a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
@@ -76,8 +76,7 @@ typedef struct {
    GetModuleHandleFunc _GetModuleHandle;
    GetProcAddressFunc _GetProcAddress;
    char jvmLib[MAX_LIBNAME_LENGTH];         /* "jvm.dll" */
-   char func1[MAX_FUNC_LENGTH];
-   char func2[MAX_FUNC_LENGTH];
+   char func[MAX_FUNC_LENGTH];
    char func_v2[MAX_FUNC_LENGTH];
    char cmd[MAX_CMD_LENGTH + 1];            /* "load", "dump", ...      */
    char arg[MAX_ARGS][MAX_ARG_LENGTH + 1];  /* arguments to command     */
@@ -113,10 +112,7 @@ DWORD WINAPI jvm_attach_thread_func(DataBlock *pData)
     }
 
     if (pData->version == 1) {
-        EnqueueOperationFunc addr = (EnqueueOperationFunc)(pData->_GetProcAddress(h, pData->func1));
-        if (addr == NULL) {
-            addr = (EnqueueOperationFunc)(pData->_GetProcAddress(h, pData->func2));
-        }
+        EnqueueOperationFunc addr = (EnqueueOperationFunc)(pData->_GetProcAddress(h, pData->func));
         if (addr == NULL) {
             return ERR_GET_ENQUEUE_FUNC_FAIL;
         }
@@ -231,24 +227,17 @@ JNIEXPORT jlong JNICALL Java_sun_tools_attach_VirtualMachineImpl_openProcess
     }
 
     /*
-     * On Windows 64-bit we need to handle 32-bit tools trying to attach to 64-bit
-     * processes (and visa versa). X-architecture attaching is currently not supported
-     * by this implementation.
+     * On Windows we need to handle 64-bit tools trying to attach to 32-bit
+     * processes, which is currently not supported by this implementation.
      */
     if (_IsWow64Process != NULL) {
-        BOOL isCurrent32bit, isTarget32bit;
-        (*_IsWow64Process)(GetCurrentProcess(), &isCurrent32bit);
+        BOOL isTarget32bit;
         (*_IsWow64Process)(hProcess, &isTarget32bit);
 
-        if (isCurrent32bit != isTarget32bit) {
+        if (isTarget32bit) {
             CloseHandle(hProcess);
-            #ifdef _WIN64
-              JNU_ThrowByName(env, "com/sun/tools/attach/AttachNotSupportedException",
-                  "Unable to attach to 32-bit process running under WOW64");
-            #else
-              JNU_ThrowByName(env, "com/sun/tools/attach/AttachNotSupportedException",
-                  "Unable to attach to 64-bit process");
-            #endif
+            JNU_ThrowByName(env, "com/sun/tools/attach/AttachNotSupportedException",
+                "Unable to attach to 32-bit process running under WOW64");
         }
     }
 
@@ -451,8 +440,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
     data._GetProcAddress = _GetProcAddress;
 
     strcpy(data.jvmLib, "jvm");
-    strcpy(data.func1, "JVM_EnqueueOperation");
-    strcpy(data.func2, "_JVM_EnqueueOperation@20");
+    strcpy(data.func, "JVM_EnqueueOperation");
     strcpy(data.func_v2, "JVM_EnqueueOperation_v2");
 
     /*
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 0c589c54edd..4a226e4de3b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -263,6 +263,7 @@ public enum Feature {
         FLEXIBLE_CONSTRUCTORS(JDK22, Fragments.FeatureFlexibleConstructors, DiagKind.NORMAL),
         MODULE_IMPORTS(JDK23, Fragments.FeatureModuleImports, DiagKind.PLURAL),
         PRIVATE_MEMBERS_IN_PERMITS_CLAUSE(JDK19),
+        ERASE_POLY_SIG_RETURN_TYPE(JDK24),
         ;
 
         enum DiagKind {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index e35ecbdc956..3545ebcc278 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -1672,6 +1672,12 @@ public boolean isCastable(Type t, Type s, Warner warn) {
     // where
         class DisjointChecker {
             Set<Pair<ClassSymbol, ClassSymbol>> pairsSeen = new HashSet<>();
+            /* there are three cases for ts and ss:
+             *   - one is a class and the other one is an interface (case I)
+             *   - both are classes                                 (case II)
+             *   - both are interfaces                              (case III)
+             * all those cases are covered in JLS 23, section: "5.1.6.1 Allowed Narrowing Reference Conversion"
+             */
             private boolean areDisjoint(ClassSymbol ts, ClassSymbol ss) {
                 Pair<ClassSymbol, ClassSymbol> newPair = new Pair<>(ts, ss);
                 /* if we are seeing the same pair again then there is an issue with the sealed hierarchy
@@ -1679,32 +1685,38 @@ private boolean areDisjoint(ClassSymbol ts, ClassSymbol ss) {
                  */
                 if (!pairsSeen.add(newPair))
                     return false;
-                if (isSubtype(erasure(ts.type), erasure(ss.type))) {
-                    return false;
-                }
-                // if both are classes or both are interfaces, shortcut
-                if (ts.isInterface() == ss.isInterface() && isSubtype(erasure(ss.type), erasure(ts.type))) {
-                    return false;
-                }
-                if (ts.isInterface() && !ss.isInterface()) {
-                    /* so ts is interface but ss is a class
-                     * an interface is disjoint from a class if the class is disjoint form the interface
-                     */
-                    return areDisjoint(ss, ts);
-                }
-                // a final class that is not subtype of ss is disjoint
-                if (!ts.isInterface() && ts.isFinal()) {
-                    return true;
-                }
-                // if at least one is sealed
-                if (ts.isSealed() || ss.isSealed()) {
-                    // permitted subtypes have to be disjoint with the other symbol
-                    ClassSymbol sealedOne = ts.isSealed() ? ts : ss;
-                    ClassSymbol other = sealedOne == ts ? ss : ts;
-                    return sealedOne.getPermittedSubclasses().stream().allMatch(type -> areDisjoint((ClassSymbol)type.tsym, other));
+
+                if (ts.isInterface() != ss.isInterface()) { // case I: one is a class and the other one is an interface
+                    ClassSymbol isym = ts.isInterface() ? ts : ss; // isym is the interface and csym the class
+                    ClassSymbol csym = isym == ts ? ss : ts;
+                    if (!isSubtype(erasure(csym.type), erasure(isym.type))) {
+                        if (csym.isFinal()) {
+                            return true;
+                        } else if (csym.isSealed()) {
+                            return areDisjoint(isym, csym.getPermittedSubclasses());
+                        } else if (isym.isSealed()) {
+                            // if the class is not final and not sealed then it has to be freely extensible
+                            return areDisjoint(csym, isym.getPermittedSubclasses());
+                        }
+                    } // now both are classes or both are interfaces
+                } else if (!ts.isInterface()) {              // case II: both are classes
+                    return !isSubtype(erasure(ss.type), erasure(ts.type)) && !isSubtype(erasure(ts.type), erasure(ss.type));
+                } else {                                     // case III: both are interfaces
+                    if (!isSubtype(erasure(ts.type), erasure(ss.type)) && !isSubtype(erasure(ss.type), erasure(ts.type))) {
+                        if (ts.isSealed()) {
+                            return areDisjoint(ss, ts.getPermittedSubclasses());
+                        } else if (ss.isSealed()) {
+                            return areDisjoint(ts, ss.getPermittedSubclasses());
+                        }
+                    }
                 }
+                // at this point we haven't been able to statically prove that the classes or interfaces are disjoint
                 return false;
             }
+
+            boolean areDisjoint(ClassSymbol csym, List<Type> permittedSubtypes) {
+                return permittedSubtypes.stream().allMatch(psubtype -> areDisjoint(csym, (ClassSymbol) psubtype.tsym));
+            }
         }
 
         private TypeRelation isCastable = new TypeRelation() {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index 81e07277bfb..d590c62f27f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -100,6 +100,8 @@ public class Infer {
 
     private final boolean dumpStacktraceOnError;
 
+    private final boolean erasePolySigReturnType;
+
     public static Infer instance(Context context) {
         Infer instance = context.get(inferKey);
         if (instance == null)
@@ -123,6 +125,8 @@ protected Infer(Context context) {
 
         emptyContext = new InferenceContext(this, List.nil());
         dumpStacktraceOnError = options.isSet("dev") || options.isSet(DOE);
+        Source source = Source.instance(context);
+        erasePolySigReturnType = Source.Feature.ERASE_POLY_SIG_RETURN_TYPE.allowedInSource(source);
     }
 
     /** A value for prototypes that admit any type, including polymorphic ones. */
@@ -544,8 +548,8 @@ Type instantiatePolymorphicSignatureInstance(Env<AttrContext> env,
             case TYPECAST:
                 JCTypeCast castTree = (JCTypeCast)env.next.tree;
                 restype = (TreeInfo.skipParens(castTree.expr) == env.tree) ?
-                          castTree.clazz.type :
-                          spType;
+                              (erasePolySigReturnType ? types.erasure(castTree.clazz.type) : castTree.clazz.type) :
+                              spType;
                 break;
             case EXEC:
                 JCTree.JCExpressionStatement execTree =
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
index 7e8b96d5856..c7e71f74d8a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -103,6 +103,7 @@ public class ClassFile {
     public static final int MAX_STACK = 0xffff;
 
     public static final int PREVIEW_MINOR_VERSION = 0xffff;
+    public static final int MAX_ANNOTATIONS = 0xffff;
 
     public enum Version {
         V45_3(45, 3), // base level for all attributes
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index 6679bb43fb8..d70032353b6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -649,11 +649,19 @@ void writeCompoundAttribute(Attribute.Compound c) {
         databuf.appendChar(poolWriter.putDescriptor(c.type));
         databuf.appendChar(c.values.length());
         for (Pair<Symbol.MethodSymbol,Attribute> p : c.values) {
+            checkAnnotationArraySizeInternal(p);
             databuf.appendChar(poolWriter.putName(p.fst.name));
             p.snd.accept(awriter);
         }
     }
 
+    private void checkAnnotationArraySizeInternal(Pair<Symbol.MethodSymbol, Attribute> p) {
+        if (p.snd instanceof Attribute.Array arrAttr &&
+                arrAttr.values.length > ClassFile.MAX_ANNOTATIONS) {
+            log.error(Errors.AnnotationArrayTooLarge(p.fst.owner));
+        }
+    }
+
     void writeTypeAnnotation(Attribute.TypeCompound c) {
         writePosition(c.position);
         writeCompoundAttribute(c);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index a991ae60601..a24dd2f95bd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -887,6 +887,10 @@ compiler.err.limit.stack=\
 compiler.err.limit.string=\
     constant string too long
 
+# 0: symbol
+compiler.err.annotation.array.too.large=\
+    Annotation array element too large in \"{0}\"
+
 # 0: string
 compiler.err.limit.string.overflow=\
     UTF8 representation for string \"{0}...\" is too long for the constant pool
@@ -2235,6 +2239,7 @@ compiler.warn.proc.duplicate.option.name=\
 compiler.warn.proc.duplicate.supported.annotation=\
     Duplicate supported annotation interface ''{0}'' returned by annotation processor ''{1}''
 
+
 # 0: string
 compiler.warn.proc.redundant.types.with.wildcard=\
     Annotation processor ''{0}'' redundantly supports both ''*'' and other annotation interfaces
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/BiClassValue.java b/src/jdk.dynalink/share/classes/jdk/dynalink/BiClassValue.java
index a1faf464ea6..4a540be5377 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/BiClassValue.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/BiClassValue.java
@@ -113,6 +113,7 @@ T getReverseValue(final Class<?> c) {
         }
 
         private T compute(final VarHandle mapHandle, final Class<?> c, final Function<Class<?>, T> compute) {
+            @SuppressWarnings("unchecked")
             Map<Class<?>, T> map = (Map<Class<?>, T>) mapHandle.getVolatile(this);
             T value;
             T newValue = null;
@@ -127,6 +128,7 @@ private T compute(final VarHandle mapHandle, final Class<?> c, final Function<Cl
                 final Map.Entry<Class<?>, T>[] entries = map.entrySet().toArray(new Map.Entry[map.size() + 1]);
                 entries[map.size()] = Map.entry(c, newValue);
                 final var newMap = Map.ofEntries(entries);
+                @SuppressWarnings("unchecked")
                 final var witness = (Map<Class<?>, T>) mapHandle.compareAndExchange(this, map, newMap);
                 if (witness == map) {
                     value = newValue;
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java b/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java
index e47625fb497..420f14f1dc5 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/CallSiteDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,8 +84,8 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * bootstrap method. Since the descriptors must be immutable, you can set up a
  * cache for equivalent descriptors to have the call sites share them.
  * <p>
- * The class extends {@link SecureLookupSupplier} for security-checked access to
- * the {@code MethodHandles.Lookup} object it carries. This lookup should be used
+ * The class extends {@link SecureLookupSupplier} to encapsulate the {@code
+ * MethodHandles.Lookup} object. This lookup should be used
  * to find method handles to set as targets of the call site described by this
  * descriptor.
  * @since 9
@@ -170,11 +170,6 @@ protected CallSiteDescriptor changeMethodTypeInternal(final MethodType newMethod
      * @param newOperation the new operation
      * @return a call site descriptor with the changed operation.
      * @throws NullPointerException if {@code newOperation} is null.
-     * @throws SecurityException if the descriptor's lookup isn't the
-     * {@link MethodHandles#publicLookup()}, and a security manager is present,
-     * and a check for {@code RuntimePermission("dynalink.getLookup")} fails.
-     * This is necessary as changing the operation in the call site descriptor
-     * allows fabrication of descriptors for arbitrary operations with the lookup.
      */
     public final CallSiteDescriptor changeOperation(final Operation newOperation) {
         getLookup(); // force security check
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java
index ed211008566..8714ae314f2 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinkerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -417,9 +417,6 @@ public DynamicLinker createLinker() {
      * specific service configuration issues, as well as some Dynalink-specific
      * errors when an exporter that the factory tried to automatically load:
      * <ul>
-     * <li>did not have the runtime permission named
-     * {@link GuardingDynamicLinkerExporter#AUTOLOAD_PERMISSION_NAME} in a
-     * system with a security manager, or</li>
      * <li>returned null from {@link GuardingDynamicLinkerExporter#get()}, or</li>
      * <li>the list returned from {@link GuardingDynamicLinkerExporter#get()}
      * had a null element.</li>
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java b/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java
index 5ec1f2737fb..8b76f0abdc3 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/SecureLookupSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,12 @@
 import java.util.Objects;
 
 /**
- * Provides security-checked access to a {@code MethodHandles.Lookup} object.
- * See {@link #getLookup()} for details.
+ * Encapsulates a {@code MethodHandles.Lookup} object.
+ *
+ * @apiNote
+ * SecureLookupSupplier provided a way in older JDK releases to guard access to
+ * a {@code MethodHandles.Lookup} object when running with a security manager set.
+ *
  * @since 9
  */
 public class SecureLookupSupplier {
@@ -46,7 +50,7 @@ public class SecureLookupSupplier {
     private final MethodHandles.Lookup lookup;
 
     /**
-     * Creates a new secure lookup supplier, securing the passed lookup.
+     * Creates a new secure lookup supplier for the given lookup.
      * @param lookup the lookup to secure. Can not be null.
      * @throws NullPointerException if null is passed.
      */
@@ -57,9 +61,6 @@ public SecureLookupSupplier(final MethodHandles.Lookup lookup) {
     /**
      * Returns the lookup secured by this {@code SecureLookupSupplier}.
      * @return the lookup secured by this {@code SecureLookupSupplier}.
-     * @throws SecurityException if the secured lookup isn't the
-     * {@link MethodHandles#publicLookup()}, and a security manager is present,
-     * and a check for {@code RuntimePermission("dynalink.getLookup")} fails.
      */
     public final Lookup getLookup() {
         @SuppressWarnings("removal")
@@ -71,8 +72,7 @@ public final Lookup getLookup() {
     }
 
     /**
-     * Returns the value of {@link #getLookup()} without a security check. Can
-     * be used by subclasses to access the lookup quickly.
+     * Returns the lookup secured by this {@code SecureLookupSupplier}.
      * @return same as returned value of {@link #getLookup()}.
      */
     protected final Lookup getLookupPrivileged() {
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java
index cd670a8fdbe..f00bb81c587 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinkerExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,32 +39,23 @@
  * subclass in
  * {@code /META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter}
  * resource of their distribution (typically, JAR file) so that dynamic linker
- * factories can discover them using the {@link ServiceLoader} mechanism. Note
- * that instantiating this class is tied to a security check for the
- * {@code RuntimePermission("dynalink.exportLinkersAutomatically")} when a
- * security manager is present, to ensure that only trusted runtimes can
- * automatically export their linkers into other runtimes.
+ * factories can discover them using the {@link ServiceLoader} mechanism.
  * @see DynamicLinkerFactory#setClassLoader(ClassLoader)
  * @since 9
  */
 public abstract class GuardingDynamicLinkerExporter implements Supplier<List<GuardingDynamicLinker>> {
     /**
      * The name of the runtime permission for creating instances of this class.
-     * Granting this permission to a language runtime allows it to export its
-     * linkers for automatic loading into other language runtimes.
+     * @apiNote
+     * This permission cannot be used for controlling access to resources
+     * anymore as the Security Manager is no longer supported.
      */
     public static final String AUTOLOAD_PERMISSION_NAME = "dynalink.exportLinkersAutomatically";
 
     private static final Permission AUTOLOAD_PERMISSION = new RuntimePermission(AUTOLOAD_PERMISSION_NAME);
 
     /**
-     * Creates a new linker exporter. If there is a security manager installed
-     * checks for the
-     * {@code RuntimePermission("dynalink.exportLinkersAutomatically")} runtime
-     * permission. This ensures only language runtimes granted this permission
-     * will be allowed to export their linkers for automatic loading.
-     * @throws SecurityException if the necessary runtime permission is not
-     * granted.
+     * Creates a new linker exporter.
      */
     protected GuardingDynamicLinkerExporter() {
         @SuppressWarnings("removal")
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
index 67bba331149..7a7c761e89f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
@@ -24,6 +24,9 @@
 
 package sun.jvm.hotspot.debugger;
 
+import sun.jvm.hotspot.oops.Mark;
+import sun.jvm.hotspot.runtime.VM;
+
 /** <P> DebuggerBase is a recommended base class for debugger
     implementations. It can use a PageCache to cache data from the
     target process. Note that this class would not be suitable if the
@@ -394,7 +397,15 @@ protected long readCompOopAddressValue(long address)
 
   protected long readCompKlassAddressValue(long address)
     throws UnmappedAddressException, UnalignedAddressException {
-    long value = readCInteger(address, getKlassPtrSize(), true);
+    long value;
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      // With compact headers, the compressed Klass* is currently read from the mark
+      // word. We need to load the whole mark, and shift the upper parts.
+      value = readCInteger(address, machDesc.getAddressSize(), true);
+      value = value >>> Mark.getKlassShift();
+    } else {
+      value = readCInteger(address, getKlassPtrSize(), true);
+    }
     if (value != 0) {
       value = (long)(narrowKlassBase + (long)(value << narrowKlassShift));
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
index 5d6b58fa085..64bdb8c1c72 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,7 @@
 import java.util.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.x86.*;
 import sun.jvm.hotspot.debugger.amd64.*;
-import sun.jvm.hotspot.debugger.windows.x86.*;
 import sun.jvm.hotspot.debugger.windows.amd64.*;
 import sun.jvm.hotspot.utilities.AddressOps;
 
@@ -69,14 +67,7 @@ public LoadObject loadObjectContainingPC(Address pc) throws DebuggerException {
   }
 
   public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
-    if (dbg.getCPU().equals("x86")) {
-      X86ThreadContext context = (X86ThreadContext) thread.getContext();
-      Address ebp = context.getRegisterAsAddress(X86ThreadContext.EBP);
-      if (ebp == null) return null;
-      Address pc  = context.getRegisterAsAddress(X86ThreadContext.EIP);
-      if (pc == null) return null;
-      return new WindowsX86CFrame(dbg, ebp, pc);
-    } else if (dbg.getCPU().equals("amd64")) {
+    if (dbg.getCPU().equals("amd64")) {
       AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
       Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
       if (rbp == null) return null;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
index f082b7e52c6..07704671fd4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,8 @@
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.aarch64.*;
 import sun.jvm.hotspot.debugger.amd64.*;
-import sun.jvm.hotspot.debugger.x86.*;
 import sun.jvm.hotspot.debugger.windbg.aarch64.*;
 import sun.jvm.hotspot.debugger.windbg.amd64.*;
-import sun.jvm.hotspot.debugger.windbg.x86.*;
 import sun.jvm.hotspot.debugger.win32.coff.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.BasicDebugEvent;
@@ -100,9 +98,7 @@ public WindbgDebuggerLocal(MachineDescription machDesc,
                                   machDesc.supports32bitAlignmentOf64bitTypes());
 
     String cpu = PlatformInfo.getCPU();
-    if (cpu.equals("x86")) {
-       threadFactory = new WindbgX86ThreadFactory(this);
-    } else if (cpu.equals("amd64")) {
+    if (cpu.equals("amd64")) {
        threadFactory = new WindbgAMD64ThreadFactory(this);
     } else if (cpu.equals("aarch64")) {
       threadFactory = new WindbgAARCH64ThreadFactory(this);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java
deleted file mode 100644
index 7a9de861f9a..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.windbg.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-
-class WindbgX86Thread implements ThreadProxy {
-  private WindbgDebugger debugger;
-  private long           sysId;
-  private boolean        gotID;
-  private long           id;
-
-  // The address argument must be the address of OSThread::_thread_id
-  WindbgX86Thread(WindbgDebugger debugger, Address addr) {
-    this.debugger = debugger;
-    this.sysId    = addr.getCIntegerAt(0, 4, true);
-    gotID         = false;
-  }
-
-  WindbgX86Thread(WindbgDebugger debugger, long sysId) {
-    this.debugger = debugger;
-    this.sysId    = sysId;
-    gotID         = false;
-  }
-
-  public ThreadContext getContext() throws IllegalThreadStateException {
-    long[] data = debugger.getThreadIntegerRegisterSet(getThreadID());
-    WindbgX86ThreadContext context = new WindbgX86ThreadContext(debugger);
-    for (int i = 0; i < data.length; i++) {
-      context.setRegister(i, data[i]);
-    }
-    return context;
-  }
-
-  public boolean canSetContext() throws DebuggerException {
-    return false;
-  }
-
-  public void setContext(ThreadContext thrCtx)
-    throws IllegalThreadStateException, DebuggerException {
-    throw new DebuggerException("Unimplemented");
-  }
-
-  public boolean equals(Object obj) {
-    if (!(obj instanceof WindbgX86Thread other)) {
-      return false;
-    }
-
-    return (other.getThreadID() == getThreadID());
-  }
-
-  public int hashCode() {
-    return Long.hashCode(getThreadID());
-  }
-
-  public String toString() {
-    return Long.toString(getThreadID());
-  }
-
-  /** Retrieves the thread ID of this thread by examining the Thread
-      Information Block. */
-  private long getThreadID() {
-    if (!gotID) {
-       id = debugger.getThreadIdFromSysId(sysId);
-    }
-
-    return id;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java
deleted file mode 100644
index 4135653b0b2..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.windbg.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-
-class WindbgX86ThreadContext extends X86ThreadContext {
-  private WindbgDebugger debugger;
-
-  public WindbgX86ThreadContext(WindbgDebugger debugger) {
-    super();
-    this.debugger = debugger;
-  }
-
-  public void setRegisterAsAddress(int index, Address value) {
-    setRegister(index, debugger.getAddressValue(value));
-  }
-
-  public Address getRegisterAsAddress(int index) {
-    return debugger.newAddress(getRegister(index));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java
deleted file mode 100644
index 8ca83af2c49..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.windbg.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-
-public class WindbgX86ThreadFactory implements WindbgThreadFactory {
-  private WindbgDebugger debugger;
-
-  public WindbgX86ThreadFactory(WindbgDebugger debugger) {
-    this.debugger = debugger;
-  }
-
-  public ThreadProxy createThreadWrapper(Address threadIdentifierAddr) {
-    return new WindbgX86Thread(debugger, threadIdentifierAddr);
-  }
-
-  public ThreadProxy createThreadWrapper(long id) {
-    return new WindbgX86Thread(debugger, id);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java
deleted file mode 100644
index 1d5e015e888..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.windows.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.cdbg.basic.*;
-import sun.jvm.hotspot.debugger.windbg.*;
-
-public class WindowsX86CFrame extends BasicCFrame {
-  private Address ebp;
-  private Address pc;
-
-  private static final int ADDRESS_SIZE = 4;
-
-  /** Constructor for topmost frame */
-  public WindowsX86CFrame(WindbgDebugger dbg, Address ebp, Address pc) {
-    super(dbg.getCDebugger());
-    this.ebp = ebp;
-    this.pc  = pc;
-    this.dbg = dbg;
-  }
-
-  public CFrame sender(ThreadProxy thread) {
-    X86ThreadContext context = (X86ThreadContext) thread.getContext();
-    /*
-     * Native code fills in the stack pointer register value using index
-     * X86ThreadContext.SP.
-     * See file sawindbg.cpp macro REG_INDEX(x).
-     *
-     * Be sure to use SP, or UESP which is aliased to SP in Java code,
-     * for the frame pointer validity check.
-     */
-    Address esp = context.getRegisterAsAddress(X86ThreadContext.SP);
-
-    if ( (ebp == null) || ebp.lessThan(esp) ) {
-      return null;
-    }
-
-    // Check alignment of ebp
-    if ( dbg.getAddressValue(ebp) % ADDRESS_SIZE != 0) {
-        return null;
-    }
-
-    Address nextEBP = ebp.getAddressAt( 0 * ADDRESS_SIZE);
-    if (nextEBP == null || nextEBP.lessThanOrEqual(ebp)) {
-      return null;
-    }
-    Address nextPC  = ebp.getAddressAt( 1 * ADDRESS_SIZE);
-    if (nextPC == null) {
-      return null;
-    }
-    return new WindowsX86CFrame(dbg, nextEBP, nextPC);
-  }
-
-  public Address pc() {
-    return pc;
-  }
-
-  public Address localVariableBase() {
-    return ebp;
-  }
-
-  private WindbgDebugger dbg;
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java
index 3f96f72cf04..c4eeaf4a367 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java
@@ -81,7 +81,9 @@ private static long lengthOffsetInBytes() {
     if (lengthOffsetInBytes != 0) {
       return lengthOffsetInBytes;
     }
-    if (VM.getVM().isCompressedKlassPointersEnabled()) {
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      lengthOffsetInBytes = Oop.getHeaderSize();
+    } else if (VM.getVM().isCompressedKlassPointersEnabled()) {
       lengthOffsetInBytes = typeSize - VM.getVM().getIntSize();
     } else {
       lengthOffsetInBytes = typeSize;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
index b837d869ea0..fd364d6a174 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
@@ -55,7 +55,9 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
 
   // Returns header size in bytes.
   public static long getHeaderSize() {
-    if (VM.getVM().isCompressedKlassPointersEnabled()) {
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      return Oop.getHeaderSize();
+    } else if (VM.getVM().isCompressedKlassPointersEnabled()) {
       return typeSize - VM.getVM().getIntSize();
     } else {
       return typeSize;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
index a3a06ec73f5..edffd56d2cd 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
@@ -54,6 +54,9 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
     lockShift           = db.lookupLongConstant("markWord::lock_shift").longValue();
     ageShift            = db.lookupLongConstant("markWord::age_shift").longValue();
     hashShift           = db.lookupLongConstant("markWord::hash_shift").longValue();
+    if (VM.getVM().isLP64()) {
+      klassShift          = db.lookupLongConstant("markWord::klass_shift").longValue();
+    }
     lockMask            = db.lookupLongConstant("markWord::lock_mask").longValue();
     lockMaskInPlace     = db.lookupLongConstant("markWord::lock_mask_in_place").longValue();
     ageMask             = db.lookupLongConstant("markWord::age_mask").longValue();
@@ -82,6 +85,7 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
   private static long lockShift;
   private static long ageShift;
   private static long hashShift;
+  private static long klassShift;
 
   private static long lockMask;
   private static long lockMaskInPlace;
@@ -102,6 +106,10 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
 
   private static long maxAge;
 
+  public static long getKlassShift() {
+    return klassShift;
+  }
+
   public Mark(Address addr) {
     super(addr);
   }
@@ -191,6 +199,11 @@ public boolean hasNoHash() {
     return hash() == noHash;
   }
 
+  public Klass getKlass() {
+    assert(VM.getVM().isCompactObjectHeadersEnabled());
+    return (Klass)Metadata.instantiateWrapperFor(addr.getCompKlassAddressAt(0));
+  }
+
   // Debugging
   public void printOn(PrintStream tty) {
     if (isLocked()) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
index bf957941a56..825b1bf1437 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
@@ -46,9 +46,14 @@ public void update(Observable o, Object data) {
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     Type type  = db.lookupType("oopDesc");
     mark       = new CIntField(type.getCIntegerField("_mark"), 0);
-    klass      = new MetadataField(type.getAddressField("_metadata._klass"), 0);
-    compressedKlass  = new NarrowKlassField(type.getAddressField("_metadata._compressed_klass"), 0);
-    headerSize = type.getSize();
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      Type markType = db.lookupType("markWord");
+      headerSize = markType.getSize();
+    } else {
+      headerSize = type.getSize();
+      klass      = new MetadataField(type.getAddressField("_metadata._klass"), 0);
+      compressedKlass  = new NarrowKlassField(type.getAddressField("_metadata._compressed_klass"), 0);
+    }
   }
 
   private OopHandle  handle;
@@ -75,8 +80,12 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
 
   // Accessors for declared fields
   public Mark  getMark()   { return new Mark(getHandle()); }
+
   public Klass getKlass() {
-    if (VM.getVM().isCompressedKlassPointersEnabled()) {
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      assert(VM.getVM().isCompressedKlassPointersEnabled());
+      return getMark().getKlass();
+    } else if (VM.getVM().isCompressedKlassPointersEnabled()) {
       return (Klass)compressedKlass.getValue(getHandle());
     } else {
       return (Klass)klass.getValue(getHandle());
@@ -147,10 +156,12 @@ public void iterate(OopVisitor visitor, boolean doVMFields) {
   void iterateFields(OopVisitor visitor, boolean doVMFields) {
     if (doVMFields) {
       visitor.doCInt(mark, true);
-      if (VM.getVM().isCompressedKlassPointersEnabled()) {
-        visitor.doMetadata(compressedKlass, true);
-      } else {
-        visitor.doMetadata(klass, true);
+      if (!VM.getVM().isCompactObjectHeadersEnabled()) {
+        if (VM.getVM().isCompressedKlassPointersEnabled()) {
+          visitor.doMetadata(compressedKlass, true);
+        } else {
+          visitor.doMetadata(klass, true);
+        }
       }
     }
   }
@@ -206,7 +217,10 @@ public static Klass getKlassForOopHandle(OopHandle handle) {
     if (handle == null) {
       return null;
     }
-    if (VM.getVM().isCompressedKlassPointersEnabled()) {
+    if (VM.getVM().isCompactObjectHeadersEnabled()) {
+      Mark mark = new Mark(handle);
+      return mark.getKlass();
+    } else if (VM.getVM().isCompressedKlassPointersEnabled()) {
       return (Klass)Metadata.instantiateWrapperFor(handle.getCompKlassAddressAt(compressedKlass.getOffset()));
     } else {
       return (Klass)Metadata.instantiateWrapperFor(handle.getAddressAt(klass.getOffset()));
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
index 03e0ed4f29a..84cf7e38d1f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ public class JavaThread extends Thread {
   private static CIntegerField stackSizeField;
   private static CIntegerField terminatedField;
   private static AddressField activeHandlesField;
+  private static CIntegerField lockIdField;
   private static long oopPtrSize;
 
   private static JavaThreadPDAccess access;
@@ -101,6 +102,7 @@ private static synchronized void initialize(TypeDataBase db) {
     stackSizeField    = type.getCIntegerField("_stack_size");
     terminatedField   = type.getCIntegerField("_terminated");
     activeHandlesField = type.getAddressField("_active_handles");
+    lockIdField        = type.getCIntegerField("_lock_id");
 
     lockStackTopOffset = type.getField("_lock_stack").getOffset() + typeLockStack.getField("_top").getOffset();
     lockStackBaseOffset = type.getField("_lock_stack").getOffset() + typeLockStack.getField("_base[0]").getOffset();
@@ -376,6 +378,10 @@ public String getThreadName() {
     return OopUtilities.threadOopGetName(threadObj);
   }
 
+  public Address getLockId() {
+    return lockIdField.getAddress(addr);
+  }
+
   //
   // Oop traversal
   //
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java
index e16982ce434..25c5344506c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,8 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeExc
     objectFieldOffset = f.getOffset();
     f = type.getField("_owner");
     ownerFieldOffset = f.getOffset();
+    f = type.getField("_stack_locker");
+    stackLockerFieldOffset = f.getOffset();
     f = type.getField("_next_om");
     nextOMFieldOffset = f.getOffset();
     contentionsField  = new CIntField(type.getCIntegerField("_contentions"), 0);
@@ -87,6 +89,7 @@ public boolean isOwnedAnonymous() {
   }
 
   public Address owner() { return addr.getAddressAt(ownerFieldOffset); }
+  public Address stackLocker() { return addr.getAddressAt(stackLockerFieldOffset); }
   // FIXME
   //  void      set_owner(void* owner);
 
@@ -117,6 +120,7 @@ public int contentions() {
   private static long          metadataFieldOffset;
   private static long          objectFieldOffset;
   private static long          ownerFieldOffset;
+  private static long          stackLockerFieldOffset;
   private static long          nextOMFieldOffset;
   private static CIntField     contentionsField;
   private static CIntField     waitersField;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
index 4a40525b78a..e8eacbe756f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.runtime.win32_x86.Win32X86JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.win32_aarch64.Win32AARCH64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess;
@@ -98,9 +97,7 @@ private static synchronized void initialize(TypeDataBase db) {
         access = null;
         // FIXME: find the platform specific PD class by reflection?
         if (os.equals("win32")) {
-            if (cpu.equals("x86")) {
-                access =  new Win32X86JavaThreadPDAccess();
-            } else if (cpu.equals("amd64")) {
+            if (cpu.equals("amd64")) {
                 access =  new Win32AMD64JavaThreadPDAccess();
             } else if (cpu.equals("aarch64")) {
                 access =  new Win32AARCH64JavaThreadPDAccess();
@@ -212,28 +209,20 @@ public void oopsDo(AddressVisitor oopVisitor) {
         }
     }
 
-    // refer to Threads::owning_thread_from_monitor_owner
-    public JavaThread owningThreadFromMonitor(Address o) {
-        assert(VM.getVM().getCommandLineFlag("LockingMode").getInt() != LockingMode.getLightweight());
+    private JavaThread owningThreadFromMonitor(Address o) {
         if (o == null) return null;
         for (int i = 0; i < getNumberOfThreads(); i++) {
             JavaThread thread = getJavaThreadAt(i);
-            if (o.equals(thread.threadObjectAddress())) {
+            if (o.equals(thread.getLockId())) {
                 return thread;
             }
         }
-
-        for (int i = 0; i < getNumberOfThreads(); i++) {
-            JavaThread thread = getJavaThreadAt(i);
-            if (thread.isLockOwned(o))
-                return thread;
-        }
         return null;
     }
 
     public JavaThread owningThreadFromMonitor(ObjectMonitor monitor) {
-        if (VM.getVM().getCommandLineFlag("LockingMode").getInt() == LockingMode.getLightweight()) {
-            if (monitor.isOwnedAnonymous()) {
+        if (monitor.isOwnedAnonymous()) {
+            if (VM.getVM().getCommandLineFlag("LockingMode").getInt() == LockingMode.getLightweight()) {
                 OopHandle object = monitor.object();
                 for (int i = 0; i < getNumberOfThreads(); i++) {
                     JavaThread thread = getJavaThreadAt(i);
@@ -246,11 +235,16 @@ public JavaThread owningThreadFromMonitor(ObjectMonitor monitor) {
                 System.out.println("Warning: We failed to find a thread that owns an anonymous lock. This is likely");
                 System.out.println("due to the JVM currently running a GC. Locking information may not be accurate.");
                 return null;
+            } else {
+                assert(VM.getVM().getCommandLineFlag("LockingMode").getInt() == LockingMode.getLegacy());
+                Address o = (Address)monitor.stackLocker();
+                for (int i = 0; i < getNumberOfThreads(); i++) {
+                    JavaThread thread = getJavaThreadAt(i);
+                    if (thread.isLockOwned(o))
+                        return thread;
+                }
+                return null;
             }
-            // Owner can only be threads at this point.
-            Address o = monitor.owner();
-            if (o == null) return null;
-            return new JavaThread(o);
         } else {
             return owningThreadFromMonitor(monitor.owner());
         }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
index da900884045..202217b6071 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
@@ -149,6 +149,7 @@ public class VM {
   private Boolean sharingEnabled;
   private Boolean compressedOopsEnabled;
   private Boolean compressedKlassPointersEnabled;
+  private Boolean compactObjectHeadersEnabled;
 
   // command line flags supplied to VM - see struct JVMFlag in jvmFlag.hpp
   public static final class Flag {
@@ -969,6 +970,15 @@ public boolean isCompressedKlassPointersEnabled() {
     return compressedKlassPointersEnabled.booleanValue();
   }
 
+  public boolean isCompactObjectHeadersEnabled() {
+    if (compactObjectHeadersEnabled == null) {
+        Flag flag = getCommandLineFlag("UseCompactObjectHeaders");
+        compactObjectHeadersEnabled = (flag == null) ? Boolean.FALSE:
+             (flag.getBool()? Boolean.TRUE: Boolean.FALSE);
+    }
+    return compactObjectHeadersEnabled.booleanValue();
+  }
+
   public int getObjectAlignmentInBytes() {
     if (objectAlignmentInBytes == 0) {
         Flag flag = getCommandLineFlag("ObjectAlignmentInBytes");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java
deleted file mode 100644
index 93dd66e1acf..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.win32_x86;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.runtime.x86.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-/** This class is only public to allow using the VMObjectFactory to
-    instantiate these.
-*/
-
-public class Win32X86JavaThreadPDAccess implements JavaThreadPDAccess {
-  private static AddressField  lastJavaFPField;
-  private static AddressField  osThreadField;
-
-  // Field from OSThread
-  private static Field         threadIdField;
-
-  // This is currently unneeded but is being kept in case we change
-  // the currentFrameGuess algorithm
-  private static final long GUESS_SCAN_RANGE = 128 * 1024;
-
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("JavaThread");
-    Type anchorType = db.lookupType("JavaFrameAnchor");
-    lastJavaFPField         = anchorType.getAddressField("_last_Java_fp");
-    osThreadField           = type.getAddressField("_osthread");
-
-    type = db.lookupType("OSThread");
-    threadIdField = type.getField("_thread_id");
-  }
-
-  public Address getLastJavaFP(Address addr) {
-    return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
-  }
-
-  public Address getLastJavaPC(Address addr) {
-    return null;
-  }
-
-  public Address getBaseOfStackPointer(Address addr) {
-    return null;
-  }
-
-  public Frame getLastFramePD(JavaThread thread, Address addr) {
-    Address fp = thread.getLastJavaFP();
-    if (fp == null) {
-      return null; // no information
-    }
-    Address pc =  thread.getLastJavaPC();
-    if ( pc != null ) {
-      return new X86Frame(thread.getLastJavaSP(), fp, pc);
-    } else {
-      return new X86Frame(thread.getLastJavaSP(), fp);
-    }
-  }
-
-  public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
-  }
-
-  public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    X86CurrentFrameGuess guesser = new X86CurrentFrameGuess(context, thread);
-    if (!guesser.run(GUESS_SCAN_RANGE)) {
-      return null;
-    }
-    if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
-    } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
-    }
-  }
-
-  public void printThreadIDOn(Address addr, PrintStream tty) {
-    tty.print(getThreadProxy(addr));
-  }
-
-  public void printInfoOn(Address threadAddr, PrintStream tty) {
-  }
-
-  public Address getLastSP(Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    return context.getRegisterAsAddress(X86ThreadContext.ESP);
-  }
-
-  public ThreadProxy getThreadProxy(Address addr) {
-    // Addr is the address of the JavaThread.
-    // Fetch the OSThread (for now and for simplicity, not making a
-    // separate "OSThread" class in this package)
-    Address osThreadAddr = osThreadField.getValue(addr);
-    // Get the address of the thread_id within the OSThread
-    Address threadIdAddr =
-      osThreadAddr.addOffsetTo(threadIdField.getOffset());
-    JVMDebugger debugger = VM.getVM().getDebugger();
-    return debugger.getThreadForIdentifierAddress(threadIdAddr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
index c9ffca89ec7..72861d9c30d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1005,56 +1005,56 @@ protected void writePrimitiveArray(TypeArray array) throws IOException {
 
     private void writeBooleanArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = BOOLEAN_BASE_OFFSET + index * BOOLEAN_SIZE;
+             long offset = (long) BOOLEAN_BASE_OFFSET + index * BOOLEAN_SIZE;
              out.writeBoolean(array.getHandle().getJBooleanAt(offset));
         }
     }
 
     private void writeByteArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = BYTE_BASE_OFFSET + index * BYTE_SIZE;
+             long offset = (long) BYTE_BASE_OFFSET + index * BYTE_SIZE;
              out.writeByte(array.getHandle().getJByteAt(offset));
         }
     }
 
     private void writeShortArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = SHORT_BASE_OFFSET + index * SHORT_SIZE;
+             long offset = (long) SHORT_BASE_OFFSET + index * SHORT_SIZE;
              out.writeShort(array.getHandle().getJShortAt(offset));
         }
     }
 
     private void writeIntArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = INT_BASE_OFFSET + index * INT_SIZE;
+             long offset = (long) INT_BASE_OFFSET + index * INT_SIZE;
              out.writeInt(array.getHandle().getJIntAt(offset));
         }
     }
 
     private void writeLongArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = LONG_BASE_OFFSET + index * LONG_SIZE;
+             long offset = (long) LONG_BASE_OFFSET + index * LONG_SIZE;
              out.writeLong(array.getHandle().getJLongAt(offset));
         }
     }
 
     private void writeCharArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = CHAR_BASE_OFFSET + index * CHAR_SIZE;
+             long offset = (long) CHAR_BASE_OFFSET + index * CHAR_SIZE;
              out.writeChar(array.getHandle().getJCharAt(offset));
         }
     }
 
     private void writeFloatArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = FLOAT_BASE_OFFSET + index * FLOAT_SIZE;
+             long offset = (long) FLOAT_BASE_OFFSET + index * FLOAT_SIZE;
              out.writeFloat(array.getHandle().getJFloatAt(offset));
         }
     }
 
     private void writeDoubleArray(TypeArray array, int length) throws IOException {
         for (int index = 0; index < length; index++) {
-             long offset = DOUBLE_BASE_OFFSET + index * DOUBLE_SIZE;
+             long offset = (long) DOUBLE_BASE_OFFSET + index * DOUBLE_SIZE;
              out.writeDouble(array.getHandle().getJDoubleAt(offset));
         }
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
index 3f701b8d24e..6a8b794a935 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
@@ -26,6 +26,7 @@
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.oops.Metadata;
+import sun.jvm.hotspot.oops.Oop;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.types.*;
 
@@ -37,26 +38,6 @@
     states than the ObjectHeap code. */
 
 public class RobustOopDeterminator {
-  private static AddressField klassField;
-
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static void initialize(TypeDataBase db) {
-    Type type = db.lookupType("oopDesc");
-
-    if (VM.getVM().isCompressedKlassPointersEnabled()) {
-      klassField = type.getAddressField("_metadata._compressed_klass");
-    } else {
-      klassField = type.getAddressField("_metadata._klass");
-    }
-  }
-
   public static boolean oopLooksValid(OopHandle oop) {
     if (oop == null) {
       return false;
@@ -66,11 +47,7 @@ public static boolean oopLooksValid(OopHandle oop) {
     }
     try {
       // Try to instantiate the Klass
-      if (VM.getVM().isCompressedKlassPointersEnabled()) {
-        Metadata.instantiateWrapperFor(oop.getCompKlassAddressAt(klassField.getOffset()));
-      } else {
-        Metadata.instantiateWrapperFor(klassField.getValue(oop));
-      }
+      Oop.getKlassForOopHandle(oop);
       return true;
     } catch (AddressException | WrongTypeException e) {
       return false;
diff --git a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
index de3c45d00d2..1ecac8ac97a 100644
--- a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
+++ b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
@@ -30,10 +30,7 @@
 
 #include "sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal.h"
 
-#ifdef _M_IX86
-  #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
-  #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
-#elif _M_AMD64
+#ifdef _M_AMD64
   #include "sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext.h"
   #define NPRGREG sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_NPRGREG
 #elif _M_ARM64
@@ -560,39 +557,7 @@ static bool addThreads(JNIEnv* env, jobject obj) {
     memset(&context, 0, sizeof(CONTEXT));
 
 #undef REG_INDEX
-#ifdef _M_IX86
-    #define REG_INDEX(x) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##x
-
-    context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
-    ptrIDebugAdvanced->GetThreadContext(&context, sizeof(CONTEXT));
-
-    ptrRegs[REG_INDEX(GS)]  = context.SegGs;
-    ptrRegs[REG_INDEX(FS)]  = context.SegFs;
-    ptrRegs[REG_INDEX(ES)]  = context.SegEs;
-    ptrRegs[REG_INDEX(DS)]  = context.SegDs;
-
-    ptrRegs[REG_INDEX(EDI)] = context.Edi;
-    ptrRegs[REG_INDEX(ESI)] = context.Esi;
-    ptrRegs[REG_INDEX(EBX)] = context.Ebx;
-    ptrRegs[REG_INDEX(EDX)] = context.Edx;
-    ptrRegs[REG_INDEX(ECX)] = context.Ecx;
-    ptrRegs[REG_INDEX(EAX)] = context.Eax;
-
-    ptrRegs[REG_INDEX(FP)] = context.Ebp;
-    ptrRegs[REG_INDEX(PC)] = context.Eip;
-    ptrRegs[REG_INDEX(CS)]  = context.SegCs;
-    ptrRegs[REG_INDEX(EFL)] = context.EFlags;
-    ptrRegs[REG_INDEX(SP)] = context.Esp;
-    ptrRegs[REG_INDEX(SS)]  = context.SegSs;
-
-    ptrRegs[REG_INDEX(DR0)] = context.Dr0;
-    ptrRegs[REG_INDEX(DR1)] = context.Dr1;
-    ptrRegs[REG_INDEX(DR2)] = context.Dr2;
-    ptrRegs[REG_INDEX(DR3)] = context.Dr3;
-    ptrRegs[REG_INDEX(DR6)] = context.Dr6;
-    ptrRegs[REG_INDEX(DR7)] = context.Dr7;
-
-#elif _M_AMD64
+#ifdef _M_AMD64
     #define REG_INDEX(x) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##x
 
     context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
index 7b9331b86b8..551f24d3cf0 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,9 +188,6 @@ public enum OutputLevel {
      *         is not a directory, or is not readable
      * @throws UncheckedIOException if an I/O error occurs
      * @throws NullPointerException if any argument is null
-     * @throws SecurityException if a security manager is installed and a
-     *         recursive {@link java.io.FilePermission} "{@code read}" of the
-     *         rootDirectory is denied
      */
     public static HttpServer createFileServer(InetSocketAddress addr,
                                               Path rootDirectory,
@@ -233,9 +230,6 @@ public static HttpServer createFileServer(InetSocketAddress addr,
      * @throws IllegalArgumentException if rootDirectory does not exist,
      *         is not absolute, is not a directory, or is not readable
      * @throws NullPointerException if the argument is null
-     * @throws SecurityException if a security manager is installed and a
-     *         recursive {@link java.io.FilePermission} "{@code read}" of the
-     *         rootDirectory is denied
      */
     public static HttpHandler createFileHandler(Path rootDirectory) {
         Objects.requireNonNull(rootDirectory);
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index 87477cffa92..e86f1944cd3 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,10 +82,6 @@ public abstract HttpsServer createHttpsServer(InetSocketAddress addr,
 
     /**
      * Initializes a new instance of this class.
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it denies
-     *          {@link RuntimePermission}{@code ("httpServerProvider")}
      */
     protected HttpServerProvider() {
         @SuppressWarnings("removal")
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index f36215ffe12..346b00eda5e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -4101,7 +4101,7 @@ static long booleanArrayAddress(boolean[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
index d7fc2cfa97d..5b3a25baa58 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -3621,7 +3621,7 @@ static long arrayAddress(double[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
new file mode 100644
index 00000000000..5a7cdb89dde
--- /dev/null
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
@@ -0,0 +1,2353 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.incubator.vector;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+// import jdk.internal.math.*;
+
+import static jdk.incubator.vector.Float16Consts.SIGN_BIT_MASK;
+import static jdk.incubator.vector.Float16Consts.EXP_BIT_MASK;
+import static jdk.incubator.vector.Float16Consts.SIGNIF_BIT_MASK;
+
+import static java.lang.Float.float16ToFloat;
+import static java.lang.Float.floatToFloat16;
+import static java.lang.Integer.numberOfLeadingZeros;
+import static java.lang.Math.multiplyHigh;
+
+/**
+ * The {@code Float16} is a class holding 16-bit data
+ * in IEEE 754 binary16 format.
+ *
+ * <p>Binary16 Format:<br>
+ *   S EEEEE  MMMMMMMMMM<br>
+ *   Sign        - 1 bit<br>
+ *   Exponent    - 5 bits<br>
+ *   Significand - 10 bits (does not include the <i>implicit bit</i>
+ *                    inferred from the exponent, see {@link #PRECISION})<br>
+ *
+ * <p>Unless otherwise specified, the methods in this class use a
+ * <em>rounding policy</em> (JLS {@jls 15.4}) of {@linkplain
+ * java.math.RoundingMode#HALF_EVEN round to nearest}.
+ *
+ * <p>This is a <a href="{@docRoot}/java.base/java/lang/doc-files/ValueBased.html">value-based</a>
+ * class; programmers should treat instances that are
+ * {@linkplain #equals(Object) equal} as interchangeable and should not
+ * use instances for synchronization, or unpredictable behavior may
+ * occur. For example, in a future release, synchronization may fail.
+ *
+ * <h2><a id=equivalenceRelation>Floating-point Equality, Equivalence,
+ * and Comparison</a></h2>
+ *
+ * The class {@code java.lang.Double} has a {@linkplain
+ * Double##equivalenceRelation discussion of equality,
+ * equivalence, and comparison of floating-point values} that is
+ * equally applicable to {@code Float16} values.
+ *
+ * <h2><a id=decimalToBinaryConversion>Decimal &harr; Binary Conversion Issues</a></h2>
+ *
+ * The {@linkplain Double##decimalToBinaryConversion discussion of binary to
+ * decimal conversion issues} in {@code java.lang.Double} is also
+ * applicable to {@code Float16} values.
+ *
+ *
+ * @apiNote
+ * The methods in this class generally have analogous methods in
+ * either {@link Float}/{@link Double} or {@link Math}/{@link
+ * StrictMath}. Unless otherwise specified, the handling of special
+ * floating-point values such as {@linkplain #isNaN(Float16) NaN}
+ * values, {@linkplain #isInfinite(Float16) infinities}, and signed
+ * zeros of methods in this class is wholly analogous to the handling
+ * of equivalent cases by methods in {@code Float}, {@code Double},
+ * {@code Math}, etc.
+ *
+ * @since 24
+ *
+ * @see <a href="https://standards.ieee.org/ieee/754/6210/">
+ *      <cite>IEEE Standard for Floating-Point Arithmetic</cite></a>
+ */
+
+// Currently Float16 is a value-based class and in future it is
+// expected to be aligned with Value Classes and Object as described in
+// JEP-401 (https://openjdk.org/jeps/401).
+// @jdk.internal.MigratedValueClass
+// @jdk.internal.ValueBased
+public final class Float16
+    extends Number
+    implements Comparable<Float16> {
+    private final short value;
+    private static final long serialVersionUID = 16; // May not be needed when a value class?
+
+    // Functionality for future consideration:
+    // IEEEremainder / remainder operator remainder
+
+    // Do *not* define any public constructors
+   /**
+    * Returns a {@code Float16} instance wrapping IEEE 754 binary16
+    * encoded {@code short} value.
+    *
+    * @param  bits a short value.
+    */
+    private Float16(short bits) {
+        this.value = bits;
+    }
+
+    /**
+     * A constant holding the positive infinity of type {@code
+     * Float16}.
+     *
+     * @see Float#POSITIVE_INFINITY
+     * @see Double#POSITIVE_INFINITY
+     */
+    public static final Float16 POSITIVE_INFINITY = valueOf(Float.POSITIVE_INFINITY);
+
+    /**
+     * A constant holding the negative infinity of type {@code
+     * Float16}.
+     *
+     * @see Float#NEGATIVE_INFINITY
+     * @see Double#NEGATIVE_INFINITY
+     */
+    public static final Float16 NEGATIVE_INFINITY = valueOf(Float.NEGATIVE_INFINITY);
+
+    /**
+     * A constant holding a Not-a-Number (NaN) value of type {@code
+     * Float16}.
+     *
+     * @see Float#NaN
+     * @see Double#NaN
+     */
+    public static final Float16 NaN = valueOf(Float.NaN);
+
+    /**
+     * A constant holding the largest positive finite value of type
+     * {@code Float16},
+     * (2-2<sup>-10</sup>)&middot;2<sup>15</sup>, numerically equal to 65504.0.
+     *
+     * @see Float#MAX_VALUE
+     * @see Double#MAX_VALUE
+     */
+    public static final Float16 MAX_VALUE = valueOf(0x1.ffcp15f);
+
+    /**
+     * A constant holding the smallest positive normal value of type
+     * {@code Float16}, 2<sup>-14</sup>.
+     *
+     * @see Float#MIN_NORMAL
+     * @see Double#MIN_NORMAL
+     */
+    public static final Float16 MIN_NORMAL = valueOf(0x1.0p-14f);
+
+    /**
+     * A constant holding the smallest positive nonzero value of type
+     * {@code Float16}, 2<sup>-24</sup>.
+     *
+     * @see Float#MIN_VALUE
+     * @see Double#MIN_VALUE
+     */
+    public static final Float16 MIN_VALUE = valueOf(0x1.0p-24f);
+
+    /**
+     * The number of bits used to represent a {@code Float16} value,
+     * {@value}.
+     *
+     * @see Float#SIZE
+     * @see Double#SIZE
+     */
+    public static final int SIZE = 16;
+
+    /**
+     * The number of bits in the significand of a {@code Float16}
+     * value, {@value}.  This corresponds to parameter N in section
+     * {@jls 4.2.3} of <cite>The Java Language Specification</cite>.
+     *
+     * @see Float#PRECISION
+     * @see Double#PRECISION
+     */
+    public static final int PRECISION = 11;
+
+    /**
+     * Maximum exponent a finite {@code Float16} variable may have,
+     * {@value}. It is equal to the value returned by {@code
+     * Float16.getExponent(Float16.MAX_VALUE)}.
+     *
+     * @see Float#MAX_EXPONENT
+     * @see Double#MAX_EXPONENT
+     */
+    public static final int MAX_EXPONENT = (1 << (SIZE - PRECISION - 1)) - 1; // 15
+
+    /**
+     * Minimum exponent a normalized {@code Float16} variable may
+     * have, {@value}.  It is equal to the value returned by {@code
+     * Float16.getExponent(Float16.MIN_NORMAL)}.
+     *
+     * @see Float#MIN_EXPONENT
+     * @see Double#MIN_EXPONENT
+     */
+    public static final int MIN_EXPONENT = 1 - MAX_EXPONENT; // -14
+
+    /**
+     * The number of bytes used to represent a {@code Float16} value,
+     * {@value}.
+     *
+     * @see Float#BYTES
+     * @see Double#BYTES
+     */
+    public static final int BYTES = SIZE / Byte.SIZE;
+
+    /**
+     * Returns a string representation of the {@code Float16}
+     * argument.
+     *
+     * The behavior of this method is analogous to {@link
+     * Float#toString(float)} in the handling of special values
+     * (signed zeros, infinities, and NaN) and the generation of a
+     * decimal string that will convert back to the argument value.
+     *
+     * @param   f16   the {@code Float16} to be converted.
+     * @return a string representation of the argument.
+     * @see java.lang.Float#toString(float)
+     */
+    public static String toString(Float16 f16) {
+         return Float16ToDecimal.toString(f16);
+    }
+
+    /**
+     * Returns a hexadecimal string representation of the {@code
+     * Float16} argument.
+     *
+     * The behavior of this class is analogous to {@link
+     * Float#toHexString(float)} except that an exponent value of
+     * {@code "p-14"} is used for subnormal {@code Float16} values.
+     *
+     * @apiNote
+     * This method corresponds to the convertToHexCharacter operation
+     * defined in IEEE 754.
+     *
+     * @param   f16   the {@code Float16} to be converted.
+     * @return a hex string representation of the argument.
+     *
+     * @see Float#toHexString(float)
+     * @see Double#toHexString(double)
+     */
+    public static String toHexString(Float16 f16) {
+        float f = f16.floatValue();
+        if (Math.abs(f) < float16ToFloat(MIN_NORMAL.value)
+            &&  f != 0.0f ) {// Float16 subnormal
+            // Adjust exponent to create subnormal double, then
+            // replace subnormal double exponent with subnormal Float16
+            // exponent
+            String s = Double.toHexString(Math.scalb((double)f,
+                                                     /* -1022+14 */
+                                                     Double.MIN_EXPONENT-
+                                                     MIN_EXPONENT));
+            return s.replaceFirst("p-1022$", "p-14");
+        } else {// double string will be the same as Float16 string
+            return Double.toHexString(f);
+        }
+    }
+
+    // -----------------------
+
+   /**
+    * {@return the value of an {@code int} converted to {@code
+    * Float16}}
+    *
+    * @param  value an {@code int} value.
+    *
+    * @apiNote
+    * This method corresponds to the convertFromInt operation defined
+    * in IEEE 754.
+    */
+    public static Float16 valueOf(int value) {
+        // int -> double conversion is exact
+        return valueOf((double)value);
+    }
+
+   /**
+    * {@return the value of a {@code long} converted to {@code Float16}}
+    *
+    * @apiNote
+    * This method corresponds to the convertFromInt operation defined
+    * in IEEE 754.
+    *
+    * @param  value a {@code long} value.
+    */
+    public static Float16 valueOf(long value) {
+        if (value <= -65_520L) {  // -(Float16.MAX_VALUE + Float16.ulp(Float16.MAX_VALUE) / 2)
+            return NEGATIVE_INFINITY;
+        } else {
+            if (value >= 65_520L) {  // Float16.MAX_VALUE + Float16.ulp(Float16.MAX_VALUE) / 2
+                return POSITIVE_INFINITY;
+            }
+            // Remaining range of long, the integers in approx. +/-
+            // 2^16, all fit in a float so the correct conversion can
+            // be done via an intermediate float conversion.
+            return valueOf((float)value);
+        }
+    }
+
+   /**
+    * {@return a {@code Float16} value rounded from the {@code float}
+    * argument using the round to nearest rounding policy}
+    *
+    * @apiNote
+    * This method corresponds to the convertFormat operation defined
+    * in IEEE 754.
+    *
+    * @param  f a {@code float}
+    */
+    public static Float16 valueOf(float f) {
+        return new Float16(Float.floatToFloat16(f));
+    }
+
+   /**
+    * {@return a {@code Float16} value rounded from the {@code double}
+    * argument using the round to nearest rounding policy}
+    *
+    * @apiNote
+    * This method corresponds to the convertFormat operation defined
+    * in IEEE 754.
+    *
+    * @param  d a {@code double}
+    */
+    public static Float16 valueOf(double d) {
+        long doppel = Double.doubleToRawLongBits(d);
+
+        short sign_bit = (short)((doppel & 0x8000_0000_0000_0000L) >> 48);
+
+        if (Double.isNaN(d)) {
+            // Have existing float code handle any attempts to
+            // preserve NaN bits.
+            return valueOf((float)d);
+        }
+
+        double abs_d = Math.abs(d);
+
+        // The overflow threshold is binary16 MAX_VALUE + 1/2 ulp
+        if (abs_d >= (0x1.ffcp15 + 0x0.002p15) ) {
+             // correctly signed infinity
+            return new Float16((short)(sign_bit | 0x7c00));
+        }
+
+        // Smallest magnitude nonzero representable binary16 value
+        // is equal to 0x1.0p-24; half-way and smaller rounds to zero.
+        if (abs_d <= 0x1.0p-24d * 0.5d) { // Covers double zeros and subnormals.
+            return new Float16(sign_bit); // Positive or negative zero
+        }
+
+        // Dealing with finite values in exponent range of binary16
+        // (when rounding is done, could still round up)
+        int exp = Math.getExponent(d);
+        assert -25 <= exp && exp <= 15;
+
+        // For binary16 subnormals, beside forcing exp to -15, retain
+        // the difference expdelta = E_min - exp.  This is the excess
+        // shift value, in addition to 42, to be used in the
+        // computations below.  Further the (hidden) msb with value 1
+        // in d must be involved as well.
+        int expdelta = 0;
+        long msb = 0x0000_0000_0000_0000L;
+        if (exp < -14) {
+            expdelta = -14 - exp; // FIXME?
+            exp = -15;
+            msb = 0x0010_0000_0000_0000L; // should be 0x0020_... ?
+        }
+        long f_signif_bits = doppel & 0x000f_ffff_ffff_ffffL | msb;
+
+        // Significand bits as if using rounding to zero (truncation).
+        short signif_bits = (short)(f_signif_bits >> (42 + expdelta));
+
+        // For round to nearest even, determining whether or not to
+        // round up (in magnitude) is a function of the least
+        // significant bit (LSB), the next bit position (the round
+        // position), and the sticky bit (whether there are any
+        // nonzero bits in the exact result to the right of the round
+        // digit). An increment occurs in three cases:
+        //
+        // LSB  Round Sticky
+        // 0    1     1
+        // 1    1     0
+        // 1    1     1
+        // See "Computer Arithmetic Algorithms," Koren, Table 4.9
+
+        long lsb    = f_signif_bits & (1L << 42 + expdelta);
+        long round  = f_signif_bits & (1L << 41 + expdelta);
+        long sticky = f_signif_bits & ((1L << 41 + expdelta) - 1);
+
+        if (round != 0 && ((lsb | sticky) != 0 )) {
+            signif_bits++;
+        }
+
+        // No bits set in significand beyond the *first* exponent bit,
+        // not just the significand; quantity is added to the exponent
+        // to implement a carry out from rounding the significand.
+        assert (0xf800 & signif_bits) == 0x0;
+
+        return new Float16((short)(sign_bit | ( ((exp + 15) << 10) + signif_bits ) ));
+    }
+
+    /**
+     * Returns a {@code Float16} holding the floating-point value
+     * represented by the argument string.
+     *
+     * The grammar of strings accepted by this method is the same as
+     * that accepted by {@link Double#valueOf(String)}. The rounding
+     * policy is also analogous to the one used by that method, a
+     * valid input is regarded as an exact numerical value that is
+     * rounded once to the nearest representable {@code Float16} value.
+     *
+     * @apiNote
+     * This method corresponds to the convertFromDecimalCharacter and
+     * convertFromHexCharacter operations defined in IEEE 754.
+     *
+     * @param  s the string to be parsed.
+     * @return the {@code Float16} value represented by the string
+     *         argument.
+     * @throws NullPointerException  if the string is null
+     * @throws NumberFormatException if the string does not contain a
+     *               parsable {@code Float16}.
+     * @see    java.lang.Float#valueOf(String)
+     */
+    public static Float16 valueOf(String s) throws NumberFormatException {
+        s = s.trim(); // Legacy behavior from analogous methods on
+                      // Float and Double.
+
+        // Trial conversion from String -> double. Do quick range
+        // check for a pass-through, then check for possibility of
+        // double-rounding and another conversion using
+        // BigInteger/BigDecimal, if needed.
+        double trialResult = Double.parseDouble(s);
+        // After this point, the trimmed string is known to be
+        // syntactically well-formed; should be able to operate on
+        // characters rather than codepoints.
+
+        if (trialResult == 0.0 // handles signed zeros
+            || Math.abs(trialResult) > (65504.0 + 32.0) || // Float.MAX_VALUE + ulp(MAX_VALUE),
+                                                           // handles infinities too
+            Double.isNaN(trialResult) ||
+            noDoubleRoundingToFloat16(trialResult)) {
+            return valueOf(trialResult);
+        } else {
+            // If double rounding is not ruled out, re-parse, create a
+            // BigDecimal to hold the exact numerical value, round and
+            // return.
+
+            // Remove any trailing FloatTypeSuffix (f|F|d|D), not
+            // recognized by BigDecimal (or BigInteger)
+            int sLength = s.length();
+            if (Character.isAlphabetic(s.charAt(sLength-1))) {
+                s = s.substring(0, sLength - 1);
+            }
+
+            char startingChar = s.charAt(0);
+            boolean isSigned = (startingChar == '-') || (startingChar == '+');
+            // Hex literal will start "-0x..." or "+0x..." or "0x...""
+            // A valid hex literal must be at least three characters
+            // long "0xH" where H is a hex digit.
+            boolean hexInput = (s.length() >= 3 ) && isX(s.charAt(isSigned ? 2 : 1));
+
+            if (!hexInput) { // Decimal input
+                // Grammar of BigDecimal string input is compatible
+                // with the decimal grammar for this method after
+                // trimming and removal of any FloatTypeSuffix.
+                return valueOf(new BigDecimal(s));
+            } else {
+                // For hex inputs, convert the significand and
+                // exponent portions separately.
+                //
+                // Rough form of the hex input:
+                // Sign_opt 0x IntHexDigits_opt . FracHexDigits_opt [p|P] SignedInteger
+                //
+                // Partition input into between "0x" and "p" and from
+                // "p" to end of string.
+                //
+                // For the region between x and p, see if there is a
+                // period present. If so, the net exponent will need
+                // to be adjusted by the number of digits to the right
+                // of the (hexa)decimal point.
+                //
+                // Use BigInteger(String, 16) to construct the
+                // significand -- accepts leading sign.
+                StringBuilder hexSignificand = new StringBuilder();
+                if (isSigned) {
+                    hexSignificand.append(startingChar);
+                }
+
+                int fractionDigits = 0;
+                int digitStart = isSigned ? 3 : 2 ;
+
+                int periodIndex = s.indexOf((int)'.');
+
+                int pIndex = findPIndex(s);
+
+                // Gather the significand digits
+                if (periodIndex != -1) {
+                    // Reconstruct integer and fraction digit sequence
+                    // without the period.
+                    hexSignificand.append(s, digitStart,      periodIndex);
+                    hexSignificand.append(s, periodIndex + 1, pIndex);
+                    fractionDigits = pIndex - periodIndex - 1;
+                } else {
+                    // All integer digits, no fraction digits
+                    hexSignificand.append(s, digitStart, pIndex);
+                }
+
+                // The exponent of a hexadecimal floating-point
+                // literal is written in _decimal_.
+                int rawExponent = Integer.parseInt(s.substring(pIndex+1));
+
+                // The exact numerical value of the string is:
+                //
+                // normalizedSignificand * 2^(adjustedExponent)
+                //
+                // Given the set of methods on BigDecimal, in
+                // particular pow being limited to non-negative
+                // exponents, this is computed either by multiplying
+                // by BigDecimal.TWO raised to the adjustedExponent or
+                // dividing by BigDecimal.TWO raised to the negated
+                // adjustedExponent.
+
+                BigDecimal normalizedSignficand =
+                    new BigDecimal(new BigInteger(hexSignificand.toString(), 16));
+
+                // Each hex fraction digit is four bits
+                int adjustedExponent = rawExponent - 4*fractionDigits;
+
+                BigDecimal convertedStringValue = (adjustedExponent >= 0) ?
+                    normalizedSignficand.multiply(BigDecimal.TWO.pow( adjustedExponent)) :
+                    normalizedSignficand.divide(  BigDecimal.TWO.pow(-adjustedExponent));
+                return valueOf(convertedStringValue);
+            }
+        }
+    }
+
+    private static boolean noDoubleRoundingToFloat16(double d) {
+        // Note that if the String -> double conversion returned
+        // whether or not the conversion was exact, many cases could
+        // be skipped since the double-rounding would be known not to
+        // have occurred.
+        long dAsLong = Double.doubleToRawLongBits(d);
+        long mask = 0x03FF_FFFF_FFFFL; // 42 low-order bits
+        long maskedValue = dAsLong & mask;
+        // not half-way between two adjacent Float16 values
+        return maskedValue != 0x0200_0000_0000L;
+    }
+
+    private static boolean isX(int character) {
+        return character == (int)'x' || character == (int)'X';
+    }
+
+    private static int findPIndex(String s) {
+        int pIndex = s.indexOf((int)'p');
+        return (pIndex != -1) ?  pIndex : s.indexOf((int)'P');
+    }
+
+    /**
+     * {@return a {@link Float16} value rounded from the {@link BigDecimal}
+     * argument using the round to nearest rounding policy}
+     *
+     * @param  v a {@link BigDecimal}
+     */
+    public static Float16 valueOf(BigDecimal v) {
+        return BigDecimalConversion.float16Value(v);
+    }
+
+    // TODO: Host this functionality in this class for now until
+    // java.base has Float16 support and this logic can be moved to
+    // BigDecimal.
+    private class BigDecimalConversion {
+        /*
+         * Let l = log_2(10).
+         * Then, L < l < L + ulp(L) / 2, that is, L = roundTiesToEven(l).
+         */
+        private static final double L = 3.321928094887362;
+
+        private static final int P_F16 = PRECISION;  // 11
+        private static final int Q_MIN_F16 = MIN_EXPONENT - (P_F16 - 1);  // -24
+        private static final int Q_MAX_F16 = MAX_EXPONENT - (P_F16 - 1);  // 5
+
+        /**
+         * Powers of 10 which can be represented exactly in {@code
+         * Float16}.
+         */
+        private static final Float16[] FLOAT16_10_POW = {
+            Float16.valueOf(1), Float16.valueOf(10), Float16.valueOf(100),
+            Float16.valueOf(1_000), Float16.valueOf(10_000)
+        };
+
+        public static Float16 float16Value(BigDecimal bd) {
+            int scale = bd.scale();
+            BigInteger unscaledValue = bd.unscaledValue();
+
+            if (unscaledValue.abs().compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) {
+                long intCompact = unscaledValue.longValue();
+                Float16 v = Float16.valueOf(intCompact);
+                if (scale == 0) {
+                    return v;
+                }
+                /*
+                 * The discussion for the double case also applies here. That is,
+                 * the following test is precise for all long values, but here
+                 * Long.MAX_VALUE is not an issue.
+                 */
+                if (v.longValue() == intCompact) {
+                    if (0 < scale && scale < FLOAT16_10_POW.length) {
+                        return Float16.divide(v, FLOAT16_10_POW[scale]);
+                    }
+                    if (0 > scale && scale > -FLOAT16_10_POW.length) {
+                        return Float16.multiply(v, FLOAT16_10_POW[-scale]);
+                    }
+                }
+            }
+            return fullFloat16Value(bd);
+        }
+
+        private static BigInteger bigTenToThe(int scale) {
+            return BigInteger.TEN.pow(scale);
+        }
+
+        private static Float16 fullFloat16Value(BigDecimal bd) {
+            if (BigDecimal.ZERO.compareTo(bd) == 0) {
+                return Float16.valueOf(0);
+            }
+            BigInteger w = bd.unscaledValue().abs();
+            int scale = bd.scale();
+            long qb = w.bitLength() - (long) Math.ceil(scale * L);
+            Float16 signum = Float16.valueOf(bd.signum());
+            if (qb < Q_MIN_F16 - 2) {  // qb < -26
+                return Float16.multiply(signum, Float16.valueOf(0));
+            }
+            if (qb > Q_MAX_F16 + P_F16 + 1) {  // qb > 17
+                return Float16.multiply(signum, Float16.POSITIVE_INFINITY);
+            }
+            if (scale < 0) {
+                return Float16.multiply(signum, valueOf(w.multiply(bigTenToThe(-scale))));
+            }
+            if (scale == 0) {
+                return Float16.multiply(signum, valueOf(w));
+            }
+            int ql = (int) qb - (P_F16 + 3);
+            BigInteger pow10 =  bigTenToThe(scale);
+            BigInteger m, n;
+            if (ql <= 0) {
+                m = w.shiftLeft(-ql);
+                n = pow10;
+            } else {
+                m = w;
+                n = pow10.shiftLeft(ql);
+            }
+            BigInteger[] qr = m.divideAndRemainder(n);
+            /*
+             * We have
+             *      2^12 = 2^{P+1} <= i < 2^{P+5} = 2^16
+             * Contrary to the double and float cases, where we use long and int, resp.,
+             * here we cannot simply declare i as short, because P + 5 < Short.SIZE
+             * fails to hold.
+             * Using int is safe, though.
+             *
+             * Further, as Math.scalb(Float16) does not exists, we fall back to
+             * Math.scalb(double).
+             */
+            int i = qr[0].intValue();
+            int sb = qr[1].signum();
+            int dq = (Integer.SIZE - (P_F16 + 2)) - Integer.numberOfLeadingZeros(i);
+            int eq = (Q_MIN_F16 - 2) - ql;
+            if (dq >= eq) {
+                return Float16.valueOf(bd.signum() * Math.scalb((double) (i | sb), ql));
+            }
+            int mask = (1 << eq) - 1;
+            int j = i >> eq | (Integer.signum(i & mask)) | sb;
+            return Float16.valueOf(bd.signum() * Math.scalb((double) j, Q_MIN_F16 - 2));
+        }
+
+        public static Float16 valueOf(BigInteger bi) {
+            int signum = bi.signum();
+            return (signum == 0 || bi.bitLength() <= 31)
+                ? Float16.valueOf(bi.longValue())  // might return infinities
+                : signum > 0
+                ? Float16.POSITIVE_INFINITY
+                : Float16.NEGATIVE_INFINITY;
+        }
+    }
+
+    /**
+     * Returns {@code true} if the specified number is a
+     * Not-a-Number (NaN) value, {@code false} otherwise.
+     *
+     * @apiNote
+     * This method corresponds to the isNaN operation defined in IEEE
+     * 754.
+     *
+     * @param   f16   the value to be tested.
+     * @return  {@code true} if the argument is NaN;
+     *          {@code false} otherwise.
+     *
+     * @see Float#isNaN(float)
+     * @see Double#isNaN(double)
+     */
+    public static boolean isNaN(Float16 f16) {
+        final short bits = float16ToRawShortBits(f16);
+        // A NaN value has all ones in its exponent and a non-zero significand
+        return ((bits & 0x7c00) == 0x7c00 && (bits & 0x03ff) != 0);
+    }
+
+    /**
+     * Returns {@code true} if the specified number is infinitely
+     * large in magnitude, {@code false} otherwise.
+     *
+     * @apiNote
+     * This method corresponds to the isInfinite operation defined in
+     * IEEE 754.
+     *
+     * @param   f16   the value to be tested.
+     * @return  {@code true} if the argument is positive infinity or
+     *          negative infinity; {@code false} otherwise.
+     *
+     * @see Float#isInfinite(float)
+     * @see Double#isInfinite(double)
+     */
+    public static boolean isInfinite(Float16 f16) {
+        return ((float16ToRawShortBits(f16) ^
+                 float16ToRawShortBits(POSITIVE_INFINITY)) & 0x7fff) == 0;
+    }
+
+    /**
+     * Returns {@code true} if the argument is a finite floating-point
+     * value; returns {@code false} otherwise (for NaN and infinity
+     * arguments).
+     *
+     * @apiNote
+     * This method corresponds to the isFinite operation defined in
+     * IEEE 754.
+     *
+     * @param f16 the {@code Float16} value to be tested
+     * @return {@code true} if the argument is a finite
+     * floating-point value, {@code false} otherwise.
+     *
+     * @see Float#isFinite(float)
+     * @see Double#isFinite(double)
+     */
+    public static boolean isFinite(Float16 f16) {
+        return (float16ToRawShortBits(f16) & (short)0x0000_7FFF) <=
+            float16ToRawShortBits(MAX_VALUE);
+     }
+
+    /**
+     * {@return the value of this {@code Float16} as a {@code byte} after
+     * a narrowing primitive conversion}
+     *
+     * @jls 5.1.3 Narrowing Primitive Conversion
+     */
+    @Override
+    public byte byteValue() {
+        return (byte)floatValue();
+    }
+
+    /**
+     * {@return a string representation of this {@code Float16}}
+     *
+     * @implSpec
+     * This method returns the result of {@code Float16.toString(this)}.
+     */
+    public String toString() {
+        return toString(this);
+    }
+
+    /**
+     * {@return the value of this {@code Float16} as a {@code short}
+     * after a narrowing primitive conversion}
+     *
+     * @jls 5.1.3 Narrowing Primitive Conversion
+     */
+    @Override
+    public short shortValue() {
+        return (short)floatValue();
+    }
+
+    /**
+     * {@return the value of this {@code Float16} as an {@code int} after
+     * a narrowing primitive conversion}
+     *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
+     * @jls 5.1.3 Narrowing Primitive Conversion
+     */
+    @Override
+    public int intValue() {
+        return (int)floatValue();
+    }
+
+    /**
+     * {@return value of this {@code Float16} as a {@code long} after a
+     * narrowing primitive conversion}
+     *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
+     * @jls 5.1.3 Narrowing Primitive Conversion
+     */
+    @Override
+    public long longValue() {
+        return (long)floatValue();
+    }
+
+    /**
+     * {@return the value of this {@code Float16} as a {@code float}
+     * after a widening primitive conversion}
+     *
+     * @apiNote
+     * This method corresponds to the convertFormat operation defined
+     * in IEEE 754.
+     *
+     * @jls 5.1.2 Widening Primitive Conversion
+     */
+    @Override
+    public float floatValue() {
+        return float16ToFloat(value);
+    }
+
+    /**
+     * {@return the value of this {@code Float16} as a {@code double}
+     * after a widening primitive conversion}
+     *
+     * @apiNote
+     * This method corresponds to the convertFormat operation defined
+     * in IEEE 754.
+     *
+     * @jls 5.1.2 Widening Primitive Conversion
+     */
+    @Override
+    public double doubleValue() {
+        return (double)floatValue();
+    }
+
+    /**
+     * {@return a hash code for this {@code Float16} object}
+     *
+     * The general contract of {@code Object#hashCode()} is satisfied.
+     * All NaN values have the same hash code. Additionally, all
+     * distinct numerical values have unique hash codes; in
+     * particular, negative zero and positive zero have different hash
+     * codes from each other.
+     */
+    @Override
+    public int hashCode() {
+        return hashCode(this);
+    }
+
+    /**
+     * Returns a hash code for a {@code Float16} value; compatible with
+     * {@code Float16.hashCode()}.
+     *
+     * @param value the value to hash
+     * @return a hash code value for a {@code Float16} value.
+     */
+    public static int hashCode(Float16 value) {
+        // Use bit-pattern of canonical NaN for hashing.
+        Float16 f16 = isNaN(value) ? Float16.NaN : value;
+        return (int)float16ToRawShortBits(f16);
+    }
+
+    /**
+     * Compares this object against the specified object.  The result
+     * is {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Float16} object that
+     * represents a {@code Float16} that has the same value as the
+     * {@code double} represented by this object.
+     *
+     * @jls 15.21.1 Numerical Equality Operators == and !=
+     */
+    public boolean equals(Object obj) {
+        return (obj instanceof Float16 f16) &&
+            (float16ToShortBits(f16) == float16ToShortBits(this));
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point binary16 bit layout.
+     *
+     * @param   f16   a {@code Float16} floating-point number.
+     * @return the bits that represent the floating-point number.
+     *
+     * @see Float#floatToRawIntBits(float)
+     * @see Double#doubleToRawLongBits(double)
+     */
+    public static short float16ToRawShortBits(Float16 f16) {
+        return f16.value;
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point binary16 bit layout.
+     * All NaN values return the same bit pattern as {@link Float16#NaN}.
+     *
+     * @param   f16   a {@code Float16} floating-point number.
+     * @return the bits that represent the floating-point number.
+     *
+     * @see Float#floatToRawIntBits(float)
+     * @see Double#doubleToRawLongBits(double)
+     */
+    public static short float16ToShortBits(Float16 f16) {
+        if (isNaN(f16)) {
+            return Float16.NaN.value;
+        }
+        return f16.value;
+    }
+
+    /**
+     * Returns the {@code Float16} value corresponding to a given bit
+     * representation.
+     *
+     * @param   bits   any {@code short} integer.
+     * @return  the {@code Float16} floating-point value with the same
+     *          bit pattern.
+     *
+     * @see Float#intBitsToFloat(int)
+     * @see Double#longBitsToDouble(long)
+     */
+    public static Float16 shortBitsToFloat16(short bits) {
+        return new Float16(bits);
+    }
+
+    /**
+     * Compares two {@code Float16} objects numerically.
+     *
+     * This method imposes a total order on {@code Float16} objects
+     * with two differences compared to the incomplete order defined by
+     * the Java language numerical comparison operators ({@code <, <=,
+     * ==, >=, >}) on {@code float} and {@code double} values.
+     *
+     * <ul><li> A NaN is <em>unordered</em> with respect to other
+     *          values and unequal to itself under the comparison
+     *          operators.  This method chooses to define {@code
+     *          Float16.NaN} to be equal to itself and greater than all
+     *          other {@code Float16} values (including {@code
+     *          Float16.POSITIVE_INFINITY}).
+     *
+     *      <li> Positive zero and negative zero compare equal
+     *      numerically, but are distinct and distinguishable values.
+     *      This method chooses to define positive zero
+     *      to be greater than negative zero.
+     * </ul>
+     *
+     * @param   anotherFloat16   the {@code Float16} to be compared.
+     * @return  the value {@code 0} if {@code anotherFloat16} is
+     *          numerically equal to this {@code Float16}; a value
+     *          less than {@code 0} if this {@code Float16}
+     *          is numerically less than {@code anotherFloat16};
+     *          and a value greater than {@code 0} if this
+     *          {@code Float16} is numerically greater than
+     *          {@code anotherFloat16}.
+     *
+     * @see Float#compareTo(Float)
+     * @see Double#compareTo(Double)
+     * @jls 15.20.1 Numerical Comparison Operators {@code <}, {@code <=}, {@code >}, and {@code >=}
+     */
+    @Override
+    public int compareTo(Float16 anotherFloat16) {
+        return compare(this, anotherFloat16);
+    }
+
+    /**
+     * Compares the two specified {@code Float16} values.
+     *
+     * @param   f1        the first {@code Float16} to compare
+     * @param   f2        the second {@code Float16} to compare
+     * @return  the value {@code 0} if {@code f1} is
+     *          numerically equal to {@code f2}; a value less than
+     *          {@code 0} if {@code f1} is numerically less than
+     *          {@code f2}; and a value greater than {@code 0}
+     *          if {@code f1} is numerically greater than
+     *          {@code f2}.
+     *
+     * @see Float#compare(float, float)
+     * @see Double#compare(double, double)
+     */
+    public static int compare(Float16 f1, Float16 f2) {
+        return Float.compare(f1.floatValue(), f2.floatValue());
+    }
+
+    /**
+     * Returns the larger of two {@code Float16} values.
+     *
+     * The handling of signed zeros, NaNs, infinities, and other
+     * special cases by this method is analogous to the handling of
+     * those cases by the Math#max(double, double) method.
+     *
+     * @apiNote
+     * This method corresponds to the maximum operation defined in
+     * IEEE 754.
+     *
+     * @param a the first operand
+     * @param b the second operand
+     * @return the greater of {@code a} and {@code b}
+     * @see java.util.function.BinaryOperator
+     * @see Math#max(float, float)
+     */
+    public static Float16 max(Float16 a, Float16 b) {
+        return valueOf(Math.max(a.floatValue(), b.floatValue()));
+    }
+
+    /**
+     * Returns the smaller of two {@code Float16} values.
+     *
+     * The handling of signed zeros, NaNs, infinities, and other
+     * special cases by this method is analogous to the handling of
+     * those cases by the Math#min(double, double) method.
+     *
+     * @apiNote
+     * This method corresponds to the minimum operation defined in
+     * IEEE 754.
+     *
+     * @param a the first operand
+     * @param b the second operand
+     * @return the smaller of {@code a} and {@code b}
+     * @see java.util.function.BinaryOperator
+     * @see Math#min(float, float)
+     */
+    public static Float16 min(Float16 a, Float16 b) {
+        return valueOf(Math.min(a.floatValue(), b.floatValue()));
+    }
+
+    // Skipping for now
+    // public Optional<Float16> describeConstable()
+    // public Float16 resolveConstantDesc(MethodHandles.Lookup lookup)
+
+    /*
+     * Note: for the basic arithmetic operations {+, -, *, /} and
+     * square root, among binary interchange formats (binary16,
+     * binary32 a.k.a. float, binary64 a.k.a double, etc.) the "2p + 2"
+     * property holds. That is, if one format has p bits of precision,
+     * if the next larger format has at least 2p + 2 bits of
+     * precision, arithmetic on the smaller format can be implemented by:
+     *
+     * 1) converting each argument to the wider format
+     * 2) performing the operation in the wider format
+     * 3) converting the result from 2) to the narrower format
+     *
+     * For example, this property hold between the formats used for the
+     * float and double types. Therefore, the following is a valid
+     * implementation of a float addition:
+     *
+     * float add(float addend, float augend) {
+     *     return (float)((double)addend + (double)augend);
+     * }
+     *
+     * The same property holds between the float16 format and
+     * float. Therefore, the software implementations of Float16 {+,
+     * -, *, /} and square root below use the technique of widening
+     * the Float16 arguments to float, performing the operation in
+     * float arithmetic, and then rounding the float result to
+     * Float16.
+     *
+     * For discussion and derivation of this property see:
+     *
+     * "When Is Double Rounding Innocuous?" by Samuel Figueroa
+     * ACM SIGNUM Newsletter, Volume 30 Issue 3, pp 21-26
+     * https://dl.acm.org/doi/pdf/10.1145/221332.221334
+     *
+     * Figueroa's write-up refers to lecture notes by W. Kahan. Those
+     * lectures notes are assumed to be these ones by Kahan and
+     * others:
+     *
+     * https://www.arithmazium.org/classroom/lib/Lecture_08_notes_slides.pdf
+     * https://www.arithmazium.org/classroom/lib/Lecture_09_notes_slides.pdf
+     */
+
+    /**
+     * Adds two {@code Float16} values together as per the {@code +}
+     * operator semantics using the round to nearest rounding policy.
+     *
+     * The handling of signed zeros, NaNs, infinities, and other
+     * special cases by this method is the same as for the handling of
+     * those cases by the built-in {@code +} operator for
+     * floating-point addition (JLS {@jls 15.18.2}).
+     *
+     * @apiNote This method corresponds to the addition operation
+     * defined in IEEE 754.
+     *
+     * @param addend the first operand
+     * @param augend the second operand
+     * @return the sum of the operands
+     *
+     * @jls 15.4 Floating-point Expressions
+     * @jls 15.18.2 Additive Operators (+ and -) for Numeric Types
+     */
+    public static Float16 add(Float16 addend, Float16 augend) {
+        return valueOf(addend.floatValue() + augend.floatValue());
+    }
+
+    /**
+     * Subtracts two {@code Float16} values as per the {@code -}
+     * operator semantics using the round to nearest rounding policy.
+     *
+     * The handling of signed zeros, NaNs, infinities, and other
+     * special cases by this method is the same as for the handling of
+     * those cases by the built-in {@code -} operator for
+     * floating-point subtraction (JLS {@jls 15.18.2}).
+     *
+     * @apiNote This method corresponds to the subtraction operation
+     * defined in IEEE 754.
+     *
+     * @param minuend the first operand
+     * @param  subtrahend the second operand
+     * @return the difference of the operands
+     *
+     * @jls 15.4 Floating-point Expressions
+     * @jls 15.18.2 Additive Operators (+ and -) for Numeric Types
+     */
+    public static Float16 subtract(Float16 minuend, Float16 subtrahend) {
+        return valueOf(minuend.floatValue() - subtrahend.floatValue());
+    }
+
+    /**
+     * Multiplies two {@code Float16} values as per the {@code *}
+     * operator semantics using the round to nearest rounding policy.
+     *
+     * The handling of signed zeros, NaNs, and infinities, other
+     * special cases by this method is the same as for the handling of
+     * those cases by the built-in {@code *} operator for
+     * floating-point multiplication (JLS {@jls 15.17.1}).
+     *
+     * @apiNote This method corresponds to the multiplication
+     * operation defined in IEEE 754.
+     *
+     * @param multiplier the first operand
+     * @param multiplicand the second operand
+     * @return the product of the operands
+     *
+     * @jls 15.4 Floating-point Expressions
+     * @jls 15.17.1 Multiplication Operator *
+     */
+    public static Float16 multiply(Float16 multiplier, Float16 multiplicand) {
+        return valueOf(multiplier.floatValue() * multiplicand.floatValue());
+    }
+
+    /**
+     * Divides two {@code Float16} values as per the {@code /}
+     * operator semantics using the round to nearest rounding policy.
+     *
+     * The handling of signed zeros, NaNs, and infinities, other
+     * special cases by this method is the same as for the handling of
+     * those cases by the built-in {@code /} operator for
+     * floating-point division (JLS {@jls 15.17.2}).
+     *
+     * @apiNote This method corresponds to the division
+     * operation defined in IEEE 754.
+     *
+     * @param dividend the first operand
+     * @param divisor the second operand
+     * @return the quotient of the operands
+     *
+     * @jls 15.4 Floating-point Expressions
+     * @jls 15.17.2 Division Operator /
+     */
+    public static Float16 divide(Float16 dividend, Float16 divisor) {
+        return valueOf(dividend.floatValue() / divisor.floatValue());
+    }
+
+    /**
+     * {@return the square root of the operand} The square root is
+     * computed using the round to nearest rounding policy.
+     *
+     * The handling of zeros, NaN, infinities, and negative arguments
+     * by this method is analogous to the handling of those cases by
+     * {@link Math#sqrt(double)}.
+     *
+     * @apiNote
+     * This method corresponds to the squareRoot operation defined in
+     * IEEE 754.
+     *
+     * @param radicand the argument to have its square root taken
+     *
+     * @see Math#sqrt(double)
+     */
+    public static Float16 sqrt(Float16 radicand) {
+        // Rounding path of sqrt(Float16 -> double) -> Float16 is fine
+        // for preserving the correct final value. The conversion
+        // Float16 -> double preserves the exact numerical value. The
+        // conversion of double -> Float16 also benefits from the
+        // 2p+2 property of IEEE 754 arithmetic.
+        return valueOf(Math.sqrt(radicand.doubleValue()));
+    }
+
+    /**
+     * Returns the fused multiply add of the three arguments; that is,
+     * returns the exact product of the first two arguments summed
+     * with the third argument and then rounded once to the nearest
+     * {@code Float16}.
+     *
+     * The handling of zeros, NaN, infinities, and other special cases
+     * by this method is analogous to the handling of those cases by
+     * {@link Math#fma(float, float, float)}.
+     *
+     * @apiNote This method corresponds to the fusedMultiplyAdd
+     * operation defined in IEEE 754.
+     *
+     * @param a a value
+     * @param b a value
+     * @param c a value
+     *
+     * @return (<i>a</i>&nbsp;&times;&nbsp;<i>b</i>&nbsp;+&nbsp;<i>c</i>)
+     * computed, as if with unlimited range and precision, and rounded
+     * once to the nearest {@code Float16} value
+     *
+     * @see Math#fma(float, float, float)
+     * @see Math#fma(double, double, double)
+     */
+    public static Float16 fma(Float16 a, Float16 b, Float16 c) {
+        /*
+         * The double format has sufficient precision that a Float16
+         * fma can be computed by doing the arithmetic in double, with
+         * one rounding error for the sum, and then a second rounding
+         * error to round the product-sum to Float16. In pseudocode,
+         * this method is equivalent to the following code, assuming
+         * casting was defined between Float16 and double:
+         *
+         * double product = (double)a * (double)b;  // Always exact
+         * double productSum = product + (double)c;
+         * return (Float16)produdctSum;
+         *
+         * (Note that a similar relationship does *not* hold between
+         * the double format and computing a float fma.)
+         *
+         * Below is a sketch of the proof that simple double
+         * arithmetic can be used to implement a correctly rounded
+         * Float16 fma.
+         *
+         * ----------------------
+         *
+         * As preliminaries, the handling of NaN and Infinity
+         * arguments falls out as a consequence of general operation
+         * of non-finite values by double * and +. Any NaN argument to
+         * fma will lead to a NaN result, infinities will propagate or
+         * get turned into NaN as appropriate, etc.
+         *
+         * One or more zero arguments are also handled correctly,
+         * including the propagation of the sign of zero if all three
+         * arguments are zero.
+         *
+         * The double format has 53 logical bits of precision and its
+         * exponent range goes from -1022 to 1023. The Float16 format
+         * has 11 bits of logical precision and its exponent range
+         * goes from -14 to 15. Therefore, the individual powers of 2
+         * representable in the Float16 format range from the
+         * subnormal 2^(-24), MIN_VALUE, to 2^15, the leading bit
+         * position of MAX_VALUE.
+         *
+         * In cases where the numerical value of (a * b) + c is
+         * computed exactly in a double, after a single rounding to
+         * Float16, the result is necessarily correct since the one
+         * double -> Float16 conversion is the only source of
+         * numerical error. The operation as implemented in those
+         * cases would be equivalent to rounding the infinitely precise
+         * value to the result format, etc.
+         *
+         * However, for some inputs, the intermediate product-sum will
+         * *not* be exact and additional analysis is needed to justify
+         * not having any corrective computation to compensate for
+         * intermediate rounding errors.
+         *
+         * The following analysis will rely on the range of bit
+         * positions representable in the intermediate
+         * product-sum.
+         *
+         * For the product a*b of Float16 inputs, the range of
+         * exponents for nonzero finite results goes from 2^(-48)
+         * (from MIN_VALUE squared) to 2^31 (from the exact value of
+         * MAX_VALUE squared). This full range of exponent positions,
+         * (31 -(-48) + 1 ) = 80 exceeds the precision of
+         * double. However, only the product a*b can exceed the
+         * exponent range of Float16. Therefore, there are three main
+         * cases to consider:
+         *
+         * 1) Large exponent product, exponent > Float16.MAX_EXPONENT
+         *
+         * The magnitude of the overflow threshold for Float16 is:
+         *
+         * MAX_VALUE + 1/2 * ulp(MAX_VALUE) =  0x1.ffcp15 + 0x0.002p15 = 0x1.ffep15
+         *
+         * Therefore, for any product greater than or equal in
+         * magnitude to (0x1.ffep15 + MAX_VALUE) = 0x1.ffdp16, the
+         * final fma result will certainly overflow to infinity (under
+         * round to nearest) since adding in c = -MAX_VALUE will still
+         * be at or above the overflow threshold.
+         *
+         * If the exponent of the product is 15 or 16, the smallest
+         * subnormal Float16 is 2^-24 and the ~40 bit wide range bit
+         * positions would fit in a single double exactly.
+         *
+         * 2) Exponent of product is within the range of _normal_
+         * Float16 values; Float16.MIN_EXPONENT <=  exponent <= Float16.MAX_EXPONENT
+         *
+         * The exact product has at most 22 contiguous bits in its
+         * logical significand. The third number being added in has at
+         * most 11 contiguous bits in its significand and the lowest
+         * bit position that could be set is 2^(-24). Therefore, when
+         * the product has the maximum in-range exponent, 2^15, a
+         * single double has enough precision to hold down to the
+         * smallest subnormal bit position, 15 - (-24) + 1 = 40 <
+         * 53. If the product was large and rounded up, increasing the
+         * exponent, when the third operand was added, this would
+         * cause the exponent to go up to 16, which is within the
+         * range of double, so the product-sum is exact and will be
+         * correct when rounded to Float16.
+         *
+         * 3) Exponent of product is in the range of subnormal values or smaller,
+         * exponent < Float16.MIN_EXPONENT
+         *
+         * The smallest exponent possible in a product is 2^(-48).
+         * For moderately sized Float16 values added to the product,
+         * with an exponent of about 4, the sum will not be
+         * exact. Therefore, an analysis is needed to determine if the
+         * double-rounding is benign or would lead to a different
+         * final Float16 result. Double rounding can lead to a
+         * different result in two cases:
+         *
+         * 1) The first rounding from the exact value to the extended
+         * precision (here `double`) happens to be directed _toward_ 0
+         * to a value exactly midway between two adjacent working
+         * precision (here `Float16`) values, followed by a second
+         * rounding from there which again happens to be directed
+         * _toward_ 0 to one of these values (the one with lesser
+         * magnitude).  A single rounding from the exact value to the
+         * working precision, in contrast, rounds to the value with
+         * larger magnitude.
+         *
+         * 2) Symmetrically, the first rounding to the extended
+         * precision happens to be directed _away_ from 0 to a value
+         * exactly midway between two adjacent working precision
+         * values, followed by a second rounding from there which
+         * again happens to be directed _away_ from 0 to one of these
+         * values (the one with larger magnitude).  However, a single
+         * rounding from the exact value to the working precision
+         * rounds to the value with lesser magnitude.
+         *
+         * If the double rounding occurs in other cases, it is
+         * innocuous, returning the same value as a single rounding to
+         * the final format. Therefore, it is sufficient to show that
+         * the first rounding to double does not occur at the midpoint
+         * of two adjacent Float16 values:
+         *
+         * 1) If a, b and c have the same sign, the sum a*b + c has a
+         * significand with a large gap of 20 or more 0s between the
+         * bits of the significand of c to the left (at most 11 bits)
+         * and those of the product a*b to the right (at most 22
+         * bits).  The rounding bit for the final working precision of
+         * `float16` is the leftmost 0 in the gap.
+         *
+         *   a) If rounding to `double` is directed toward 0, all the
+         *   0s in the gap are preserved, thus the `Float16` rounding
+         *   bit is unaffected and remains 0. This means that the
+         *   `double` value is _not_ the midpoint of two adjacent
+         *   `float16` values, so double rounding is harmless.
+         *
+         *   b) If rounding to `double` is directed away form 0, the
+         *   rightmost 0 in the gap might be replaced by a 1, but the
+         *   others are unaffected, including the `float16` rounding
+         *   bit. Again, this shows that the `double` value is _not_
+         *   the midpoint of two adjacent `float16` values, and double
+         *   rounding is innocuous.
+         *
+         * 2) If a, b and c have opposite signs, in the sum a*b + c
+         * the long gap of 0s above is replaced by a long gap of
+         * 1s. The `float16` rounding bit is the leftmost 1 in the
+         * gap, or the second leftmost 1 iff c is a power of 2. In
+         * both cases, the rounding bit is followed by at least
+         * another 1.
+         *
+         *   a) If rounding to `double` is directed toward 0, the
+         *   `float16` rounding bit and its follower are preserved and
+         *   both 1, so the `double` value is _not_ the midpoint of
+         *   two adjacent `float16` values, and double rounding is
+         *   harmless.
+         *
+         *   b) If rounding to `double` is directed away from 0, the
+         *   `float16` rounding bit and its follower are either
+         *   preserved (both 1), or both switch to 0. Either way, the
+         *   `double` value is again _not_ the midpoint of two
+         *   adjacent `float16` values, and double rounding is
+         *   harmless.
+         */
+
+        // product is numerically exact in float before the cast to
+        // double; not necessary to widen to double before the
+        // multiply.
+        double product = (double)(a.floatValue() * b.floatValue());
+        return valueOf(product + c.doubleValue());
+    }
+
+    /**
+     * {@return the negation of the argument}
+     *
+     * Special cases:
+     * <ul>
+     * <li> If the argument is zero, the result is a zero with the
+     * opposite sign as the argument.
+     * <li> If the argument is infinite, the result is an infinity
+     * with the opposite sign as the argument.
+     * <li> If the argument is a NaN, the result is a NaN.
+     * </ul>
+     *
+     * @apiNote
+     * This method corresponds to the negate operation defined in IEEE
+     * 754.
+     *
+     * @param f16 the value to be negated
+     * @jls 15.15.4 Unary Minus Operator {@code -}
+     */
+    public static Float16 negate(Float16 f16) {
+        // Negate sign bit only. Per IEEE 754-2019 section 5.5.1,
+        // negate is a bit-level operation and not a logical
+        // operation. Therefore, in this case do _not_ use the float
+        // unary minus as an implementation as that is not guaranteed
+        // to flip the sign bit of a NaN.
+        return shortBitsToFloat16((short)(f16.value ^ (short)0x0000_8000));
+    }
+
+    /**
+     * {@return the absolute value of the argument}
+     *
+     * The handling of zeros, NaN, and infinities by this method is
+     * analogous to the handling of those cases by {@link
+     * Math#abs(float)}.
+     *
+     * @param f16 the argument whose absolute value is to be determined
+     *
+     * @see Math#abs(float)
+     * @see Math#abs(double)
+     */
+    public static Float16 abs(Float16 f16) {
+        // Zero out sign bit. Per IEE 754-2019 section 5.5.1, abs is a
+        // bit-level operation and not a logical operation.
+        return shortBitsToFloat16((short)(f16.value & (short)0x0000_7FFF));
+    }
+
+    /**
+     * Returns the unbiased exponent used in the representation of a
+     * {@code Float16}.
+     *
+     * <ul>
+     * <li>If the argument is NaN or infinite, then the result is
+     * {@link Float16#MAX_EXPONENT} + 1.
+     * <li>If the argument is zero or subnormal, then the result is
+     * {@link Float16#MIN_EXPONENT} - 1.
+     * </ul>
+     *
+     * @apiNote
+     * This method is analogous to the logB operation defined in IEEE
+     * 754, but returns a different value on subnormal arguments.
+     *
+     * @param f16 a {@code Float16} value
+     * @return the unbiased exponent of the argument
+     *
+     * @see Math#getExponent(float)
+     * @see Math#getExponent(double)
+     */
+    public static int getExponent(Float16 f16) {
+        return getExponent0(f16.value);
+    }
+
+    /**
+     * From the bitwise representation of a float16, mask out exponent
+     * bits, shift to the right and then subtract out float16's bias
+     * adjust, 15, to get true exponent value.
+     */
+    /*package*/ static int getExponent0(short bits) {
+        // package private to be usable in java.lang.Float.
+        int bin16ExpBits     = 0x0000_7c00 & bits;     // Five exponent bits.
+        return (bin16ExpBits >> (PRECISION - 1)) - 15;
+    }
+
+    /**
+     * Returns the size of an ulp of the argument.  An ulp, unit in
+     * the last place, of a {@code Float16} value is the positive
+     * distance between this floating-point value and the {@code
+     * Float16} value next larger in magnitude.  Note that for non-NaN
+     * <i>x</i>, <code>ulp(-<i>x</i>) == ulp(<i>x</i>)</code>.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive or negative infinity, then the
+     * result is positive infinity.
+     * <li> If the argument is positive or negative zero, then the result is
+     * {@code Float16.MIN_VALUE}.
+     * <li> If the argument is &plusmn;{@code Float16.MAX_VALUE}, then
+     * the result is equal to 2<sup>5</sup>, 32.0.
+     * </ul>
+     *
+     * @param f16 the floating-point value whose ulp is to be returned
+     * @return the size of an ulp of the argument
+     *
+     * @see Math#ulp(float)
+     * @see Math#ulp(double)
+     */
+    public static Float16 ulp(Float16 f16) {
+        int exp = getExponent(f16);
+
+        return switch(exp) {
+        case MAX_EXPONENT + 1 -> abs(f16);          // NaN or infinity
+        case MIN_EXPONENT - 1 -> Float16.MIN_VALUE; // zero or subnormal
+        default -> {
+            assert exp <= MAX_EXPONENT && exp >= MIN_EXPONENT;
+            // ulp(x) is usually 2^(SIGNIFICAND_WIDTH-1)*(2^ilogb(x))
+            // Let float -> float16 conversion handle encoding issues.
+            yield scalb(valueOf(1), exp - (PRECISION - 1));
+        }
+        };
+    }
+
+    /**
+     * Returns the floating-point value adjacent to {@code v} in
+     * the direction of positive infinity.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, the result is NaN.
+     *
+     * <li> If the argument is positive infinity, the result is
+     * positive infinity.
+     *
+     * <li> If the argument is zero, the result is
+     * {@link #MIN_VALUE}
+     *
+     * </ul>
+     *
+     * @apiNote This method corresponds to the nextUp
+     * operation defined in IEEE 754.
+     *
+     * @param v starting floating-point value
+     * @return The adjacent floating-point value closer to positive
+     * infinity.
+     *
+     * @see Math#nextUp(float)
+     * @see Math#nextUp(double)
+     */
+    public static Float16 nextUp(Float16 v) {
+        float f = v.floatValue();
+        if (f < Float.POSITIVE_INFINITY) {
+            if (f != 0) {
+                int bits = float16ToRawShortBits(v);
+                return shortBitsToFloat16((short) (bits + ((bits >= 0) ? 1 : -1)));
+            }
+            return MIN_VALUE;
+        }
+        return v; // v is NaN or +Infinity
+    }
+
+    /**
+     * Returns the floating-point value adjacent to {@code v} in
+     * the direction of negative infinity.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, the result is NaN.
+     *
+     * <li> If the argument is negative infinity, the result is
+     * negative infinity.
+     *
+     * <li> If the argument is zero, the result is
+     * -{@link #MIN_VALUE}
+     *
+     * </ul>
+     *
+     * @apiNote This method corresponds to the nextDown
+     * operation defined in IEEE 754.
+     *
+     * @param v  starting floating-point value
+     * @return The adjacent floating-point value closer to negative
+     * infinity.
+     *
+     * @see Math#nextDown(float)
+     * @see Math#nextDown(double)
+     */
+    public static Float16 nextDown(Float16 v) {
+        float f = v.floatValue();
+        if (f > Float.NEGATIVE_INFINITY) {
+            if (f != 0) {
+                int bits = float16ToRawShortBits(v);
+                return shortBitsToFloat16((short) (bits - ((bits >= 0) ? 1 : -1)));
+            }
+            return negate(MIN_VALUE);
+        }
+        return v; // v is NaN or -Infinity
+    }
+
+    /**
+     * Returns {@code v} &times; 2<sup>{@code scaleFactor}</sup>
+     * rounded as if performed by a single correctly rounded
+     * floating-point multiply.  If the exponent of the result is
+     * between {@link Float16#MIN_EXPONENT} and {@link
+     * Float16#MAX_EXPONENT}, the answer is calculated exactly.  If the
+     * exponent of the result would be larger than {@code
+     * Float16.MAX_EXPONENT}, an infinity is returned.  Note that if the
+     * result is subnormal, precision may be lost; that is, when
+     * {@code scalb(x, n)} is subnormal, {@code scalb(scalb(x, n),
+     * -n)} may not equal <i>x</i>.  When the result is non-NaN, the
+     * result has the same sign as {@code v}.
+     *
+     * <p>Special cases:
+     * <ul>
+     * <li> If the first argument is NaN, NaN is returned.
+     * <li> If the first argument is infinite, then an infinity of the
+     * same sign is returned.
+     * <li> If the first argument is zero, then a zero of the same
+     * sign is returned.
+     * </ul>
+     *
+     * @apiNote This method corresponds to the scaleB operation
+     * defined in IEEE 754.
+     *
+     * @param v number to be scaled by a power of two.
+     * @param scaleFactor power of 2 used to scale {@code v}
+     * @return {@code v} &times; 2<sup>{@code scaleFactor}</sup>
+     *
+     * @see Math#scalb(float, int)
+     * @see Math#scalb(double, int)
+     */
+    public static Float16 scalb(Float16 v, int scaleFactor) {
+        // magnitude of a power of two so large that scaling a finite
+        // nonzero value by it would be guaranteed to over or
+        // underflow; due to rounding, scaling down takes an
+        // additional power of two which is reflected here
+        final int MAX_SCALE = Float16.MAX_EXPONENT + -Float16.MIN_EXPONENT +
+                Float16Consts.SIGNIFICAND_WIDTH + 1;
+
+        // Make sure scaling factor is in a reasonable range
+        scaleFactor = Math.max(Math.min(scaleFactor, MAX_SCALE), -MAX_SCALE);
+
+        int DoubleConsts_EXP_BIAS = 1023;
+        /*
+         * Since + MAX_SCALE for Float16 fits well within the double
+         * exponent range and + Float16 -> double conversion is exact
+         * the multiplication below will be exact. Therefore, the
+         * rounding that occurs when the double product is cast to
+         * Float16 will be the correctly rounded Float16 result.
+         */
+        return valueOf(v.doubleValue()
+                * Double.longBitsToDouble((long) (scaleFactor + DoubleConsts_EXP_BIAS) << Double.PRECISION - 1));
+    }
+    /**
+     * Returns the first floating-point argument with the sign of the
+     * second floating-point argument.
+     * This method does not require NaN {@code sign}
+     * arguments to be treated as positive values; implementations are
+     * permitted to treat some NaN arguments as positive and other NaN
+     * arguments as negative to allow greater performance.
+     *
+     * @apiNote
+     * This method corresponds to the copySign operation defined in
+     * IEEE 754.
+     *
+     * @param magnitude  the parameter providing the magnitude of the result
+     * @param sign   the parameter providing the sign of the result
+     * @return a value with the magnitude of {@code magnitude}
+     * and the sign of {@code sign}.
+     *
+     * @see Math#copySign(float, float)
+     * @see Math#copySign(double, double)
+     */
+    public static Float16 copySign(Float16 magnitude, Float16 sign) {
+        return shortBitsToFloat16((short) ((float16ToRawShortBits(sign) & SIGN_BIT_MASK) |
+                                           (float16ToRawShortBits(magnitude) &
+                                            (EXP_BIT_MASK | SIGNIF_BIT_MASK) )));
+    }
+
+    /**
+     * Returns the signum function of the argument; zero if the argument
+     * is zero, 1.0 if the argument is greater than zero, -1.0 if the
+     * argument is less than zero.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive zero or negative zero, then the
+     *      result is the same as the argument.
+     * </ul>
+     *
+     * @param f the floating-point value whose signum is to be returned
+     * @return the signum function of the argument
+     *
+     * @see Math#signum(float)
+     * @see Math#signum(double)
+     */
+    public static Float16 signum(Float16 f) {
+        return (f.floatValue() == 0.0f || isNaN(f)) ? f : copySign(valueOf(1), f);
+    }
+
+    // TODO: Temporary location for this functionality while Float16
+    // resides in incubator.
+    private static final class Float16ToDecimal {
+        /*
+         * For full details about this code see the following references:
+         *
+         * [1] Giulietti, "The Schubfach way to render doubles",
+         *     https://drive.google.com/file/d/1gp5xv4CAa78SVgCeWfGqqI4FfYYYuNFb
+         *
+         * [2] IEEE Computer Society, "IEEE Standard for Floating-Point Arithmetic"
+         *
+         * [3] Bouvier & Zimmermann, "Division-Free Binary-to-Decimal Conversion"
+         *
+         * Divisions are avoided altogether for the benefit of those architectures
+         * that do not provide specific machine instructions or where they are slow.
+         * This is discussed in section 10 of [1].
+         */
+
+        /* The precision in bits */
+        static final int P = PRECISION;
+
+        /* Exponent width in bits */
+        private static final int W = (Float16.SIZE - 1) - (P - 1);
+
+        /* Minimum value of the exponent: -(2^(W-1)) - P + 3 */
+        static final int Q_MIN = (-1 << (W - 1)) - P + 3;
+
+        /* Maximum value of the exponent: 2^(W-1) - P */
+        static final int Q_MAX = (1 << (W - 1)) - P;
+
+        /* 10^(E_MIN - 1) <= MIN_VALUE < 10^E_MIN */
+        static final int E_MIN = -7;
+
+        /* 10^(E_MAX - 1) <= MAX_VALUE < 10^E_MAX */
+        static final int E_MAX = 5;
+
+        /* Threshold to detect tiny values, as in section 8.2.1 of [1] */
+        static final int C_TINY = 2;
+
+        /* The minimum and maximum k, as in section 8 of [1] */
+        static final int K_MIN = -8;
+        static final int K_MAX = 1;
+
+        /* H is as in section 8.1 of [1] */
+        static final int H = 5;
+
+        /* Minimum value of the significand of a normal value: 2^(P-1) */
+        private static final int C_MIN = 1 << (P - 1);
+
+        /* Mask to extract the biased exponent */
+        private static final int BQ_MASK = (1 << W) - 1;
+
+        /* Mask to extract the fraction bits */
+        private static final int T_MASK = (1 << (P - 1)) - 1;
+
+        /* Used in rop() */
+        private static final long MASK_32 = (1L << 32) - 1;
+
+        /* Used for left-to-tight digit extraction */
+        private static final int MASK_15 = (1 << 15) - 1;
+
+        private static final int NON_SPECIAL    = 0;
+        private static final int PLUS_ZERO      = 1;
+        private static final int MINUS_ZERO     = 2;
+        private static final int PLUS_INF       = 3;
+        private static final int MINUS_INF      = 4;
+        private static final int NAN            = 5;
+
+        /*
+         * Room for the longer of the forms
+         *     -ddd.dd      H + 2 characters
+         *     -ddddd.0     H + 3 characters
+         *     -0.00ddddd   H + 5 characters
+         *     -d.ddddE-e   H + 5 characters
+         * where there are H digits d
+         */
+        public static final int MAX_CHARS = H + 5;
+
+        private final byte[] bytes = new byte[MAX_CHARS];
+
+        /* Index into bytes of rightmost valid character */
+        private int index;
+
+        private Float16ToDecimal() {
+        }
+
+        /**
+         * Returns a string representation of the {@code Float16}
+         * argument. All characters mentioned below are ASCII characters.
+         *
+         * @param   v   the {@code Float16} to be converted.
+         * @return a string representation of the argument.
+         * @see Float16#toString(Float16)
+         */
+        public static String toString(Float16 v) {
+            return new Float16ToDecimal().toDecimalString(v);
+        }
+
+        /**
+         * Appends the rendering of the {@code v} to {@code app}.
+         *
+         * <p>The outcome is the same as if {@code v} were first
+         * {@link #toString(Float16) rendered} and the resulting string were then
+         * {@link Appendable#append(CharSequence) appended} to {@code app}.
+         *
+         * @param v the {@code Float16} whose rendering is appended.
+         * @param app the {@link Appendable} to append to.
+         * @throws IOException If an I/O error occurs
+         */
+        public static Appendable appendTo(Float16 v, Appendable app)
+                throws IOException {
+            return new Float16ToDecimal().appendDecimalTo(v, app);
+        }
+
+        private String toDecimalString(Float16 v) {
+            return switch (toDecimal(v)) {
+                case NON_SPECIAL -> charsToString();
+                case PLUS_ZERO -> "0.0";
+                case MINUS_ZERO -> "-0.0";
+                case PLUS_INF -> "Infinity";
+                case MINUS_INF -> "-Infinity";
+                default -> "NaN";
+            };
+        }
+
+        private Appendable appendDecimalTo(Float16 v, Appendable app)
+                throws IOException {
+            switch (toDecimal(v)) {
+                case NON_SPECIAL:
+                    char[] chars = new char[index + 1];
+                    for (int i = 0; i < chars.length; ++i) {
+                        chars[i] = (char) bytes[i];
+                    }
+                    if (app instanceof StringBuilder builder) {
+                        return builder.append(chars);
+                    }
+                    if (app instanceof StringBuffer buffer) {
+                        return buffer.append(chars);
+                    }
+                    for (char c : chars) {
+                        app.append(c);
+                    }
+                    return app;
+                case PLUS_ZERO: return app.append("0.0");
+                case MINUS_ZERO: return app.append("-0.0");
+                case PLUS_INF: return app.append("Infinity");
+                case MINUS_INF: return app.append("-Infinity");
+                default: return app.append("NaN");
+            }
+        }
+
+        /*
+         * Returns
+         *     PLUS_ZERO       iff v is 0.0
+         *     MINUS_ZERO      iff v is -0.0
+         *     PLUS_INF        iff v is POSITIVE_INFINITY
+         *     MINUS_INF       iff v is NEGATIVE_INFINITY
+         *     NAN             iff v is NaN
+         */
+        private int toDecimal(Float16 v) {
+            /*
+             * For full details see references [2] and [1].
+             *
+             * For finite v != 0, determine integers c and q such that
+             *     |v| = c 2^q    and
+             *     Q_MIN <= q <= Q_MAX    and
+             *         either    2^(P-1) <= c < 2^P                 (normal)
+             *         or        0 < c < 2^(P-1)  and  q = Q_MIN    (subnormal)
+             */
+            int bits = float16ToRawShortBits(v);
+            int t = bits & T_MASK;
+            int bq = (bits >>> P - 1) & BQ_MASK;
+            if (bq < BQ_MASK) {
+                index = -1;
+                if (bits < 0) {
+                    append('-');
+                }
+                if (bq != 0) {
+                    /* normal value. Here mq = -q */
+                    int mq = -Q_MIN + 1 - bq;
+                    int c = C_MIN | t;
+                    /* The fast path discussed in section 8.3 of [1] */
+                    if (0 < mq & mq < P) {
+                        int f = c >> mq;
+                        if (f << mq == c) {
+                            return toChars(f, 0);
+                        }
+                    }
+                    return toDecimal(-mq, c, 0);
+                }
+                if (t != 0) {
+                    /* subnormal value */
+                    return t < C_TINY
+                            ? toDecimal(Q_MIN, 10 * t, -1)
+                            : toDecimal(Q_MIN, t, 0);
+                }
+                return bits == 0 ? PLUS_ZERO : MINUS_ZERO;
+            }
+            if (t != 0) {
+                return NAN;
+            }
+            return bits > 0 ? PLUS_INF : MINUS_INF;
+        }
+
+        private int toDecimal(int q, int c, int dk) {
+            /*
+             * The skeleton corresponds to figure 7 of [1].
+             * The efficient computations are those summarized in figure 9.
+             * Also check the appendix.
+             *
+             * Here's a correspondence between Java names and names in [1],
+             * expressed as approximate LaTeX source code and informally.
+             * Other names are identical.
+             * cb:     \bar{c}     "c-bar"
+             * cbr:    \bar{c}_r   "c-bar-r"
+             * cbl:    \bar{c}_l   "c-bar-l"
+             *
+             * vb:     \bar{v}     "v-bar"
+             * vbr:    \bar{v}_r   "v-bar-r"
+             * vbl:    \bar{v}_l   "v-bar-l"
+             *
+             * rop:    r_o'        "r-o-prime"
+             */
+            int out = c & 0x1;
+            long cb = c << 2;
+            long cbr = cb + 2;
+            long cbl;
+            int k;
+            /*
+             * flog10pow2(e) = floor(log_10(2^e))
+             * flog10threeQuartersPow2(e) = floor(log_10(3/4 2^e))
+             * flog2pow10(e) = floor(log_2(10^e))
+             */
+            if (c != C_MIN | q == Q_MIN) {
+                /* regular spacing */
+                cbl = cb - 2;
+                k = MathUtils.flog10pow2(q);
+            } else {
+                /* irregular spacing */
+                cbl = cb - 1;
+                k = MathUtils.flog10threeQuartersPow2(q);
+            }
+            int h = q + MathUtils.flog2pow10(-k) + 33;
+
+            /* g is as in the appendix */
+            long g = MathUtils.g1(k) + 1;
+
+            int vb = rop(g, cb << h);
+            int vbl = rop(g, cbl << h);
+            int vbr = rop(g, cbr << h);
+
+            int s = vb >> 2;
+            if (s >= 100) {
+                /*
+                 * For n = 5, m = 1 the discussion in section 10 of [1] shows
+                 *     s' = floor(s / 10) = floor(s 52_429 / 2^19)
+                 *
+                 * sp10 = 10 s'
+                 * tp10 = 10 t'
+                 * upin    iff    u' = sp10 10^k in Rv
+                 * wpin    iff    w' = tp10 10^k in Rv
+                 * See section 9.3 of [1].
+                 */
+                int sp10 = 10 * (int) (s * 52_429L >>> 19);
+                int tp10 = sp10 + 10;
+                boolean upin = vbl + out <= sp10 << 2;
+                boolean wpin = (tp10 << 2) + out <= vbr;
+                if (upin != wpin) {
+                    return toChars(upin ? sp10 : tp10, k);
+                }
+            }
+
+            /*
+             * 10 <= s < 100    or    s >= 100  and  u', w' not in Rv
+             * uin    iff    u = s 10^k in Rv
+             * win    iff    w = t 10^k in Rv
+             * See section 9.3 of [1].
+             */
+            int t = s + 1;
+            boolean uin = vbl + out <= s << 2;
+            boolean win = (t << 2) + out <= vbr;
+            if (uin != win) {
+                /* Exactly one of u or w lies in Rv */
+                return toChars(uin ? s : t, k + dk);
+            }
+            /*
+             * Both u and w lie in Rv: determine the one closest to v.
+             * See section 9.3 of [1].
+             */
+            int cmp = vb - (s + t << 1);
+            return toChars(cmp < 0 || cmp == 0 && (s & 0x1) == 0 ? s : t, k + dk);
+        }
+
+        /*
+         * Computes rop(cp g 2^(-95))
+         * See appendix and figure 11 of [1].
+         */
+        private static int rop(long g, long cp) {
+            long x1 = multiplyHigh(g, cp);
+            long vbp = x1 >>> 31;
+            return (int) (vbp | (x1 & MASK_32) + MASK_32 >>> 32);
+        }
+
+        /*
+         * Formats the decimal f 10^e.
+         */
+        private int toChars(int f, int e) {
+            /*
+             * For details not discussed here see section 10 of [1].
+             *
+             * Determine len such that
+             *     10^(len-1) <= f < 10^len
+             */
+            int len = MathUtils.flog10pow2(Integer.SIZE - numberOfLeadingZeros(f));
+            if (f >= MathUtils.pow10(len)) {
+                len += 1;
+            }
+
+            /*
+             * Let fp and ep be the original f and e, respectively.
+             * Transform f and e to ensure
+             *     10^(H-1) <= f < 10^H
+             *     fp 10^ep = f 10^(e-H) = 0.f 10^e
+             */
+            f *= (int)MathUtils.pow10(H - len);
+            e += len;
+
+            /*
+             * The toChars?() methods perform left-to-right digits extraction
+             * using ints, provided that the arguments are limited to 8 digits.
+             * Therefore, split the H = 9 digits of f into:
+             *     h = the most significant digit of f
+             *     l = the last 4, least significant digits of f
+             *
+             * For n = 5, m = 4 the discussion in section 10 of [1] shows
+             *     floor(f / 10^4) = floor(107_375L f / 2^30)
+             */
+            int h = (int) (f * 107_375L >>> 30);
+            int l = f - 10_000 * h;
+
+            if (0 < e && e <= 7) {
+                return toChars1(h, l, e);
+            }
+            if (-3 < e && e <= 0) {
+                return toChars2(h, l, e);
+            }
+            return toChars3(h, l, e);
+        }
+
+        private int toChars1(int h, int l, int e) {
+            /*
+             * 0 < e <= 7: plain format without leading zeroes.
+             * Left-to-right digits extraction:
+             * algorithm 1 in [3], with b = 10, k = 4, n = 15.
+             */
+            appendDigit(h);
+            int y = y(l);
+            int t;
+            int i = 1;
+            for (; i < e; ++i) {
+                t = 10 * y;
+                appendDigit(t >>> 15);
+                y = t & MASK_15;
+            }
+            append('.');
+            for (; i <= 4; ++i) {
+                t = 10 * y;
+                appendDigit(t >>> 15);
+                y = t & MASK_15;
+            }
+            /*
+             * As H = 5 < 7, where 7 is the threshold for plain format without
+             * leading zeros, it can happen that the 2nd loop above is not executed.
+             * The following line ensures the presence of a digit to the right
+             * of the decimal point.
+             */
+            appendDigit(0);
+            removeTrailingZeroes();
+            return NON_SPECIAL;
+        }
+
+        private int toChars2(int h, int l, int e) {
+            /* -3 < e <= 0: plain format with leading zeroes */
+            appendDigit(0);
+            append('.');
+            for (; e < 0; ++e) {
+                appendDigit(0);
+            }
+            appendDigit(h);
+            append4Digits(l);
+            removeTrailingZeroes();
+            return NON_SPECIAL;
+        }
+
+        private int toChars3(int h, int l, int e) {
+            /* -3 >= e | e > 7: computerized scientific notation */
+            appendDigit(h);
+            append('.');
+            append4Digits(l);
+            removeTrailingZeroes();
+            exponent(e - 1);
+            return NON_SPECIAL;
+        }
+
+        private void append4Digits(int m) {
+            /*
+             * Left-to-right digits extraction:
+             * algorithm 1 in [3], with b = 10, k = 4, n = 15.
+             */
+            int y = y(m);
+            for (int i = 0; i < 4; ++i) {
+                int t = 10 * y;
+                appendDigit(t >>> 15);
+                y = t & MASK_15;
+            }
+        }
+
+        private void removeTrailingZeroes() {
+            while (bytes[index] == '0') {
+                --index;
+            }
+            /* ... but do not remove the one directly to the right of '.' */
+            if (bytes[index] == '.') {
+                ++index;
+            }
+        }
+
+        private int y(int a) {
+            /*
+             * Algorithm 1 in [3] needs computation of
+             *     floor((a + 1) 2^n / b^k) - 1
+             * with a < 10^4, b = 10, k = 4, n = 15.
+             * Noting that
+             *     (a + 1) 2^n <= 10^4 2^15 < 10^9
+             * For n = 9, m = 4 the discussion in section 10 of [1] leads to:
+             */
+            return (int) (((a + 1) << 15) * 1_759_218_605L >>> 44) - 1;
+        }
+
+        private void exponent(int e) {
+            append('E');
+            if (e < 0) {
+                append('-');
+                e = -e;
+            }
+            appendDigit(e);
+        }
+
+        private void append(int c) {
+            bytes[++index] = (byte) c;
+        }
+
+        private void appendDigit(int d) {
+            bytes[++index] = (byte) ('0' + d);
+        }
+
+        /* Using the deprecated constructor enhances performance */
+        @SuppressWarnings("deprecation")
+        private String charsToString() {
+            return new String(bytes, 0, 0, index + 1);
+        }
+
+    }
+
+    /* TODO Temporary hack while Float16 resides in incubator */
+
+    /**
+     * This class exposes package private utilities for other classes.
+     * Thus, all methods are assumed to be invoked with correct arguments,
+     * so these are not checked at all.
+     */
+    private static final class MathUtils {
+        /*
+         * For full details about this code see the following reference:
+         *
+         *     Giulietti, "The Schubfach way to render doubles",
+         *     https://drive.google.com/file/d/1gp5xv4CAa78SVgCeWfGqqI4FfYYYuNFb
+         */
+
+        /*
+         * The boundaries for k in g0(int) and g1(int).
+         * K_MIN must be DoubleToDecimal.K_MIN or less.
+         * K_MAX must be DoubleToDecimal.K_MAX or more.
+         */
+        static final int K_MIN = -8;
+        static final int K_MAX = 1;
+
+        /* Must be DoubleToDecimal.H or more */
+        static final int H = 17;
+
+        /* C_10 = floor(log10(2) * 2^Q_10), A_10 = floor(log10(3/4) * 2^Q_10) */
+        private static final int Q_10 = 41;
+        private static final long C_10 = 661_971_961_083L;
+        private static final long A_10 = -274_743_187_321L;
+
+        /* C_2 = floor(log2(10) * 2^Q_2) */
+        private static final int Q_2 = 38;
+        private static final long C_2 = 913_124_641_741L;
+
+        private MathUtils() {
+            throw new RuntimeException("not supposed to be instantiated.");
+        }
+
+        /* The first powers of 10. The last entry must be 10^(DoubleToDecimal.H) */
+        private static final long[] pow10 = {
+                1L,
+                10L,
+                100L,
+                1_000L,
+                10_000L,
+                100_000L,
+                1_000_000L,
+                10_000_000L,
+                100_000_000L,
+                1_000_000_000L,
+                10_000_000_000L,
+                100_000_000_000L,
+                1_000_000_000_000L,
+                10_000_000_000_000L,
+                100_000_000_000_000L,
+                1_000_000_000_000_000L,
+                10_000_000_000_000_000L,
+                100_000_000_000_000_000L,
+        };
+
+        /**
+         * Returns 10<sup>{@code e}</sup>.
+         *
+         * @param e The exponent which must meet
+         *          0 &le; {@code e} &le; {@link #H}.
+         * @return 10<sup>{@code e}</sup>.
+         */
+        static long pow10(int e) {
+            return pow10[e];
+        }
+
+        /**
+         * Returns the unique integer <i>k</i> such that
+         * 10<sup><i>k</i></sup> &le; 2<sup>{@code e}</sup>
+         * &lt; 10<sup><i>k</i>+1</sup>.
+         * <p>
+         * The result is correct when |{@code e}| &le; 6_432_162.
+         * Otherwise the result is undefined.
+         *
+         * @param e The exponent of 2, which should meet
+         *          |{@code e}| &le; 6_432_162 for safe results.
+         * @return &lfloor;log<sub>10</sub>2<sup>{@code e}</sup>&rfloor;.
+         */
+        static int flog10pow2(int e) {
+            return (int) (e * C_10 >> Q_10);
+        }
+
+        /**
+         * Returns the unique integer <i>k</i> such that
+         * 10<sup><i>k</i></sup> &le; 3/4 &middot; 2<sup>{@code e}</sup>
+         * &lt; 10<sup><i>k</i>+1</sup>.
+         * <p>
+         * The result is correct when
+         * -3_606_689 &le; {@code e} &le; 3_150_619.
+         * Otherwise the result is undefined.
+         *
+         * @param e The exponent of 2, which should meet
+         *          -3_606_689 &le; {@code e} &le; 3_150_619 for safe results.
+         * @return &lfloor;log<sub>10</sub>(3/4 &middot;
+         * 2<sup>{@code e}</sup>)&rfloor;.
+         */
+        static int flog10threeQuartersPow2(int e) {
+            return (int) (e * C_10 + A_10 >> Q_10);
+        }
+
+        /**
+         * Returns the unique integer <i>k</i> such that
+         * 2<sup><i>k</i></sup> &le; 10<sup>{@code e}</sup>
+         * &lt; 2<sup><i>k</i>+1</sup>.
+         * <p>
+         * The result is correct when |{@code e}| &le; 1_838_394.
+         * Otherwise the result is undefined.
+         *
+         * @param e The exponent of 10, which should meet
+         *          |{@code e}| &le; 1_838_394 for safe results.
+         * @return &lfloor;log<sub>2</sub>10<sup>{@code e}</sup>&rfloor;.
+         */
+        static int flog2pow10(int e) {
+            return (int) (e * C_2 >> Q_2);
+        }
+
+        /**
+         * Let 10<sup>-{@code k}</sup> = <i>&beta;</i> 2<sup><i>r</i></sup>,
+         * for the unique pair of integer <i>r</i> and real <i>&beta;</i> meeting
+         * 2<sup>125</sup> &le; <i>&beta;</i> &lt; 2<sup>126</sup>.
+         * Further, let <i>g</i> = &lfloor;<i>&beta;</i>&rfloor; + 1.
+         * Split <i>g</i> into the higher 63 bits <i>g</i><sub>1</sub> and
+         * the lower 63 bits <i>g</i><sub>0</sub>. Thus,
+         * <i>g</i><sub>1</sub> =
+         * &lfloor;<i>g</i> 2<sup>-63</sup>&rfloor;
+         * and
+         * <i>g</i><sub>0</sub> =
+         * <i>g</i> - <i>g</i><sub>1</sub> 2<sup>63</sup>.
+         * <p>
+         * This method returns <i>g</i><sub>1</sub> while
+         * {@link #g0(int)} returns <i>g</i><sub>0</sub>.
+         * <p>
+         * If needed, the exponent <i>r</i> can be computed as
+         * <i>r</i> = {@code flog2pow10(-k)} - 125 (see {@link #flog2pow10(int)}).
+         *
+         * @param k The exponent of 10, which must meet
+         *          {@link #K_MIN} &le; {@code e} &le; {@link #K_MAX}.
+         * @return <i>g</i><sub>1</sub> as described above.
+         */
+        static long g1(int k) {
+            return g[k - K_MIN << 1];
+        }
+
+        /**
+         * Returns <i>g</i><sub>0</sub> as described in
+         * {@link #g1(int)}.
+         *
+         * @param k The exponent of 10, which must meet
+         *          {@link #K_MIN} &le; {@code e} &le; {@link #K_MAX}.
+         * @return <i>g</i><sub>0</sub> as described in
+         * {@link #g1(int)}.
+         */
+        static long g0(int k) {
+            return g[k - K_MIN << 1 | 1];
+        }
+
+        /*
+         * The precomputed values for g1(int) and g0(int).
+         * The first entry must be for an exponent of K_MIN or less.
+         * The last entry must be for an exponent of K_MAX or more.
+         */
+        private static final long[] g = {
+                0x5F5E_1000_0000_0000L, 0x0000_0000_0000_0001L, //   -8
+                0x4C4B_4000_0000_0000L, 0x0000_0000_0000_0001L, //   -7
+                0x7A12_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -6
+                0x61A8_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -5
+                0x4E20_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -4
+                0x7D00_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -3
+                0x6400_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -2
+                0x5000_0000_0000_0000L, 0x0000_0000_0000_0001L, //   -1
+                0x4000_0000_0000_0000L, 0x0000_0000_0000_0001L, //    0
+                0x6666_6666_6666_6666L, 0x3333_3333_3333_3334L, //    1
+        };
+
+    }
+}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Consts.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Consts.java
new file mode 100644
index 00000000000..48c4d2199b1
--- /dev/null
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Consts.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.incubator.vector;
+
+import static jdk.incubator.vector.Float16.MIN_EXPONENT;
+import static jdk.incubator.vector.Float16.PRECISION;
+import static jdk.incubator.vector.Float16.SIZE;
+
+/**
+ * This class contains additional constants documenting limits of the
+ * {@code Float16} type.
+ */
+
+class Float16Consts {
+    /**
+     * Don't let anyone instantiate this class.
+     */
+    private Float16Consts() {}
+
+    /**
+     * The number of logical bits in the significand of a
+     * {@code Float16} number, including the implicit bit.
+     */
+    public static final int SIGNIFICAND_WIDTH = PRECISION;
+
+    /**
+     * The exponent the smallest positive {@code Float16}
+     * subnormal value would have if it could be normalized.
+     */
+    public static final int MIN_SUB_EXPONENT =
+            MIN_EXPONENT - (SIGNIFICAND_WIDTH - 1); // -24
+
+    /**
+     * Bias used in representing a {@code Float16} exponent.
+     */
+    public static final int EXP_BIAS =
+            (1 << (SIZE - SIGNIFICAND_WIDTH - 1)) - 1; // 15
+
+    /**
+     * Bit mask to isolate the sign bit of a {@code Float16}.
+     */
+    public static final int SIGN_BIT_MASK = 1 << (SIZE - 1);
+
+    /**
+     * Bit mask to isolate the exponent field of a {@code Float16}.
+     */
+    public static final int EXP_BIT_MASK =
+            ((1 << (SIZE - SIGNIFICAND_WIDTH)) - 1) << (SIGNIFICAND_WIDTH - 1);
+
+    /**
+     * Bit mask to isolate the significand field of a {@code Float16}.
+     */
+    public static final int SIGNIF_BIT_MASK = (1 << (SIGNIFICAND_WIDTH - 1)) - 1;
+
+    /**
+     * Bit mask to isolate the magnitude bits (combined exponent and
+     * significand fields) of a {@code Float16}.
+     */
+    public static final int MAG_BIT_MASK = EXP_BIT_MASK | SIGNIF_BIT_MASK;
+
+    static {
+        // verify bit masks cover all bit positions and that the bit
+        // masks are non-overlapping
+        assert(((SIGN_BIT_MASK | EXP_BIT_MASK | SIGNIF_BIT_MASK) == 0xFFFF) &&
+               (((SIGN_BIT_MASK & EXP_BIT_MASK) == 0) &&
+                ((SIGN_BIT_MASK & SIGNIF_BIT_MASK) == 0) &&
+                ((EXP_BIT_MASK & SIGNIF_BIT_MASK) == 0)) &&
+                ((SIGN_BIT_MASK | MAG_BIT_MASK) == 0xFFFF));
+    }
+}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
index 098eed06095..a3686d467a7 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -3571,7 +3571,7 @@ static long arrayAddress(float[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index 6cb81767cdd..390c8026083 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -3739,7 +3739,7 @@ static long arrayAddress(int[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index a740c9d49cf..43fedc2693b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -3674,7 +3674,7 @@ static long arrayAddress(long[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index 0e3ff9aaa87..552967d82e7 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -4092,7 +4092,7 @@ static long charArrayAddress(char[] a, int index) {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index b5f3a4b7d87..7eb1d9810b1 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -5310,7 +5310,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 
     @ForceInline
     static long byteArrayAddress(byte[] a, int index) {
-        return Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
+        return (long) Unsafe.ARRAY_BYTE_BASE_OFFSET + index;
     }
 
     // ================================================
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index 16d9cf3625e..5d5956a667c 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -69,7 +69,7 @@ String getHostArchitectureName() {
 
     final int objectAlignment = getFlag("ObjectAlignmentInBytes", Integer.class);
 
-    final int hubOffset = getFieldOffset("oopDesc::_metadata._klass", Integer.class, "Klass*");
+    final int klassOffsetInBytes = getFieldValue("CompilerToVM::Data::oopDesc_klass_offset_in_bytes", Integer.class, "int");
 
     final int subklassOffset = getFieldOffset("Klass::_subklass", Integer.class, "Klass*");
     final int superOffset = getFieldOffset("Klass::_super", Integer.class, "Klass*");
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
index 2877a09968f..ab8b3d335cb 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
@@ -191,7 +191,11 @@ HotSpotResolvedObjectTypeImpl getType(HotSpotObjectConstantImpl object) {
             String name = theClass.getName().replace('.', '/');
             return (HotSpotResolvedObjectTypeImpl) runtime().compilerToVm.lookupType(theClass.getClassLoader(), name);
         }
-        return runtime().compilerToVm.getResolvedJavaType(object, runtime().getConfig().hubOffset, false);
+        // HotSpot tests if the offset is oopDesc::klass_offset_in_bytes() and returns
+        // the object type accordingly. When UseCompactClassPointers is enabled,
+        // oopDesc::klass_offset_in_bytes() will return an offset halfway into the
+        // object's markWord as a placeholder referring to the klass pointer.
+        return runtime().compilerToVm.getResolvedJavaType(object, runtime().getConfig().klassOffsetInBytes, false);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index f098a8dc8f3..5edcf4f839f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -172,6 +172,7 @@ public class Contents {
     public final Content relatedPackages;
     public final Content returns;
     public final Content searchLabel;
+    public final Content searchTagsLabel;
     public final Content seeAlso;
     public final Content serializedForm;
     public final Content servicesLabel;
@@ -325,6 +326,7 @@ public class Contents {
         relatedPackages = getContent("doclet.Related_Packages");
         returns = getContent("doclet.Returns");
         searchLabel = getContent("doclet.search");
+        searchTagsLabel = getContent("doclet.searchTags");
         seeAlso = getContent("doclet.See_Also");
         serializedForm = getContent("doclet.Serialized_Form");
         servicesLabel = getContent("doclet.Services");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 1687f891896..a103ffb70fb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -183,7 +183,7 @@ private Content getNavigationSection() {
      * <li>Declaration pages: module, package, classes
      * <li>Derived info for declarations: use and tree
      * <li>General summary info: deprecated, preview
-     * <li>Detailed summary info: constant values, serialized form, system properties
+     * <li>Detailed summary info: constant values, search tags, serialized form, system properties
      * <li>Index info: all packages, all classes, full index
      * </ul>
      *
@@ -346,6 +346,15 @@ private Content getPageKindSection() {
             pageKindsSection.add(section);
         }
 
+        // Search Tags
+        if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.SEARCH_TAGS)) {
+            section = newHelpSection(contents.searchTagsLabel, PageMode.SEARCH_TAGS);
+            Content searchTagsBody = getContent("doclet.help.searchTags.body",
+                    links.createLink(DocPaths.SEARCH_TAGS, resources.getText("doclet.searchTags")));
+            section.add(HtmlTree.P(searchTagsBody));
+            pageKindsSection.add(section);
+        }
+
         // Serialized Form
         if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.SERIALIZED_FORM)) {
             section = newHelpSection(contents.serializedForm, PageMode.SERIALIZED_FORM)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index 649687e19a2..ca20d065a1e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -177,7 +177,7 @@ public class HtmlConfiguration extends BaseConfiguration {
     // which performs a somewhat similar role
     public enum ConditionalPage {
         CONSTANT_VALUES, DEPRECATED, EXTERNAL_SPECS, PREVIEW, RESTRICTED,
-        SERIALIZED_FORM, SYSTEM_PROPERTIES, NEW
+        SEARCH_TAGS, SERIALIZED_FORM, SYSTEM_PROPERTIES, NEW
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index 17867e368bf..193e1f3a129 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -283,6 +283,7 @@ protected void generateOtherFiles(ClassTree classTree)
             if (!options.noExternalSpecsPage()){
                 writerFactory.newExternalSpecsWriter().buildPage();
             }
+            writerFactory.newSearchTagsWriter().buildPage();
             writerFactory.newSystemPropertiesWriter().buildPage();
 
             configuration.indexBuilder.addElements();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java
new file mode 100644
index 00000000000..2a581a09c62
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java
@@ -0,0 +1,286 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.WeakHashMap;
+import java.util.stream.Collectors;
+
+import com.sun.source.doctree.DocTree;
+
+import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
+import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
+
+import static java.util.stream.Collectors.groupingBy;
+
+/**
+ * Generates summary files for tags represented by {@code IndexItem}.
+ * Supported items are search tags and system properties.
+ */
+public abstract class IndexItemListWriter extends HtmlDocletWriter {
+
+    /**
+     * Cached contents of {@code <title>...</title>} tags of the HTML pages.
+     */
+    final Map<DocFileElement, String> titles = new WeakHashMap<>();
+
+    /**
+     * Constructs a IndexItemListWriter object.
+     *
+     * @param configuration The current configuration
+     * @param path the doc path of the file to write
+     */
+    protected IndexItemListWriter(HtmlConfiguration configuration, DocPath path) {
+        super(configuration, path, false);
+    }
+
+    @Override
+    public void buildPage() throws DocFileIOException {
+        boolean hasTags = configuration.indexBuilder != null
+                && !configuration.indexBuilder.getItems(getKind()).isEmpty();
+        if (!hasTags) {
+            return;
+        }
+
+        writeGenerating();
+        configuration.conditionalPages.add(getConditionalPage());
+
+        String title = getPageLabel().toString();
+        HtmlTree body = getBody(getWindowTitle(title));
+        Content mainContent = new ContentBuilder();
+        addIndexItems(mainContent);
+        body.add(new BodyContents()
+                .setHeader(getHeader(getPageMode()))
+                .addMainContent(HtmlTree.DIV(HtmlStyles.header,
+                        HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, getPageLabel())))
+                .addMainContent(mainContent)
+                .setFooter(getFooter()));
+        printHtmlDocument(null, title.toLowerCase(Locale.ROOT), body);
+
+        if (configuration.indexBuilder != null) {
+            configuration.indexBuilder.add(IndexItem.of(IndexItem.Category.TAGS, title, path));
+        }
+    }
+
+    protected Map<String, List<IndexItem>> groupTags() {
+        return configuration.indexBuilder.getItems(getKind()).stream()
+                .collect(groupingBy(IndexItem::getLabel, TreeMap::new, Collectors.toCollection(ArrayList::new)));
+    }
+
+    protected Content createLink(IndexItem i) {
+        assert i.getDocTree().getKind() == getKind() : i;
+        var element = i.getElement();
+        if (element instanceof OverviewElement) {
+            return links.createLink(pathToRoot.resolve(i.getUrl()),
+                    resources.getText("doclet.Overview"));
+        } else if (element instanceof DocFileElement e) {
+            var fo = e.getFileObject();
+            var t = titles.computeIfAbsent(e, this::getFileTitle);
+            if (t.isBlank()) {
+                // The user should probably be notified (a warning?) that this
+                // file does not have a title
+                var p = Path.of(fo.toUri());
+                t = p.getFileName().toString();
+            }
+            var b = new ContentBuilder()
+                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
+                    .add(t);
+            return links.createLink(pathToRoot.resolve(i.getUrl()), b);
+        } else {
+            // program elements should be displayed using a code font
+            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
+            return HtmlTree.CODE(link);
+        }
+    }
+
+    /**
+     * Adds a table with the included index items to the content.
+     *
+     * @param target the content to which the table will be added
+     */
+    protected abstract void addIndexItems(Content target);
+
+    /**
+     * {@return the kind of index item to list in this page}
+     */
+    protected abstract DocTree.Kind getKind();
+
+    /**
+     * {@return the conditional page value}
+     */
+    protected abstract HtmlConfiguration.ConditionalPage getConditionalPage();
+
+    /**
+     * {@return the label for the page heading}
+     */
+    protected abstract Content getPageLabel();
+
+    /**
+     * {@return the Navigation.PageMode value}
+     */
+    protected abstract Navigation.PageMode getPageMode();
+
+    // Note: The reason we can't use anonymous classes below is that HtmlDocletWriter.getBodyStyle()
+    // uses the writer's class name to deduce the CSS body style name.
+
+    public static IndexItemListWriter createSystemPropertiesWriter(HtmlConfiguration configuration) {
+        return new SystemPropertiesWriter(configuration);
+    }
+
+    public static IndexItemListWriter createSearchTagsWriter(HtmlConfiguration configuration) {
+        return new SearchTagsWriter(configuration);
+    }
+
+    static class SystemPropertiesWriter extends IndexItemListWriter {
+        SystemPropertiesWriter(HtmlConfiguration configuration) {
+            super(configuration, DocPaths.SYSTEM_PROPERTIES);
+        }
+
+        @Override
+        protected DocTree.Kind getKind() {
+            return DocTree.Kind.SYSTEM_PROPERTY;
+        }
+
+        @Override
+        protected HtmlConfiguration.ConditionalPage getConditionalPage() {
+            return HtmlConfiguration.ConditionalPage.SYSTEM_PROPERTIES;
+        }
+
+        @Override
+        protected Content getPageLabel() {
+            return contents.systemPropertiesLabel;
+        }
+
+        @Override
+        protected Navigation.PageMode getPageMode() {
+            return PageMode.SYSTEM_PROPERTIES;
+        }
+
+        /**
+         * Creates a 2-column table containing system properties.
+         *
+         * @param target the content to which the links will be added
+         */
+        @Override
+        protected void addIndexItems(Content target) {
+            Map<String, List<IndexItem>> searchIndexMap = groupTags();
+            Content separator = Text.of(", ");
+            var table = new Table<Void>(HtmlStyles.summaryTable)
+                    .setCaption(contents.systemPropertiesSummaryLabel)
+                    .setHeader(new TableHeader(contents.propertyLabel, contents.referencedIn))
+                    .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
+            searchIndexMap.forEach((key, searchIndexItems) -> {
+                Content propertyName = Text.of(key);
+                Content referenceLinks = new ContentBuilder();
+                for (IndexItem searchIndexItem : searchIndexItems) {
+                    if (!referenceLinks.isEmpty()) {
+                        referenceLinks.add(separator);
+                    }
+                    referenceLinks.add(createLink(searchIndexItem));
+                }
+                table.addRow(propertyName, HtmlTree.DIV(HtmlStyles.block, referenceLinks));
+            });
+            target.add(table);
+        }
+    }
+
+    static class SearchTagsWriter extends IndexItemListWriter {
+        SearchTagsWriter(HtmlConfiguration configuration) {
+            super(configuration, DocPaths.SEARCH_TAGS);
+        }
+
+        @Override
+        protected DocTree.Kind getKind() {
+            return DocTree.Kind.INDEX;
+        }
+
+        @Override
+        protected HtmlConfiguration.ConditionalPage getConditionalPage() {
+            return HtmlConfiguration.ConditionalPage.SEARCH_TAGS;
+        }
+
+        @Override
+        protected Content getPageLabel() {
+            return contents.searchTagsLabel;
+        }
+
+        @Override
+        protected Navigation.PageMode getPageMode() {
+            return PageMode.SEARCH_TAGS;
+        }
+
+        /**
+         * Creates a 3-column table containing search tags.
+         *
+         * @param target the content to which the links will be added
+         */
+        @Override
+        protected void addIndexItems(Content target) {
+            Map<String, List<IndexItem>> searchIndexMap = groupTags();
+            Content separator = Text.of(", ");
+            var table = new Table<Void>(HtmlStyles.summaryTable)
+                    .setCaption(contents.getContent("doclet.searchTagsSummary"))
+                    .setHeader(new TableHeader(contents.getContent("doclet.searchTag"),
+                            contents.descriptionLabel,
+                            contents.getContent("doclet.DefinedIn")))
+                    .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
+            searchIndexMap.forEach((key, searchIndexItems) -> {
+                Content propertyName = Text.of(key);
+                Content referenceLinks = new ContentBuilder();
+                String description = "";
+                for (IndexItem searchIndexItem : searchIndexItems) {
+                    if (!referenceLinks.isEmpty()) {
+                        referenceLinks.add(separator);
+                    }
+                    referenceLinks.add(createLink(searchIndexItem));
+                    if (description.isEmpty()) {
+                        description = searchIndexItem.getDescription();
+                        Objects.requireNonNull(description);
+                    }
+                }
+                table.addRow(propertyName, Text.of(description), HtmlTree.DIV(HtmlStyles.block, referenceLinks));
+            });
+            target.add(table);
+        }
+    }
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 9d12d3bb23d..7c63a581a4f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -87,8 +87,9 @@ public enum PageMode {
         PACKAGE,
         PREVIEW,
         RESTRICTED,
-        SERIALIZED_FORM,
         SEARCH,
+        SEARCH_TAGS,
+        SERIALIZED_FORM,
         SYSTEM_PROPERTIES,
         TREE,
         USE
@@ -274,6 +275,7 @@ private void addMainNavLinks(Content target) {
             case CONSTANT_VALUES:
             case EXTERNAL_SPECS:
             case RESTRICTED:
+            case SEARCH_TAGS:
             case SERIALIZED_FORM:
             case SYSTEM_PROPERTIES:
                 addOverviewLink(target);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
deleted file mode 100644
index d7aacd3ab0f..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.WeakHashMap;
-import java.util.stream.Collectors;
-
-import com.sun.source.doctree.DocTree;
-
-import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
-import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
-import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
-import jdk.javadoc.internal.html.Content;
-import jdk.javadoc.internal.html.ContentBuilder;
-import jdk.javadoc.internal.html.HtmlTree;
-import jdk.javadoc.internal.html.Text;
-
-import static java.util.stream.Collectors.groupingBy;
-
-/**
- * Generates the file with the summary of all the system properties.
- */
-public class SystemPropertiesWriter extends HtmlDocletWriter {
-
-    /**
-     * Cached contents of {@code <title>...</title>} tags of the HTML pages.
-     */
-    final Map<DocFileElement, String> titles = new WeakHashMap<>();
-
-    /**
-     * Constructs SystemPropertiesWriter object.
-     *
-     * @param configuration The current configuration
-     */
-    public SystemPropertiesWriter(HtmlConfiguration configuration) {
-        super(configuration, DocPaths.SYSTEM_PROPERTIES, false);
-    }
-
-    @Override
-    public void buildPage() throws DocFileIOException {
-        boolean hasSystemProperties = configuration.indexBuilder != null
-                && !configuration.indexBuilder.getItems(DocTree.Kind.SYSTEM_PROPERTY).isEmpty();
-        if (!hasSystemProperties) {
-            return;
-        }
-
-        writeGenerating();
-        configuration.conditionalPages.add(HtmlConfiguration.ConditionalPage.SYSTEM_PROPERTIES);
-
-        String title = resources.getText("doclet.systemProperties");
-        HtmlTree body = getBody(getWindowTitle(title));
-        Content mainContent = new ContentBuilder();
-        addSystemProperties(mainContent);
-        body.add(new BodyContents()
-                .setHeader(getHeader(PageMode.SYSTEM_PROPERTIES))
-                .addMainContent(HtmlTree.DIV(HtmlStyles.header,
-                        HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
-                                contents.getContent("doclet.systemProperties"))))
-                .addMainContent(mainContent)
-                .setFooter(getFooter()));
-        printHtmlDocument(null, "system properties", body);
-
-        if (configuration.indexBuilder != null) {
-            configuration.indexBuilder.add(IndexItem.of(IndexItem.Category.TAGS, title, path));
-        }
-    }
-
-    /**
-     * Adds all the system properties to the content.
-     *
-     * @param target the content to which the links will be added
-     */
-    protected void addSystemProperties(Content target) {
-        Map<String, List<IndexItem>> searchIndexMap = groupSystemProperties();
-        Content separator = Text.of(", ");
-        var table = new Table<Void>(HtmlStyles.summaryTable)
-                .setCaption(contents.systemPropertiesSummaryLabel)
-                .setHeader(new TableHeader(contents.propertyLabel, contents.referencedIn))
-                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
-        for (Entry<String, List<IndexItem>> entry : searchIndexMap.entrySet()) {
-            Content propertyName = Text.of(entry.getKey());
-            List<IndexItem> searchIndexItems = entry.getValue();
-            Content separatedReferenceLinks = new ContentBuilder();
-            separatedReferenceLinks.add(createLink(searchIndexItems.get(0)));
-            for (int i = 1; i < searchIndexItems.size(); i++) {
-                separatedReferenceLinks.add(separator);
-                separatedReferenceLinks.add(createLink(searchIndexItems.get(i)));
-            }
-            table.addRow(propertyName, HtmlTree.DIV(HtmlStyles.block, separatedReferenceLinks));
-        }
-        target.add(table);
-    }
-
-    private Map<String, List<IndexItem>> groupSystemProperties() {
-        return configuration.indexBuilder.getItems(DocTree.Kind.SYSTEM_PROPERTY).stream()
-                .collect(groupingBy(IndexItem::getLabel, TreeMap::new, Collectors.toCollection(ArrayList::new)));
-    }
-
-    private Content createLink(IndexItem i) {
-        assert i.getDocTree().getKind() == DocTree.Kind.SYSTEM_PROPERTY : i;
-        var element = i.getElement();
-        if (element instanceof OverviewElement) {
-            return links.createLink(pathToRoot.resolve(i.getUrl()),
-                    resources.getText("doclet.Overview"));
-        } else if (element instanceof DocFileElement e) {
-            var fo = e.getFileObject();
-            var t = titles.computeIfAbsent(e, this::getFileTitle);
-            if (t.isBlank()) {
-                // The user should probably be notified (a warning?) that this
-                // file does not have a title
-                var p = Path.of(fo.toUri());
-                t = p.getFileName().toString();
-            }
-            var b = new ContentBuilder()
-                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
-                    .add(t);
-            return links.createLink(pathToRoot.resolve(i.getUrl()), b);
-        } else {
-            // program elements should be displayed using a code font
-            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
-            return HtmlTree.CODE(link);
-        }
-    }
-}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactory.java
index 064fff0879d..d656fe35293 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/WriterFactory.java
@@ -37,7 +37,6 @@
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
 
 /**
@@ -184,6 +183,13 @@ public HtmlDocletWriter newSearchWriter() {
         return new SearchWriter(configuration);
     }
 
+    /**
+     * {@return a new writer for the page listing search tags defined in the API}
+     */
+    public HtmlDocletWriter newSearchTagsWriter() {
+        return IndexItemListWriter.createSearchTagsWriter(configuration);
+    }
+
     /**
      * {@return a new writer for the page giving the serialized forms of classes and other type elements}
      */
@@ -195,7 +201,7 @@ public HtmlDocletWriter newSerializedFormWriter() {
      * {@return a new writer for the page listing system properties referenced in the API}
      */
     public HtmlDocletWriter newSystemPropertiesWriter() {
-        return new SystemPropertiesWriter(configuration);
+        return IndexItemListWriter.createSystemPropertiesWriter(configuration);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
index 35240fa69da..e13ed9393a3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
@@ -857,6 +857,11 @@ public enum HtmlStyles implements HtmlStyle {
      */
     searchPage,
 
+    /**
+     * The class of the {@code body} element for the search tags page.
+     */
+    searchTagsPage,
+
     /**
      * The class of the {@code body} element for the serialized-forms page.
      */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index bb001912229..e6faa7bbe19 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -135,6 +135,9 @@ doclet.Preview_Label=Preview
 doclet.Preview_Mark=PREVIEW
 doclet.Restricted_Methods=Restricted Methods
 doclet.Restricted_Mark=RESTRICTED
+doclet.searchTag=Search Tag
+doclet.searchTags=Search Tags
+doclet.searchTagsSummary=Search Tags Summary
 doclet.Terminally_Deprecated=Terminally Deprecated
 doclet.Terminally_Deprecated_Elements=Terminally Deprecated Elements
 doclet.Terminally_Deprecated_In_Release=Terminally Deprecated in {0}
@@ -171,6 +174,7 @@ doclet.Interfaces=Interfaces
 doclet.Enclosing_Class=Enclosing class:
 doclet.Enclosing_Interface=Enclosing interface:
 doclet.Inheritance_Tree=Inheritance Tree
+doclet.DefinedIn=Defined In
 doclet.ReferencedIn=Referenced In
 doclet.Section=Section
 doclet.External_Specification=External Specification
@@ -340,6 +344,9 @@ doclet.help.serial_form.body=\
 # 0: link to Constant Values page
 doclet.help.constants.body=\
     The {0} page lists the static final fields and their values.
+# 0: link to Search Tags page
+doclet.help.searchTags.body=\
+    The {0} page lists search tags defined in the documentation.
 # 0: link to System Properties page
 doclet.help.systemProperties.body=\
     The {0} page lists references to system properties.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
index b05bb144f1b..4ba730cca9c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,7 +128,7 @@ private Content retrieveInheritedDocumentation(TagletWriter writer,
                     d = docFinder.search(src, m -> extractMainDescription(m, isFirstSentence, utils));
                 }
                 if (d instanceof Result.Conclude<Documentation> doc) {
-                    replacement = writer.commentTagsToOutput(doc.value().method, null,
+                    replacement = writer.commentTagsToOutput(doc.value().method, inheritDoc,
                             doc.value().mainDescription, isFirstSentence);
                 }
             } catch (DocFinder.NoOverriddenMethodFound e) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index 15e88da5bae..c171e10132a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -254,16 +254,13 @@ Content linkSeeReferenceOutput(Element holder,
                 // documented, this must be an inherited link.  Redirect it.
                 // The current class either overrides the referenced member or
                 // inherits it automatically.
-                if (htmlWriter instanceof ClassWriter cw) {
-                    containing = cw.getTypeElement();
-                } else if (!utils.isPublic(containing)) {
-                    reportWarning.accept("doclet.link.see.reference_not_accessible",
-                            new Object[] { utils.getFullyQualifiedName(containing)});
-                } else {
-                    if (!config.isDocLintReferenceGroupEnabled()) {
-                        reportWarning.accept("doclet.link.see.reference_not_found",
-                                new Object[] { refSignature });
+                if (utils.configuration.docEnv.isSelected(refMem)) {
+                    if (htmlWriter instanceof ClassWriter cw) {
+                        containing = cw.getTypeElement();
                     }
+                } else {
+                    reportWarning.accept("doclet.link.see.reference_not_accessible",
+                            new Object[]{refMem});
                 }
             }
             String refMemName = refFragment;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
index ca1b6ae016b..7b6c7060a6f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
@@ -368,21 +368,22 @@ public Content createAnchorAndSearchIndex(Element element, String tagText, Strin
     }
 
     Content createAnchorAndSearchIndex(Element element, String tagText, Content tagContent, String desc, DocTree tree) {
-        Content result;
-        if (context.isFirstSentence && context.inSummary || context.inTags.contains(DocTree.Kind.INDEX)
+        // Only create index item for tags in their native location.
+        if (context.isFirstSentence && context.inSummary
+                || context.inTags.contains(DocTree.Kind.INDEX)
+                || context.inTags.contains(DocTree.Kind.INHERIT_DOC)
+                || isDifferentTypeElement(element)
                 || !htmlWriter.isIndexable()) {
-            result = tagContent;
-        } else {
-            HtmlId id = HtmlIds.forText(tagText, htmlWriter.indexAnchorTable);
-            result = HtmlTree.SPAN(id, HtmlStyles.searchTagResult, tagContent);
-            if (options.createIndex() && !tagText.isEmpty()) {
-                String holder = getHolderName(element);
-                IndexItem item = IndexItem.of(element, tree, tagText, holder, desc,
-                        new DocLink(htmlWriter.path, id.name()));
-                configuration.indexBuilder.add(item);
-            }
+            return tagContent;
         }
-        return result;
+        HtmlId id = HtmlIds.forText(tagText, htmlWriter.indexAnchorTable);
+        if (options.createIndex() && !tagText.isEmpty()) {
+            String holder = getHolderName(element);
+            IndexItem item = IndexItem.of(element, tree, tagText, holder, desc,
+                    new DocLink(htmlWriter.path, id.name()));
+            configuration.indexBuilder.add(item);
+        }
+        return HtmlTree.SPAN(id, HtmlStyles.searchTagResult, tagContent);
     }
 
     public String getHolderName(Element element) {
@@ -471,4 +472,15 @@ private boolean isLongOrHasComma(Content c) {
                 .replaceAll("\\R", "\n");             // normalize newlines
         return s.length() > TAG_LIST_ITEM_MAX_INLINE_LENGTH || s.contains(",");
     }
+
+    // Test if element is the same as or belongs to the current page element
+    private boolean isDifferentTypeElement(Element element) {
+        if (element.getKind().isDeclaredType()) {
+            return element != getCurrentPageElement();
+        } else if (element.getKind() == ElementKind.OTHER) {
+            return false;
+        } else {
+            return utils.getEnclosingTypeElement(element) != getCurrentPageElement();
+        }
+    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index 47cf3e81ebe..eb937b48e2e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -175,6 +175,9 @@ public static DocPath indexN(int n) {
     /** The name of the file for search page. */
     public static final DocPath SEARCH_PAGE = DocPath.create("search.html");
 
+    /** The name of the file for search tags index page. */
+    public static final DocPath SEARCH_TAGS = DocPath.create("search-tags.html");
+
     /** The name of the file for all system properties. */
     public static final DocPath SYSTEM_PROPERTIES = DocPath.create("system-properties.html");
 
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java
index 49b97cad21b..ad142e9c572 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/TableSorter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -221,7 +221,6 @@ private Vector<?> getRow(int row) {
         return dataVector.elementAt(row);
     }
 
-    @SuppressWarnings("unchecked")
     private void setRow(Vector<?> data, int row) {
         dataVector.setElementAt(data,row);
     }
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java
index a18e84f3ca3..9ee1fad0e8b 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ public abstract class XTable extends JTable {
 
     public XTable () {
         super();
-        @SuppressWarnings("serial")
         final TableSorter sorter = new TableSorter();
         setModel(sorter);
         sorter.addMouseListenerToHeaderInTable(this);
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java b/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java
index a173bcf4fc0..940340e32b2 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,11 +50,6 @@ public Bootstrap() {}
      * <p> May throw an unspecified error if initialization of the
      * {@link VirtualMachineManager} fails or if the virtual machine manager
      * is unable to locate or create any {@link Connector Connectors}.
-     *
-     * @throws java.lang.SecurityException if a security manager has been
-     * installed and it denies {@link JDIPermission}
-     * ("{@code virtualMachineManager}") or other unspecified
-     * permissions required by the implementation.
      */
     public static synchronized VirtualMachineManager virtualMachineManager() {
         return VirtualMachineManagerImpl.virtualMachineManager();
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java b/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java
index 2c80497d3f1..a968f6894be 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,50 +26,13 @@
 package com.sun.jdi;
 
 /**
- * The {@code JDIPermission} class represents access rights to
- * the {@code VirtualMachineManager}.  This is the permission
- * which the SecurityManager will check when code that is running with
- * a SecurityManager requests access to the VirtualMachineManager, as
- * defined in the Java Debug Interface (JDI) for the Java platform.
- * <P>
  * A {@code JDIPermission} object contains a name (also referred
  * to as a "target name") but no actions list; you either have the
  * named permission or you don't.
- * <P>
- * The following table provides a summary description of what the
- * permission allows, and discusses the risks of granting code the
- * permission.
  *
- * <table class="striped">
- * <caption style="display:none">Table shows permission target name, what the
- * permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- *
- * <tbody>
- * <tr>
- *   <th scope="row">virtualMachineManager</th>
- *   <td>Ability to inspect and modify the JDI objects in the
- *   {@code VirtualMachineManager}
- *   </td>
- *   <td>This allows an attacker to control the
- *   {@code VirtualMachineManager} and cause the system to
- *   misbehave.
- *   </td>
- * </tr>
- * </tbody>
- *
- * </table>
- *
- * <p>
- * Programmers do not normally create JDIPermission objects directly.
- * Instead they are created by the security policy code based on reading
- * the security policy file.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @author  Tim Bell
  * @since   1.5
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
index e35280eb0e8..fa051eae278 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -376,7 +376,6 @@ public void forEachClass(Consumer<ReferenceType> action) {
         }
         Iterator<?> it = classToBytes.entrySet().iterator();
         for (int i = 0; it.hasNext(); i++) {
-            @SuppressWarnings("rawtypes")
             Map.Entry<?, ?> entry = (Map.Entry)it.next();
             ReferenceTypeImpl refType = (ReferenceTypeImpl)entry.getKey();
             validateMirror(refType);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/transport.c b/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
index f67e9da47ea..b19afd972b7 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
@@ -105,13 +105,6 @@ findTransportOnLoad(void *handle)
     if (handle == NULL) {
         return onLoad;
     }
-#if defined(_WIN32) && !defined(_WIN64)
-    onLoad = (jdwpTransport_OnLoad_t)
-                 dbgsysFindLibraryEntry(handle, "_jdwpTransport_OnLoad@16");
-    if (onLoad != NULL) {
-        return onLoad;
-    }
-#endif
     onLoad = (jdwpTransport_OnLoad_t)
                  dbgsysFindLibraryEntry(handle, "jdwpTransport_OnLoad");
     return onLoad;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Configuration.java b/src/jdk.jfr/share/classes/jdk/jfr/Configuration.java
index 8be9d2ee23d..097f069c895 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/Configuration.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,11 +136,8 @@ public String getContents() {
      * @return the read {@link Configuration}, not {@code null}
      * @throws ParseException if the file can't be parsed
      * @throws IOException if the file can't be read
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method denies read access to the file.
      *
      * @see java.io.File#getPath()
-     * @see java.lang.SecurityManager#checkRead(java.lang.String)
      */
     public static Configuration create(Path path) throws IOException, ParseException {
         Objects.requireNonNull(path, "path");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/EventFactory.java b/src/jdk.jfr/share/classes/jdk/jfr/EventFactory.java
index 55991ccadda..fc7b61e8756 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/EventFactory.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/EventFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,9 +92,6 @@ private EventFactory(Class<? extends Event> eventClass, List<AnnotationElement>
      *         the Java language or an annotation element references a type that
      *         can't be found.
      *
-     * @throws SecurityException if a security manager exists and the caller does
-     *         not have {@code FlightRecorderPermission("registerEvent")}
-     *
      * @see Event#set(int, Object)
      */
     public static EventFactory create(List<AnnotationElement> annotationElements, List<ValueDescriptor> fields) {
@@ -200,8 +197,6 @@ public EventType getEventType() {
      * If the event class associated with this event factory is already registered,
      * the call to this method is ignored.
      *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have {@code FlightRecorderPermission("registerEvent")}
      * @see Registered
      * @see FlightRecorder#register(Class)
      */
@@ -219,8 +214,6 @@ public void register() {
      * If the event class associated with this event factory is not already
      * registered, the call to this method is ignored.
      *
-     * @throws SecurityException if a security manager exists and the caller does
-     *         not have {@code FlightRecorderPermission("registerEvent")}
      * @see Registered
      * @see FlightRecorder#unregister(Class)
      */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
index d88742f7435..774b36b97d7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,8 +117,6 @@ public Recording takeSnapshot() {
      *
      * @throws IllegalArgumentException if class is abstract or not a subclass
      *         of {@link Event}
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have {@code FlightRecorderPermission("registerEvent")}
      */
     public static void register(Class<? extends Event> eventClass) {
         Objects.requireNonNull(eventClass, "eventClass");
@@ -138,9 +136,6 @@ public static void register(Class<? extends Event> eventClass) {
      * @param eventClass the event class to unregistered, not {@code null}
      * @throws IllegalArgumentException if a class is abstract or not a subclass
      *         of {@link Event}
-     *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have {@code FlightRecorderPermission("registerEvent")}
      */
     public static void unregister(Class<? extends Event> eventClass) {
         Objects.requireNonNull(eventClass, "eventClass");
@@ -159,11 +154,8 @@ public static void unregister(Class<? extends Event> eventClass) {
      * @throws IllegalStateException if Flight Recorder can't be created (for
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
-     *
-     * @throws SecurityException if a security manager exists and the caller does
-     *         not have {@code FlightRecorderPermission("accessFlightRecorder")}
      */
-    public static FlightRecorder getFlightRecorder() throws IllegalStateException, SecurityException {
+    public static FlightRecorder getFlightRecorder() throws IllegalStateException {
         synchronized (PlatformRecorder.class) {
             SecuritySupport.checkAccessFlightRecorder();
             JVMSupport.ensureWithIllegalStateException();
@@ -212,10 +204,8 @@ public static FlightRecorder getFlightRecorder() throws IllegalStateException, S
      *         {@link Event}, is abstract, or the hook is already added
      * @throws IllegalStateException if the event class has the
      *         {@code Registered(false)} annotation and is not registered manually
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have {@code FlightRecorderPermission("registerEvent")}
      */
-    public static void addPeriodicEvent(Class<? extends Event> eventClass, Runnable hook) throws SecurityException {
+    public static void addPeriodicEvent(Class<? extends Event> eventClass, Runnable hook) {
         Objects.requireNonNull(eventClass, "eventClass");
         Objects.requireNonNull(hook, "hook");
         if (JVMSupport.isNotAvailable()) {
@@ -234,10 +224,8 @@ public static void addPeriodicEvent(Class<? extends Event> eventClass, Runnable
      *
      * @param hook the hook to remove, not {@code null}
      * @return {@code true} if hook is removed, {@code false} otherwise
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have {@code FlightRecorderPermission("registerEvent")}
      */
-    public static boolean removePeriodicEvent(Runnable hook) throws SecurityException {
+    public static boolean removePeriodicEvent(Runnable hook) {
         Objects.requireNonNull(hook, "hook");
         SecuritySupport.checkRegisterPermission();
         if (JVMSupport.isNotAvailable()) {
@@ -269,10 +257,6 @@ public List<EventType> getEventTypes() {
      * invoked before returning from this method.
      *
      * @param changeListener the listener to add, not {@code null}
-     *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have
-     *         {@code FlightRecorderPermission("accessFlightRecorder")}
      */
     public static void addListener(FlightRecorderListener changeListener) {
         Objects.requireNonNull(changeListener, "changeListener");
@@ -291,10 +275,6 @@ public static void addListener(FlightRecorderListener changeListener) {
      *
      * @param changeListener listener to remove, not {@code null}
      *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have
-     *         {@code FlightRecorderPermission("accessFlightRecorder")}
-     *
      * @return {@code true}, if the listener could be removed, {@code false}
      *         otherwise
      */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorderPermission.java b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorderPermission.java
index 48469730b01..5a2dc51bc41 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorderPermission.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorderPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,47 +40,10 @@
 
 /**
  * Permission for controlling access to Flight Recorder.
- * <p>
- * The following table provides a summary of what the permission
- * allows, and the risks of granting code the permission.
  *
- * <table class="striped">
- * <caption style="display:none">Table shows permission target name,
- *      what the permission allows, and associated risks</caption>
- * <thead>
- * <tr>
- * <th scope="col">Permission Target Name</th>
- * <th scope="col">What the Permission Allows</th>
- * <th scope="col">Risks of Allowing this Permission</th>
- * </tr>
- * </thead>
- *
- * <tbody>
- * <tr>
- * <th scope="row">{@code accessFlightRecorder}</th>
- * <td>Ability to create a Flight Recorder instance, register callbacks to
- * monitor the Flight Recorder life cycle, and control an existing instance
- * of Flight Recorder, which can record and dump runtime information, such as
- * stack traces, class names, and data in user defined events.</td>
- * <td>A malicious user may be able to extract sensitive information that is stored in
- * events and interrupt Flight Recorder by installing listeners or hooks that
- * never finish.</td>
- * </tr>
- * <tr>
- * <th scope="row">{@code registerEvent}</th>
- * <td>Ability to register events, write data to the Flight Recorder buffers,
- * and execute code in a callback function for periodic events.
- *
- * <td>A malicious user may be able to write sensitive information to Flight
- * Recorder buffers.</td>
- * </tr>
- * </tbody>
- * </table>
- *
- * <p>
- * Typically, programmers do not create {@code FlightRecorderPermission} objects
- * directly. Instead the objects are created by the security policy code that is based on
- * reading the security policy file.
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
  *
  * @since 9
  *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
index 9e1882ed918..f1dcadf8b68 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,9 +96,6 @@ public Map<String, String> toMap() {
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
      *
-     * @throws SecurityException If a security manager is used and
-     *         FlightRecorderPermission "accessFlightRecorder" is not set.
-     *
      * @see jdk.jfr
      */
     public Recording(Map<String, String> settings) {
@@ -123,9 +120,6 @@ public Recording(Map<String, String> settings) {
      * @throws IllegalStateException if Flight Recorder can't be created (for
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
-     *
-     * @throws SecurityException If a security manager is used and
-     *         FlightRecorderPermission "accessFlightRecorder" is not set.
      */
     public Recording() {
         this(Map.of());
@@ -150,9 +144,6 @@ public Recording() {
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
      *
-     * @throws SecurityException if a security manager is used and
-     *         FlightRecorderPermission "accessFlightRecorder" is not set.
-     *
      * @see Configuration
      */
     public Recording(Configuration configuration) {
@@ -207,10 +198,6 @@ public void scheduleStart(Duration delay) {
      *
      * @throws IllegalStateException if the recording is not started or is already stopped
      *
-     * @throws SecurityException if a security manager exists and the caller
-     *         doesn't have {@code FilePermission} to write to the destination
-     *         path
-     *
      * @see #setDestination(Path)
      *
      */
@@ -375,9 +362,6 @@ public Recording copy(boolean stop) {
      *         location, for example, if the recording is closed or the
      *         destination path is not writable
      *
-     * @throws SecurityException if a security manager exists and the caller doesn't
-     *         have {@code FilePermission} to write to the destination path
-     *
      * @see #getState()
      * @see #isToDisk()
      */
@@ -473,10 +457,6 @@ public void setMaxAge(Duration maxAge) {
      * @throws IllegalStateException if recording is in the {@code STOPPED} or
      *         {@code CLOSED} state.
      *
-     * @throws SecurityException if a security manager exists and the caller
-     *         doesn't have {@code FilePermission} to read, write, and delete the
-     *         {@code destination} file
-     *
      * @throws IOException if the path is not writable
      */
     public void setDestination(Path destination) throws IOException {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/ValueDescriptor.java b/src/jdk.jfr/share/classes/jdk/jfr/ValueDescriptor.java
index b3c52d078e5..ff485aa96e7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/ValueDescriptor.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/ValueDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,10 +98,6 @@ public final class ValueDescriptor {
      * @param name the name, not {@code null}
      *
      * @throws IllegalArgumentException if the name is not a valid Java identifier
-     *
-     * @throws SecurityException if a security manager is present and the caller
-     *         doesn't have {@code FlightRecorderPermission("registerEvent")}
-     *
      */
     public ValueDescriptor(Class<?> type, String name) {
         this(type, name, Collections.<AnnotationElement> emptyList());
@@ -137,9 +133,6 @@ public ValueDescriptor(Class<?> type, String name) {
      *        {@code null}
      *
      * @throws IllegalArgumentException if the name is not a valid Java identifier
-     *
-     * @throws SecurityException if a security manager is present and the caller
-     *         doesn't have {@code FlightRecorderPermission("registerEvent")}
      */
     public ValueDescriptor(Class<?> type, String name, List<AnnotationElement> annotations) {
         this(type, name, List.copyOf(annotations), false);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java
index cd904a41aa5..1a1c468add9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,10 +112,6 @@ public interface EventStream extends AutoCloseable {
      *
      * @throws IOException if a stream can't be opened, or an I/O error occurs
      *         when trying to access the repository
-     *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have
-     *         {@code FlightRecorderPermission("accessFlightRecorder")}
      */
     @SuppressWarnings("removal")
     public static EventStream openRepository() throws IOException {
@@ -144,10 +140,6 @@ public static EventStream openRepository() throws IOException {
      *
      * @throws IOException if a stream can't be opened, or an I/O error occurs
      *         when trying to access the repository
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method denies read access to the directory, or
-     *         files in the directory.
      */
     public static EventStream openRepository(Path directory) throws IOException {
         Objects.requireNonNull(directory, "directory");
@@ -176,9 +168,6 @@ public static EventStream openRepository(Path directory) throws IOException {
      *
      * @throws IOException if the file can't be opened, or an I/O error occurs
      *         during reading
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method denies read access to the file
      */
     @SuppressWarnings("removal")
     static EventStream openFile(Path file) throws IOException {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java
index 4c9baaf5309..0437ec59589 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,9 +77,6 @@ public final class RecordingFile implements Closeable {
      * @throws IOException if it's not a valid recording file, or an I/O error
      *         occurred
      * @throws NoSuchFileException if the {@code file} can't be located
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method denies read access to the file.
      */
     public RecordingFile(Path file) throws IOException {
         Objects.requireNonNull(file, "file");
@@ -228,10 +225,6 @@ public void close() throws IOException {
      *                           Recorder file or a version of a JFR file that can't
      *                           be parsed
      *
-     * @throws SecurityException if a security manager exists and its
-     *                           {@code checkWrite} method denies write access to the
-     *                           file
-     *
      * @since 19
      */
     public void write(Path destination, Predicate<RecordedEvent> filter) throws IOException {
@@ -262,9 +255,6 @@ public void write(Path destination, Predicate<RecordedEvent> filter) throws IOEx
      *
      * @throws IOException if an I/O error occurred, it's not a Flight Recorder
      *         file or a version of a JFR file that can't be parsed
-     *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code checkRead} method denies read access to the file.
      */
     public static List<RecordedEvent> readAllEvents(Path path) throws IOException {
         Objects.requireNonNull(path, "path");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
index ec70fb13174..564b97797fc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,10 +92,6 @@ public void accept(Long endNanos) {
      * @throws IllegalStateException if Flight Recorder can't be created (for
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
-     *
-     * @throws SecurityException if a security manager exists and the caller
-     *         does not have
-     *         {@code FlightRecorderPermission("accessFlightRecorder")}
      */
     public RecordingStream() {
         this(Map.of());
@@ -150,9 +146,6 @@ private List<Configuration> configurations() {
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
      *
-     * @throws SecurityException if a security manager is used and
-     *         FlightRecorderPermission "accessFlightRecorder" is not set.
-     *
      * @see Configuration
      */
     public RecordingStream(Configuration configuration) {
@@ -432,9 +425,6 @@ public boolean stop() {
      * @throws IOException if the recording data can't be copied to the specified
      *         location, or if the stream is closed, or not started.
      *
-     * @throws SecurityException if a security manager exists and the caller doesn't
-     *         have {@code FilePermission} to write to the destination path
-     *
      * @see RecordingStream#setMaxAge(Duration)
      * @see RecordingStream#setMaxSize(long)
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java
deleted file mode 100644
index 83547125ac5..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.events;
-
-import jdk.jfr.Category;
-import jdk.jfr.Label;
-import jdk.jfr.Name;
-import jdk.jfr.internal.MirrorEvent;
-
-@Category("Java Application")
-@Label("Virtual Thread Pinned")
-@Name("jdk.VirtualThreadPinned")
-public final class VirtualThreadPinnedEvent extends MirrorEvent {
-}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
index ee9b5f2b4cd..d0d186e2479 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
@@ -68,7 +68,6 @@ public final class JDKEvents {
         jdk.internal.event.TLSHandshakeEvent.class,
         jdk.internal.event.VirtualThreadStartEvent.class,
         jdk.internal.event.VirtualThreadEndEvent.class,
-        jdk.internal.event.VirtualThreadPinnedEvent.class,
         jdk.internal.event.VirtualThreadSubmitFailedEvent.class,
         jdk.internal.event.X509CertificateEvent.class,
         jdk.internal.event.X509ValidationEvent.class,
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
index e8a26fe425d..48dc0d22cea 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
@@ -43,7 +43,6 @@
 import jdk.jfr.events.TLSHandshakeEvent;
 import jdk.jfr.events.ThreadSleepEvent;
 import jdk.jfr.events.VirtualThreadEndEvent;
-import jdk.jfr.events.VirtualThreadPinnedEvent;
 import jdk.jfr.events.VirtualThreadStartEvent;
 import jdk.jfr.events.VirtualThreadSubmitFailedEvent;
 import jdk.jfr.events.X509CertificateEvent;
@@ -72,7 +71,6 @@ final class MirrorEvents {
         register("jdk.internal.event.TLSHandshakeEvent", TLSHandshakeEvent.class);
         register("jdk.internal.event.VirtualThreadStartEvent", VirtualThreadStartEvent.class);
         register("jdk.internal.event.VirtualThreadEndEvent", VirtualThreadEndEvent.class);
-        register("jdk.internal.event.VirtualThreadPinnedEvent", VirtualThreadPinnedEvent.class);
         register("jdk.internal.event.VirtualThreadSubmitFailedEvent", VirtualThreadSubmitFailedEvent.class);
         register("jdk.internal.event.X509CertificateEvent", X509CertificateEvent.class);
         register("jdk.internal.event.X509ValidationEvent", X509ValidationEvent.class);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
index cd39fb7b6e8..781661a427f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
@@ -144,7 +144,7 @@ private void resolveSelect() throws QueryException {
             field.aggregator = expression.aggregator();
             FieldBuilder.configureAggregator(field);
             expression.alias().ifPresent(alias -> fieldAliases.put(alias, field));
-            if (field.name.equals("*") && field.aggregator != Aggregator.COUNT) {
+            if (expression.name().equals("*") && field.aggregator != Aggregator.COUNT) {
                 throw new QuerySyntaxException("Wildcard ('*') can only be used with aggregator function COUNT");
             }
         }
@@ -259,7 +259,7 @@ private List<Field> resolveFields(String name, List<FilteredType> types) {
         List<Field> fields = new ArrayList<>();
 
         if (name.equals("*")) {
-            // Used with COUNT(*) and UNIQUE(*)
+            // Used with COUNT(*)
             // All events should have a start time
             name = "startTime";
         }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index b21b99e2dad..51dc2ca11bf 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -178,7 +178,7 @@ table = "COLUMN 'StackTrace', 'Count', 'Avg.', 'Max.'
 [application.contention-by-address]
 label = "Contention by Monitor Address"
 table = "COLUMN 'Monitor Address', 'Class', 'Threads', 'Max Duration'
-         SELECT address, FIRST(monitorClass), UNIQUE(*), MAX(duration) AS M
+         SELECT address, FIRST(monitorClass), UNIQUE(eventThread), MAX(duration) AS M
          FROM JavaMonitorEnter
          GROUP BY monitorClass ORDER BY M"
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
index 5664c195003..466c5d0a14c 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,29 +24,44 @@
  */
 package jdk.tools.jlink.internal;
 
+import static jdk.tools.jlink.internal.LinkableRuntimeImage.DIFF_PATTERN;
+import static jdk.tools.jlink.internal.LinkableRuntimeImage.RESPATH_PATTERN;
+
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jdk.tools.jlink.internal.Archive.Entry;
 import jdk.tools.jlink.internal.Archive.Entry.EntryType;
+import jdk.tools.jlink.internal.JRTArchive.ResourceFileEntry;
 import jdk.tools.jlink.internal.ResourcePoolManager.CompressedModuleData;
+import jdk.tools.jlink.internal.runtimelink.JimageDiffGenerator;
+import jdk.tools.jlink.internal.runtimelink.JimageDiffGenerator.ImageResource;
+import jdk.tools.jlink.internal.runtimelink.ResourceDiff;
+import jdk.tools.jlink.internal.runtimelink.ResourcePoolReader;
+import jdk.tools.jlink.internal.runtimelink.RuntimeImageLinkException;
 import jdk.tools.jlink.plugin.PluginException;
 import jdk.tools.jlink.plugin.ResourcePool;
+import jdk.tools.jlink.plugin.ResourcePoolBuilder;
 import jdk.tools.jlink.plugin.ResourcePoolEntry;
+import jdk.tools.jlink.plugin.ResourcePoolModule;
 
 /**
  * An image (native endian.)
@@ -68,38 +83,61 @@
  * }</pre>
  */
 public final class ImageFileCreator {
+    private static final byte[] EMPTY_RESOURCE_BYTES = new byte[] {};
+
+    private static final String JLINK_MOD_NAME = "jdk.jlink";
+    private static final String RESPATH = "/" + JLINK_MOD_NAME + "/" + RESPATH_PATTERN;
+    private static final String DIFF_PATH = "/" + JLINK_MOD_NAME + "/" + DIFF_PATTERN;
     private final Map<String, List<Entry>> entriesForModule = new HashMap<>();
     private final ImagePluginStack plugins;
-    private ImageFileCreator(ImagePluginStack plugins) {
-        this.plugins = Objects.requireNonNull(plugins);
-    }
-
-    public static ExecutableImage create(Set<Archive> archives,
-            ImagePluginStack plugins)
-            throws IOException {
-        return ImageFileCreator.create(archives, ByteOrder.nativeOrder(),
-                plugins);
-    }
+    private final boolean generateRuntimeImage;
+    private final TaskHelper helper;
 
-    public static ExecutableImage create(Set<Archive> archives,
-            ByteOrder byteOrder)
-            throws IOException {
-        return ImageFileCreator.create(archives, byteOrder,
-                new ImagePluginStack());
+    private ImageFileCreator(ImagePluginStack plugins,
+                             boolean generateRuntimeImage,
+                             TaskHelper taskHelper) {
+        this.plugins = Objects.requireNonNull(plugins);
+        this.generateRuntimeImage = generateRuntimeImage;
+        this.helper = taskHelper;
     }
 
+    /**
+     * Create an executable image based on a set of input archives and a given
+     * plugin stack for a given byte order. It optionally generates a runtime
+     * that can be used for linking from the run-time image if
+     * {@code generateRuntimeImage} is set to {@code true}.
+     *
+     * @param archives The set of input archives
+     * @param byteOrder The desired byte order of the result
+     * @param plugins The plugin stack to apply to the input
+     * @param generateRuntimeImage if a runtime suitable for linking from the
+     *        run-time image should get created.
+     * @return The executable image.
+     * @throws IOException
+     */
     public static ExecutableImage create(Set<Archive> archives,
             ByteOrder byteOrder,
-            ImagePluginStack plugins)
+            ImagePluginStack plugins,
+            boolean generateRuntimeImage,
+            TaskHelper taskHelper)
             throws IOException
     {
-        ImageFileCreator image = new ImageFileCreator(plugins);
+        ImageFileCreator image = new ImageFileCreator(plugins,
+                                                      generateRuntimeImage,
+                                                      taskHelper);
         try {
             image.readAllEntries(archives);
             // write to modular image
             image.writeImage(archives, byteOrder);
+        } catch (RuntimeImageLinkException e) {
+            // readAllEntries() might throw this exception.
+            // Propagate as IOException with appropriate message for
+            // jlink runs from the run-time image. This handles better
+            // error messages for the case of modified files in the run-time
+            // image.
+            throw image.newIOException(e);
         } finally {
-            //Close all archives
+            // Close all archives
             for (Archive a : archives) {
                 a.close();
             }
@@ -125,7 +163,8 @@ private void readAllEntries(Set<Archive> archives) {
 
     public static void recreateJimage(Path jimageFile,
             Set<Archive> archives,
-            ImagePluginStack pluginSupport)
+            ImagePluginStack pluginSupport,
+            boolean generateRuntimeImage)
             throws IOException {
         try {
             Map<String, List<Entry>> entriesForModule
@@ -142,7 +181,7 @@ public static void recreateJimage(Path jimageFile,
             try (OutputStream fos = Files.newOutputStream(jimageFile);
                     BufferedOutputStream bos = new BufferedOutputStream(fos);
                     DataOutputStream out = new DataOutputStream(bos)) {
-                generateJImage(pool, writer, pluginSupport, out);
+                generateJImage(pool, writer, pluginSupport, out, generateRuntimeImage);
             }
         } finally {
             //Close all archives
@@ -158,9 +197,14 @@ private void writeImage(Set<Archive> archives,
         BasicImageWriter writer = new BasicImageWriter(byteOrder);
         ResourcePoolManager allContent = createPoolManager(archives,
                 entriesForModule, byteOrder, writer);
-        ResourcePool result;
+        ResourcePool result = null;
         try (DataOutputStream out = plugins.getJImageFileOutputStream()) {
-            result = generateJImage(allContent, writer, plugins, out);
+            result = generateJImage(allContent, writer, plugins, out, generateRuntimeImage);
+        } catch (RuntimeImageLinkException e) {
+            // Propagate as IOException with appropriate message for
+            // jlink runs from the run-time image. This handles better
+            // error messages for the case of --patch-module.
+            throw newIOException(e);
         }
 
         //Handle files.
@@ -174,14 +218,53 @@ private void writeImage(Set<Archive> archives,
         }
     }
 
+    private IOException newIOException(RuntimeImageLinkException e) throws IOException {
+        if (JlinkTask.DEBUG) {
+            e.printStackTrace();
+        }
+        String message = switch (e.getReason()) {
+            case PATCH_MODULE -> helper.getMessage("err.runtime.link.patched.module", e.getFile());
+            case MODIFIED_FILE -> helper.getMessage("err.runtime.link.modified.file", e.getFile());
+            default -> throw new AssertionError("Unexpected value: " + e.getReason());
+        };
+        throw new IOException(message);
+    }
+
+    /**
+     * Create a jimage based on content of the given ResourcePoolManager,
+     * optionally creating a runtime that can be used for linking from the
+     * run-time image
+     *
+     * @param allContent The content that needs to get added to the resulting
+     *                   lib/modules (jimage) file.
+     * @param writer The writer for the jimage file.
+     * @param pluginSupport The stack of all plugins to apply.
+     * @param out The output stream to write the jimage to.
+     * @param generateRuntimeImage if a runtime suitable for linking from the
+     *        run-time image should get created.
+     * @return A pool of the actual result resources.
+     * @throws IOException
+     */
     private static ResourcePool generateJImage(ResourcePoolManager allContent,
             BasicImageWriter writer,
             ImagePluginStack pluginSupport,
-            DataOutputStream out
+            DataOutputStream out,
+            boolean generateRuntimeImage
     ) throws IOException {
         ResourcePool resultResources;
         try {
             resultResources = pluginSupport.visitResources(allContent);
+            if (generateRuntimeImage) {
+                // Keep track of non-modules resources for linking from a run-time image
+                resultResources = addNonClassResourcesTrackFiles(resultResources,
+                                                                 writer);
+                // Generate the diff between the input resources from packaged
+                // modules in 'allContent' to the plugin- or otherwise
+                // generated-content in 'resultResources'
+                resultResources = addResourceDiffFiles(allContent.resourcePool(),
+                                                       resultResources,
+                                                       writer);
+            }
         } catch (PluginException pe) {
             if (JlinkTask.DEBUG) {
                 pe.printStackTrace();
@@ -198,7 +281,7 @@ private static ResourcePool generateJImage(ResourcePoolManager allContent,
 
         List<ResourcePoolEntry> content = new ArrayList<>();
         List<String> paths = new ArrayList<>();
-                 // the order of traversing the resources and the order of
+        // the order of traversing the resources and the order of
         // the module content being written must be the same
         resultResources.entries().forEach(res -> {
             if (res.type().equals(ResourcePoolEntry.Type.CLASS_OR_RESOURCE)) {
@@ -248,11 +331,225 @@ private static ResourcePool generateJImage(ResourcePoolManager allContent,
         return resultResources;
     }
 
+    /**
+     * Support for creating a runtime suitable for linking from the run-time
+     * image.
+     *
+     * Generates differences between the packaged modules "view" in
+     * {@code jmodContent} to the optimized image in {@code resultContent} and
+     * adds the result to the returned resource pool.
+     *
+     * @param jmodContent The resource pool view of packaged modules
+     * @param resultContent The optimized result generated from the jmodContent
+     *                      input by applying the plugin stack.
+     * @param writer The image writer.
+     * @return The resource pool with the difference file resources added to
+     *         the {@code resultContent}
+     */
+    @SuppressWarnings("try")
+    private static ResourcePool addResourceDiffFiles(ResourcePool jmodContent,
+                                                     ResourcePool resultContent,
+                                                     BasicImageWriter writer) {
+        JimageDiffGenerator generator = new JimageDiffGenerator();
+        List<ResourceDiff> diff;
+        try (ImageResource jmods = new ResourcePoolReader(jmodContent);
+             ImageResource jimage = new ResourcePoolReader(resultContent)) {
+            diff = generator.generateDiff(jmods, jimage);
+        } catch (Exception e) {
+            throw new AssertionError("Failed to generate the runtime image diff", e);
+        }
+        Set<String> modules = resultContent.moduleView().modules()
+                                                        .map(a -> a.name())
+                                                        .collect(Collectors.toSet());
+        // Add resource diffs for the resource files we are about to add
+        modules.stream().forEach(m -> {
+            String resourceName = String.format(DIFF_PATH, m);
+            ResourceDiff.Builder builder = new ResourceDiff.Builder();
+            ResourceDiff d = builder.setKind(ResourceDiff.Kind.ADDED)
+                                    .setName(resourceName)
+                                    .build();
+            diff.add(d);
+        });
+        Map<String, List<ResourceDiff>> perModDiffs = preparePerModuleDiffs(diff,
+                                                                            modules);
+        return addDiffResourcesFiles(modules, perModDiffs, resultContent, writer);
+    }
+
+    private static Map<String, List<ResourceDiff>> preparePerModuleDiffs(List<ResourceDiff> resDiffs,
+                                                                         Set<String> modules) {
+        Map<String, List<ResourceDiff>> modToDiff = new HashMap<>();
+        resDiffs.forEach(d -> {
+            int secondSlash = d.getName().indexOf("/", 1);
+            if (secondSlash == -1) {
+                throw new AssertionError("Module name not present");
+            }
+            String module = d.getName().substring(1, secondSlash);
+            List<ResourceDiff> perModDiff = modToDiff.computeIfAbsent(module,
+                                                                      a -> new ArrayList<>());
+            perModDiff.add(d);
+        });
+        Map<String, List<ResourceDiff>> allModsToDiff = new HashMap<>();
+        modules.stream().forEach(m -> {
+            List<ResourceDiff> d = modToDiff.get(m);
+            if (d == null) {
+                // Not all modules will have a diff
+                allModsToDiff.put(m, Collections.emptyList());
+            } else {
+                allModsToDiff.put(m, d);
+            }
+        });
+        return allModsToDiff;
+    }
+
+    private static ResourcePool addDiffResourcesFiles(Set<String> modules,
+                                                      Map<String, List<ResourceDiff>> perModDiffs,
+                                                      ResourcePool resultResources,
+                                                      BasicImageWriter writer) {
+        ResourcePoolManager mgr = createPoolManager(resultResources, writer);
+        ResourcePoolBuilder out = mgr.resourcePoolBuilder();
+        modules.stream().sorted().forEach(module -> {
+            String mResource = String.format(DIFF_PATH, module);
+            List<ResourceDiff> diff = perModDiffs.get(module);
+            // Note that for modules without diff to the packaged modules view
+            // we create resource diff files with just the header and no content.
+            ByteArrayOutputStream bout = new ByteArrayOutputStream();
+            try {
+                ResourceDiff.write(diff, bout);
+            } catch (IOException e) {
+                throw new AssertionError("Failed to write resource diff file" +
+                                         " for module " + module, e);
+            }
+            out.add(ResourcePoolEntry.create(mResource, bout.toByteArray()));
+        });
+        return out.build();
+    }
+
+    /**
+     * Support for creating runtimes that can be used for linking from the
+     * run-time image. Adds meta-data files for resources not in the lib/modules
+     * file of the JDK. That is, mapping files for which on-disk files belong to
+     * which module.
+     *
+     * @param resultResources
+     *            The original resources which serve as the basis for generating
+     *            the meta-data files.
+     * @param writer
+     *            The image writer.
+     *
+     * @return An amended resource pool which includes meta-data files.
+     */
+    private static ResourcePool addNonClassResourcesTrackFiles(ResourcePool resultResources,
+                                                               BasicImageWriter writer) {
+        // Only add resources if jdk.jlink module is present in the target image
+        Optional<ResourcePoolModule> jdkJlink = resultResources.moduleView()
+                                                               .findModule(JLINK_MOD_NAME);
+        if (jdkJlink.isPresent()) {
+            Map<String, List<String>> nonClassResources = recordAndFilterEntries(resultResources);
+            return addModuleResourceEntries(resultResources, nonClassResources, writer);
+        } else {
+            return resultResources; // No-op
+        }
+    }
+
+    /**
+     * Support for creating runtimes that can be used for linking from the
+     * run-time image. Adds the given mapping of files as a meta-data file to
+     * the given resource pool.
+     *
+     * @param resultResources
+     *            The resource pool to add files to.
+     * @param nonClassResEntries
+     *            The per module mapping for which to create the meta-data files
+     *            for.
+     * @param writer
+     *            The image writer.
+     *
+     * @return A resource pool with meta-data files added.
+     */
+    private static ResourcePool addModuleResourceEntries(ResourcePool resultResources,
+                                                         Map<String, List<String>> nonClassResEntries,
+                                                         BasicImageWriter writer) {
+        Set<String> inputModules = resultResources.moduleView().modules()
+                                                  .map(rm -> rm.name())
+                                                  .collect(Collectors.toSet());
+        ResourcePoolManager mgr = createPoolManager(resultResources, writer);
+        ResourcePoolBuilder out = mgr.resourcePoolBuilder();
+        inputModules.stream().sorted().forEach(module -> {
+            String mResource = String.format(RESPATH, module);
+            List<String> mResources = nonClassResEntries.get(module);
+            if (mResources == null) {
+                // We create empty resource files for modules in the resource
+                // pool view that don't themselves contain native resources
+                // or config files.
+                out.add(ResourcePoolEntry.create(mResource, EMPTY_RESOURCE_BYTES));
+            } else {
+                String mResContent = mResources.stream().sorted()
+                                               .collect(Collectors.joining("\n"));
+                out.add(ResourcePoolEntry.create(mResource,
+                                                 mResContent.getBytes(StandardCharsets.UTF_8)));
+            }
+        });
+        return out.build();
+    }
+
+    /**
+     * Support for creating runtimes that can be used for linking from the
+     * run-time image. Generates a per module mapping of files not part of the
+     * modules image (jimage). This mapping is needed so as to know which files
+     * of the installed JDK belong to which module.
+     *
+     * @param resultResources
+     *            The resources from which the mapping gets generated
+     * @return A mapping with the module names as keys and the list of files not
+     *         part of the modules image (jimage) as values.
+     */
+    private static Map<String, List<String>> recordAndFilterEntries(ResourcePool resultResources) {
+        Map<String, List<String>> nonClassResEntries = new HashMap<>();
+        Platform platform = getTargetPlatform(resultResources);
+        resultResources.entries().forEach(entry -> {
+            // Note that the fs_$module_files file is a resource file itself, so
+            // we cannot add fs_$module_files themselves due to the
+            // not(class_or_resources) condition. However, we also don't want
+            // to track 'release' file entries (not(top) condition) as those are
+            // handled by the release info plugin.
+            if (entry.type() != ResourcePoolEntry.Type.CLASS_OR_RESOURCE &&
+                    entry.type() != ResourcePoolEntry.Type.TOP) {
+                List<String> mRes = nonClassResEntries.computeIfAbsent(entry.moduleName(),
+                                                                       a -> new ArrayList<>());
+                ResourceFileEntry rfEntry = ResourceFileEntry.toResourceFileEntry(entry,
+                                                                                  platform);
+                mRes.add(rfEntry.encodeToString());
+            }
+        });
+        return nonClassResEntries;
+    }
+
+    private static Platform getTargetPlatform(ResourcePool in) {
+        String platform = in.moduleView().findModule("java.base")
+                .map(ResourcePoolModule::targetPlatform)
+                .orElseThrow(() -> new AssertionError("java.base not found"));
+        return Platform.parsePlatform(platform);
+    }
+
     private static ResourcePoolManager createPoolManager(Set<Archive> archives,
             Map<String, List<Entry>> entriesForModule,
             ByteOrder byteOrder,
             BasicImageWriter writer) throws IOException {
-        ResourcePoolManager resources = new ResourcePoolManager(byteOrder, new StringTable() {
+        ResourcePoolManager resources = createBasicResourcePoolManager(byteOrder, writer);
+        archives.stream()
+                .map(Archive::moduleName)
+                .sorted()
+                .flatMap(mn ->
+                    entriesForModule.get(mn).stream()
+                            .map(e -> new ArchiveEntryResourcePoolEntry(mn,
+                                    e.getResourcePoolEntryName(), e)))
+                .forEach(resources::add);
+        return resources;
+    }
+
+    private static ResourcePoolManager createBasicResourcePoolManager(ByteOrder byteOrder,
+                                                                      BasicImageWriter writer) {
+        return new ResourcePoolManager(byteOrder, new StringTable() {
 
             @Override
             public int addString(String str) {
@@ -264,14 +561,25 @@ public String getString(int id) {
                 return writer.getString(id);
             }
         });
-        archives.stream()
-                .map(Archive::moduleName)
-                .sorted()
-                .flatMap(mn ->
-                    entriesForModule.get(mn).stream()
-                            .map(e -> new ArchiveEntryResourcePoolEntry(mn,
-                                    e.getResourcePoolEntryName(), e)))
-                .forEach(resources::add);
+    }
+
+    /**
+     * Creates a ResourcePoolManager from existing resources so that more
+     * resources can be appended.
+     *
+     * @param resultResources The existing resources to initially add.
+     * @param writer The basic image writer.
+     * @return An appendable ResourcePoolManager.
+     */
+    private static ResourcePoolManager createPoolManager(ResourcePool resultResources,
+                                                         BasicImageWriter writer) {
+        ResourcePoolManager resources = createBasicResourcePoolManager(resultResources.byteOrder(),
+                                                                       writer);
+        // Note that resources are already sorted in the correct order.
+        // The underlying ResourcePoolManager keeps track of entries via
+        // LinkedHashMap, which keeps values in insertion order. Therefore
+        // adding resources here, preserving that same order is OK.
+        resultResources.entries().forEach(resources::add);
         return resources;
     }
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java
new file mode 100644
index 00000000000..755afea8c60
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.tools.jlink.internal;
+
+import static jdk.tools.jlink.internal.LinkableRuntimeImage.RESPATH_PATTERN;
+import static jdk.tools.jlink.internal.runtimelink.RuntimeImageLinkException.Reason.MODIFIED_FILE;
+import static jdk.tools.jlink.internal.runtimelink.RuntimeImageLinkException.Reason.PATCH_MODULE;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReference;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jdk.internal.util.OperatingSystem;
+import jdk.tools.jlink.internal.Archive.Entry.EntryType;
+import jdk.tools.jlink.internal.runtimelink.ResourceDiff;
+import jdk.tools.jlink.internal.runtimelink.RuntimeImageLinkException;
+import jdk.tools.jlink.plugin.ResourcePoolEntry;
+import jdk.tools.jlink.plugin.ResourcePoolEntry.Type;
+
+/**
+ * An archive implementation based on the JDK's run-time image. That is, classes
+ * and resources from the modules image (lib/modules, or jimage) and other
+ * associated files from the filesystem of the JDK installation.
+ */
+public class JRTArchive implements Archive {
+
+    private final String module;
+    private final Path path;
+    private final ModuleReference ref;
+    // The collection of files of this module
+    private final List<JRTFile> files = new ArrayList<>();
+    // Files not part of the lib/modules image of the JDK install.
+    // Thus, native libraries, binaries, legal files, etc.
+    private final List<String> otherRes;
+    // Maps a module resource path to the corresponding diff to packaged
+    // modules for that resource (if any)
+    private final Map<String, ResourceDiff> resDiff;
+    private final boolean errorOnModifiedFile;
+    private final TaskHelper taskHelper;
+
+    /**
+     * JRTArchive constructor
+     *
+     * @param module The module name this archive refers to
+     * @param path The JRT filesystem path.
+     * @param errorOnModifiedFile Whether or not modified files of the JDK
+     *        install aborts the link.
+     * @param perModDiff The lib/modules (a.k.a jimage) diff for this module,
+     *                   possibly an empty list if there are no differences.
+     */
+    JRTArchive(String module,
+               Path path,
+               boolean errorOnModifiedFile,
+               List<ResourceDiff> perModDiff,
+               TaskHelper taskHelper) {
+        this.module = module;
+        this.path = path;
+        this.ref = ModuleFinder.ofSystem()
+                               .find(module)
+                               .orElseThrow(() ->
+                                    new IllegalArgumentException(
+                                            "Module " + module +
+                                            " not part of the JDK install"));
+        this.errorOnModifiedFile = errorOnModifiedFile;
+        this.otherRes = readModuleResourceFile(module);
+        this.resDiff = Objects.requireNonNull(perModDiff).stream()
+                            .collect(Collectors.toMap(ResourceDiff::getName, Function.identity()));
+        this.taskHelper = taskHelper;
+    }
+
+    @Override
+    public String moduleName() {
+        return module;
+    }
+
+    @Override
+    public Path getPath() {
+        return path;
+    }
+
+    @Override
+    public Stream<Entry> entries() {
+        try {
+            collectFiles();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return files.stream().map(JRTFile::toEntry);
+    }
+
+    @Override
+    public void open() throws IOException {
+        if (files.isEmpty()) {
+            collectFiles();
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (!files.isEmpty()) {
+            files.clear();
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(module, path);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return (obj instanceof JRTArchive other &&
+                   Objects.equals(module, other.module) &&
+                   Objects.equals(path, other.path));
+    }
+
+    private void collectFiles() throws IOException {
+        if (files.isEmpty()) {
+            addNonClassResources();
+            // Add classes/resources from the run-time image,
+            // patched with the run-time image diff
+            files.addAll(ref.open().list()
+                                   .filter(i -> {
+                                           String lookupKey = String.format("/%s/%s", module, i);
+                                           ResourceDiff rd = resDiff.get(lookupKey);
+                                           // Filter all resources with a resource diff
+                                           // that are of kind MODIFIED.
+                                           // Note that REMOVED won't happen since in
+                                           // that case the module listing won't have
+                                           // the resource anyway.
+                                           // Note as well that filter removes files
+                                           // of kind ADDED. Those files are not in
+                                           // the packaged modules, so ought not to
+                                           // get returned from the pipeline.
+                                           return (rd == null ||
+                                                   rd.getKind() == ResourceDiff.Kind.MODIFIED);
+                                   })
+                                   .map(s -> {
+                                           String lookupKey = String.format("/%s/%s", module, s);
+                                           return new JRTArchiveFile(JRTArchive.this, s,
+                                                           EntryType.CLASS_OR_RESOURCE,
+                                                           null /* hashOrTarget */,
+                                                           false /* symlink */,
+                                                           resDiff.get(lookupKey));
+                                   })
+                                   .toList());
+            // Finally add all files only present in the resource diff
+            // That is, removed items in the run-time image.
+            files.addAll(resDiff.values().stream()
+                                         .filter(rd -> rd.getKind() == ResourceDiff.Kind.REMOVED)
+                                         .map(s -> {
+                                                 int secondSlash = s.getName().indexOf("/", 1);
+                                                 assert secondSlash != -1;
+                                                 String pathWithoutModule = s.getName().substring(secondSlash + 1);
+                                                 return new JRTArchiveFile(JRTArchive.this,
+                                                         pathWithoutModule,
+                                                         EntryType.CLASS_OR_RESOURCE,
+                                                         null  /* hashOrTarget */,
+                                                         false /* symlink */,
+                                                         s);
+                                         })
+                                         .toList());
+        }
+    }
+
+    /*
+     * no need to keep track of the warning produced since this is eagerly
+     * checked once.
+     */
+    private void addNonClassResources() {
+        // Not all modules will have other resources like bin, lib, legal etc.
+        // files. In that case the list will be empty.
+        if (!otherRes.isEmpty()) {
+            files.addAll(otherRes.stream()
+                 .filter(Predicate.not(String::isEmpty))
+                 .map(s -> {
+                        ResourceFileEntry m = ResourceFileEntry.decodeFromString(s);
+
+                        // Read from the base JDK image.
+                        Path path = BASE.resolve(m.resPath);
+                        if (shaSumMismatch(path, m.hashOrTarget, m.symlink)) {
+                            if (errorOnModifiedFile) {
+                                throw new RuntimeImageLinkException(path.toString(), MODIFIED_FILE);
+                            } else {
+                                taskHelper.warning("err.runtime.link.modified.file", path.toString());
+                            }
+                        }
+
+                        return new JRTArchiveFile(JRTArchive.this,
+                                                  m.resPath,
+                                                  toEntryType(m.resType),
+                                                  m.hashOrTarget,
+                                                  m.symlink,
+                                                  /* diff only for resources */
+                                                  null);
+                 })
+                 .toList());
+        }
+    }
+
+    static boolean shaSumMismatch(Path res, String expectedSha, boolean isSymlink) {
+        if (isSymlink) {
+            return false;
+        }
+        // handle non-symlink resources
+        try {
+            HexFormat format = HexFormat.of();
+            byte[] expected = format.parseHex(expectedSha);
+            MessageDigest digest = MessageDigest.getInstance("SHA-512");
+            try (InputStream is = Files.newInputStream(res)) {
+                byte[] buf = new byte[1024];
+                int readBytes = -1;
+                while ((readBytes = is.read(buf)) != -1) {
+                    digest.update(buf, 0, readBytes);
+                }
+            }
+            byte[] actual = digest.digest();
+            return !MessageDigest.isEqual(expected, actual);
+        } catch (Exception e) {
+            throw new AssertionError("SHA-512 sum check failed!", e);
+        }
+    }
+
+    private static EntryType toEntryType(Type input) {
+        return switch(input) {
+            case CLASS_OR_RESOURCE -> EntryType.CLASS_OR_RESOURCE;
+            case CONFIG -> EntryType.CONFIG;
+            case HEADER_FILE -> EntryType.HEADER_FILE;
+            case LEGAL_NOTICE -> EntryType.LEGAL_NOTICE;
+            case MAN_PAGE -> EntryType.MAN_PAGE;
+            case NATIVE_CMD -> EntryType.NATIVE_CMD;
+            case NATIVE_LIB -> EntryType.NATIVE_LIB;
+            case TOP -> throw new IllegalArgumentException(
+                           "TOP files should be handled by ReleaseInfoPlugin!");
+            default -> throw new IllegalArgumentException("Unknown type: " + input);
+        };
+    }
+
+    public record ResourceFileEntry(Type resType,
+                                    boolean symlink,
+                                    String hashOrTarget,
+                                    String resPath) {
+        // Type file format:
+        // '<type>|{0,1}|<sha-sum>|<file-path>'
+        //   (1)    (2)      (3)      (4)
+        //
+        // Where fields are:
+        //
+        // (1) The resource type as specified by ResourcePoolEntry.type()
+        // (2) Symlink designator. 0 => regular resource, 1 => symlinked resource
+        // (3) The SHA-512 sum of the resources' content. The link to the target
+        //     for symlinked resources.
+        // (4) The relative file path of the resource
+        private static final String TYPE_FILE_FORMAT = "%d|%d|%s|%s";
+
+        private static final Map<Integer, Type> typeMap = Arrays.stream(Type.values())
+                .collect(Collectors.toMap(Type::ordinal, Function.identity()));
+
+        public String encodeToString() {
+            return String.format(TYPE_FILE_FORMAT,
+                                 resType.ordinal(),
+                                 symlink ? 1 : 0,
+                                 hashOrTarget,
+                                 resPath);
+        }
+
+        /**
+         *  line: <int>|<int>|<hashOrTarget>|<path>
+         *
+         *  Take the integer before '|' convert it to a Type. The second
+         *  token is an integer representing symlinks (or not). The third token is
+         *  a hash sum (sha512) of the file denoted by the fourth token (path).
+         */
+        static ResourceFileEntry decodeFromString(String line) {
+            assert !line.isEmpty();
+
+            String[] tokens = line.split("\\|", 4);
+            Type type = null;
+            int symlinkNum = -1;
+            try {
+                Integer typeInt = Integer.valueOf(tokens[0]);
+                type = typeMap.get(typeInt);
+                if (type == null) {
+                    throw new AssertionError("Illegal type ordinal: " + typeInt);
+                }
+                symlinkNum = Integer.valueOf(tokens[1]);
+            } catch (NumberFormatException e) {
+                throw new AssertionError(e); // must not happen
+            }
+            if (symlinkNum < 0 || symlinkNum > 1) {
+                throw new AssertionError(
+                        "Symlink designator out of range [0,1] got: " +
+                        symlinkNum);
+            }
+            return new ResourceFileEntry(type,
+                                         symlinkNum == 1,
+                                         tokens[2] /* hash or target */,
+                                         tokens[3] /* resource path */);
+        }
+
+        public static ResourceFileEntry toResourceFileEntry(ResourcePoolEntry entry,
+                                                            Platform platform) {
+            String resPathWithoutMod = dropModuleFromPath(entry, platform);
+            // Symlinks don't have a hash sum, but a link to the target instead
+            String hashOrTarget = entry.linkedTarget() == null
+                                        ? computeSha512(entry)
+                                        : dropModuleFromPath(entry.linkedTarget(),
+                                                             platform);
+            return new ResourceFileEntry(entry.type(),
+                                         entry.linkedTarget() != null,
+                                         hashOrTarget,
+                                         resPathWithoutMod);
+        }
+
+        private static String computeSha512(ResourcePoolEntry entry) {
+            try {
+                assert entry.linkedTarget() == null;
+                MessageDigest digest = MessageDigest.getInstance("SHA-512");
+                try (InputStream is = entry.content()) {
+                    byte[] buf = new byte[1024];
+                    int bytesRead = -1;
+                    while ((bytesRead = is.read(buf)) != -1) {
+                        digest.update(buf, 0, bytesRead);
+                    }
+                }
+                byte[] db = digest.digest();
+                HexFormat format = HexFormat.of();
+                return format.formatHex(db);
+            } catch (Exception e) {
+                throw new AssertionError("Failed to generate hash sum for " +
+                                         entry.path());
+            }
+        }
+
+        private static String dropModuleFromPath(ResourcePoolEntry entry,
+                                                 Platform platform) {
+            String resPath = entry.path()
+                                  .substring(
+                                      // + 2 => prefixed and suffixed '/'
+                                      // For example: '/java.base/'
+                                      entry.moduleName().length() + 2);
+            if (!isWindows(platform)) {
+                return resPath;
+            }
+            // For Windows the libraries live in the 'bin' folder rather than
+            // the 'lib' folder in the final image. Note that going by the
+            // NATIVE_LIB type only is insufficient since only files with suffix
+            // .dll/diz/map/pdb are transplanted to 'bin'.
+            // See: DefaultImageBuilder.nativeDir()
+            return nativeDir(entry, resPath);
+        }
+
+        private static boolean isWindows(Platform platform) {
+            return platform.os() == OperatingSystem.WINDOWS;
+        }
+
+        private static String nativeDir(ResourcePoolEntry entry, String resPath) {
+            if (entry.type() != ResourcePoolEntry.Type.NATIVE_LIB) {
+                return resPath;
+            }
+            // precondition: Native lib, windows platform
+            if (resPath.endsWith(".dll") || resPath.endsWith(".diz")
+                    || resPath.endsWith(".pdb") || resPath.endsWith(".map")) {
+                if (resPath.startsWith(LIB_DIRNAME + "/")) {
+                    return BIN_DIRNAME + "/" +
+                               resPath.substring((LIB_DIRNAME + "/").length());
+                }
+            }
+            return resPath;
+        }
+        private static final String BIN_DIRNAME = "bin";
+        private static final String LIB_DIRNAME = "lib";
+    }
+
+    private static final Path BASE = Paths.get(System.getProperty("java.home"));
+
+    interface JRTFile {
+        Entry toEntry();
+    }
+
+    record JRTArchiveFile(Archive archive,
+                          String resPath,
+                          EntryType resType,
+                          String sha,
+                          boolean symlink,
+                          ResourceDiff diff) implements JRTFile {
+        public Entry toEntry() {
+            return new Entry(archive,
+                             String.format("/%s/%s",
+                                           archive.moduleName(),
+                                           resPath),
+                             resPath,
+                             resType) {
+                @Override
+                public long size() {
+                    try {
+                        if (resType != EntryType.CLASS_OR_RESOURCE) {
+                            // Read from the base JDK image, special casing
+                            // symlinks, which have the link target in the
+                            // hashOrTarget field
+                            if (symlink) {
+                                return Files.size(BASE.resolve(sha));
+                            }
+                            return Files.size(BASE.resolve(resPath));
+                        } else {
+                            if (diff != null) {
+                                // If the resource has a diff to the
+                                // packaged modules, use the diff. Diffs of kind
+                                // ADDED have been filtered out in collectFiles();
+                                assert diff.getKind() != ResourceDiff.Kind.ADDED;
+                                assert diff.getName().equals(String.format("/%s/%s",
+                                                                           archive.moduleName(),
+                                                                           resPath));
+                                return diff.getResourceBytes().length;
+                            }
+                            // Read from the module image. This works, because
+                            // the underlying base path is a JrtPath with the
+                            // JrtFileSystem underneath which is able to handle
+                            // this size query.
+                            try {
+                                return Files.size(archive.getPath().resolve(resPath));
+                            } catch (NoSuchFileException file) {
+                                // This indicates that we don't find the class in the
+                                // modules image using the JRT FS provider. Yet, we find
+                                // the class using the system module finder. Therefore,
+                                // we have a patched module. Mention that module patching
+                                // is not supported.
+                                throw new RuntimeImageLinkException(file.getFile(), PATCH_MODULE);
+                            }
+                        }
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                }
+
+                @Override
+                public InputStream stream() throws IOException {
+                    if (resType != EntryType.CLASS_OR_RESOURCE) {
+                        // Read from the base JDK image.
+                        Path path = symlink ? BASE.resolve(sha) : BASE.resolve(resPath);
+                        return Files.newInputStream(path);
+                    } else {
+                        // Read from the module image. Use the diff to the
+                        // packaged modules if we have one. Diffs of kind
+                        // ADDED have been filtered out in collectFiles();
+                        if (diff != null) {
+                            assert diff.getKind() != ResourceDiff.Kind.ADDED;
+                            assert diff.getName().equals(String.format("/%s/%s",
+                                                                       archive.moduleName(),
+                                                                       resPath));
+                            return new ByteArrayInputStream(diff.getResourceBytes());
+                        }
+                        String module = archive.moduleName();
+                        ModuleReference mRef = ModuleFinder.ofSystem()
+                                                    .find(module).orElseThrow();
+                        return mRef.open().open(resPath).orElseThrow();
+                    }
+                }
+
+            };
+        }
+    }
+
+    private static List<String> readModuleResourceFile(String modName) {
+        String resName = String.format(RESPATH_PATTERN, modName);
+        try {
+            try (InputStream inStream = JRTArchive.class.getModule()
+                                                  .getResourceAsStream(resName)) {
+                String input = new String(inStream.readAllBytes(), StandardCharsets.UTF_8);
+                if (input.isEmpty()) {
+                    // Not all modules have non-class resources
+                    return Collections.emptyList();
+                } else {
+                    return Arrays.asList(input.split("\n"));
+                }
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to process resources from the " +
+                                           "run-time image for module " + modName, e);
+        }
+    }
+}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java
index 1c5b0a3cd57..465a1cae8d9 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Jlink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
-import java.nio.ByteOrder;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -148,6 +147,9 @@ public static final class JlinkConfiguration {
         private final Path output;
         private final Set<String> modules;
         private final ModuleFinder finder;
+        private final boolean linkFromRuntimeImage;
+        private final boolean ignoreModifiedRuntime;
+        private final boolean generateRuntimeImage;
 
         /**
          * jlink configuration,
@@ -158,10 +160,16 @@ public static final class JlinkConfiguration {
          */
         public JlinkConfiguration(Path output,
                                   Set<String> modules,
-                                  ModuleFinder finder) {
+                                  ModuleFinder finder,
+                                  boolean linkFromRuntimeImage,
+                                  boolean ignoreModifiedRuntime,
+                                  boolean generateRuntimeImage) {
             this.output = output;
             this.modules = Objects.requireNonNull(modules);
             this.finder = finder;
+            this.linkFromRuntimeImage = linkFromRuntimeImage;
+            this.ignoreModifiedRuntime = ignoreModifiedRuntime;
+            this.generateRuntimeImage = generateRuntimeImage;
         }
 
         /**
@@ -186,6 +194,18 @@ public ModuleFinder finder() {
             return finder;
         }
 
+        public boolean linkFromRuntimeImage() {
+            return linkFromRuntimeImage;
+        }
+
+        public boolean ignoreModifiedRuntime() {
+            return ignoreModifiedRuntime;
+        }
+
+        public boolean isGenerateRuntimeImage() {
+            return generateRuntimeImage;
+        }
+
         /**
          * Returns a {@link Configuration} of the given module path,
          * root modules with full service binding.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
index d9dbf1d0661..15998d6b929 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package jdk.tools.jlink.internal;
 
+import static jdk.tools.jlink.internal.TaskHelper.JLINK_BUNDLE;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -39,14 +41,15 @@
 import java.lang.module.ResolvedModule;
 import java.net.URI;
 import java.nio.ByteOrder;
-import java.nio.file.Files;
 import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -60,18 +63,18 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import jdk.internal.module.ModulePath;
 import jdk.internal.module.ModuleReferenceImpl;
-import jdk.tools.jlink.internal.TaskHelper.BadArgs;
-import static jdk.tools.jlink.internal.TaskHelper.JLINK_BUNDLE;
+import jdk.internal.module.ModuleResolution;
+import jdk.internal.opt.CommandLine;
+import jdk.tools.jlink.internal.ImagePluginStack.ImageProvider;
 import jdk.tools.jlink.internal.Jlink.JlinkConfiguration;
 import jdk.tools.jlink.internal.Jlink.PluginsConfiguration;
+import jdk.tools.jlink.internal.TaskHelper.BadArgs;
 import jdk.tools.jlink.internal.TaskHelper.Option;
 import jdk.tools.jlink.internal.TaskHelper.OptionsHelper;
-import jdk.tools.jlink.internal.ImagePluginStack.ImageProvider;
+import jdk.tools.jlink.internal.runtimelink.RuntimeImageLinkException;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.internal.opt.CommandLine;
-import jdk.internal.module.ModulePath;
-import jdk.internal.module.ModuleResolution;
 
 /**
  * Implementation for the jlink tool.
@@ -86,7 +89,6 @@ public class JlinkTask {
 
     private static final TaskHelper taskHelper
             = new TaskHelper(JLINK_BUNDLE);
-
     private static final Option<?>[] recognizedOptions = {
         new Option<JlinkTask>(false, (task, opt, arg) -> {
             task.options.help = true;
@@ -182,7 +184,17 @@ public class JlinkTask {
         }, true, "--full-version"),
         new Option<JlinkTask>(false, (task, opt, arg) -> {
             task.options.ignoreSigning = true;
-        }, "--ignore-signing-information"),};
+        }, "--ignore-signing-information"),
+        new Option<JlinkTask>(false, (task, opt, arg) -> {
+            task.options.ignoreModifiedRuntime = true;
+        }, true, "--ignore-modified-runtime"),
+        // option for generating a runtime that can then
+        // be used for linking from the run-time image.
+        new Option<JlinkTask>(false, (task, opt, arg) -> {
+            task.options.generateLinkableRuntime = true;
+        }, true, "--generate-linkable-runtime")
+    };
+
 
     private static final String PROGNAME = "jlink";
     private final OptionsValues options = new OptionsValues();
@@ -222,6 +234,8 @@ static class OptionsValues {
         boolean ignoreSigning = false;
         boolean bindServices = false;
         boolean suggestProviders = false;
+        boolean ignoreModifiedRuntime = false;
+        boolean generateLinkableRuntime = false;
     }
 
     public static final String OPTIONS_RESOURCE = "jdk/tools/jlink/internal/options";
@@ -252,7 +266,7 @@ int run(String[] args) {
                                 .showUsage(true);
             }
             if (options.help) {
-                optionsHelper.showHelp(PROGNAME);
+                optionsHelper.showHelp(PROGNAME, LinkableRuntimeImage.isLinkableRuntime());
                 return EXIT_OK;
             }
             if (optionsHelper.shouldListPlugins()) {
@@ -270,11 +284,6 @@ int run(String[] args) {
                 if (jmods != null) {
                     options.modulePath.add(jmods);
                 }
-
-                if (options.modulePath.isEmpty()) {
-                    throw taskHelper.newBadArgs("err.modulepath.must.be.specified")
-                            .showUsage(true);
-                }
             }
 
             JlinkConfiguration config = initJlinkConfig();
@@ -300,7 +309,7 @@ int run(String[] args) {
             }
             cleanupOutput(outputPath);
             return EXIT_ERROR;
-        } catch (IllegalArgumentException | ResolutionException e) {
+        } catch (IllegalArgumentException | ResolutionException | RuntimeImageLinkException e) {
             log.println(taskHelper.getMessage("error.prefix") + " " + e.getMessage());
             if (DEBUG) {
                 e.printStackTrace(log);
@@ -356,6 +365,7 @@ public static void createImage(JlinkConfiguration config,
                                     false,
                                     null,
                                     false,
+                                    new OptionsValues(),
                                     null);
 
         // Then create the Plugin Stack
@@ -370,7 +380,7 @@ public static void createImage(JlinkConfiguration config,
     private JlinkConfiguration initJlinkConfig() throws BadArgs {
         Set<String> roots = new HashSet<>();
         for (String mod : options.addMods) {
-            if (mod.equals(ALL_MODULE_PATH)) {
+            if (mod.equals(ALL_MODULE_PATH) && options.modulePath.size() > 0) {
                 ModuleFinder finder = newModuleFinder(options.modulePath, options.limitMods, Set.of());
                 // all observable modules are roots
                 finder.findAll()
@@ -392,9 +402,75 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
             finder = newModuleFinder(options.modulePath, options.limitMods, roots);
         }
 
+        boolean isLinkFromRuntime = options.modulePath.isEmpty();
+        // In case of custom modules outside the JDK we may
+        // have a non-empty module path, which must not include
+        // java.base. If it did, we link using packaged modules from that
+        // module path. If the module path does not include java.base, we have
+        // the case where we link from the run-time image. In that case, we take
+        // the JDK modules from the run-time image (ModuleFinder.ofSystem()).
+        if (finder.find("java.base").isEmpty()) {
+            isLinkFromRuntime = true;
+            ModuleFinder runtimeImageFinder = ModuleFinder.ofSystem();
+            finder = combinedFinders(runtimeImageFinder, finder, options.limitMods, roots);
+        }
+
+        // --keep-packaged-modules doesn't make sense as we are not linking
+        // from packaged modules to begin with.
+        if (isLinkFromRuntime && options.packagedModulesPath != null) {
+            throw taskHelper.newBadArgs("err.runtime.link.packaged.mods");
+        }
+
         return new JlinkConfiguration(options.output,
                                       roots,
-                                      finder);
+                                      finder,
+                                      isLinkFromRuntime,
+                                      options.ignoreModifiedRuntime,
+                                      options.generateLinkableRuntime);
+    }
+
+    /**
+     * Creates a combined module finder of {@code finder} and
+     * {@code runtimeImageFinder} that first looks-up modules in the
+     * {@code runtimeImageFinder} and if not present in {@code finder}.
+     *
+     * @param runtimeImageFinder A system modules finder.
+     * @param finder A module finder based on packaged modules.
+     * @param limitMods The set of limited modules for the resulting
+     *                  finder (if any).
+     * @param roots All module roots.
+     *
+     * @return A combined finder, or the input finder, potentially applying
+     *         module limits.
+     */
+    private ModuleFinder combinedFinders(ModuleFinder runtimeImageFinder,
+                                         ModuleFinder finder,
+                                         Set<String> limitMods,
+                                         Set<String> roots) {
+        ModuleFinder combined = new ModuleFinder() {
+
+            @Override
+            public Optional<ModuleReference> find(String name) {
+                Optional<ModuleReference> mref = runtimeImageFinder.find(name);
+                if (mref.isEmpty()) {
+                    return finder.find(name);
+                }
+                return mref;
+            }
+
+            @Override
+            public Set<ModuleReference> findAll() {
+                Set<ModuleReference> all = new HashSet<>();
+                all.addAll(runtimeImageFinder.findAll());
+                all.addAll(finder.findAll());
+                return Collections.unmodifiableSet(all);
+            }
+        };
+        // if limitmods is specified then limit the universe
+        if (limitMods != null && !limitMods.isEmpty()) {
+            return limitFinder(combined, limitMods, Objects.requireNonNull(roots));
+        }
+        return combined;
     }
 
     private void createImage(JlinkConfiguration config) throws Exception {
@@ -413,6 +489,7 @@ private void createImage(JlinkConfiguration config) throws Exception {
                                                         options.bindServices,
                                                         options.endian,
                                                         options.verbose,
+                                                        options,
                                                         log);
 
         // Then create the Plugin Stack
@@ -433,10 +510,10 @@ public static Path getDefaultModulePath() {
     }
 
     /*
-     * Returns a module finder of the given module path that limits
-     * the observable modules to those in the transitive closure of
-     * the modules specified in {@code limitMods} plus other modules
-     * specified in the {@code roots} set.
+     * Returns a module finder of the given module path or the system modules
+     * if the module path is empty that limits the observable modules to those
+     * in the transitive closure of the modules specified in {@code limitMods}
+     * plus other modules specified in the {@code roots} set.
      *
      * @throws IllegalArgumentException if java.base module is present
      * but its descriptor has no version
@@ -445,14 +522,10 @@ public static ModuleFinder newModuleFinder(List<Path> paths,
                                                Set<String> limitMods,
                                                Set<String> roots)
     {
-        if (Objects.requireNonNull(paths).isEmpty()) {
-             throw new IllegalArgumentException(taskHelper.getMessage("err.empty.module.path"));
-        }
-
-        Path[] entries = paths.toArray(new Path[0]);
         Runtime.Version version = Runtime.version();
-        ModuleFinder finder = ModulePath.of(version, true, entries);
-
+        Path[] entries = paths.toArray(new Path[0]);
+        ModuleFinder finder = paths.isEmpty() ? ModuleFinder.ofSystem()
+                                              : ModulePath.of(version, true, entries);
         if (finder.find("java.base").isPresent()) {
             // use the version of java.base module, if present, as
             // the release version for multi-release JAR files
@@ -505,8 +578,9 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e)
 
     private static Path toPathLocation(ResolvedModule m) {
         Optional<URI> ouri = m.reference().location();
-        if (ouri.isEmpty())
+        if (ouri.isEmpty()) {
             throw new InternalError(m + " does not have a location");
+        }
         URI uri = ouri.get();
         return Paths.get(uri);
     }
@@ -518,6 +592,7 @@ private static ImageHelper createImageProvider(JlinkConfiguration config,
                                                    boolean bindService,
                                                    ByteOrder endian,
                                                    boolean verbose,
+                                                   OptionsValues opts,
                                                    PrintWriter log)
             throws IOException
     {
@@ -534,12 +609,35 @@ private static ImageHelper createImageProvider(JlinkConfiguration config,
                     taskHelper.getMessage("err.automatic.module", mref.descriptor().name(), loc));
             });
 
+        // Perform some sanity checks for linking from the run-time image
+        if (config.linkFromRuntimeImage()) {
+            if (!LinkableRuntimeImage.isLinkableRuntime()) {
+                String msg = taskHelper.getMessage("err.runtime.link.not.linkable.runtime");
+                throw new IllegalArgumentException(msg);
+            }
+            // Do not permit linking from run-time image and also including jdk.jlink module
+            if (cf.findModule(JlinkTask.class.getModule().getName()).isPresent()) {
+                String msg = taskHelper.getMessage("err.runtime.link.jdk.jlink.prohibited");
+                throw new IllegalArgumentException(msg);
+            }
+
+            // Print info message indicating linking from the run-time image
+            if (verbose && log != null) {
+                log.println(taskHelper.getMessage("runtime.link.info"));
+            }
+        }
+
         if (verbose && log != null) {
             // print modules to be linked in
             cf.modules().stream()
               .sorted(Comparator.comparing(ResolvedModule::name))
-              .forEach(rm -> log.format("%s %s%n",
-                                        rm.name(), rm.reference().location().get()));
+              .forEach(rm -> log.format("%s %s%s%n",
+                                        rm.name(),
+                                        rm.reference().location().get(),
+                                        // We have a link from run-time image when scheme is 'jrt'
+                                        "jrt".equals(rm.reference().location().get().getScheme())
+                                                ? " " + taskHelper.getMessage("runtime.link.jprt.path.extra")
+                                                : ""));
 
             // print provider info
             Set<ModuleReference> references = cf.modules().stream()
@@ -559,14 +657,15 @@ private static ImageHelper createImageProvider(JlinkConfiguration config,
                           .map(ModuleDescriptor::name)
                           .collect(Collectors.joining(", "));
 
-            if (!"".equals(im))
+            if (!"".equals(im)) {
                 log.println("WARNING: Using incubator modules: " + im);
+            }
         }
 
         Map<String, Path> mods = cf.modules().stream()
             .collect(Collectors.toMap(ResolvedModule::name, JlinkTask::toPathLocation));
         // determine the target platform of the image being created
-        Platform targetPlatform = targetPlatform(cf, mods);
+        Platform targetPlatform = targetPlatform(cf, mods, config.linkFromRuntimeImage());
         // if the user specified any --endian, then it must match the target platform's native
         // endianness
         if (endian != null && endian != targetPlatform.arch().byteOrder()) {
@@ -580,7 +679,92 @@ private static ImageHelper createImageProvider(JlinkConfiguration config,
                         targetPlatform.arch().byteOrder(), targetPlatform);
             }
         }
-        return new ImageHelper(cf, mods, targetPlatform, retainModulesPath, ignoreSigning);
+
+        // use the version of java.base module, if present, as
+        // the release version for multi-release JAR files
+        var version = cf.findModule("java.base")
+                        .map(ResolvedModule::reference)
+                        .map(ModuleReference::descriptor)
+                        .flatMap(ModuleDescriptor::version)
+                        .map(ModuleDescriptor.Version::toString)
+                        .map(Runtime.Version::parse)
+                        .orElse(Runtime.version());
+
+        Set<Archive> archives = mods.entrySet().stream()
+                .map(e -> newArchive(e.getKey(),
+                                     e.getValue(),
+                                     version,
+                                     ignoreSigning,
+                                     config,
+                                     log))
+                .collect(Collectors.toSet());
+
+        return new ImageHelper(archives,
+                               targetPlatform,
+                               retainModulesPath,
+                               config.isGenerateRuntimeImage());
+    }
+
+    private static Archive newArchive(String module,
+                                      Path path,
+                                      Runtime.Version version,
+                                      boolean ignoreSigning,
+                                      JlinkConfiguration config,
+                                      PrintWriter log) {
+        if (path.toString().endsWith(".jmod")) {
+            return new JmodArchive(module, path);
+        } else if (path.toString().endsWith(".jar")) {
+            ModularJarArchive modularJarArchive = new ModularJarArchive(module, path, version);
+            try (Stream<Archive.Entry> entries = modularJarArchive.entries()) {
+                boolean hasSignatures = entries.anyMatch((entry) -> {
+                    String name = entry.name().toUpperCase(Locale.ROOT);
+
+                    return name.startsWith("META-INF/") && name.indexOf('/', 9) == -1 && (
+                            name.endsWith(".SF") ||
+                                    name.endsWith(".DSA") ||
+                                    name.endsWith(".RSA") ||
+                                    name.endsWith(".EC") ||
+                                    name.startsWith("META-INF/SIG-")
+                    );
+                });
+
+                if (hasSignatures) {
+                    if (ignoreSigning) {
+                        System.err.println(taskHelper.getMessage("warn.signing", path));
+                    } else {
+                        throw new IllegalArgumentException(taskHelper.getMessage("err.signing", path));
+                    }
+                }
+            }
+            return modularJarArchive;
+        } else if (Files.isDirectory(path) && !"jrt".equals(path.toUri().getScheme())) {
+            // The jrt URI path scheme conditional is there since we'd otherwise
+            // enter this branch for linking from the run-time image where the
+            // path is a jrt path. Note that the specific module would be a
+            // directory. I.e. Files.isDirectory() would be true.
+            Path modInfoPath = path.resolve("module-info.class");
+            if (Files.isRegularFile(modInfoPath)) {
+                return new DirArchive(path, findModuleName(modInfoPath));
+            } else {
+                throw new IllegalArgumentException(
+                        taskHelper.getMessage("err.not.a.module.directory", path));
+            }
+        } else if (config.linkFromRuntimeImage()) {
+            return LinkableRuntimeImage.newArchive(module, path, config.ignoreModifiedRuntime(), taskHelper);
+        } else {
+            throw new IllegalArgumentException(
+                    taskHelper.getMessage("err.not.modular.format", module, path));
+        }
+    }
+
+    private static String findModuleName(Path modInfoPath) {
+        try (BufferedInputStream bis = new BufferedInputStream(
+                Files.newInputStream(modInfoPath))) {
+            return ModuleDescriptor.read(bis).name();
+        } catch (IOException exp) {
+            throw new IllegalArgumentException(taskHelper.getMessage(
+                    "err.cannot.read.module.info", modInfoPath), exp);
+        }
     }
 
     /*
@@ -626,10 +810,12 @@ public Set<ModuleReference> findAll() {
         };
     }
 
-    private static Platform targetPlatform(Configuration cf, Map<String, Path> modsPaths) throws IOException {
+    private static Platform targetPlatform(Configuration cf,
+                                           Map<String, Path> modsPaths,
+                                           boolean runtimeImageLink) throws IOException {
         Path javaBasePath = modsPaths.get("java.base");
         assert javaBasePath != null : "java.base module path is missing";
-        if (isJavaBaseFromDefaultModulePath(javaBasePath)) {
+        if (runtimeImageLink || isJavaBaseFromDefaultModulePath(javaBasePath)) {
             // this implies that the java.base module used for the target image
             // will correspond to the current platform. So this isn't an attempt to
             // build a cross-platform image. We use the current platform's endianness
@@ -720,8 +906,9 @@ private static void printProviders(PrintWriter log,
                                        String header,
                                        Set<ModuleReference> modules,
                                        Map<String, Set<String>> serviceToUses) {
-        if (modules.isEmpty())
+        if (modules.isEmpty()) {
             return;
+        }
 
         // Build a map of a service type to the provider modules
         Map<String, Set<ModuleDescriptor>> providers = new HashMap<>();
@@ -845,95 +1032,14 @@ private String getSaveOpts() {
         return sb.toString();
     }
 
-    private static class ImageHelper implements ImageProvider {
-        final Platform targetPlatform;
-        final Path packagedModulesPath;
-        final boolean ignoreSigning;
-        final Runtime.Version version;
-        final Set<Archive> archives;
-
-        ImageHelper(Configuration cf,
-                    Map<String, Path> modsPaths,
-                    Platform targetPlatform,
-                    Path packagedModulesPath,
-                    boolean ignoreSigning) throws IOException {
-            Objects.requireNonNull(targetPlatform);
-            this.targetPlatform = targetPlatform;
-            this.packagedModulesPath = packagedModulesPath;
-            this.ignoreSigning = ignoreSigning;
-
-            // use the version of java.base module, if present, as
-            // the release version for multi-release JAR files
-            this.version = cf.findModule("java.base")
-                .map(ResolvedModule::reference)
-                .map(ModuleReference::descriptor)
-                .flatMap(ModuleDescriptor::version)
-                .map(ModuleDescriptor.Version::toString)
-                .map(Runtime.Version::parse)
-                .orElse(Runtime.version());
-
-            this.archives = modsPaths.entrySet().stream()
-                                .map(e -> newArchive(e.getKey(), e.getValue()))
-                                .collect(Collectors.toSet());
-        }
-
-        private Archive newArchive(String module, Path path) {
-            if (path.toString().endsWith(".jmod")) {
-                return new JmodArchive(module, path);
-            } else if (path.toString().endsWith(".jar")) {
-                ModularJarArchive modularJarArchive = new ModularJarArchive(module, path, version);
-
-                try (Stream<Archive.Entry> entries = modularJarArchive.entries()) {
-                    boolean hasSignatures = entries.anyMatch((entry) -> {
-                        String name = entry.name().toUpperCase(Locale.ROOT);
-
-                        return name.startsWith("META-INF/") && name.indexOf('/', 9) == -1 && (
-                                name.endsWith(".SF") ||
-                                name.endsWith(".DSA") ||
-                                name.endsWith(".RSA") ||
-                                name.endsWith(".EC") ||
-                                name.startsWith("META-INF/SIG-")
-                        );
-                    });
-
-                    if (hasSignatures) {
-                        if (ignoreSigning) {
-                            System.err.println(taskHelper.getMessage("warn.signing", path));
-                        } else {
-                            throw new IllegalArgumentException(taskHelper.getMessage("err.signing", path));
-                        }
-                    }
-                }
-
-                return modularJarArchive;
-            } else if (Files.isDirectory(path)) {
-                Path modInfoPath = path.resolve("module-info.class");
-                if (Files.isRegularFile(modInfoPath)) {
-                    return new DirArchive(path, findModuleName(modInfoPath));
-                } else {
-                    throw new IllegalArgumentException(
-                        taskHelper.getMessage("err.not.a.module.directory", path));
-                }
-            } else {
-                throw new IllegalArgumentException(
-                    taskHelper.getMessage("err.not.modular.format", module, path));
-            }
-        }
-
-        private static String findModuleName(Path modInfoPath) {
-            try (BufferedInputStream bis = new BufferedInputStream(
-                    Files.newInputStream(modInfoPath))) {
-                return ModuleDescriptor.read(bis).name();
-            } catch (IOException exp) {
-                throw new IllegalArgumentException(taskHelper.getMessage(
-                    "err.cannot.read.module.info", modInfoPath), exp);
-            }
-        }
-
+    private static record ImageHelper(Set<Archive> archives,
+                                      Platform targetPlatform,
+                                      Path packagedModulesPath,
+                                      boolean generateRuntimeImage) implements ImageProvider {
         @Override
         public ExecutableImage retrieve(ImagePluginStack stack) throws IOException {
             ExecutableImage image = ImageFileCreator.create(archives,
-                    targetPlatform.arch().byteOrder(), stack);
+                    targetPlatform.arch().byteOrder(), stack, generateRuntimeImage, taskHelper);
             if (packagedModulesPath != null) {
                 // copy the packaged modules to the given path
                 Files.createDirectories(packagedModulesPath);
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
new file mode 100644
index 00000000000..935af4585ad
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.tools.jlink.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.List;
+
+import jdk.tools.jlink.internal.runtimelink.ResourceDiff;
+
+/**
+ * Class that supports the feature of running jlink based on the current
+ * run-time image.
+ */
+public class LinkableRuntimeImage {
+
+    // meta-data files per module for supporting linking from the run-time image
+    public static final String RESPATH_PATTERN = "jdk/tools/jlink/internal/runtimelink/fs_%s_files";
+    // The diff files per module for supporting linking from the run-time image
+    public static final String DIFF_PATTERN = "jdk/tools/jlink/internal/runtimelink/diff_%s";
+
+    /**
+     * In order to be able to show whether or not a runtime is capable of
+     * linking from it in {@code jlink --help} we need to look for the delta
+     * files in the {@code jdk.jlink} module. If present we have the capability.
+     *
+     * @return {@code true} iff this jlink is capable of linking from the
+     *         run-time image.
+     */
+    public static boolean isLinkableRuntime() {
+        try (InputStream in = getDiffInputStream("java.base")) {
+            return in != null;
+        } catch (IOException e) {
+            // fall-through
+        }
+        return false;
+    }
+
+    private static InputStream getDiffInputStream(String module) throws IOException {
+        String resourceName = String.format(DIFF_PATTERN, module);
+        return LinkableRuntimeImage.class.getModule().getResourceAsStream(resourceName);
+    }
+
+    public static Archive newArchive(String module,
+                                     Path path,
+                                     boolean ignoreModifiedRuntime,
+                                     TaskHelper taskHelper) {
+        assert isLinkableRuntime();
+        // Here we retrieve the per module difference file, which is
+        // potentially empty, from the modules image and pass that on to
+        // JRTArchive for further processing. When streaming resources from
+        // the archive, the diff is being applied.
+        List<ResourceDiff> perModuleDiff = null;
+        try (InputStream in = getDiffInputStream(module)){
+            perModuleDiff = ResourceDiff.read(in);
+        } catch (IOException e) {
+            throw new AssertionError("Failure to retrieve resource diff for " +
+                                     "module " + module, e);
+        }
+        return new JRTArchive(module, path, !ignoreModifiedRuntime, perModuleDiff, taskHelper);
+    }
+
+
+}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
index 2b4e6ca0a97..23b3dfb7079 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,23 +28,21 @@
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.text.MessageFormat;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.stream.Stream;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
-import java.util.ResourceBundle;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.MissingResourceException;
-import java.util.Comparator;
-
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Stream;
 
 import jdk.tools.jlink.builder.DefaultImageBuilder;
 import jdk.tools.jlink.builder.ImageBuilder;
@@ -55,7 +53,6 @@
 import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
 import jdk.tools.jlink.plugin.Plugin;
 import jdk.tools.jlink.plugin.Plugin.Category;
-import jdk.tools.jlink.plugin.PluginException;
 
 /**
  *
@@ -584,7 +581,7 @@ private Option<T> getOption(String name) {
             return null;
         }
 
-        public void showHelp(String progName) {
+        public void showHelp(String progName, boolean linkableRuntimeEnabled) {
             log.println(bundleHelper.getMessage("main.usage", progName));
             Stream.concat(options.stream(), pluginOptions.mainOptions.stream())
                 .filter(option -> !option.isHidden())
@@ -594,6 +591,17 @@ public void showHelp(String progName) {
                 });
 
             log.println(bundleHelper.getMessage("main.command.files"));
+            // If the JDK build has the run-time image capability show it
+            // in the help output in human readable form.
+            String qualifier = null;
+            if (linkableRuntimeEnabled) {
+                qualifier = bundleHelper.getMessage("main.runtime.image.linking.cap.enabled");
+            } else {
+                qualifier = bundleHelper.getMessage("main.runtime.image.linking.cap.disabled");
+            }
+            log.println(bundleHelper.getMessage("main.runtime.image.linking.cap.sect.header"));
+            log.println(bundleHelper.getMessage("main.runtime.image.linking.cap.msg",
+                                                qualifier));
         }
 
         public void listPlugins() {
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
new file mode 100644
index 00000000000..5e540be7ced
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.tools.jlink.internal.runtimelink;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Generates a delta between packaged modules (as an ImageResource) and an
+ * optimized jimage (lib/modules) as an ImageResource. The result can be
+ * serialized to a file using {@link ResourceDiff}.
+ */
+public class JimageDiffGenerator {
+
+    /**
+     * A resource used for linking. Either packaged modules or
+     * packaged modules transformed to an optimized run-time image by applying
+     * the jlink plug-in pipeline. The canonical source, the packaged modules,
+     * are being used to devise the delta to the transformed run-time image. The
+     * delta can can then be used for jlink input together *with* a prepared
+     * run-time image.
+     */
+    @SuppressWarnings("try")
+    public interface ImageResource extends AutoCloseable {
+        public List<String> getEntries();
+        public byte[] getResourceBytes(String name);
+    }
+
+    /**
+     * Produce a difference between packaged modules' resources (base) and the
+     * result of all plug-ins being applied on those resources (image).
+     *
+     * @param base
+     *            The ImageResource view of unmodified resources coming from
+     *            packaged modules.
+     * @param image
+     *            The ImageResource view of the jlink plug-in pipeline having
+     *            been applied to the resources in base.
+     * @return The list of resource differences across all modules.
+     */
+    public List<ResourceDiff> generateDiff(ImageResource base, ImageResource image) throws Exception {
+        List<String> baseResources;
+        Set<String> resources = new HashSet<>();
+        List<ResourceDiff> diffs = new ArrayList<>();
+        try (base; image) {
+            resources.addAll(image.getEntries());
+            baseResources = base.getEntries();
+            for (String item: baseResources) {
+                byte[] baseBytes = base.getResourceBytes(item);
+                // First check that every item in the base image exist in
+                // the optimized image as well. If it does not, it's a removed
+                // item in the optimized image.
+                if (!resources.remove(item)) {
+                    // keep track of original bytes for removed item in the
+                    // optimized image, since we need to restore them for the
+                    // runtime image link
+                    ResourceDiff.Builder builder = new ResourceDiff.Builder();
+                    ResourceDiff diff = builder.setKind(ResourceDiff.Kind.REMOVED)
+                           .setName(item)
+                           .setResourceBytes(baseBytes)
+                           .build();
+                    diffs.add(diff);
+                    continue;
+                }
+                // Verify resource bytes are equal if present in both images
+                boolean contentEquals = Arrays.equals(baseBytes, image.getResourceBytes(item));
+                if (!contentEquals) {
+                    // keep track of original bytes (non-optimized)
+                    ResourceDiff.Builder builder = new ResourceDiff.Builder();
+                    ResourceDiff diff = builder.setKind(ResourceDiff.Kind.MODIFIED)
+                        .setName(item)
+                        .setResourceBytes(baseBytes)
+                        .build();
+                    diffs.add(diff);
+                }
+            }
+        }
+        // What's now left in the set are the resources only present in the
+        // optimized image (generated by some plugins; not present in jmods)
+        for (String e: resources) {
+            ResourceDiff.Builder builder = new ResourceDiff.Builder();
+            ResourceDiff diff = builder.setKind(ResourceDiff.Kind.ADDED)
+                                    .setName(e)
+                                    .build();
+            diffs.add(diff);
+        }
+        return diffs;
+    }
+
+}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourceDiff.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourceDiff.java
new file mode 100644
index 00000000000..a007350c16f
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourceDiff.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.tools.jlink.internal.runtimelink;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Class representing a difference of a jimage resource. For all intents
+ * and purposes this represents a difference between a resource in an optimized
+ * jimage (e.g. images/jdk/lib/modules) and the underlying basic resources from
+ * which the optimized image got derived from (e.g. packaged modules). The
+ * differences are being used in JRTArchive so as to back-track from an optimized
+ * jimage to the original (i.e. it restores original resources using the diff).
+ */
+public class ResourceDiff implements Comparable<ResourceDiff> {
+
+    private static final int MAGIC = 0xabba;
+
+    public static enum Kind {
+        ADDED((short)1),    // Resource added
+        REMOVED((short)2),  // Resource removed
+        MODIFIED((short)3); // Resource modified
+
+        private short value;
+
+        private Kind(short value) {
+            this.value = value;
+        }
+
+        public short value() {
+            return value;
+        }
+
+        static Kind fromShort(short v) {
+            if (v > 3 || v < 1) {
+                throw new IllegalArgumentException("Must be within range [1-3]");
+            }
+            switch (v) {
+            case 1: return ADDED;
+            case 2: return REMOVED;
+            case 3: return MODIFIED;
+            }
+            throw new AssertionError("Must not reach here!");
+        }
+    }
+
+    private final Kind kind;
+    private final byte[] resourceBytes;
+    private final String name;
+
+    private ResourceDiff(Kind kind, String name, byte[] resourceBytes) {
+        this.kind = kind;
+        this.name = name;
+        if ((kind == Kind.REMOVED || kind == Kind.MODIFIED) &&
+                resourceBytes == null) {
+            throw new AssertionError("Resource bytes must be set for REMOVED or MODIFIED");
+        }
+        this.resourceBytes = resourceBytes;
+    }
+
+    public Kind getKind() {
+        return kind;
+    }
+
+    public byte[] getResourceBytes() {
+        return resourceBytes;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int compareTo(ResourceDiff o) {
+        int kindComp = kind.value() - o.kind.value();
+        if (kindComp == 0) {
+            return getName().compareTo(o.getName());
+        } else {
+            return kindComp;
+        }
+    }
+
+    public static class Builder {
+        private Kind kind;
+        private String name;
+        private byte[] resourceBytes;
+
+        public Builder setKind(Kind kind) {
+            this.kind = kind;
+            return this;
+        }
+        public Builder setName(String name) {
+            this.name = Objects.requireNonNull(name);
+            return this;
+        }
+        public Builder setResourceBytes(byte[] resourceBytes) {
+            this.resourceBytes = Objects.requireNonNull(resourceBytes);
+            return this;
+        }
+        public ResourceDiff build() {
+            if (kind == null || name == null) {
+                throw new AssertionError("kind and name must be set");
+            }
+            switch (kind) {
+            case ADDED:
+                {
+                    break; // null bytes for added is OK.
+                }
+            case MODIFIED: // fall-through
+            case REMOVED:
+                {
+                    if (resourceBytes == null) {
+                        throw new AssertionError("Original bytes needed for MODIFIED, REMOVED!");
+                    }
+                    break;
+                }
+            default:
+                break;
+            }
+            return new ResourceDiff(kind, name, resourceBytes);
+        }
+    }
+
+    /**
+     * Writes a list of resource diffs to an output stream
+     *
+     * @param diffs The list of resource diffs to write.
+     * @param out The stream to write the serialized bytes to.
+     */
+    public static void write(List<ResourceDiff> diffs, OutputStream out) throws IOException {
+        /*
+         * Simple binary format:
+         *
+         * <header>|<items>
+         *
+         * ****************************************
+         * HEADER info
+         * ****************************************
+         *
+         * where <header> is ('|' separation for clarity):
+         *
+         *  <int>|<int>
+         *
+         * The first integer is the MAGIC, 0xabba. The second integer is the
+         * total number of items.
+         *
+         * *****************************************
+         * ITEMS info
+         * *****************************************
+         *
+         * Each <item> consists of ('|' separation for clarity):
+         *
+         * <short>|<int>|<name-bytes-utf>|<int>|<resource-bytes>
+         *
+         * Where the individual items are:
+         *
+         * <short>:
+         *     The value of the respective ResourceDiff.Kind.
+         * <int>:
+         *     The length of the name bytes (in UTF-8).
+         * <name-bytes-utf>:
+         *     The resource name bytes in UTF-8.
+         * <int>:
+         *     The length of the resource bytes. 0 (zero) if no resource bytes.
+         *     A.k.a 'null'.
+         * <resource-bytes>:
+         *     The bytes of the resource as stored in the jmod files.
+         */
+        try (DataOutputStream dataOut = new DataOutputStream(out)) {
+            dataOut.writeInt(MAGIC);
+            dataOut.writeInt(diffs.size());
+            for (ResourceDiff d: diffs) {
+                dataOut.writeShort(d.kind.value());
+                byte[] buf = d.name.getBytes(StandardCharsets.UTF_8);
+                dataOut.writeInt(buf.length);
+                dataOut.write(buf);
+                buf = d.resourceBytes;
+                dataOut.writeInt(buf == null ? 0 : buf.length);
+                if (buf != null) {
+                    dataOut.write(buf);
+                }
+            }
+        }
+    }
+
+    /**
+     * Read a list of resource diffs from an input stream.
+     *
+     * @param in The input stream to read from
+     * @return The list of resource diffs.
+     */
+    public static List<ResourceDiff> read(InputStream in) throws IOException {
+        /*
+         * See write() for the details how this is being written
+         */
+        List<ResourceDiff> diffs = new ArrayList<>();
+        try (DataInputStream din = new DataInputStream(in)) {
+            int magic = din.readInt();
+            if (magic != MAGIC) {
+                throw new IllegalArgumentException("Not a ResourceDiff data stream!");
+            }
+            int numItems = din.readInt();
+            for (int i = 0; i < numItems; i++) {
+                Kind k = Kind.fromShort(din.readShort());
+                int numBytes = din.readInt();
+                byte[] buf = readBytesFromStream(din, numBytes);
+                String name = new String(buf, StandardCharsets.UTF_8);
+                numBytes = din.readInt();
+                byte[] resBytes = null;
+                if (numBytes != 0) {
+                    resBytes = readBytesFromStream(din, numBytes);
+                }
+                Builder builder = new Builder();
+                builder.setKind(k)
+                       .setName(name);
+                if (resBytes != null) {
+                    builder.setResourceBytes(resBytes);
+                }
+                diffs.add(builder.build());
+            }
+        }
+        return Collections.unmodifiableList(diffs);
+    }
+
+    private static byte[] readBytesFromStream(DataInputStream din, int numBytes) throws IOException {
+        byte[] b = new byte[numBytes];
+        for (int i = 0; i < numBytes; i++) {
+            int data = din.read();
+            if (data == -1) {
+                throw new IOException("Short read!");
+            }
+            b[i] = (byte)data;
+        }
+        return b;
+    }
+
+    public static void printDiffs(List<ResourceDiff> diffs) {
+        for (ResourceDiff diff: diffs.stream().sorted().toList()) {
+            switch (diff.getKind()) {
+            case ADDED:
+                System.out.println("Only added in opt: " + diff.getName());
+                break;
+            case MODIFIED:
+                System.out.println("Modified in opt: " + diff.getName());
+                break;
+            case REMOVED:
+                System.out.println("Removed in opt: " + diff.getName());
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/java/awt/FontClass/FontPrivilege.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
similarity index 54%
rename from test/jdk/java/awt/FontClass/FontPrivilege.java
rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
index 96938ece225..12e8708477c 100644
--- a/test/jdk/java/awt/FontClass/FontPrivilege.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,37 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 5010310 6319835 6904882 6968373
- * @summary test fonts can be created in the presence of a security manager
- * @run main/othervm -Djava.security.manager=allow FontPrivilege
- */
+package jdk.tools.jlink.internal.runtimelink;
+
+import java.util.List;
+import java.util.Objects;
+
+import jdk.tools.jlink.internal.runtimelink.JimageDiffGenerator.ImageResource;
+import jdk.tools.jlink.plugin.ResourcePool;
+import jdk.tools.jlink.plugin.ResourcePoolEntry;
+
+@SuppressWarnings("try")
+public class ResourcePoolReader implements ImageResource {
+
+    private final ResourcePool pool;
+
+    public ResourcePoolReader(ResourcePool pool) {
+        this.pool = Objects.requireNonNull(pool);
+    }
 
-import java.awt.Font;
+    @Override
+    public void close() throws Exception {
+        // nothing
+    }
 
-public class FontPrivilege {
+    @Override
+    public List<String> getEntries() {
+        return pool.entries().map(ResourcePoolEntry::path).toList();
+    }
 
-    public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new SecurityManager());
+    @Override
+    public byte[] getResourceBytes(String name) {
+        return pool.findEntry(name).orElseThrow().contentBytes();
+    }
 
-        new Font("Helvetica", Font.PLAIN, 12).getFamily();
-        new Font("foo bar", Font.PLAIN, 12).getFamily();
-   }
 }
diff --git a/src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/RuntimeImageLinkException.java
similarity index 55%
rename from src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp
rename to src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/RuntimeImageLinkException.java
index 072093466a6..9f54fd63476 100644
--- a/src/jdk.accessibility/windows/native/libjabsysinfo/AccessBridgeSysInfo.cpp
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/RuntimeImageLinkException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,34 +23,40 @@
  * questions.
  */
 
-#include <exception>
-#include <stdexcept>
-#include <jni.h>
-#include <windows.h>
-#include <WinDef.h>
+package jdk.tools.jlink.internal.runtimelink;
 
-extern "C" {
+import java.util.Objects;
 
-BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpvReserved) {
-    return TRUE;
-}
+/**
+ * Exception thrown when linking from the run-time image
+ */
+public class RuntimeImageLinkException extends RuntimeException {
 
-// Determine bitness of Win OS
-JNIEXPORT jboolean JNICALL
-Java_com_sun_java_accessibility_internal_AccessBridge_isSysWow(JNIEnv *env, jobject callingObj) {
-    BOOL bIsWow64 = FALSE;
-    typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
+    private static final long serialVersionUID = -1848914673073119403L;
 
-    LPFN_ISWOW64PROCESS fnIsWow64Process =
-        (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "IsWow64Process");
+    public static enum Reason {
+        PATCH_MODULE,  /* link exception due to patched module */
+        MODIFIED_FILE, /* link exception due to modified file  */
+    }
 
-    if (fnIsWow64Process != NULL) {
-        if (!fnIsWow64Process(GetCurrentProcess(), &bIsWow64)) {
-            throw std::runtime_error("fnIsWow64Process() failed");
-        }
+    private final String file;
+    private final Reason reason;
+
+    public RuntimeImageLinkException(String file, Reason reason) {
+        this.file = Objects.requireNonNull(file);
+        this.reason = Objects.requireNonNull(reason);
     }
 
-    return bIsWow64 ? JNI_TRUE : JNI_FALSE;
-}
+    public String getFile() {
+        return file;
+    }
+
+    public Reason getReason() {
+        return reason;
+    }
 
+    @Override
+    public String getMessage() {
+        return reason + ", file: " + file;
+    }
 }
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
index e09eadbb3d0..9e18177d9c8 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -111,10 +111,22 @@ main.extended.help.footer=\
 \              used, one pattern per line\n\
 \n\
 
+main.runtime.image.linking.cap.enabled=enabled
+main.runtime.image.linking.cap.disabled=disabled
+main.runtime.image.linking.cap.sect.header=Capabilities:
+main.runtime.image.linking.cap.msg=\      Linking from run-time image {0}
 
 error.prefix=Error:
 warn.prefix=Warning:
 
+err.runtime.link.not.linkable.runtime=This JDK does not support linking from the current run-time image
+err.runtime.link.jdk.jlink.prohibited=This JDK does not contain packaged modules\
+\ and cannot be used to create another image with the jdk.jlink module
+err.runtime.link.packaged.mods=This JDK has no packaged modules.\
+\ --keep-packaged-modules is not supported
+err.runtime.link.modified.file={0} has been modified
+err.runtime.link.patched.module=File {0} not found in the modules image.\
+\ --patch-module is not supported when linking from the run-time image
 err.empty.module.path=empty module path
 err.jlink.version.mismatch=jlink version {0}.{1} does not match target java.base version {2}.{3}
 err.automatic.module:automatic module cannot be used with jlink: {0} from {1}
@@ -123,7 +135,7 @@ err.launcher.main.class.empty:launcher main class name cannot be empty: {0}
 err.launcher.module.name.empty:launcher module name cannot be empty: {0}
 err.launcher.value.format:launcher value should be of form <command>=<module>[/<main-class>]: {0}
 err.output.must.be.specified:--output must be specified
-err.modulepath.must.be.specified:--module-path is not specified and this runtime image does not contain jmods directory.
+err.modulepath.must.be.specified:--module-path is not specified and this run-time image does not contain a jmods directory
 err.mods.must.be.specified:no modules specified to {0}
 err.path.not.found=path not found: {0}
 err.path.not.valid=invalid path: {0}
@@ -157,3 +169,6 @@ warn.provider.notfound=No provider found for service specified to --suggest-prov
 no.suggested.providers=--bind-services option is specified. No additional providers suggested.
 suggested.providers.header=Suggested providers
 providers.header=Providers
+
+runtime.link.info=Linking based on the current run-time image
+runtime.link.jprt.path.extra=(run-time image)
diff --git a/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
index db01cd164bc..5997b80fa5f 100644
--- a/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,6 @@
 #include "Toolbox.h"
 #include "ErrorHandling.h"
 
-#if defined(_WIN32) && !defined(_WIN64)
-#define LAUNCH_FUNC "_JLI_Launch@56"
-#else
-#define LAUNCH_FUNC "JLI_Launch"
-#endif
-
 Jvm::Jvm() {
     LOG_TRACE(tstrings::any() << "Jvm(" << this << ")::Jvm()");
 }
@@ -206,7 +200,7 @@ void Jvm::launch() {
 
     LOG_TRACE(tstrings::any() << "JVM library: \"" << jvmPath << "\"");
 
-    DllFunction<void*> func(Dll(jvmPath), LAUNCH_FUNC);
+    DllFunction<void*> func(Dll(jvmPath), "JLI_Launch");
 
     int exitStatus = jvmLauncherStartJvm(jld.get(), func.operator void*());
 
diff --git a/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp b/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
index 5323643cddd..fe59cd94b84 100644
--- a/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
+++ b/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
@@ -339,13 +339,13 @@ void launchApp() {
 
 #ifndef JP_LAUNCHERW
 
-int __cdecl  wmain() {
+int wmain() {
     return app::launch(std::nothrow, launchApp);
 }
 
 #else
 
-int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) {
+int wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) {
     return app::wlaunch(std::nothrow, launchApp);
 }
 
diff --git a/src/jdk.jpackage/windows/native/common/MsiCA.h b/src/jdk.jpackage/windows/native/common/MsiCA.h
index 67dfde82c91..72dfa7607b0 100644
--- a/src/jdk.jpackage/windows/native/common/MsiCA.h
+++ b/src/jdk.jpackage/windows/native/common/MsiCA.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -267,7 +267,7 @@ class MsiLogTrigger {
 //
 #define JP_CA_BASE(name, ca_type) \
     static void name ## Body(ca_type&); \
-    extern "C" UINT __stdcall name(MSIHANDLE hInstall) { \
+    extern "C" UINT name(MSIHANDLE hInstall) { \
         __pragma(comment(linker, "/EXPORT:" __FUNCTION__ "=" __FUNCDNAME__)); \
         const msi::MsiLogTrigger logTrigger(hInstall); \
         JP_DEBUG_BREAK(JP_CA_DEBUG_BREAK, name); \
@@ -286,13 +286,9 @@ class MsiLogTrigger {
 #define JP_DEFERRED_CA(name) JP_CA_BASE(name, msi::DeferredCA)
 
 #define JP_CA_DECLARE(name) \
-    extern "C" UINT __stdcall name(MSIHANDLE); \
+    extern "C" UINT name(MSIHANDLE); \
     __pragma(comment(linker, "/INCLUDE:" JP_CA_MANGLED_NAME(name)))
 
-#ifdef _WIN64
-    #define JP_CA_MANGLED_NAME(name) #name
-#else
-    #define JP_CA_MANGLED_NAME(name) "_" #name "@4"
-#endif
+#define JP_CA_MANGLED_NAME(name) #name
 
 #endif // #ifndef MsiCA_h
diff --git a/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp b/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
index 405a4cbf0a9..df09aae8079 100644
--- a/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
+++ b/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ void launchApp() {
 } // namespace
 
 
-int __stdcall WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int nShowCmd) {
+int WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int nShowCmd) {
     app::wlaunch(std::nothrow, launchApp);
     return exitCode;
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
index 0ee6a926b41..bc6f6d30236 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
@@ -176,7 +176,16 @@ List<Snippet> sourceToSnippetsWithWrappers(String userSource) {
     List<Snippet> toScratchSnippets(String userSource) {
         try {
             preserveState = true;
-            return sourceToSnippets(userSource);
+            List<Snippet> result = sourceToSnippetsWithWrappers(userSource);
+            result.forEach(snippet -> {
+                if (snippet.diagnostics() == null || snippet.diagnostics().isEmpty()) {
+                    //if no better diagnostics set yet, do trial compilation, and
+                    //set diagnostic found:
+                    DiagList fullDiagnostics = state.taskFactory.analyze(snippet.outerWrap(), AnalyzeTask::getDiagnostics);
+                    snippet.setDiagnostics(fullDiagnostics);
+                }
+            });
+            return result;
         } finally {
             preserveState = false;
         }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/JShell.java b/src/jdk.jshell/share/classes/jdk/jshell/JShell.java
index ffa46cf8be4..4ca8e3830c8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/JShell.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/JShell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -678,6 +678,12 @@ public Status status(Snippet snippet) {
      * Return the diagnostics of the most recent evaluation of the snippet.
      * The evaluation can either because of an explicit {@code eval()} call or
      * an automatic update triggered by a dependency.
+     *
+     * <p>This method will return best-effort diagnostics for snippets returned
+     * from {@link SourceCodeAnalysis#sourceToSnippets(java.lang.String) }. The
+     * diagnostics returned for such snippets may differ from diagnostics provided
+     * after the snippet is {@link #eval(java.lang.String) }-ed.
+     *
      * @param snippet the {@code Snippet} to look up
      * @return the diagnostics corresponding to this snippet.  This does not
      * include unresolvedDependencies references reported in {@code unresolvedDependencies()}.
@@ -686,7 +692,7 @@ public Status status(Snippet snippet) {
      * this {@code JShell} instance.
      */
     public Stream<Diag> diagnostics(Snippet snippet) {
-        return checkValidSnippet(snippet).diagnostics().stream();
+        return checkValidSnippet(snippet, true).diagnostics().stream();
     }
 
     /**
@@ -901,10 +907,22 @@ void checkIfAlive()  throws IllegalStateException {
      * @return the input Snippet (for chained calls)
      */
     private Snippet checkValidSnippet(Snippet sn) {
+        return checkValidSnippet(sn, false);
+    }
+
+    /**
+     * Check a Snippet parameter coming from the API user
+     * @param sn the Snippet to check
+     * @param acceptUnassociated  accept snippets that are unassociated
+     * @throws NullPointerException if Snippet parameter is null
+     * @throws IllegalArgumentException if Snippet is not from this JShell
+     * @return the input Snippet (for chained calls)
+     */
+    private Snippet checkValidSnippet(Snippet sn, boolean acceptUnassociated) {
         if (sn == null) {
             throw new NullPointerException(messageFormat("jshell.exc.null"));
         } else {
-            if (sn.key().state() != this || sn.id() == Snippet.UNASSOCIATED_ID) {
+            if (sn.key().state() != this || (!acceptUnassociated && sn.id() == Snippet.UNASSOCIATED_ID)) {
                 throw new IllegalArgumentException(messageFormat("jshell.exc.alien", sn.toString()));
             }
             return sn;
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
index 99bfd870f37..0375a2ead65 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
@@ -145,7 +145,8 @@ public abstract class SourceCodeAnalysis {
      * will be {@code "*UNASSOCIATED*"}.
      * The returned snippets are not associated with the
      * {@link JShell} instance, so attempts to pass them to {@code JShell}
-     * methods will throw an {@code IllegalArgumentException}.
+     * methods will throw an {@code IllegalArgumentException}, unless otherwise
+     * noted.
      * They will not appear in queries for snippets --
      * for example, {@link JShell#snippets() }.
      * <p>
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
index 4f83786709f..a0648a0b1a6 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,12 +186,9 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *         example, if the Java Virtual Machine (JVM) lacks Flight Recorder
      *         support, or if the file repository can't be created or accessed)
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
-     *
      * @see Recording
      */
-    long newRecording() throws IllegalStateException, SecurityException;
+    long newRecording() throws IllegalStateException;
 
     /**
      * Creates a snapshot recording of all available recorded data.
@@ -207,9 +204,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *
      * @return a unique ID that can be used for reading recording data
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
-     *
      * @see Recording
      */
     public long takeSnapshot();
@@ -235,12 +229,9 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if a recording with the specified ID
      *         doesn't exist
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
-     *
      * @see Recording
      */
-    long cloneRecording(long recordingId, boolean stop) throws IllegalArgumentException, SecurityException;
+    long cloneRecording(long recordingId, boolean stop) throws IllegalArgumentException;
 
     /**
      * Starts the recording with the specified ID.
@@ -252,12 +243,9 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if a recording with the specified ID
      *         doesn't exist
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
-     *
      * @see Recording
      */
-    void startRecording(long recordingId) throws IllegalStateException, SecurityException;
+    void startRecording(long recordingId) throws IllegalStateException;
 
     /**
      * Stops the running recording with the specified ID.
@@ -270,12 +258,10 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if a recording with the specified ID
      *         doesn't exist
      * @throws IllegalStateException if the recording is not running
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see #newRecording()
      */
-    boolean stopRecording(long recordingId) throws IllegalArgumentException, IllegalStateException, SecurityException;
+    boolean stopRecording(long recordingId) throws IllegalArgumentException, IllegalStateException;
 
     /**
      * Closes the recording with the specified ID and releases any system
@@ -288,8 +274,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if a recording with the specified ID
      *         doesn't exist
      * @throws IOException if an I/O error occurs
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see #newRecording()
      */
@@ -377,9 +361,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IOException if the recording is closed, an I/O error occurs, or
      *         no data is available for the specified recording or
      *         interval
-     *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      */
     long openStream(long recordingId, Map<String, String> streamOptions) throws IOException;
 
@@ -394,8 +375,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if a stream with the specified ID doesn't
      *         exist
      * @throws IOException if an I/O error occurs while trying to close the stream
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see #openStream(long, Map)
      */
@@ -415,8 +394,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IOException if the stream is closed, or an I/O error occurred while
      *         trying to read the stream
      * @throws IllegalArgumentException if no recording with the stream ID exists
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("monitor")}
      */
     byte[] readStream(long streamId) throws IOException;
 
@@ -433,9 +410,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *
      * @throws IllegalArgumentException if no recording with the
      *         specified ID exists
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("monitor")}
-     *
      */
     Map<String, String> getRecordingOptions(long recordingId) throws IllegalArgumentException;
 
@@ -456,8 +430,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @return a map that describes the recording settings, not {@code null}
      *
      * @throws IllegalArgumentException if no recording with the specified ID exists
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("monitor")}
      */
     Map<String, String> getRecordingSettings(long recordingId) throws IllegalArgumentException;
 
@@ -470,8 +442,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *        not {@code null}
      * @throws IllegalArgumentException if no recording with the
      *         specified ID exists or if the configuration could not be parsed.
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see Configuration#getContents()
      */
@@ -485,8 +455,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *        {@code "profile"} or {@code "default"}), not {@code null}
      * @throws IllegalArgumentException if no recording with the
      *         specified ID exists
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see #getConfigurations()
      */
@@ -531,8 +499,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @param settings name value map of the settings to set, not {@code null}
      *
      * @throws IllegalArgumentException if no recording with the specified ID exists
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("control")}
      *
      * @see Recording#getId()
      */
@@ -551,10 +517,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @param options name/value map of the settings to set, not {@code null}
      *
      * @throws IllegalArgumentException if no recording with the specified ID exists
-     * @throws java.lang.SecurityException if a security manager exists, and the
-     *         caller does not have {@code ManagementPermission("control")} or an
-     *         option contains a file that the caller does not have permission to
-     *         operate on.
      * @see Recording#getId()
      */
     void setRecordingOptions(long recordingId, Map<String, String> options) throws IllegalArgumentException;
@@ -569,9 +531,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *
      * @return list of recordings, not {@code null}
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code  ManagementPermission("monitor")}
-     *
      * @see RecordingInfo
      * @see Recording
      */
@@ -587,9 +546,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *
      * @return the list of predefined configurations, not {@code null}
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("monitor")}
-     *
      * @see ConfigurationInfo
      * @see Configuration
      */
@@ -605,9 +561,6 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      *
      * @return the list of registered event types, not {@code null}
      *
-     * @throws java.lang.SecurityException if a security manager exists and the
-     *         caller does not have {@code ManagementPermission("monitor")}
-     *
      * @see EventTypeInfo
      * @see EventType
      */
@@ -635,13 +588,8 @@ public interface FlightRecorderMXBean extends PlatformManagedObject {
      * @throws IllegalStateException if the recording is not yet started or if it is
      *         already closed
      *
-     * @throws SecurityException if a security manager exists and its
-     *         {@code SecurityManager.checkWrite(java.lang.String)} method denies
-     *         write access to the named file or the caller does not have
-     *         {@code ManagmentPermission("control")}
-     *
      * @see java.nio.file.Path#toString()
      * @see Recording#dump(java.nio.file.Path)
      */
-    void copyTo(long recordingId, String outputFile) throws IOException, SecurityException;
+    void copyTo(long recordingId, String outputFile) throws IOException;
 }
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
index 72a35fd527a..e6dc9700c00 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -175,10 +175,6 @@ public void accept(Long endNanos) {
      * @throws IOException       if a stream can't be opened, an I/O error occurs
      *                           when trying to access the repository or the
      *                           {@code FlightRecorderMXBean}
-     *
-     * @throws SecurityException if a security manager exists and its
-     *                           {@code checkRead} method denies read access to the
-     *                           directory, or files in the directory.
      */
     public RemoteRecordingStream(MBeanServerConnection connection) throws IOException {
         this(connection, makeTempDirectory(), true);
@@ -200,10 +196,6 @@ public RemoteRecordingStream(MBeanServerConnection connection) throws IOExceptio
      * @throws IOException       if a stream can't be opened, an I/O error occurs
      *                           when trying to access the repository or the
      *                           {@code FlightRecorderMXBean}
-     *
-     * @throws SecurityException if a security manager exists and its
-     *                           {@code checkRead} method denies read access to the
-     *                           directory, or files in the directory.
      */
     public RemoteRecordingStream(MBeanServerConnection connection, Path directory) throws IOException {
         this(connection, directory, false);
@@ -646,9 +638,6 @@ private void ensureStartable() {
      * @throws IOException if the recording data can't be copied to the specified
      *         location, or if the stream is closed, or not started.
      *
-     * @throws SecurityException if a security manager exists and the caller doesn't
-     *         have {@code FilePermission} to write to the destination path
-     *
      * @see RemoteRecordingStream#setMaxAge(Duration)
      * @see RemoteRecordingStream#setMaxSize(long)
      *
diff --git a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index cb8b3bdf0a6..fba64846155 100644
--- a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,11 +69,6 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      * @throws UnsupportedOperationException if this operation is not supported.
      * @throws IllegalArgumentException if {@code outputFile} does not end with ".hprof" suffix.
      * @throws NullPointerException if {@code outputFile} is {@code null}.
-     * @throws SecurityException
-     *         If a security manager exists and its {@link
-     *         java.lang.SecurityManager#checkWrite(java.lang.String)}
-     *         method denies write access to the named file
-     *         or the caller does not have ManagmentPermission("control").
      */
     public void dumpHeap(String outputFile, boolean live) throws IOException;
 
@@ -113,10 +108,6 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if the new value is invalid.
      * @throws IllegalArgumentException if the VM option is not writable.
      * @throws NullPointerException if name or value is {@code null}.
-     *
-     * @throws  java.lang.SecurityException
-     *     if a security manager exists and the caller does not have
-     *     ManagementPermission("control").
      */
     public void setVMOption(String name, String value);
 
@@ -142,11 +133,6 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      * @throws IOException if the file already exists or an I/O exception is
      *         thrown writing to the file
      * @throws NullPointerException if either parameter is {@code null}
-     * @throws SecurityException
-     *         if a security manager is set and its {@link
-     *         SecurityManager#checkWrite(java.lang.String)} method denies write
-     *         access to the file or {@link java.lang.management.ManagementPermission
-     *         ManagementPermission("control")} is denied
      * @throws UnsupportedOperationException if this operation is not supported
      * @since 21
      */
diff --git a/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java b/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java
index c42c273f22f..78c39ddd8b1 100644
--- a/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -278,10 +278,6 @@ public default long getCurrentThreadAllocatedBytes() {
      * @throws UnsupportedOperationException if the Java virtual
      *         machine does not support thread memory allocation measurement.
      *
-     * @throws SecurityException if a security manager
-     *         exists and the caller does not have
-     *         ManagementPermission("control").
-     *
      * @see #isThreadAllocatedMemorySupported
      */
     public void setThreadAllocatedMemoryEnabled(boolean enable);
diff --git a/src/jdk.net/share/classes/jdk/net/NetworkPermission.java b/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
index 2a1f3465890..7aac1fb1120 100644
--- a/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
+++ b/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,10 @@
  * defined in the jdk.net package. These permissions contain a target
  * name, but no actions list. Callers either possess the permission or not.
  *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  * @see jdk.net.ExtendedSocketOptions
  *
  * @since 1.8
diff --git a/src/jdk.net/share/classes/jdk/net/Sockets.java b/src/jdk.net/share/classes/jdk/net/Sockets.java
index 3d113b562ae..cdc1236fb1d 100644
--- a/src/jdk.net/share/classes/jdk/net/Sockets.java
+++ b/src/jdk.net/share/classes/jdk/net/Sockets.java
@@ -50,11 +50,6 @@
  * The {@link #supportedOptions(Class)} method can be called to determine
  * the complete set of options available (per socket type) on the
  * current system.
- * <p>
- * When a security manager is installed, some non-standard socket options
- * may require a security permission before being set or get.
- * The details are specified in {@link ExtendedSocketOptions}. No permission
- * is required for {@link java.net.StandardSocketOptions}.
  *
  * @deprecated
  * Java SE 9 added standard methods to set/get socket options, and retrieve the per-Socket
@@ -90,9 +85,6 @@ private Sockets() {}
      *
      * @throws IOException if an I/O error occurs, or socket is closed.
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @throws NullPointerException if name is null
      *
      * @deprecated use {@link java.net.Socket#setOption(SocketOption, Object)} instead.
@@ -119,9 +111,6 @@ public static <T> void setOption(Socket s, SocketOption<T> name, T value) throws
      *
      * @throws IOException if an I/O error occurs
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @throws NullPointerException if name is null
      *
      * @deprecated use {@link java.net.Socket#getOption(SocketOption)} instead.
@@ -152,9 +141,6 @@ public static <T> T getOption(Socket s, SocketOption<T> name) throws IOException
      *
      * @throws NullPointerException if name is null
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @deprecated use {@link java.net.ServerSocket#setOption(SocketOption, Object)} instead.
      *
      * @see java.net.StandardSocketOptions
@@ -181,9 +167,6 @@ public static <T> void setOption(ServerSocket s, SocketOption<T> name, T value)
      *
      * @throws NullPointerException if name is null
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @deprecated use {@link java.net.ServerSocket#getOption(SocketOption)} instead.
      *
      * @see java.net.StandardSocketOptions
@@ -213,9 +196,6 @@ public static <T> T getOption(ServerSocket s, SocketOption<T> name) throws IOExc
      *
      * @throws NullPointerException if name is null
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @deprecated use {@link java.net.DatagramSocket#setOption(SocketOption, Object)} instead.
      *
      * @see java.net.StandardSocketOptions
@@ -243,9 +223,6 @@ public static <T> void setOption(DatagramSocket s, SocketOption<T> name, T value
      *
      * @throws NullPointerException if name is null
      *
-     * @throws SecurityException if a security manager is set and the
-     *         caller does not have any required permission.
-     *
      * @deprecated use {@link java.net.DatagramSocket#getOption(SocketOption)} instead.
      *
      * @see java.net.StandardSocketOptions
diff --git a/src/jdk.net/share/classes/jdk/nio/Channels.java b/src/jdk.net/share/classes/jdk/nio/Channels.java
index e59acdbc654..fbbbaa2b3a4 100644
--- a/src/jdk.net/share/classes/jdk/nio/Channels.java
+++ b/src/jdk.net/share/classes/jdk/nio/Channels.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,12 +129,6 @@ public interface SelectableChannelCloser {
      * close the file descriptor and to coordinate the closing when the channel
      * is registered with a {@code Selector}. </p>
      *
-     * <p> If there is a security manager set then its
-     * {@link SecurityManager#checkRead(FileDescriptor) checkRead} and
-     * {@link SecurityManager#checkWrite(FileDescriptor) checkWrite} methods
-     * are invoked to check that the caller has permission to both read from and
-     * write to the file descriptor. </p>
-     *
      * @implNote This method throws {@code UnsupportedOperationException} if
      * the default {@code SelectorProvider} is not the JDK built-in implementation.
      *
@@ -147,8 +141,6 @@ public interface SelectableChannelCloser {
      *
      * @throws IllegalArgumentException
      *         If the file descriptor is not {@link FileDescriptor#valid() valid}
-     * @throws SecurityException
-     *         If denied by the security manager
      */
     public static SelectableChannel readWriteSelectableChannel(FileDescriptor fd,
                                                                SelectableChannelCloser closer) {
diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
index 55e2afb79e9..30920864c98 100644
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
+++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -210,10 +210,6 @@ public static SctpChannel open() throws
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote peer
-     *
      * @throws  UnsupportedOperationException
      *          If the SCTP protocol is not supported
      *
@@ -280,11 +276,6 @@ public static SctpChannel open(SocketAddress remote, int maxOutStreams,
      *
      * @throws  IOException
      *          If some other I/O error occurs
-     *
-     * @throws  SecurityException
-     *          If a security manager has been installed and its
-     *          {@link SecurityManager#checkListen checkListen} method denies
-     *          the operation
      */
     public abstract SctpChannel bind(SocketAddress local)
         throws IOException;
@@ -399,11 +390,6 @@ public abstract SctpChannel unbindAddress(InetAddress address)
      * method will block until the connection is established or an I/O error
      * occurs.
      *
-     * <P> If a security manager has been installed then this method verifies
-     * that its {@link java.lang.SecurityManager#checkConnect checkConnect}
-     * method permits connecting to the address and port number of the given
-     * remote peer.
-     *
      * <p> This method may be invoked at any time. If a {@link #send send} or
      * {@link #receive receive} operation upon this channel is invoked while an
      * invocation of this method is in progress then that operation will first
@@ -444,10 +430,6 @@ public abstract SctpChannel unbindAddress(InetAddress address)
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote peer
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -509,10 +491,6 @@ public abstract SctpChannel unbindAddress(InetAddress address)
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given remote address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote peer
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
index 290838755cd..a44a5d9c142 100644
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
+++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
@@ -236,11 +236,6 @@ public abstract Set<Association> associations()
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          java.lang.SecurityManager#checkListen(int) checkListen} method
-     *          denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -273,11 +268,6 @@ public abstract SctpMultiChannel bind(SocketAddress local,
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          java.lang.SecurityManager#checkListen(int) checkListen} method
-     *          denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -567,11 +557,6 @@ public final int validOps() {
      * this method will return {@code null}. If an uncaught exception is thrown by the
      * handler it will be propagated up the stack through this method.
      *
-     * <P> If a security manager has been installed then for each new association
-     * setup this method verifies that the associations source address and port
-     * number are permitted by the security manager's {@link
-     * java.lang.SecurityManager#checkAccept(String,int) checkAccept} method.
-     *
      * <P> This method may be invoked at any time. If another thread has
      * already initiated a receive operation upon this channel, then an
      * invocation of this method will block until the first operation is
@@ -620,10 +605,6 @@ public final int validOps() {
      *          If the given handler invokes the {@code receive} method of this
      *          channel
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not permit
-     *          new associations to be accepted from the message's sender
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -669,11 +650,6 @@ public abstract <T> MessageInfo receive(ByteBuffer buffer,
      * {@link java.nio.channels.WritableByteChannel#write(java.nio.ByteBuffer)
      * write} operation.
      *
-     * <P> If a security manager has been installed then for each new association
-     * setup this method verifies that the given remote peers address and port
-     * number are permitted by the security manager's {@link
-     * java.lang.SecurityManager#checkConnect(String,int) checkConnect} method.
-     *
      * <P> This method may be invoked at any time. If another thread has already
      * initiated a send operation upon this channel, then an invocation of
      * this method will block until the first operation is complete.
@@ -708,10 +684,6 @@ public abstract <T> MessageInfo receive(ByteBuffer buffer,
      *          closing the channel and setting the current thread's
      *          interrupt status
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not permit
-     *          new associations to be setup with the messages's address
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java
index 212e111a930..27abbc71b29 100644
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java
+++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,11 +117,6 @@ public static SctpServerChannel open() throws
      * <P> The {@code SCTPChannel} returned by this method, if any, will be in
      *  blocking mode regardless of the blocking mode of this channel.
      *
-     * <P> If a security manager has been installed then for each new
-     * association this method verifies that the address and port number of the
-     * assocaitions's remote peer are permitted by the security manager's {@link
-     * java.lang.SecurityManager#checkAccept(String,int) checkAccept} method.
-     *
      * @return  The SCTP channel for the new association, or {@code null}
      *          if this channel is in non-blocking mode and no association is
      *          available to be accepted
@@ -142,10 +137,6 @@ public static SctpServerChannel open() throws
      * @throws  java.nio.channels.NotYetBoundException
      *          If this channel's socket has not yet been bound
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not permit
-     *          access to the remote peer of the new association
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -176,11 +167,6 @@ public static SctpServerChannel open() throws
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          java.lang.SecurityManager#checkListen(int) checkListen} method
-     *          denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -231,11 +217,6 @@ public final SctpServerChannel bind(SocketAddress local)
      * @throws  java.nio.channels.UnsupportedAddressTypeException
      *          If the type of the given address is not supported
      *
-     * @throws  SecurityException
-     *          If a security manager has been installed and its {@link
-     *          java.lang.SecurityManager#checkListen(int) checkListen} method
-     *          denies the operation
-     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java
index bb371333dfd..22498d60367 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java
@@ -135,9 +135,6 @@ public ConfigFile(URI uri) {
     /**
      * Refresh and reload the {@code Configuration} by re-reading all of the
      * login configurations.
-     *
-     * @throws SecurityException if the caller does not have permission
-     *                           to refresh the {@code Configuration}
      */
     @Override
     public void refresh() {
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
index 08aa59d239b..a90c1a48226 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package com.sun.security.auth.module;
 
-import java.net.SocketPermission;
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.Hashtable;
@@ -255,47 +254,6 @@
  *
  * }</pre>
  *
- * <dl>
- * <dt><b>Note:</b> </dt>
- * <dd>When a {@link SecurityManager} is active then an application
- *     that creates a {@link LoginContext} and uses a {@link LoginModule}
- *     must be granted certain permissions.
- *     <p>
- *     If the application creates a login context using an <em>installed</em>
- *     {@link Configuration} then the application must be granted the
- *     {@link AuthPermission} to create login contexts.
- *     For example, the following security policy allows an application in
- *     the user's current directory to instantiate <em>any</em> login context:
- *     <pre>
- *
- *     grant codebase "file:${user.dir}/" {
- *         permission javax.security.auth.AuthPermission "createLoginContext.*";
- *     };
- *     </pre>
- *
- *     Alternatively, if the application creates a login context using a
- *     <em>caller-specified</em> {@link Configuration} then the application
- *     must be granted the permissions required by the {@link LoginModule}.
- *     <em>This</em> module requires the following two permissions:
- *     <ul>
- *     <li> The {@link SocketPermission} to connect to an LDAP server.
- *     <li> The {@link AuthPermission} to modify the set of {@link Principal}s
- *          associated with a {@link Subject}.
- *     </ul>
- *     <p>
- *     For example, the following security policy grants an application in the
- *     user's current directory all the permissions required by this module:
- *     <pre>
- *
- *     grant codebase "file:${user.dir}/" {
- *         permission java.net.SocketPermission "*:389", "connect";
- *         permission java.net.SocketPermission "*:636", "connect";
- *         permission javax.security.auth.AuthPermission "modifyPrincipals";
- *     };
- *     </pre>
- * </dd>
- * </dl>
- *
  * @since 1.6
  */
 public class LdapLoginModule implements LoginModule {
diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
index 8daa300ea5d..eba2fbb6e3c 100644
--- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
+++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
@@ -39,10 +39,6 @@ public interface ExtendedGSSContext extends GSSContext {
     /**
      * Return the mechanism-specific attribute associated with {@code type}.
      * <p>
-     * If there is a security manager, an {@link InquireSecContextPermission}
-     * with the name {@code type.mech} must be granted. Otherwise, this could
-     * result in a {@link SecurityException}.
-     * <p>
      * Example:
      * <pre>
      *      GSSContext ctxt = m.createContext(...)
@@ -70,9 +66,6 @@ public interface ExtendedGSSContext extends GSSContext {
      *   security context is invalid,
      *   {@link GSSException#FAILURE GSSException.FAILURE} for other
      *   unspecified failures.
-     * @throws SecurityException if a security manager exists and a proper
-     *   {@link InquireSecContextPermission} is not granted.
-     * @see InquireSecContextPermission
      * @see InquireType
      */
     public Object inquireSecContext(InquireType type)
diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
index 33ac51e8d51..641edec9c38 100644
--- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
+++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
@@ -28,13 +28,14 @@
 import java.security.BasicPermission;
 
 /**
- * This class is used to protect various attributes of an established
- * GSS security context that can be accessed using the
- * {@link com.sun.security.jgss.ExtendedGSSContext#inquireSecContext}
- * method.
+ * This class is for GSS security context permissions.
  *
  * <p>The target name is the {@link InquireType} allowed.
  *
+ * @apiNote
+ * This permission cannot be used for controlling access to resources
+ * as the Security Manager is no longer supported.
+ *
  * @since 1.7
  */
 public final class InquireSecContextPermission extends BasicPermission {
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
index e47518de4a7..f9c2e991d46 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -222,6 +222,17 @@ public void filteredChanged(SelectionCoordinator coordinator) {
         }
     };
 
+    public void colorSelectedFigures(Color color) {
+        for (Figure figure : model.getSelectedFigures()) {
+            figure.setColor(color);
+            FigureWidget figureWidget = getWidget(figure);
+            if (figureWidget != null) {
+                figureWidget.refreshColor();
+            }
+        }
+        validateAll();
+    }
+
     private Point getScrollPosition() {
         return scrollPane.getViewport().getViewPosition();
     }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java
index 591bbe371a3..e8cfd2968dc 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,7 @@
 
 import com.sun.hotspot.igv.data.ChangedEvent;
 import com.sun.hotspot.igv.data.InputNode;
-import java.awt.Component;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.util.Collection;
 import javax.swing.JComponent;
 import org.openide.awt.UndoRedo;
@@ -89,4 +86,6 @@ enum InteractionMode {
     Rectangle getBounds();
 
     JComponent getView();
+
+    void colorSelectedFigures(Color color);
 }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
index 617f59a591d..e24ffa476a2 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
@@ -99,6 +99,7 @@ public EditorTopComponent(DiagramViewModel diagramViewModel) {
         };
 
         Action[] actionsWithSelection = new Action[]{
+                ColorAction.get(ColorAction.class),
                 ExtractAction.get(ExtractAction.class),
                 HideAction.get(HideAction.class),
                 null,
@@ -349,6 +350,10 @@ public void addSelectedNodes(Collection<InputNode> nodes, boolean showIfHidden)
         scene.addSelectedNodes(nodes, showIfHidden);
     }
 
+    public void colorSelectedFigures(Color color) {
+        scene.colorSelectedFigures(color);
+    }
+
     public void centerSelectedNodes() {
         scene.centerSelectedFigures();
     }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ColorAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ColorAction.java
new file mode 100644
index 00000000000..7a38587eb38
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ColorAction.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.view.actions;
+
+import com.sun.hotspot.igv.view.DiagramViewModel;
+import com.sun.hotspot.igv.view.EditorTopComponent;
+import com.sun.hotspot.igv.view.widgets.FigureWidget;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import javax.swing.*;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
+
+
+@ActionID(category = "View", id = "com.sun.hotspot.igv.view.actions.ColorAction")
+@ActionRegistration(displayName = "#CTL_ColorAction")
+@ActionReferences({
+        @ActionReference(path = "Menu/View", position = 360),
+        @ActionReference(path = "Shortcuts", name = "D-C")
+})
+@Messages({
+        "CTL_ColorAction=Color",
+        "HINT_ColorAction=Color current set of selected nodes"
+})
+public final class ColorAction extends ModelAwareAction {
+
+    @Override
+    protected String iconResource() {
+        return "com/sun/hotspot/igv/view/images/color.gif"; // NOI18N
+    }
+
+    @Override
+    protected String getDescription() {
+        return NbBundle.getMessage(ColorAction.class, "HINT_ColorAction");
+    }
+
+    @Override
+    public String getName() {
+        return NbBundle.getMessage(ColorAction.class, "CTL_ColorAction");
+    }
+
+    private static final ArrayList<Color> colors = new ArrayList<>(Arrays.asList(
+            Color.RED,
+            Color.ORANGE,
+            Color.YELLOW,
+            Color.GREEN,
+            Color.CYAN,
+            Color.BLUE,
+            Color.MAGENTA,
+            Color.PINK,
+            Color.DARK_GRAY,
+            Color.GRAY,
+            Color.LIGHT_GRAY,
+            Color.WHITE
+    ));
+
+    private static final JLabel selectedColorLabel = new JLabel("Preview");
+    private static final JColorChooser colorChooser = new JColorChooser(Color.WHITE);
+
+    public ColorAction() {
+        initializeComponents();
+    }
+
+    private void initializeComponents() {
+        selectedColorLabel.setPreferredSize(new Dimension(3 * 32, 32));
+        selectedColorLabel.setOpaque(true);
+        selectedColorLabel.setBackground(Color.WHITE);
+        selectedColorLabel.setForeground(Color.BLACK); // Set text color
+        selectedColorLabel.setHorizontalAlignment(SwingConstants.CENTER); // Center the text
+
+
+        // Add a ChangeListener to react to color selection changes
+        colorChooser.getSelectionModel().addChangeListener(e -> {
+            Color selectedColor = colorChooser.getColor();
+            if (selectedColor != null) {
+                selectedColorLabel.setBackground(selectedColor);
+                selectedColorLabel.setForeground(FigureWidget.getTextColor(selectedColor));
+            }
+        });
+
+        // Create a panel to display recent colors
+        JPanel colorsPanel = new JPanel();
+        colorsPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
+        for (Color color : colors) {
+            JButton colorButton = new JButton();
+            colorButton.setBackground(color);
+            colorButton.setOpaque(true);
+            colorButton.setBorderPainted(false);
+            colorButton.setRolloverEnabled(false);
+            colorButton.setRequestFocusEnabled(false);
+
+            colorButton.setPreferredSize(new Dimension(16, 16));
+            colorButton.addActionListener(e -> {
+                selectedColorLabel.setBackground(color);
+                selectedColorLabel.setForeground(FigureWidget.getTextColor(color));
+            });
+            colorsPanel.add(colorButton);
+        }
+        colorsPanel.add(selectedColorLabel, 0);
+        colorsPanel.revalidate();
+        colorsPanel.repaint();
+
+        // Add recent colors panel below the color chooser
+        colorChooser.setPreviewPanel(colorsPanel);
+    }
+
+    // Variables to store the dialog position
+    private Point dialogLoc = null;
+
+    public void performAction(DiagramViewModel model) {
+        EditorTopComponent editor = EditorTopComponent.getActive();
+        if (editor != null) {
+            // Create the dialog with an OK button to select the color
+            final JDialog[] dialogHolder = new JDialog[1];
+            dialogHolder[0] = JColorChooser.createDialog(
+                    null,
+                    "Choose a Color",
+                    true,
+                    colorChooser,
+                    e -> {
+                        // Save the current location
+                        dialogLoc = dialogHolder[0].getLocation();
+                        // OK button action
+                        Color selectedColor = selectedColorLabel.getBackground();
+                        if (selectedColor != null) {
+                            editor.colorSelectedFigures(selectedColor);
+                        }
+                    },
+                    null // Cancel button action
+            );
+
+            // Set the dialog's position if previously saved
+            if (dialogLoc != null) {
+                dialogHolder[0].setLocation(dialogLoc);
+            }
+            dialogHolder[0].setVisible(true);
+        }
+    }
+
+    @Override
+    public boolean isEnabled(DiagramViewModel model) {
+        return model != null && !model.getSelectedNodes().isEmpty();
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java
index 24815527a0e..24547b19b6a 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
         @ActionReference(path = "Shortcuts", name = "D-X")
 })
 @Messages({
-        "CTL_ExtractAction=Extract action",
+        "CTL_ExtractAction=Extract",
         "HINT_ExtractAction=Extract current set of selected nodes"
 })
 public final class ExtractAction extends ModelAwareAction {
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
index 7ac76fdefba..bbdf08dc8b8 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,20 @@ private void formatExtraLabel(boolean selected) {
         if (getFigure().getProperties().get("extra_label") != null) {
             LabelWidget extraLabelWidget = labelWidgets.get(labelWidgets.size() - 1);
             extraLabelWidget.setFont(Diagram.FONT.deriveFont(Font.ITALIC));
-            extraLabelWidget.setForeground(selected ? getTextColor() : Color.DARK_GRAY);
+            extraLabelWidget.setForeground(getTextColorHelper(figure.getColor(), !selected));
+        }
+    }
+
+    public static Color getTextColor(Color color) {
+        return getTextColorHelper(color, false);
+    }
+
+    private static Color getTextColorHelper(Color bg, boolean useGrey) {
+        double brightness = bg.getRed() * 0.21 + bg.getGreen() * 0.72 + bg.getBlue() * 0.07;
+        if (brightness < 150) {
+            return useGrey ? Color.LIGHT_GRAY : Color.WHITE;
+        } else {
+            return useGrey ? Color.DARK_GRAY : Color.BLACK;
         }
     }
 
@@ -113,7 +126,6 @@ public FigureWidget(final Figure f, DiagramScene scene) {
             LayoutFactory.SerialAlignment.LEFT_TOP :
             LayoutFactory.SerialAlignment.CENTER;
         middleWidget.setLayout(LayoutFactory.createVerticalFlowLayout(textAlign, 0));
-        middleWidget.setBackground(f.getColor());
         middleWidget.setOpaque(true);
         middleWidget.getActions().addAction(new DoubleClickAction(this));
         middleWidget.setCheckClipping(false);
@@ -143,13 +155,13 @@ public FigureWidget(final Figure f, DiagramScene scene) {
             textWidget.addChild(lw);
             lw.setLabel(displayString);
             lw.setFont(Diagram.FONT);
-            lw.setForeground(getTextColor());
             lw.setAlignment(LabelWidget.Alignment.CENTER);
             lw.setVerticalAlignment(LabelWidget.VerticalAlignment.CENTER);
             lw.setBorder(BorderFactory.createEmptyBorder());
             lw.setCheckClipping(false);
         }
         formatExtraLabel(false);
+        refreshColor();
 
         if (getFigure().getWarning() != null) {
             ImageWidget warningWidget = new ImageWidget(scene, warningSign);
@@ -184,6 +196,13 @@ protected Sheet createSheet() {
         this.setToolTipText(PropertiesConverter.convertToHTML(f.getProperties()));
     }
 
+    public void refreshColor() {
+        middleWidget.setBackground(figure.getColor());
+        for (LabelWidget lw : labelWidgets) {
+            lw.setForeground(getTextColor(figure.getColor()));
+        }
+    }
+
     @Override
     protected void notifyStateChanged(ObjectState previousState, ObjectState state) {
         super.notifyStateChanged(previousState, state);
@@ -222,16 +241,6 @@ public Figure getFigure() {
         return figure;
     }
 
-    private Color getTextColor() {
-        Color bg = figure.getColor();
-        double brightness = bg.getRed() * 0.21 + bg.getGreen() * 0.72 + bg.getBlue() * 0.07;
-        if (brightness < 150) {
-            return Color.WHITE;
-        } else {
-            return Color.BLACK;
-        }
-    }
-
     @Override
     protected void paintChildren() {
         Composite oldComposite = null;
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/color.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/color.gif
new file mode 100644
index 00000000000..fb95a6f2958
Binary files /dev/null and b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/color.gif differ
diff --git a/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp b/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
index 5f9a361105e..0b438572b2d 100644
--- a/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
+++ b/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,59 +23,48 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
+#include "gc/shared/fullGCForwarding.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "unittest.hpp"
 
-// Class to create a "fake" oop with a mark that will
-// return true for calls to must_be_preserved().
-class FakeOop {
-  oopDesc _oop;
-
-public:
-  FakeOop() : _oop() { _oop.set_mark(originalMark()); }
-
-  oop get_oop() { return &_oop; }
-  markWord mark() { return _oop.mark(); }
-  void set_mark(markWord m) { _oop.set_mark(m); }
-  void forward_to(oop obj) {
-    markWord m = markWord::encode_pointer_as_mark(obj);
-    _oop.set_mark(m);
-  }
-
-  static markWord originalMark() { return markWord(markWord::lock_mask_in_place); }
-  static markWord changedMark()  { return markWord(0x4711); }
-};
+static markWord originalMark() { return markWord(markWord::lock_mask_in_place); }
+static markWord changedMark()  { return markWord(0x4711); }
 
 #define ASSERT_MARK_WORD_EQ(a, b) ASSERT_EQ((a).value(), (b).value())
 
 TEST_VM(PreservedMarks, iterate_and_restore) {
   PreservedMarks pm;
-  FakeOop o1;
-  FakeOop o2;
-  FakeOop o3;
-  FakeOop o4;
+
+  HeapWord fakeheap[32] = { nullptr };
+  HeapWord* heap = align_up(fakeheap, 8 * sizeof(HeapWord));
+  FullGCForwarding::initialize(MemRegion(&heap[0], &heap[16]));
+
+  oop o1 = cast_to_oop(&heap[0]); o1->set_mark(originalMark());
+  oop o2 = cast_to_oop(&heap[2]); o2->set_mark(originalMark());
+  oop o3 = cast_to_oop(&heap[4]); o3->set_mark(originalMark());
+  oop o4 = cast_to_oop(&heap[6]); o4->set_mark(originalMark());
 
   // Make sure initial marks are correct.
-  ASSERT_MARK_WORD_EQ(o1.mark(), FakeOop::originalMark());
-  ASSERT_MARK_WORD_EQ(o2.mark(), FakeOop::originalMark());
-  ASSERT_MARK_WORD_EQ(o3.mark(), FakeOop::originalMark());
-  ASSERT_MARK_WORD_EQ(o4.mark(), FakeOop::originalMark());
+  ASSERT_MARK_WORD_EQ(o1->mark(), originalMark());
+  ASSERT_MARK_WORD_EQ(o2->mark(), originalMark());
+  ASSERT_MARK_WORD_EQ(o3->mark(), originalMark());
+  ASSERT_MARK_WORD_EQ(o4->mark(), originalMark());
 
   // Change the marks and verify change.
-  o1.set_mark(FakeOop::changedMark());
-  o2.set_mark(FakeOop::changedMark());
-  ASSERT_MARK_WORD_EQ(o1.mark(), FakeOop::changedMark());
-  ASSERT_MARK_WORD_EQ(o2.mark(), FakeOop::changedMark());
+  o1->set_mark(changedMark());
+  o2->set_mark(changedMark());
+  ASSERT_MARK_WORD_EQ(o1->mark(), changedMark());
+  ASSERT_MARK_WORD_EQ(o2->mark(), changedMark());
 
   // Push o1 and o2 to have their marks preserved.
-  pm.push_if_necessary(o1.get_oop(), o1.mark());
-  pm.push_if_necessary(o2.get_oop(), o2.mark());
+  pm.push_if_necessary(o1, o1->mark());
+  pm.push_if_necessary(o2, o2->mark());
 
   // Fake a move from o1->o3 and o2->o4.
-  o1.forward_to(o3.get_oop());
-  o2.forward_to(o4.get_oop());
-  ASSERT_EQ(o1.get_oop()->forwardee(), o3.get_oop());
-  ASSERT_EQ(o2.get_oop()->forwardee(), o4.get_oop());
+  FullGCForwarding::forward_to(o1, o3);
+  FullGCForwarding::forward_to(o2, o4);
+  ASSERT_EQ(FullGCForwarding::forwardee(o1), o3);
+  ASSERT_EQ(FullGCForwarding::forwardee(o2), o4);
   // Adjust will update the PreservedMarks stack to
   // make sure the mark is updated at the new location.
   pm.adjust_during_full_gc();
@@ -83,6 +72,6 @@ TEST_VM(PreservedMarks, iterate_and_restore) {
   // Restore all preserved and verify that the changed
   // mark is now present at o3 and o4.
   pm.restore();
-  ASSERT_MARK_WORD_EQ(o3.mark(), FakeOop::changedMark());
-  ASSERT_MARK_WORD_EQ(o4.mark(), FakeOop::changedMark());
+  ASSERT_MARK_WORD_EQ(o3->mark(), changedMark());
+  ASSERT_MARK_WORD_EQ(o4->mark(), changedMark());
 }
diff --git a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp
index f1a3ac0141a..8a5aabf6cec 100644
--- a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp
+++ b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp
@@ -37,10 +37,14 @@ using metaspace::chunklevel_t;
 using namespace metaspace::chunklevel;
 
 class MetaspaceGtestContext : public metaspace::MetaspaceTestContext {
+  int _num_arenas_created;
 public:
   MetaspaceGtestContext(size_t commit_limit = 0, size_t reserve_limit = 0) :
-    metaspace::MetaspaceTestContext("gtest-metaspace-context", commit_limit, reserve_limit)
-  {}
+    metaspace::MetaspaceTestContext("gtest-metaspace-context", commit_limit, reserve_limit),
+    _num_arenas_created(0) {}
+
+  int num_arenas_created() const { return _num_arenas_created; }
+  void inc_num_arenas_created() { _num_arenas_created ++; }
 };
 
 class ChunkGtestContext : public MetaspaceGtestContext {
diff --git a/test/hotspot/gtest/metaspace/test_binlist.cpp b/test/hotspot/gtest/metaspace/test_binlist.cpp
index dd26d858e24..df12b40c30f 100644
--- a/test/hotspot/gtest/metaspace/test_binlist.cpp
+++ b/test/hotspot/gtest/metaspace/test_binlist.cpp
@@ -26,12 +26,14 @@
 #include "precompiled.hpp"
 #include "memory/metaspace/binList.hpp"
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 //#define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 
 using metaspace::BinList32;
 using metaspace::BinListImpl;
 using metaspace::MemRangeCounter;
+using metaspace::MetaBlock;
 
 #define CHECK_BL_CONTENT(bl, expected_num, expected_size) { \
   EXPECT_EQ(bl.count(), (unsigned)expected_num); \
@@ -43,6 +45,19 @@ using metaspace::MemRangeCounter;
   } \
 }
 
+template <int num_lists>
+struct TestedBinList : public BinListImpl<num_lists> {
+  typedef BinListImpl<num_lists> ListType;
+  void add_block(MetaWord* p, size_t word_size) {
+    ListType::add_block(MetaBlock(p, word_size));
+  }
+  MetaWord* remove_block(size_t requested_size, size_t* real_size) {
+    MetaBlock result = ListType::remove_block(requested_size);
+    (*real_size) = result.word_size();
+    return result.base();
+  }
+};
+
 template <class BINLISTTYPE>
 struct BinListBasicTest {
 
@@ -206,14 +221,14 @@ struct BinListBasicTest {
 
 template <typename BINLISTTYPE> const size_t BinListBasicTest<BINLISTTYPE>::maxws = BINLISTTYPE::MaxWordSize;
 
-TEST_VM(metaspace, BinList_basic_1)     { BinListBasicTest< BinListImpl<1> >::basic_test(); }
-TEST_VM(metaspace, BinList_basic_8)     { BinListBasicTest< BinListImpl<8> >::basic_test(); }
-TEST_VM(metaspace, BinList_basic_32)    { BinListBasicTest<BinList32>::basic_test(); }
+TEST_VM(metaspace, BinList_basic_1)     { BinListBasicTest< TestedBinList<1> >::basic_test(); }
+TEST_VM(metaspace, BinList_basic_8)     { BinListBasicTest< TestedBinList<8> >::basic_test(); }
+TEST_VM(metaspace, BinList_basic_32)    { BinListBasicTest< TestedBinList<32> >::basic_test(); }
 
-TEST_VM(metaspace, BinList_basic_2_1)     { BinListBasicTest< BinListImpl<1> >::basic_test_2(); }
-TEST_VM(metaspace, BinList_basic_2_8)     { BinListBasicTest< BinListImpl<8> >::basic_test_2(); }
-TEST_VM(metaspace, BinList_basic_2_32)    { BinListBasicTest<BinList32>::basic_test_2(); }
+TEST_VM(metaspace, BinList_basic_2_1)     { BinListBasicTest< TestedBinList<1> >::basic_test_2(); }
+TEST_VM(metaspace, BinList_basic_2_8)     { BinListBasicTest< TestedBinList<8> >::basic_test_2(); }
+TEST_VM(metaspace, BinList_basic_2_32)    { BinListBasicTest< TestedBinList<32> >::basic_test_2(); }
 
-TEST_VM(metaspace, BinList_basic_rand_1)     { BinListBasicTest< BinListImpl<1> >::random_test(); }
-TEST_VM(metaspace, BinList_basic_rand_8)     { BinListBasicTest< BinListImpl<8> >::random_test(); }
-TEST_VM(metaspace, BinList_basic_rand_32)    { BinListBasicTest<BinList32>::random_test(); }
+TEST_VM(metaspace, BinList_basic_rand_1)     { BinListBasicTest< TestedBinList<1> >::random_test(); }
+TEST_VM(metaspace, BinList_basic_rand_8)     { BinListBasicTest< TestedBinList<8> >::random_test(); }
+TEST_VM(metaspace, BinList_basic_rand_32)    { BinListBasicTest< TestedBinList<32> >::random_test(); }
diff --git a/test/hotspot/gtest/metaspace/test_blocktree.cpp b/test/hotspot/gtest/metaspace/test_blocktree.cpp
index 50ec021ec11..05a3025f529 100644
--- a/test/hotspot/gtest/metaspace/test_blocktree.cpp
+++ b/test/hotspot/gtest/metaspace/test_blocktree.cpp
@@ -26,16 +26,29 @@
 #include "precompiled.hpp"
 #include "memory/metaspace/blockTree.hpp"
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "memory/resourceArea.hpp"
 // #define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 
 using metaspace::BlockTree;
 using metaspace::MemRangeCounter;
+using metaspace::MetaBlock;
+
+struct TestedBlockTree : public BlockTree {
+  void add_block(MetaWord* p, size_t word_size) {
+    BlockTree::add_block(MetaBlock(p, word_size));
+  }
+  MetaWord* remove_block(size_t requested_size, size_t* real_size) {
+    MetaBlock result = BlockTree::remove_block(requested_size);
+    (*real_size) = result.word_size();
+    return result.base();
+  }
+};
 
 // Small helper. Given a 0-terminated array of sizes, a feeder buffer and a tree,
 //  add blocks of these sizes to the tree in the order they appear in the array.
-static void create_nodes(const size_t sizes[], FeederBuffer& fb, BlockTree& bt) {
+static void create_nodes(const size_t sizes[], FeederBuffer& fb, TestedBlockTree& bt) {
   for (int i = 0; sizes[i] > 0; i ++) {
     size_t s = sizes[i];
     MetaWord* p = fb.get(s);
@@ -55,7 +68,7 @@ static void create_nodes(const size_t sizes[], FeederBuffer& fb, BlockTree& bt)
 
 TEST_VM(metaspace, BlockTree_basic) {
 
-  BlockTree bt;
+  TestedBlockTree bt;
   CHECK_BT_CONTENT(bt, 0, 0);
 
   size_t real_size = 0;
@@ -112,7 +125,7 @@ static size_t helper_find_nearest_fit(const size_t sizes[], size_t request_size)
 // for a request size and check that it is the expected result.
 static void test_find_nearest_fit_with_tree(const size_t sizes[], size_t request_size) {
 
-  BlockTree bt;
+  TestedBlockTree bt;
   FeederBuffer fb(4 * K);
 
   create_nodes(sizes, fb, bt);
@@ -155,7 +168,7 @@ TEST_VM(metaspace, BlockTree_find_nearest_fit) {
     0 // stop
   };
 
-  BlockTree bt;
+  TestedBlockTree bt;
   FeederBuffer fb(4 * K);
 
   create_nodes(sizes, fb, bt);
@@ -170,7 +183,7 @@ TEST_VM(metaspace, BlockTree_find_nearest_fit) {
 // should exercise the list-part of the tree.
 TEST_VM(metaspace, BlockTree_basic_siblings)
 {
-  BlockTree bt;
+  TestedBlockTree bt;
   FeederBuffer fb(4 * K);
 
   CHECK_BT_CONTENT(bt, 0, 0);
@@ -204,7 +217,7 @@ TEST_VM(metaspace, BlockTree_print_test) {
     0 // stop
   };
 
-  BlockTree bt;
+  TestedBlockTree bt;
   FeederBuffer fb(4 * K);
 
   create_nodes(sizes, fb, bt);
@@ -222,7 +235,7 @@ TEST_VM_ASSERT_MSG(metaspace, BlockTree_overwriter_test, ".*failed: Invalid node
   static const size_t sizes1[] = { 30, 17, 0 };
   static const size_t sizes2[] = { 12, 12, 0 };
 
-  BlockTree bt;
+  TestedBlockTree bt;
   FeederBuffer fb(4 * K);
 
   // some nodes...
@@ -249,7 +262,7 @@ class BlockTreeTest {
 
   FeederBuffer _fb;
 
-  BlockTree _bt[2];
+  TestedBlockTree _bt[2];
   MemRangeCounter _cnt[2];
 
   RandSizeGenerator _rgen;
@@ -356,7 +369,7 @@ class BlockTreeTest {
   void drain_all() {
 
     for (int which = 0; which < 2; which++) {
-      BlockTree* bt = _bt + which;
+      TestedBlockTree* bt = _bt + which;
       size_t last_size = 0;
       while (!bt->is_empty()) {
 
diff --git a/test/hotspot/gtest/metaspace/test_clms.cpp b/test/hotspot/gtest/metaspace/test_clms.cpp
new file mode 100644
index 00000000000..efe83c415e0
--- /dev/null
+++ b/test/hotspot/gtest/metaspace/test_clms.cpp
@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 2024 Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/classLoaderMetaspace.hpp"
+#include "memory/metaspace/freeBlocks.hpp"
+#include "memory/metaspace/metablock.inline.hpp"
+#include "memory/metaspace/metaspaceArena.hpp"
+#include "memory/metaspace/metaspaceSettings.hpp"
+#include "memory/metaspace/metaspaceStatistics.hpp"
+#include "memory/metaspace.hpp"
+#include "oops/klass.hpp"
+#include "runtime/mutex.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/align.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+#ifdef _LP64
+
+#define LOG_PLEASE
+#include "metaspaceGtestCommon.hpp"
+#include "metaspaceGtestContexts.hpp"
+#include "metaspaceGtestRangeHelpers.hpp"
+#include "metaspaceGtestSparseArray.hpp"
+
+#define HANDLE_FAILURE \
+  if (testing::Test::HasFailure()) { \
+    return; \
+  }
+
+namespace metaspace {
+
+class ClmsTester {
+
+  Mutex _lock;
+  MetaspaceContext* _class_context;
+  MetaspaceContext* _nonclass_context;
+  ClassLoaderMetaspace* _clms;
+  const size_t _klass_arena_alignment_words;
+  unsigned _num_allocations;
+
+  struct Deltas {
+    int num_chunks_delta;
+    ssize_t used_words_delta;
+    int num_freeblocks_delta;
+    ssize_t freeblocks_words_delta;
+  };
+
+  Deltas calc_deltas(const ArenaStats& before, const ArenaStats& after) {
+    Deltas d;
+    d.num_chunks_delta = after.totals()._num - before.totals()._num;
+    d.used_words_delta = after.totals()._used_words - before.totals()._used_words;
+    d.num_freeblocks_delta = (int)after._free_blocks_num - (int)before._free_blocks_num;
+    d.freeblocks_words_delta = after._free_blocks_word_size - before._free_blocks_word_size;
+    return d;
+  }
+
+public:
+
+  ClmsTester(size_t klass_alignment_words, Metaspace::MetaspaceType space_type,
+             MetaspaceContext* class_context, MetaspaceContext* nonclass_context)
+  : _lock(Monitor::nosafepoint, "CLMSTest_lock"),
+    _class_context(class_context), _nonclass_context(nonclass_context),
+    _clms(nullptr), _klass_arena_alignment_words(klass_alignment_words), _num_allocations(0) {
+    _clms = new ClassLoaderMetaspace(&_lock, space_type, nonclass_context, class_context, klass_alignment_words);
+  }
+
+  ~ClmsTester() {
+    delete _clms;
+    EXPECT_EQ(_class_context->used_words(), (size_t)0);
+    EXPECT_EQ(_nonclass_context->used_words(), (size_t)0);
+  }
+
+  MetaBlock allocate_and_check(size_t word_size, bool is_class) {
+
+    // take stats before allocation
+    ClmsStats stats_before;
+    _clms->add_to_statistics(&stats_before);
+
+    // allocate
+    MetaWord* p = _clms->allocate(word_size, is_class ? Metaspace::ClassType : Metaspace::NonClassType);
+    _num_allocations ++;
+
+    // take stats after allocation
+    ClmsStats stats_after;
+    _clms->add_to_statistics(&stats_after);
+
+    // for less verbose testing:
+    const ArenaStats& ca_before = stats_before._arena_stats_class;
+    const ArenaStats& ca_after = stats_after._arena_stats_class;
+    const ArenaStats& nca_before = stats_before._arena_stats_nonclass;
+    const ArenaStats& nca_after = stats_after._arena_stats_nonclass;
+
+    // deltas
+    const Deltas d_ca = calc_deltas(ca_before, ca_after);
+    const Deltas d_nca = calc_deltas(nca_before, nca_after);
+
+#define EXPECT_FREEBLOCKS_UNCHANGED(arena_prefix) \
+    EXPECT_EQ(d_##arena_prefix.num_freeblocks_delta, 0);  \
+    EXPECT_EQ(d_##arena_prefix.freeblocks_words_delta, (ssize_t)0);
+
+#define EXPECT_ARENA_UNCHANGED(arena_prefix) \
+    EXPECT_EQ(d_##arena_prefix.num_chunks_delta, 0);  \
+    EXPECT_EQ(d_##arena_prefix.used_words_delta, (ssize_t)0);
+
+    if (p != nullptr) {
+
+      MetaBlock bl(p, word_size);
+
+      if (is_class) {
+
+        EXPECT_TRUE(bl.is_aligned_base(_klass_arena_alignment_words));
+
+        if (_num_allocations == 1) {
+          // first allocation: nonclass arena unchanged, class arena grows by 1 chunk and wordsize,
+          // class arena freeblocks unchanged
+          EXPECT_ARENA_UNCHANGED(nca);
+          EXPECT_FREEBLOCKS_UNCHANGED(nca);
+          EXPECT_EQ(d_ca.num_chunks_delta, 1);
+          EXPECT_EQ((size_t)d_ca.used_words_delta, word_size);
+          EXPECT_FREEBLOCKS_UNCHANGED(ca);
+          return bl;
+        }
+
+        // Had this been taken from class arena freeblocks?
+        if (d_ca.num_freeblocks_delta == -1) {
+          // the class arena freeblocks should have gone down, and the non-class arena freeblocks may have gone
+          // up in case the block was larger than required
+          const size_t wordsize_block_taken = (size_t)(-d_ca.freeblocks_words_delta);
+          EXPECT_GE(wordsize_block_taken, word_size); // the block we took must be at least allocation size
+          const size_t expected_freeblock_remainder = wordsize_block_taken - word_size;
+          if (expected_freeblock_remainder > 0) {
+            // the remainder, if it existed, should have been added to nonclass freeblocks
+            EXPECT_EQ(d_nca.num_freeblocks_delta, 1);
+            EXPECT_EQ((size_t)d_nca.freeblocks_words_delta, expected_freeblock_remainder);
+          }
+          // finally, nothing should have happened in the arenas proper.
+          EXPECT_ARENA_UNCHANGED(ca);
+          EXPECT_ARENA_UNCHANGED(nca);
+          return bl;
+        }
+
+        // block was taken from class arena proper
+
+        // We expect allocation waste due to alignment, should have been added to the freeblocks
+        // of nonclass arena. Allocation waste can be 0. If no chunk turnover happened, it must be
+        // smaller than klass alignment, otherwise it can get as large as a commit granule.
+        const size_t max_expected_allocation_waste =
+            d_ca.num_chunks_delta == 0 ? (_klass_arena_alignment_words - 1) : Settings::commit_granule_words();
+        EXPECT_GE(d_ca.num_chunks_delta, 0);
+        EXPECT_LE(d_ca.num_chunks_delta, 1);
+        EXPECT_GE((size_t)d_ca.used_words_delta, word_size);
+        EXPECT_LE((size_t)d_ca.used_words_delta, word_size + max_expected_allocation_waste);
+        EXPECT_FREEBLOCKS_UNCHANGED(ca);
+        EXPECT_ARENA_UNCHANGED(nca);
+        if (max_expected_allocation_waste > 0) {
+          EXPECT_GE(d_nca.num_freeblocks_delta, 0);
+          EXPECT_LE(d_nca.num_freeblocks_delta, 1);
+          EXPECT_GE(d_nca.freeblocks_words_delta, 0);
+          EXPECT_LE((size_t)d_nca.freeblocks_words_delta, max_expected_allocation_waste);
+        } else {
+          EXPECT_FREEBLOCKS_UNCHANGED(nca);
+        }
+        return bl;
+        // end: is_class
+      } else {
+        // Nonclass arena allocation.
+        // Allocation waste can happen:
+        // - if we allocate from nonclass freeblocks, the block remainder
+        // - if we allocate from arena proper, by chunk turnover
+
+        if (d_nca.freeblocks_words_delta < 0) {
+          // We allocated a block from the nonclass arena freeblocks.
+          const size_t wordsize_block_taken = (size_t)(-d_nca.freeblocks_words_delta);
+          EXPECT_EQ(wordsize_block_taken, word_size);
+          // The number of blocks may or may not have decreased (depending on whether there
+          // was a wastage block)
+          EXPECT_GE(d_nca.num_chunks_delta, -1);
+          EXPECT_LE(d_nca.num_chunks_delta, 0);
+          EXPECT_ARENA_UNCHANGED(nca);
+          EXPECT_ARENA_UNCHANGED(ca);
+          EXPECT_FREEBLOCKS_UNCHANGED(ca);
+          return bl;
+        }
+
+        // We don't expect alignment waste. Only wastage happens at chunk turnover.
+        const size_t max_expected_allocation_waste =
+            d_nca.num_chunks_delta == 0 ? 0 : Settings::commit_granule_words();
+        EXPECT_ARENA_UNCHANGED(ca);
+        EXPECT_FREEBLOCKS_UNCHANGED(ca);
+        EXPECT_GE(d_nca.num_chunks_delta, 0);
+        EXPECT_LE(d_nca.num_chunks_delta, 1);
+        EXPECT_GE((size_t)d_nca.used_words_delta, word_size);
+        EXPECT_LE((size_t)d_nca.used_words_delta, word_size + max_expected_allocation_waste);
+        if (max_expected_allocation_waste == 0) {
+          EXPECT_FREEBLOCKS_UNCHANGED(nca);
+        }
+      }
+      return bl;
+
+    } // end: allocation successful
+
+    // allocation failed.
+    EXPECT_ARENA_UNCHANGED(ca);
+    EXPECT_FREEBLOCKS_UNCHANGED(ca);
+    EXPECT_ARENA_UNCHANGED(nca);
+    EXPECT_FREEBLOCKS_UNCHANGED(nca);
+
+    return MetaBlock();
+  }
+
+  MetaBlock allocate_expect_success(size_t word_size, bool is_class) {
+    MetaBlock bl = allocate_and_check(word_size, is_class);
+    EXPECT_TRUE(bl.is_nonempty());
+    return bl;
+  }
+
+  MetaBlock allocate_expect_failure(size_t word_size, bool is_class) {
+    MetaBlock bl = allocate_and_check(word_size, is_class);
+    EXPECT_TRUE(bl.is_empty());
+    return bl;
+  }
+
+  void deallocate_and_check(MetaBlock bl) {
+
+    // take stats before deallocation
+    ClmsStats stats_before;
+    _clms->add_to_statistics(&stats_before);
+
+    // allocate
+    _clms->deallocate(bl.base(), bl.word_size());
+
+    // take stats after deallocation
+    ClmsStats stats_after;
+    _clms->add_to_statistics(&stats_after);
+
+    // for less verbose testing:
+    const ArenaStats& ca_before = stats_before._arena_stats_class;
+    const ArenaStats& ca_after = stats_after._arena_stats_class;
+    const ArenaStats& nca_before = stats_before._arena_stats_nonclass;
+    const ArenaStats& nca_after = stats_after._arena_stats_nonclass;
+
+    // deltas
+    // deltas
+    const Deltas d_ca = calc_deltas(ca_before, ca_after);
+    const Deltas d_nca = calc_deltas(nca_before, nca_after);
+
+    EXPECT_ARENA_UNCHANGED(ca);
+    EXPECT_ARENA_UNCHANGED(nca);
+    // Depending on whether the returned block was suitable for Klass,
+    // it may have gone to either the non-class freelist or the class freelist
+    if (d_ca.num_freeblocks_delta == 1) {
+      EXPECT_EQ(d_ca.num_freeblocks_delta, 1);
+      EXPECT_EQ((size_t)d_ca.freeblocks_words_delta, bl.word_size());
+      EXPECT_FREEBLOCKS_UNCHANGED(nca);
+    } else {
+      EXPECT_EQ(d_nca.num_freeblocks_delta, 1);
+      EXPECT_EQ((size_t)d_nca.freeblocks_words_delta, bl.word_size());
+      EXPECT_FREEBLOCKS_UNCHANGED(ca);
+    }
+  }
+};
+
+static constexpr size_t klass_size = sizeof(Klass) / BytesPerWord;
+
+static void basic_test(size_t klass_arena_alignment) {
+  MetaspaceGtestContext class_context, nonclass_context;
+  {
+    ClmsTester tester(klass_arena_alignment, Metaspace::StandardMetaspaceType, class_context.context(), nonclass_context.context());
+
+    MetaBlock bl1 = tester.allocate_expect_success(klass_size, true);
+    HANDLE_FAILURE;
+
+    MetaBlock bl2 = tester.allocate_expect_success(klass_size, true);
+    HANDLE_FAILURE;
+
+    tester.deallocate_and_check(bl1);
+    HANDLE_FAILURE;
+
+    MetaBlock bl3 = tester.allocate_expect_success(klass_size, true);
+    HANDLE_FAILURE;
+
+    MetaBlock bl4 = tester.allocate_expect_success(Metaspace::min_allocation_word_size, false);
+    HANDLE_FAILURE;
+
+    MetaBlock bl5 = tester.allocate_expect_success(K, false);
+    HANDLE_FAILURE;
+
+    tester.deallocate_and_check(bl5);
+    HANDLE_FAILURE;
+
+    MetaBlock bl6 = tester.allocate_expect_success(K, false);
+    HANDLE_FAILURE;
+
+    EXPECT_EQ(bl5, bl6); // should have gotten the same block back from freelist
+  }
+  EXPECT_EQ(class_context.used_words(), (size_t)0);
+  EXPECT_EQ(nonclass_context.used_words(), (size_t)0);
+  // we should have used exactly one commit granule (64K), not more, for each context
+  EXPECT_EQ(class_context.committed_words(), Settings::commit_granule_words());
+  EXPECT_EQ(nonclass_context.committed_words(), Settings::commit_granule_words());
+}
+
+#define TEST_BASIC_N(n)               \
+TEST_VM(metaspace, CLMS_basics_##n) { \
+  basic_test(n);            \
+}
+
+TEST_BASIC_N(1)
+TEST_BASIC_N(4)
+TEST_BASIC_N(16)
+TEST_BASIC_N(32)
+TEST_BASIC_N(128)
+
+static void test_random(size_t klass_arena_alignment) {
+  MetaspaceGtestContext class_context, nonclass_context;
+  constexpr int max_allocations = 1024;
+  const SizeRange nonclass_alloc_range(Metaspace::min_allocation_alignment_words, 1024);
+  const SizeRange class_alloc_range(klass_size, 1024);
+  const IntRange one_out_of_ten(0, 10);
+  for (int runs = 9; runs >= 0; runs--) {
+    {
+      ClmsTester tester(64, Metaspace::StandardMetaspaceType, class_context.context(), nonclass_context.context());
+      struct LifeBlock {
+        MetaBlock bl;
+        bool is_class;
+      };
+      LifeBlock life_allocations[max_allocations];
+      for (int i = 0; i < max_allocations; i++) {
+        life_allocations[i].bl.reset();
+      }
+
+      unsigned num_class_allocs = 0, num_nonclass_allocs = 0, num_class_deallocs = 0, num_nonclass_deallocs = 0;
+      for (int i = 0; i < 5000; i ++) {
+        const int slot = IntRange(0, max_allocations).random_value();
+        if (life_allocations[slot].bl.is_empty()) {
+          const bool is_class = one_out_of_ten.random_value() == 0;
+          const size_t word_size =
+              is_class ? class_alloc_range.random_value() : nonclass_alloc_range.random_value();
+          MetaBlock bl = tester.allocate_expect_success(word_size, is_class);
+          HANDLE_FAILURE;
+          life_allocations[slot].bl = bl;
+          life_allocations[slot].is_class = is_class;
+          if (is_class) {
+            num_class_allocs ++;
+          } else {
+            num_nonclass_allocs ++;
+          }
+        } else {
+          tester.deallocate_and_check(life_allocations[slot].bl);
+          HANDLE_FAILURE;
+          life_allocations[slot].bl.reset();
+          if (life_allocations[slot].is_class) {
+            num_class_deallocs ++;
+          } else {
+            num_nonclass_deallocs ++;
+          }
+        }
+      }
+      LOG("num class allocs: %u, num nonclass allocs: %u, num class deallocs: %u, num nonclass deallocs: %u",
+          num_class_allocs, num_nonclass_allocs, num_class_deallocs, num_nonclass_deallocs);
+    }
+    EXPECT_EQ(class_context.used_words(), (size_t)0);
+    EXPECT_EQ(nonclass_context.used_words(), (size_t)0);
+    constexpr float fragmentation_factor = 3.0f;
+    const size_t max_expected_nonclass_committed = max_allocations * nonclass_alloc_range.highest() * fragmentation_factor;
+    const size_t max_expected_class_committed = max_allocations * class_alloc_range.highest() * fragmentation_factor;
+    // we should have used exactly one commit granule (64K), not more, for each context
+    EXPECT_LT(class_context.committed_words(), max_expected_class_committed);
+    EXPECT_LT(nonclass_context.committed_words(), max_expected_nonclass_committed);
+  }
+}
+
+#define TEST_RANDOM_N(n)               \
+TEST_VM(metaspace, CLMS_random_##n) {  \
+  test_random(n);                      \
+}
+
+TEST_RANDOM_N(1)
+TEST_RANDOM_N(4)
+TEST_RANDOM_N(16)
+TEST_RANDOM_N(32)
+TEST_RANDOM_N(128)
+
+} // namespace metaspace
+
+#endif // _LP64
diff --git a/test/hotspot/gtest/metaspace/test_freeblocks.cpp b/test/hotspot/gtest/metaspace/test_freeblocks.cpp
index fbf2e822c11..239729bc696 100644
--- a/test/hotspot/gtest/metaspace/test_freeblocks.cpp
+++ b/test/hotspot/gtest/metaspace/test_freeblocks.cpp
@@ -26,10 +26,13 @@
 #include "precompiled.hpp"
 #include "memory/metaspace/counters.hpp"
 #include "memory/metaspace/freeBlocks.hpp"
+#include "memory/metaspace/metablock.hpp"
+
 //#define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 
 using metaspace::FreeBlocks;
+using metaspace::MetaBlock;
 using metaspace::SizeCounter;
 
 #define CHECK_CONTENT(fb, num_blocks_expected, word_size_expected) \
@@ -43,199 +46,21 @@ using metaspace::SizeCounter;
   EXPECT_EQ(fb.count(), (int)num_blocks_expected); \
 }
 
-class FreeBlocksTest {
-
-  FeederBuffer _fb;
-  FreeBlocks _freeblocks;
-
-  // random generator for block feeding
-  RandSizeGenerator _rgen_feeding;
-
-  // random generator for allocations (and, hence, deallocations)
-  RandSizeGenerator _rgen_allocations;
-
-  SizeCounter _allocated_words;
-
-  struct allocation_t {
-    allocation_t* next;
-    size_t word_size;
-    MetaWord* p;
-  };
-
-  // Array of the same size as the pool max capacity; holds the allocated elements.
-  allocation_t* _allocations;
-
-  int _num_allocs;
-  int _num_deallocs;
-  int _num_feeds;
-
-  bool feed_some() {
-    size_t word_size = _rgen_feeding.get();
-    MetaWord* p = _fb.get(word_size);
-    if (p != nullptr) {
-      _freeblocks.add_block(p, word_size);
-      return true;
-    }
-    return false;
-  }
-
-  bool deallocate_top() {
-
-    allocation_t* a = _allocations;
-    if (a != nullptr) {
-      _allocations = a->next;
-      check_marked_range(a->p, a->word_size);
-      _freeblocks.add_block(a->p, a->word_size);
-      delete a;
-      DEBUG_ONLY(_freeblocks.verify();)
-      return true;
-    }
-    return false;
-  }
-
-  void deallocate_all() {
-    while (deallocate_top());
-  }
-
-  bool allocate() {
-
-    size_t word_size = MAX2(_rgen_allocations.get(), _freeblocks.MinWordSize);
-    MetaWord* p = _freeblocks.remove_block(word_size);
-    if (p != nullptr) {
-      _allocated_words.increment_by(word_size);
-      allocation_t* a = new allocation_t;
-      a->p = p; a->word_size = word_size;
-      a->next = _allocations;
-      _allocations = a;
-      DEBUG_ONLY(_freeblocks.verify();)
-      mark_range(p, word_size);
-      return true;
-    }
-    return false;
-  }
-
-  void test_all_marked_ranges() {
-    for (allocation_t* a = _allocations; a != nullptr; a = a->next) {
-      check_marked_range(a->p, a->word_size);
-    }
-  }
-
-  void test_loop() {
-    // We loop and in each iteration execute one of three operations:
-    // - allocation from fbl
-    // - deallocation to fbl of a previously allocated block
-    // - feeding a new larger block into the fbl (mimicks chunk retiring)
-    // When we have fed all large blocks into the fbl (feedbuffer empty), we
-    //  switch to draining the fbl completely (only allocs)
-    bool forcefeed = false;
-    bool draining = false;
-    bool stop = false;
-    int iter = 25000; // safety stop
-    while (!stop && iter > 0) {
-      iter --;
-      int surprise = (int)os::random() % 10;
-      if (!draining && (surprise >= 7 || forcefeed)) {
-        forcefeed = false;
-        if (feed_some()) {
-          _num_feeds++;
-        } else {
-          // We fed all input memory into the fbl. Now lets proceed until the fbl is drained.
-          draining = true;
-        }
-      } else if (!draining && surprise < 1) {
-        deallocate_top();
-        _num_deallocs++;
-      } else {
-        if (allocate()) {
-          _num_allocs++;
-        } else {
-          if (draining) {
-            stop = _freeblocks.total_size() < 512;
-          } else {
-            forcefeed = true;
-          }
-        }
-      }
-      if ((iter % 1000) == 0) {
-        DEBUG_ONLY(_freeblocks.verify();)
-        test_all_marked_ranges();
-        LOG("a %d (" SIZE_FORMAT "), d %d, f %d", _num_allocs, _allocated_words.get(), _num_deallocs, _num_feeds);
-#ifdef LOG_PLEASE
-        _freeblocks.print(tty, true);
-        tty->cr();
-#endif
-      }
-    }
-
-    // Drain
-
-  }
-
-public:
-
-  FreeBlocksTest(size_t avg_alloc_size) :
-    _fb(512 * K), _freeblocks(),
-    _rgen_feeding(128, 4096),
-    _rgen_allocations(avg_alloc_size / 4, avg_alloc_size * 2, 0.01f, avg_alloc_size / 3, avg_alloc_size * 30),
-    _allocations(nullptr),
-    _num_allocs(0),
-    _num_deallocs(0),
-    _num_feeds(0)
-  {
-    CHECK_CONTENT(_freeblocks, 0, 0);
-    // some initial feeding
-    _freeblocks.add_block(_fb.get(1024), 1024);
-    CHECK_CONTENT(_freeblocks, 1, 1024);
-  }
-
-  ~FreeBlocksTest() {
-    deallocate_all();
-  }
-
-  static void test_small_allocations() {
-    FreeBlocksTest test(10);
-    test.test_loop();
-  }
-
-  static void test_medium_allocations() {
-    FreeBlocksTest test(30);
-    test.test_loop();
-  }
-
-  static void test_large_allocations() {
-    FreeBlocksTest test(150);
-    test.test_loop();
-  }
-
-};
-
 TEST_VM(metaspace, freeblocks_basics) {
 
   FreeBlocks fbl;
   MetaWord tmp[1024];
   CHECK_CONTENT(fbl, 0, 0);
 
-  fbl.add_block(tmp, 1024);
+  MetaBlock bl(tmp, 1024);
+  fbl.add_block(bl);
   DEBUG_ONLY(fbl.verify();)
   ASSERT_FALSE(fbl.is_empty());
   CHECK_CONTENT(fbl, 1, 1024);
 
-  MetaWord* p = fbl.remove_block(1024);
-  EXPECT_EQ(p, tmp);
+  MetaBlock bl2 = fbl.remove_block(1024);
+  ASSERT_EQ(bl, bl2);
   DEBUG_ONLY(fbl.verify();)
   CHECK_CONTENT(fbl, 0, 0);
 
 }
-
-TEST_VM(metaspace, freeblocks_small) {
-  FreeBlocksTest::test_small_allocations();
-}
-
-TEST_VM(metaspace, freeblocks_medium) {
-  FreeBlocksTest::test_medium_allocations();
-}
-
-TEST_VM(metaspace, freeblocks_large) {
-  FreeBlocksTest::test_large_allocations();
-}
-
diff --git a/test/hotspot/gtest/metaspace/test_metablock.cpp b/test/hotspot/gtest/metaspace/test_metablock.cpp
new file mode 100644
index 00000000000..af103a2b462
--- /dev/null
+++ b/test/hotspot/gtest/metaspace/test_metablock.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/metaspace/metablock.inline.hpp"
+//#define LOG_PLEASE
+#include "metaspaceGtestCommon.hpp"
+
+using metaspace::MetaBlock;
+
+
+#define CHECK_BLOCK_EMPTY(block) { \
+  EXPECT_TRUE(block.is_empty()); \
+  DEBUG_ONLY(block.verify()); \
+}
+
+#define CHECK_BLOCK(block, expected_base, expected_size) { \
+    EXPECT_EQ(block.base(), (MetaWord*)expected_base); \
+    EXPECT_EQ((size_t)expected_size, block.word_size()); \
+    EXPECT_EQ(block.end(), expected_base + expected_size); \
+    DEBUG_ONLY(block.verify()); \
+}
+
+static constexpr uintptr_t large_pointer = NOT_LP64(0x99999990) LP64_ONLY(0x9999999999999990ULL);
+
+TEST(metaspace, MetaBlock_1) {
+  MetaBlock bl;
+  CHECK_BLOCK_EMPTY(bl);
+}
+
+TEST(metaspace, MetaBlock_2) {
+  MetaWord* const p = (MetaWord*)large_pointer;
+  constexpr size_t s = G;
+  MetaBlock bl(p, s);
+  CHECK_BLOCK(bl, p, s);
+}
+
+TEST(metaspace, MetaBlock_3) {
+  MetaWord* const p = (MetaWord*)large_pointer;
+  MetaBlock bl(p, 0);
+  CHECK_BLOCK_EMPTY(bl);
+}
+
+TEST_VM(metaspace, MetaBlock_4) {
+  MetaWord* const p = (MetaWord*)large_pointer;
+  MetaBlock bl(p, G);
+  CHECK_BLOCK(bl, p, G);
+
+  MetaBlock bl_copy = bl, bl2;
+
+  bl2 = bl.split_off_tail(M);
+  CHECK_BLOCK(bl, p, G - M);
+  CHECK_BLOCK(bl2, p + G - M, M);
+
+  bl = bl_copy;
+
+bl.print_on(tty);
+bl2.print_on(tty);
+  bl2 = bl.split_off_tail(G);
+  bl.print_on(tty);
+  bl2.print_on(tty);
+
+  ASSERT_EQ(bl2, bl_copy);
+  ASSERT_TRUE(bl.is_empty());
+
+  bl = bl_copy;
+
+  bl2 = bl.split_off_tail(0);
+  ASSERT_EQ(bl, bl_copy);
+  ASSERT_TRUE(bl2.is_empty());
+
+  MetaBlock empty;
+  bl = empty.split_off_tail(0);
+  ASSERT_TRUE(bl.is_empty());
+}
diff --git a/test/hotspot/gtest/metaspace/test_metaspaceUtils.cpp b/test/hotspot/gtest/metaspace/test_metaspaceUtils.cpp
index 9f6ac9e988a..8a46f71be5d 100644
--- a/test/hotspot/gtest/metaspace/test_metaspaceUtils.cpp
+++ b/test/hotspot/gtest/metaspace/test_metaspaceUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,7 +28,7 @@
 #include "memory/metaspaceUtils.hpp"
 #include "unittest.hpp"
 
-TEST_VM(MetaspaceUtils, reserved) {
+TEST_VM(metaspace, MetaspaceUtils_reserved) {
   size_t reserved = MetaspaceUtils::reserved_bytes();
   EXPECT_GT(reserved, 0UL);
 
@@ -37,7 +37,7 @@ TEST_VM(MetaspaceUtils, reserved) {
   EXPECT_LE(reserved_metadata, reserved);
 }
 
-TEST_VM(MetaspaceUtils, reserved_compressed_class_pointers) {
+TEST_VM(metaspace, MetaspaceUtils_reserved_compressed_class_pointers) {
   if (!UseCompressedClassPointers) {
     return;
   }
@@ -49,7 +49,7 @@ TEST_VM(MetaspaceUtils, reserved_compressed_class_pointers) {
   EXPECT_LE(reserved_class, reserved);
 }
 
-TEST_VM(MetaspaceUtils, committed) {
+TEST_VM(metaspace, MetaspaceUtils_committed) {
   size_t committed = MetaspaceUtils::committed_bytes();
   EXPECT_GT(committed, 0UL);
 
@@ -61,7 +61,7 @@ TEST_VM(MetaspaceUtils, committed) {
   EXPECT_LE(committed_metadata, committed);
 }
 
-TEST_VM(MetaspaceUtils, committed_compressed_class_pointers) {
+TEST_VM(metaspace, MetaspaceUtils_committed_compressed_class_pointers) {
   if (!UseCompressedClassPointers) {
     return;
   }
@@ -73,7 +73,7 @@ TEST_VM(MetaspaceUtils, committed_compressed_class_pointers) {
   EXPECT_LE(committed_class, committed);
 }
 
-TEST_VM(MetaspaceUtils, non_compressed_class_pointers) {
+TEST_VM(metaspace, MetaspaceUtils_non_compressed_class_pointers) {
   if (UseCompressedClassPointers) {
     return;
   }
@@ -99,7 +99,7 @@ static void check_metaspace_stats_are_not_null(const MetaspaceStats& stats) {
   EXPECT_GT(stats.used(), 0UL);
 }
 
-TEST_VM(MetaspaceUtils, get_statistics) {
+TEST_VM(MetaspaceUtils, MetaspaceUtils_get_statistics) {
   MetaspaceCombinedStats combined_stats = MetaspaceUtils::get_combined_statistics();
   check_metaspace_stats_are_not_null(combined_stats);
   check_metaspace_stats_are_consistent(combined_stats);
diff --git a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
index 2e5a6d40ce7..2f7627ccffe 100644
--- a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
+++ b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,98 +29,125 @@
 #include "memory/metaspace/commitLimiter.hpp"
 #include "memory/metaspace/counters.hpp"
 #include "memory/metaspace/internalStats.hpp"
+#include "memory/metaspace/freeBlocks.hpp"
+#include "memory/metaspace/metablock.inline.hpp"
 #include "memory/metaspace/metaspaceArena.hpp"
 #include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp"
+#include "memory/metaspace/metachunkList.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/metaspaceSettings.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
+#include "memory/metaspace.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-//#define LOG_PLEASE
+#define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 #include "metaspaceGtestContexts.hpp"
 #include "metaspaceGtestRangeHelpers.hpp"
 
-using metaspace::AllocationAlignmentByteSize;
-using metaspace::ArenaGrowthPolicy;
-using metaspace::CommitLimiter;
-using metaspace::InternalStats;
-using metaspace::MemRangeCounter;
-using metaspace::MetaspaceArena;
-using metaspace::SizeAtomicCounter;
-using metaspace::Settings;
-using metaspace::ArenaStats;
+#define HANDLE_FAILURE \
+  if (testing::Test::HasFailure()) { \
+    return; \
+  }
+
+namespace metaspace {
+
+class MetaspaceArenaTestFriend {
+  const MetaspaceArena* const _arena;
+public:
+  MetaspaceArenaTestFriend(const MetaspaceArena* arena) : _arena(arena) {}
+  const MetachunkList& chunks() const { return _arena->_chunks; }
+  const FreeBlocks* fbl() const { return _arena->_fbl; }
+};
 
 class MetaspaceArenaTestHelper {
 
   MetaspaceGtestContext& _context;
+  const ArenaGrowthPolicy* const _growth_policy;
 
-  const ArenaGrowthPolicy* _growth_policy;
-  SizeAtomicCounter _used_words_counter;
   MetaspaceArena* _arena;
 
-  void initialize(const ArenaGrowthPolicy* growth_policy, const char* name = "gtest-MetaspaceArena") {
-    _growth_policy = growth_policy;
-    _arena = new MetaspaceArena(&_context.cm(), _growth_policy, &_used_words_counter, name);
-    DEBUG_ONLY(_arena->verify());
-  }
-
 public:
 
-  // Create a helper; growth policy for arena is determined by the given spacetype|class tupel
-  MetaspaceArenaTestHelper(MetaspaceGtestContext& helper,
-                            Metaspace::MetaspaceType space_type, bool is_class,
-                            const char* name = "gtest-MetaspaceArena") :
-    _context(helper)
-  {
-    initialize(ArenaGrowthPolicy::policy_for_space_type(space_type, is_class), name);
-  }
-
   // Create a helper; growth policy is directly specified
   MetaspaceArenaTestHelper(MetaspaceGtestContext& helper, const ArenaGrowthPolicy* growth_policy,
-                           const char* name = "gtest-MetaspaceArena") :
-    _context(helper)
+                           size_t allocation_alignment_words = Metaspace::min_allocation_alignment_words) :
+    _context(helper), _growth_policy(growth_policy), _arena(nullptr)
   {
-    initialize(growth_policy, name);
+    _arena = new MetaspaceArena(_context.context(), _growth_policy, allocation_alignment_words, "gtest-MetaspaceArena");
+    DEBUG_ONLY(_arena->verify());
+    _context.inc_num_arenas_created();
   }
 
+
+  // Create a helper; growth policy for arena is determined by the given spacetype|class tupel
+  MetaspaceArenaTestHelper(MetaspaceGtestContext& helper,
+                           Metaspace::MetaspaceType space_type, bool is_class,
+                           size_t allocation_alignment_words = Metaspace::min_allocation_alignment_words) :
+    MetaspaceArenaTestHelper(helper, ArenaGrowthPolicy::policy_for_space_type(space_type, is_class), allocation_alignment_words)
+  {}
+
   ~MetaspaceArenaTestHelper() {
     delete_arena_with_tests();
   }
 
-  const CommitLimiter& limiter() const { return _context.commit_limiter(); }
   MetaspaceArena* arena() const { return _arena; }
-  SizeAtomicCounter& used_words_counter() { return _used_words_counter; }
 
   // Note: all test functions return void due to gtests limitation that we cannot use ASSERT
   // in non-void returning tests.
 
   void delete_arena_with_tests() {
     if (_arena != nullptr) {
-      size_t used_words_before = _used_words_counter.get();
-      size_t committed_words_before = limiter().committed_words();
+      size_t used_words_before = _context.used_words();
+      size_t committed_words_before = _context.committed_words();
       DEBUG_ONLY(_arena->verify());
       delete _arena;
       _arena = nullptr;
-      size_t used_words_after = _used_words_counter.get();
-      size_t committed_words_after = limiter().committed_words();
-      ASSERT_0(used_words_after);
+      size_t used_words_after = _context.used_words();
+      size_t committed_words_after = _context.committed_words();
+      assert(_context.num_arenas_created() >= 1, "Sanity");
+      if (_context.num_arenas_created() == 1) {
+        ASSERT_0(used_words_after);
+      } else {
+        ASSERT_LE(used_words_after, used_words_before);
+      }
       ASSERT_LE(committed_words_after, committed_words_before);
     }
   }
 
   void usage_numbers_with_test(size_t* p_used, size_t* p_committed, size_t* p_capacity) const {
-    _arena->usage_numbers(p_used, p_committed, p_capacity);
-    if (p_used != nullptr) {
-      if (p_committed != nullptr) {
-        ASSERT_GE(*p_committed, *p_used);
-      }
-      // Since we own the used words counter, it should reflect our usage number 1:1
-      ASSERT_EQ(_used_words_counter.get(), *p_used);
+    size_t arena_used = 0, arena_committed = 0, arena_reserved = 0;
+    _arena->usage_numbers(&arena_used, &arena_committed, &arena_reserved);
+    EXPECT_GE(arena_committed, arena_used);
+    EXPECT_GE(arena_reserved, arena_committed);
+
+    size_t context_used = _context.used_words();
+    size_t context_committed = _context.committed_words();
+    size_t context_reserved = _context.reserved_words();
+    EXPECT_GE(context_committed, context_used);
+    EXPECT_GE(context_reserved, context_committed);
+
+    // If only one arena uses the context, usage numbers must match.
+    if (_context.num_arenas_created() == 1) {
+      EXPECT_EQ(context_used, arena_used);
+    } else {
+      assert(_context.num_arenas_created() > 1, "Sanity");
+      EXPECT_GE(context_used, arena_used);
     }
-    if (p_committed != nullptr && p_capacity != nullptr) {
-      ASSERT_GE(*p_capacity, *p_committed);
+
+    // commit, reserve numbers don't have to match since free chunks may exist
+    EXPECT_GE(context_committed, arena_committed);
+    EXPECT_GE(context_reserved, arena_reserved);
+
+    if (p_used) {
+      *p_used = arena_used;
+    }
+    if (p_committed) {
+      *p_committed = arena_committed;
+    }
+    if (p_capacity) {
+      *p_capacity = arena_reserved;
     }
   }
 
@@ -142,23 +170,33 @@ class MetaspaceArenaTestHelper {
     ASSERT_NULL(dummy);
   }
 
-  // Allocate; it may or may not work; return value in *p_return_value
   void allocate_from_arena_with_tests(MetaWord** p_return_value, size_t word_size) {
+    MetaBlock result, wastage;
+    allocate_from_arena_with_tests(word_size, result, wastage);
+    if (wastage.is_nonempty()) {
+      _arena->deallocate(wastage);
+      wastage.reset();
+    }
+    (*p_return_value) = result.base();
+  }
+
+  // Allocate; it may or may not work; return value in *p_return_value
+  void allocate_from_arena_with_tests(size_t word_size, MetaBlock& result, MetaBlock& wastage) {
 
     // Note: usage_numbers walks all chunks in use and counts.
     size_t used = 0, committed = 0, capacity = 0;
     usage_numbers_with_test(&used, &committed, &capacity);
 
-    size_t possible_expansion = limiter().possible_expansion_words();
+    size_t possible_expansion = _context.commit_limiter().possible_expansion_words();
 
-    MetaWord* p = _arena->allocate(word_size);
+    result = _arena->allocate(word_size, wastage);
 
     SOMETIMES(DEBUG_ONLY(_arena->verify();))
 
     size_t used2 = 0, committed2 = 0, capacity2 = 0;
     usage_numbers_with_test(&used2, &committed2, &capacity2);
 
-    if (p == nullptr) {
+    if (result.is_empty()) {
       // Allocation failed.
       ASSERT_LT(possible_expansion, word_size);
       ASSERT_EQ(used, used2);
@@ -166,7 +204,8 @@ class MetaspaceArenaTestHelper {
       ASSERT_EQ(capacity, capacity2);
     } else {
       // Allocation succeeded. Should be correctly aligned.
-      ASSERT_TRUE(is_aligned(p, AllocationAlignmentByteSize));
+      ASSERT_TRUE(result.is_aligned_base(_arena->allocation_alignment_words()));
+
       // used: may go up or may not (since our request may have been satisfied from the freeblocklist
       //   whose content already counts as used).
       // committed: may go up, may not
@@ -175,8 +214,6 @@ class MetaspaceArenaTestHelper {
       ASSERT_GE(committed2, committed);
       ASSERT_GE(capacity2, capacity);
     }
-
-    *p_return_value = p;
   }
 
   // Allocate; it may or may not work; but caller does not care for the result value
@@ -189,7 +226,7 @@ class MetaspaceArenaTestHelper {
     size_t used = 0, committed = 0, capacity = 0;
     usage_numbers_with_test(&used, &committed, &capacity);
 
-    _arena->deallocate(p, word_size);
+    _arena->deallocate(MetaBlock(p, word_size));
 
     SOMETIMES(DEBUG_ONLY(_arena->verify();))
 
@@ -209,9 +246,13 @@ class MetaspaceArenaTestHelper {
     return stats;
   }
 
+  MetaspaceArenaTestFriend internal_access() const {
+    return MetaspaceArenaTestFriend (_arena);
+  }
+
   // Convenience method to return number of chunks in arena (including current chunk)
   int get_number_of_chunks() const {
-    return get_arena_statistics().totals()._num;
+    return internal_access().chunks().count();
   }
 
 };
@@ -391,23 +432,28 @@ TEST_VM(metaspace, MetaspaceArena_deallocate) {
 
     MetaWord* p1 = nullptr;
     helper.allocate_from_arena_with_tests_expect_success(&p1, s);
+    ASSERT_FALSE(HasFailure());
 
     size_t used1 = 0, capacity1 = 0;
     helper.usage_numbers_with_test(&used1, nullptr, &capacity1);
+    ASSERT_FALSE(HasFailure());
     ASSERT_EQ(used1, s);
 
     helper.deallocate_with_tests(p1, s);
 
     size_t used2 = 0, capacity2 = 0;
     helper.usage_numbers_with_test(&used2, nullptr, &capacity2);
+    ASSERT_FALSE(HasFailure());
     ASSERT_EQ(used1, used2);
     ASSERT_EQ(capacity2, capacity2);
 
     MetaWord* p2 = nullptr;
     helper.allocate_from_arena_with_tests_expect_success(&p2, s);
+    ASSERT_FALSE(HasFailure());
 
     size_t used3 = 0, capacity3 = 0;
     helper.usage_numbers_with_test(&used3, nullptr, &capacity3);
+    ASSERT_FALSE(HasFailure());
     ASSERT_EQ(used3, used2);
     ASSERT_EQ(capacity3, capacity2);
 
@@ -450,6 +496,7 @@ static void test_recover_from_commit_limit_hit() {
     helper1.allocate_from_arena_with_tests_expect_success(1);
     helper2.allocate_from_arena_with_tests_expect_success(1);
     allocated_from_1_and_2 += 2;
+    HANDLE_FAILURE
   }
 
   // Now, allocating from helper3, creep up on the limit
@@ -494,11 +541,11 @@ static void test_controlled_growth(Metaspace::MetaspaceType type, bool is_class,
   // have different initial capacities.
 
   MetaspaceGtestContext context;
-  MetaspaceArenaTestHelper smhelper(context, type, is_class, "Grower");
+  MetaspaceArenaTestHelper smhelper(context, type, is_class);
 
   const Metaspace::MetaspaceType other_type =
          (type == Metaspace::StandardMetaspaceType) ? Metaspace::ClassMirrorHolderMetaspaceType : Metaspace::StandardMetaspaceType;
-  MetaspaceArenaTestHelper smhelper_harrasser(context, other_type, true, "Harasser");
+  MetaspaceArenaTestHelper smhelper_harrasser(context, other_type, true);
 
   size_t used = 0, committed = 0, capacity = 0;
   const size_t alloc_words = 16;
@@ -561,12 +608,14 @@ static void test_controlled_growth(Metaspace::MetaspaceType type, bool is_class,
     }
 
     smhelper.allocate_from_arena_with_tests_expect_success(alloc_words);
+    HANDLE_FAILURE
     words_allocated += metaspace::get_raw_word_size_for_requested_word_size(alloc_words);
     num_allocated++;
 
     size_t used2 = 0, committed2 = 0, capacity2 = 0;
 
     smhelper.arena()->usage_numbers(&used2, &committed2, &capacity2);
+    HANDLE_FAILURE
 
     // used should not grow larger than what we allocated, plus possible overhead.
     ASSERT_GE(used2, used);
@@ -608,6 +657,10 @@ static void test_controlled_growth(Metaspace::MetaspaceType type, bool is_class,
 
   }
 
+  // No FBL should exist, we did not deallocate
+  ASSERT_EQ(smhelper.internal_access().fbl(), (FreeBlocks*)nullptr);
+  ASSERT_EQ(smhelper_harrasser.internal_access().fbl(), (FreeBlocks*)nullptr);
+
   // After all this work, we should see an increase in number of chunk-in-place-enlargements
   //  (this especially is vulnerable to regression: the decisions of when to do in-place-enlargements are somewhat
   //   complicated, see MetaspaceArena::attempt_enlarge_current_chunk())
@@ -691,7 +744,8 @@ TEST_VM(metaspace, MetaspaceArena_growth_boot_nc_not_inplace) {
 //  block should be reused by the next allocation).
 static void test_repeatedly_allocate_and_deallocate(bool is_topmost) {
   // Test various sizes, including (important) the max. possible block size = 1 root chunk
-  for (size_t blocksize = Metaspace::max_allocation_word_size(); blocksize >= 1; blocksize /= 2) {
+  for (size_t blocksize = Metaspace::max_allocation_word_size();
+       blocksize >= Metaspace::min_allocation_word_size; blocksize /= 2) {
     size_t used1 = 0, used2 = 0, committed1 = 0, committed2 = 0;
     MetaWord* p = nullptr, *p2 = nullptr;
 
@@ -703,6 +757,7 @@ static void test_repeatedly_allocate_and_deallocate(bool is_topmost) {
     if (!is_topmost) {
       // another one on top, size does not matter.
       helper.allocate_from_arena_with_tests_expect_success(0x10);
+      HANDLE_FAILURE
     }
 
     // Measure
@@ -712,6 +767,7 @@ static void test_repeatedly_allocate_and_deallocate(bool is_topmost) {
     for (int i = 0; i < 5; i ++) {
       helper.deallocate_with_tests(p, blocksize);
       helper.allocate_from_arena_with_tests_expect_success(&p2, blocksize);
+      HANDLE_FAILURE
       // We should get the same pointer back.
       EXPECT_EQ(p2, p);
     }
@@ -730,3 +786,120 @@ TEST_VM(metaspace, MetaspaceArena_test_repeatedly_allocate_and_deallocate_top_al
 TEST_VM(metaspace, MetaspaceArena_test_repeatedly_allocate_and_deallocate_nontop_allocation) {
   test_repeatedly_allocate_and_deallocate(false);
 }
+
+static void test_random_aligned_allocation(size_t arena_alignment_words, SizeRange range) {
+  // We let the arena use 4K chunks, unless the alloc size is larger.
+  chunklevel_t level = CHUNK_LEVEL_4K;
+  const ArenaGrowthPolicy policy (&level, 1);
+  const size_t chunk_word_size = word_size_for_level(level);
+
+  size_t expected_used = 0;
+
+  MetaspaceGtestContext context;
+  MetaspaceArenaTestHelper helper(context, &policy, arena_alignment_words);
+
+  size_t last_alloc_size = 0;
+  unsigned num_allocations = 0;
+
+  const size_t max_used = MIN2(MAX2(chunk_word_size * 10, (range.highest() * 100)),
+                               LP64_ONLY(64) NOT_LP64(16) * M); // word size!
+  while (expected_used < max_used) {
+
+    const int chunks_before = helper.get_number_of_chunks();
+
+    MetaBlock result, wastage;
+    size_t alloc_words = range.random_value();
+    NOT_LP64(alloc_words = align_up(alloc_words, Metaspace::min_allocation_alignment_words));
+    helper.allocate_from_arena_with_tests(alloc_words, result, wastage);
+
+    ASSERT_TRUE(result.is_nonempty());
+    ASSERT_TRUE(result.is_aligned_base(arena_alignment_words));
+    ASSERT_EQ(result.word_size(), alloc_words);
+
+    expected_used += alloc_words + wastage.word_size();
+    const int chunks_now = helper.get_number_of_chunks();
+    ASSERT_GE(chunks_now, chunks_before);
+    ASSERT_LE(chunks_now, chunks_before + 1);
+
+    // Estimate wastage:
+    // Guessing at wastage is somewhat simple since we don't expect to ever use the fbl (we
+    // don't deallocate). Therefore, wastage can only be caused by alignment gap or by
+    // salvaging an old chunk before a new chunk is added.
+    const bool expect_alignment_gap = !is_aligned(last_alloc_size, arena_alignment_words);
+    const bool new_chunk_added = chunks_now > chunks_before;
+
+    if (num_allocations == 0) {
+      // expect no wastage if its the first allocation in the arena
+      ASSERT_TRUE(wastage.is_empty());
+    } else {
+      if (expect_alignment_gap) {
+        // expect wastage if the alignment requires it
+        ASSERT_TRUE(wastage.is_nonempty());
+      }
+    }
+
+    if (wastage.is_nonempty()) {
+      // If we have wastage, we expect it to be either too small or unaligned. That would not be true
+      // for wastage from the fbl, which could have any size; however, in this test we don't deallocate,
+      // so we don't expect wastage from the fbl.
+      if (wastage.is_aligned_base(arena_alignment_words)) {
+        ASSERT_LT(wastage.word_size(), alloc_words);
+      }
+      if (new_chunk_added) {
+        // chunk turnover: no more wastage than size of a commit granule, since we salvage the
+        // committed remainder of the old chunk.
+        ASSERT_LT(wastage.word_size(), Settings::commit_granule_words());
+      } else {
+        // No chunk turnover: no more wastage than what alignment requires.
+        ASSERT_LT(wastage.word_size(), arena_alignment_words);
+      }
+    }
+
+    // Check stats too
+    size_t used, committed, reserved;
+    helper.usage_numbers_with_test(&used, &committed, &reserved);
+    ASSERT_EQ(used, expected_used);
+
+    // No FBL should exist, we did not deallocate
+    ASSERT_EQ(helper.internal_access().fbl(), (FreeBlocks*)nullptr);
+
+    HANDLE_FAILURE
+
+    last_alloc_size = alloc_words;
+    num_allocations ++;
+  }
+  LOG("allocs: %u", num_allocations);
+}
+
+#define TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(al)                              \
+TEST_VM(metaspace, MetaspaceArena_test_random_small_aligned_allocation_##al) { \
+  static const SizeRange range(Metaspace::min_allocation_word_size, 128);      \
+  test_random_aligned_allocation(al, range);                                   \
+}
+
+#ifdef _LP64
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(1);
+#endif
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(2);
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(8);
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(32);
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(128);
+TEST_ARENA_WITH_ALIGNMENT_SMALL_RANGE(MIN_CHUNK_WORD_SIZE);
+
+#define TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(al)                              \
+TEST_VM(metaspace, MetaspaceArena_test_random_large_aligned_allocation_##al) { \
+  static const SizeRange range(Metaspace::max_allocation_word_size() / 2,      \
+                                   Metaspace::max_allocation_word_size());     \
+  test_random_aligned_allocation(al, range);                                   \
+}
+
+#ifdef _LP64
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(1);
+#endif
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(2);
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(8);
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(32);
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(128);
+TEST_ARENA_WITH_ALIGNMENT_LARGE_RANGE(MIN_CHUNK_WORD_SIZE);
+
+} // namespace metaspace
diff --git a/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp b/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp
index bb536dfd0e2..950f21fb92f 100644
--- a/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp
+++ b/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp
@@ -26,8 +26,10 @@
 #include "precompiled.hpp"
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/counters.hpp"
+#include "memory/metaspace/metablock.hpp"
 #include "memory/metaspace/metaspaceArena.hpp"
 #include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp"
+#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceSettings.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -43,7 +45,9 @@ using metaspace::ArenaGrowthPolicy;
 using metaspace::ChunkManager;
 using metaspace::IntCounter;
 using metaspace::MemRangeCounter;
+using metaspace::MetaBlock;
 using metaspace::MetaspaceArena;
+using metaspace::MetaspaceContext;
 using metaspace::SizeAtomicCounter;
 using metaspace::ArenaStats;
 using metaspace::InUseChunkStats;
@@ -124,16 +128,14 @@ class MetaspaceArenaTestBed : public CHeapObj<mtInternal> {
 
   MetaspaceArena* arena() { return _arena; }
 
-  MetaspaceArenaTestBed(ChunkManager* cm, const ArenaGrowthPolicy* alloc_sequence,
-                        SizeAtomicCounter* used_words_counter, SizeRange allocation_range) :
-    _arena(nullptr),
-    _allocation_range(allocation_range),
-    _size_of_last_failed_allocation(0),
-    _allocations(nullptr),
-    _alloc_count(),
-    _dealloc_count()
+  MetaspaceArenaTestBed(MetaspaceContext* context, const ArenaGrowthPolicy* growth_policy,
+                        size_t allocation_alignment_words, SizeRange allocation_range)
+    : _arena(nullptr)
+    , _allocation_range(allocation_range)
+    , _size_of_last_failed_allocation(0)
+    , _allocations(nullptr)
   {
-    _arena = new MetaspaceArena(cm, alloc_sequence, used_words_counter, "gtest-MetaspaceArenaTestBed-sm");
+    _arena = new MetaspaceArena(context, growth_policy, Metaspace::min_allocation_alignment_words, "gtest-MetaspaceArenaTestBed-sm");
   }
 
   ~MetaspaceArenaTestBed() {
@@ -163,13 +165,20 @@ class MetaspaceArenaTestBed : public CHeapObj<mtInternal> {
   // Allocate a random amount. Return false if the allocation failed.
   bool checked_random_allocate() {
     size_t word_size = 1 + _allocation_range.random_value();
-    MetaWord* p = _arena->allocate(word_size);
-    if (p != nullptr) {
-      EXPECT_TRUE(is_aligned(p, AllocationAlignmentByteSize));
+    MetaBlock wastage;
+    MetaBlock bl = _arena->allocate(word_size, wastage);
+    // We only expect wastage if either alignment was not met or the chunk remainder
+    // was not large enough.
+    if (wastage.is_nonempty()) {
+      _arena->deallocate(wastage);
+      wastage.reset();
+    }
+    if (bl.is_nonempty()) {
+      EXPECT_TRUE(is_aligned(bl.base(), AllocationAlignmentByteSize));
 
       allocation_t* a = NEW_C_HEAP_OBJ(allocation_t, mtInternal);
       a->word_size = word_size;
-      a->p = p;
+      a->p = bl.base();
       a->mark();
       a->next = _allocations;
       _allocations = a;
@@ -193,7 +202,7 @@ class MetaspaceArenaTestBed : public CHeapObj<mtInternal> {
     }
     if (a != nullptr && a->p != nullptr) {
       a->verify();
-      _arena->deallocate(a->p, a->word_size);
+      _arena->deallocate(MetaBlock(a->p, a->word_size));
       _dealloc_count.add(a->word_size);
       a->p = nullptr; a->word_size = 0;
       if ((_dealloc_count.count() % 20) == 0) {
@@ -218,8 +227,8 @@ class MetaspaceArenaTest {
 
   void create_new_test_bed_at(int slotindex, const ArenaGrowthPolicy* growth_policy, SizeRange allocation_range) {
     DEBUG_ONLY(_testbeds.check_slot_is_null(slotindex));
-    MetaspaceArenaTestBed* bed = new MetaspaceArenaTestBed(&_context.cm(), growth_policy,
-                                                       &_used_words_counter, allocation_range);
+    MetaspaceArenaTestBed* bed = new MetaspaceArenaTestBed(_context.context(), growth_policy,
+        Metaspace::min_allocation_alignment_words, allocation_range);
     _testbeds.set_at(slotindex, bed);
     _num_beds.increment();
   }
diff --git a/test/hotspot/gtest/nmt/test_vmatree.cpp b/test/hotspot/gtest/nmt/test_vmatree.cpp
index 7a5a98b7863..d7a9a5fcff7 100644
--- a/test/hotspot/gtest/nmt/test_vmatree.cpp
+++ b/test/hotspot/gtest/nmt/test_vmatree.cpp
@@ -31,7 +31,7 @@
 #include "unittest.hpp"
 
 using Tree = VMATree;
-using Node = Tree::TreapNode;
+using TNode = Tree::TreapNode;
 using NCS = NativeCallStackStorage;
 
 class NMTVMATreeTest : public testing::Test {
@@ -77,7 +77,7 @@ class NMTVMATreeTest : public testing::Test {
 
   int count_nodes(Tree& tree) {
     int count = 0;
-    treap(tree).visit_in_order([&](Node* x) {
+    treap(tree).visit_in_order([&](TNode* x) {
       ++count;
     });
     return count;
@@ -130,7 +130,7 @@ class NMTVMATreeTest : public testing::Test {
     for (int i = 0; i < 10; i++) {
       tree.commit_mapping(i * 100, 100, rd);
     }
-    treap(tree).visit_in_order([&](Node* x) {
+    treap(tree).visit_in_order([&](TNode* x) {
       VMATree::StateType in = in_type_of(x);
       VMATree::StateType out = out_type_of(x);
       EXPECT_TRUE((in == VMATree::StateType::Released && out == VMATree::StateType::Committed) ||
@@ -155,7 +155,7 @@ class NMTVMATreeTest : public testing::Test {
     };
 
     int i = 0;
-    treap(tree).visit_in_order([&](Node* x) {
+    treap(tree).visit_in_order([&](TNode* x) {
       if (i < 16) {
         found[i] = x->key();
       }
@@ -187,7 +187,7 @@ TEST_VM_F(NMTVMATreeTest, UseFlagInplace) {
   tree.reserve_mapping(0, 100, rd1);
   tree.commit_mapping(20, 50, rd2, true);
   tree.uncommit_mapping(30, 10, rd2);
-  tree.visit_in_order([&](Node* node) {
+  tree.visit_in_order([&](TNode* node) {
     if (node->key() != 100) {
       EXPECT_EQ(mtTest, node->val().out.mem_tag()) << "failed at: " << node->key();
       if (node->key() != 20 && node->key() != 40) {
@@ -227,7 +227,7 @@ TEST_VM_F(NMTVMATreeTest, LowLevel) {
     VMATree::RegionData rd2{si[1], mtNMT };
     tree.commit_mapping(50, 50, rd2);
     tree.reserve_mapping(0, 100, rd);
-    treap(tree).visit_in_order([&](Node* x) {
+    treap(tree).visit_in_order([&](TNode* x) {
       EXPECT_TRUE(x->key() == 0 || x->key() == 100);
       if (x->key() == 0) {
         EXPECT_EQ(x->val().out.regiondata().mem_tag, mtTest);
@@ -264,7 +264,7 @@ TEST_VM_F(NMTVMATreeTest, LowLevel) {
     Tree tree;
     tree.reserve_mapping(0, 100, rd);
     tree.commit_mapping(0, 100, rd2);
-    treap(tree).visit_range_in_order(0, 99999, [&](Node* x) {
+    treap(tree).visit_range_in_order(0, 99999, [&](TNode* x) {
       if (x->key() == 0) {
         EXPECT_EQ(mtTest, x->val().out.regiondata().mem_tag);
       }
diff --git a/test/hotspot/gtest/oops/test_arrayOop.cpp b/test/hotspot/gtest/oops/test_arrayOop.cpp
index e67e6e6c13b..5670aedafc1 100644
--- a/test/hotspot/gtest/oops/test_arrayOop.cpp
+++ b/test/hotspot/gtest/oops/test_arrayOop.cpp
@@ -82,7 +82,23 @@ TEST_VM(arrayOopDesc, narrowOop) {
 
 TEST_VM(arrayOopDesc, base_offset) {
 #ifdef _LP64
-  if (UseCompressedClassPointers) {
+  if (UseCompactObjectHeaders) {
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_BOOLEAN), 12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_BYTE),    12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_SHORT),   12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_CHAR),    12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_INT),     12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_FLOAT),   12);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_LONG),    16);
+    EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_DOUBLE),  16);
+    if (UseCompressedOops) {
+      EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_OBJECT), 12);
+      EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_ARRAY),  12);
+    } else {
+      EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_OBJECT), 16);
+      EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_ARRAY),  16);
+    }
+  } else if (UseCompressedClassPointers) {
     EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_BOOLEAN), 16);
     EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_BYTE),    16);
     EXPECT_EQ(arrayOopDesc::base_offset_in_bytes(T_SHORT),   16);
diff --git a/test/hotspot/gtest/oops/test_compressedKlass.cpp b/test/hotspot/gtest/oops/test_compressedKlass.cpp
index b2fc5064581..48026f46852 100644
--- a/test/hotspot/gtest/oops/test_compressedKlass.cpp
+++ b/test/hotspot/gtest/oops/test_compressedKlass.cpp
@@ -36,6 +36,7 @@ TEST_VM(CompressedKlass, basics) {
   ASSERT_LE(CompressedKlassPointers::base(), CompressedKlassPointers::klass_range_start());
   ASSERT_LT(CompressedKlassPointers::klass_range_start(), CompressedKlassPointers::klass_range_end());
   ASSERT_LE(CompressedKlassPointers::klass_range_end(), CompressedKlassPointers::encoding_range_end());
+
   switch (CompressedKlassPointers::shift()) {
   case 0:
     ASSERT_EQ(CompressedKlassPointers::encoding_range_end() - CompressedKlassPointers::base(), (ptrdiff_t)(4 * G));
@@ -44,10 +45,23 @@ TEST_VM(CompressedKlass, basics) {
     ASSERT_EQ(CompressedKlassPointers::encoding_range_end() - CompressedKlassPointers::base(), (ptrdiff_t)(32 * G));
     break;
   default:
-    ShouldNotReachHere();
+    const size_t expected_size = nth_bit(CompressedKlassPointers::narrow_klass_pointer_bits() + CompressedKlassPointers::shift());
+    ASSERT_EQ(CompressedKlassPointers::encoding_range_end() - CompressedKlassPointers::base(), (ptrdiff_t)expected_size);
   }
 }
 
+TEST_VM(CompressedKlass, ccp_off) {
+  if (UseCompressedClassPointers) {
+    return;
+  }
+  ASSERT_EQ(CompressedKlassPointers::klass_range_start(), (address)nullptr);
+  ASSERT_EQ(CompressedKlassPointers::klass_range_end(), (address)nullptr);
+  // We should be able to call CompressedKlassPointers::is_encodable, and it should
+  // always return false
+  ASSERT_FALSE(CompressedKlassPointers::is_encodable((address)0x12345));
+}
+
+
 TEST_VM(CompressedKlass, test_too_low_address) {
   if (!UseCompressedClassPointers) {
     return;
@@ -68,12 +82,29 @@ TEST_VM(CompressedKlass, test_too_high_address) {
   ASSERT_FALSE(CompressedKlassPointers::is_encodable(high));
 }
 
+TEST_VM(CompressedKlass, test_unaligned_address) {
+  if (!UseCompressedClassPointers) {
+    return;
+  }
+  const size_t alignment = CompressedKlassPointers::klass_alignment_in_bytes();
+  address addr = CompressedKlassPointers::klass_range_start() + alignment - 1;
+  ASSERT_FALSE(CompressedKlassPointers::is_encodable(addr));
+  // Try word-aligned, but not sufficiently aligned
+  if (alignment > BytesPerWord) {
+    addr = CompressedKlassPointers::klass_range_start() + BytesPerWord;
+    ASSERT_FALSE(CompressedKlassPointers::is_encodable(addr));
+  }
+  addr = CompressedKlassPointers::klass_range_end() - 1;
+  ASSERT_FALSE(CompressedKlassPointers::is_encodable(addr));
+}
+
 TEST_VM(CompressedKlass, test_good_address) {
   if (!UseCompressedClassPointers) {
     return;
   }
+  const size_t alignment = CompressedKlassPointers::klass_alignment_in_bytes();
   address addr = CompressedKlassPointers::klass_range_start();
   ASSERT_TRUE(CompressedKlassPointers::is_encodable(addr));
-  addr = CompressedKlassPointers::klass_range_end() - 1;
+  addr = CompressedKlassPointers::klass_range_end() - alignment;
   ASSERT_TRUE(CompressedKlassPointers::is_encodable(addr));
 }
diff --git a/test/hotspot/gtest/oops/test_objArrayOop.cpp b/test/hotspot/gtest/oops/test_objArrayOop.cpp
index 60cf6242dd5..deb4919ce46 100644
--- a/test/hotspot/gtest/oops/test_objArrayOop.cpp
+++ b/test/hotspot/gtest/oops/test_objArrayOop.cpp
@@ -28,29 +28,36 @@
 
 TEST_VM(objArrayOop, osize) {
   static const struct {
-    int objal; bool ccp; bool coops; int result;
+    int objal; bool ccp; bool coops; bool coh; int result;
   } x[] = {
-//    ObjAligInB, UseCCP, UseCoops, object size in heap words
+//    ObjAligInB, UseCCP, UseCoops, UseCOH, object size in heap words
 #ifdef _LP64
-    { 8,          false,  false,    4 },  // 20 byte header, 8 byte oops
-    { 8,          false,  true,     3 },  // 20 byte header, 4 byte oops
-    { 8,          true,   false,    3 },  // 16 byte header, 8 byte oops
-    { 8,          true,   true,     3 },  // 16 byte header, 4 byte oops
-    { 16,         false,  false,    4 },  // 20 byte header, 8 byte oops, 16-byte align
-    { 16,         false,  true,     4 },  // 20 byte header, 4 byte oops, 16-byte align
-    { 16,         true,   false,    4 },  // 16 byte header, 8 byte oops, 16-byte align
-    { 16,         true,   true,     4 },  // 16 byte header, 4 byte oops, 16-byte align
-    { 256,        false,  false,    32 }, // 20 byte header, 8 byte oops, 256-byte align
-    { 256,        false,  true,     32 }, // 20 byte header, 4 byte oops, 256-byte align
-    { 256,        true,   false,    32 }, // 16 byte header, 8 byte oops, 256-byte align
-    { 256,        true,   true,     32 }, // 16 byte header, 4 byte oops, 256-byte align
+    { 8,          false,  false, false,   4 },  // 20 byte header, 8 byte oops
+    { 8,          false,  true,  false,   3 },  // 20 byte header, 4 byte oops
+    { 8,          true,   false, false,   3 },  // 16 byte header, 8 byte oops
+    { 8,          true,   true,  false,   3 },  // 16 byte header, 4 byte oops
+    { 8,          true,   false, true,    3 },  // 12 byte header, 8 byte oops
+    { 8,          true,   true,  true,    2 },  // 12 byte header, 4 byte oops
+    { 16,         false,  false, false,   4 },  // 20 byte header, 8 byte oops, 16-byte align
+    { 16,         false,  true,  false,   4 },  // 20 byte header, 4 byte oops, 16-byte align
+    { 16,         true,   false, false,   4 },  // 16 byte header, 8 byte oops, 16-byte align
+    { 16,         true,   true,  false,   4 },  // 16 byte header, 4 byte oops, 16-byte align
+    { 16,         true,   false, true,    4 },  // 12 byte header, 8 byte oops, 16-byte align
+    { 16,         true,   true,  true,    2 },  // 12 byte header, 4 byte oops, 16-byte align
+    { 256,        false,  false, false,  32 }, // 20 byte header, 8 byte oops, 256-byte align
+    { 256,        false,  true,  false,  32 }, // 20 byte header, 4 byte oops, 256-byte align
+    { 256,        true,   false, false,  32 }, // 16 byte header, 8 byte oops, 256-byte align
+    { 256,        true,   true,  false,  32 }, // 16 byte header, 4 byte oops, 256-byte align
+    { 256,        true,   false, true,   32 }, // 12 byte header, 8 byte oops, 256-byte align
+    { 256,        true,   true,  true,   32 }, // 12 byte header, 4 byte oops, 256-byte align
 #else
-    { 8,          false,  false,    4 }, // 12 byte header, 4 byte oops, wordsize 4
+    { 8,          false,  false, false,   4 }, // 12 byte header, 4 byte oops, wordsize 4
 #endif
-    { -1,         false,  false,   -1 }
+    { -1,         false,  false, false,  -1 }
   };
   for (int i = 0; x[i].result != -1; i++) {
-    if (x[i].objal == (int)ObjectAlignmentInBytes && x[i].ccp == UseCompressedClassPointers && x[i].coops == UseCompressedOops) {
+    if (x[i].objal == (int)ObjectAlignmentInBytes && x[i].ccp == UseCompressedClassPointers && x[i].coops == UseCompressedOops &&
+        x[i].coh == UseCompactObjectHeaders) {
       EXPECT_EQ(objArrayOopDesc::object_size(1), (size_t)x[i].result);
     }
   }
diff --git a/test/hotspot/gtest/oops/test_typeArrayOop.cpp b/test/hotspot/gtest/oops/test_typeArrayOop.cpp
index a7565a23d58..b8c55867077 100644
--- a/test/hotspot/gtest/oops/test_typeArrayOop.cpp
+++ b/test/hotspot/gtest/oops/test_typeArrayOop.cpp
@@ -36,7 +36,11 @@ TEST_VM(typeArrayOopDesc, bool_at_put) {
   char* addr = align_up(mem, 16);
 
   typeArrayOop o = (typeArrayOop) cast_to_oop(addr);
-  o->set_klass(Universe::boolArrayKlass());
+  if (UseCompactObjectHeaders) {
+    o->set_mark(Universe::boolArrayKlass()->prototype_header());
+  } else {
+    o->set_klass(Universe::boolArrayKlass());
+  }
   o->set_length(10);
 
 
diff --git a/test/hotspot/gtest/x86/asmtest.out.h b/test/hotspot/gtest/x86/asmtest.out.h
index 5c59f0b8d76..f43a9527e0f 100644
--- a/test/hotspot/gtest/x86/asmtest.out.h
+++ b/test/hotspot/gtest/x86/asmtest.out.h
@@ -1,647 +1,1355 @@
 // BEGIN  Generated code -- do not edit
 // Generated by x86-asmtest.py
 #ifdef _LP64
-    __ shldl(r22, r14);                                                         //    {load}shld r22d, r14d    IID0
-#endif // _LP64
-    __ shrdl(rcx, rbx);                                                         //    {load}shrd ecx, ebx    IID1
-#ifdef _LP64
-    __ adcl(r24, r18);                                                          //    {load}adc r24d, r18d    IID2
-    __ cmpl(r8, r19);                                                           //    {load}cmp r8d, r19d    IID3
-    __ imull(r25, r19);                                                         //    {load}imul r25d, r19d    IID4
-    __ popcntl(r19, r15);                                                       //    {load}popcnt r19d, r15d    IID5
-    __ sbbl(r21, r19);                                                          //    {load}sbb r21d, r19d    IID6
-    __ subl(r17, r29);                                                          //    {load}sub r17d, r29d    IID7
-    __ tzcntl(r21, rdx);                                                        //    {load}tzcnt r21d, edx    IID8
-    __ lzcntl(rcx, r23);                                                        //    {load}lzcnt ecx, r23d    IID9
-    __ addl(r10, r11);                                                          //    {load}add r10d, r11d    IID10
-    __ andl(r21, r14);                                                          //    {load}and r21d, r14d    IID11
-    __ orl(r12, r30);                                                           //    {load}or r12d, r30d    IID12
-    __ xorl(r19, r30);                                                          //    {load}xor r19d, r30d    IID13
-    __ movl(r27, r11);                                                          //    {load}mov r27d, r11d    IID14
-    __ bsfl(r10, r12);                                                          //    {load}bsf r10d, r12d    IID15
-    __ bsrl(r16, r10);                                                          //    {load}bsr r16d, r10d    IID16
-    __ xchgl(r16, r28);                                                         //    {load}xchg r16d, r28d    IID17
-    __ testl(r25, r16);                                                         //    {load}test r25d, r16d    IID18
-    __ addb(Address(r27, rdx, (Address::ScaleFactor)1, +0x6f304723), rcx);      //    add byte ptr [r27+rdx*2+0x6f304723], cl    IID19
-    __ addw(Address(r19, rcx, (Address::ScaleFactor)2, +0x17244c57), r17);      //    add word ptr [r19+rcx*4+0x17244c57], r17w    IID20
-    __ addl(Address(r23, r16, (Address::ScaleFactor)1, +0x138df419), r19);      //    add dword ptr [r23+r16*2+0x138df419], r19d    IID21
-    __ adcl(Address(r8, r11, (Address::ScaleFactor)3, -0x164f7a73), rcx);       //    adc dword ptr [r8+r11*8-0x164f7a73], ecx    IID22
-    __ andb(Address(rdx, r17, (Address::ScaleFactor)3, +0x4df7f181), r22);      //    and byte ptr [rdx+r17*8+0x4df7f181], r22b    IID23
-    __ andl(Address(r15, -0x41884769), r23);                                    //    and dword ptr [r15-0x41884769], r23d    IID24
-    __ cmpb(Address(r20, r18, (Address::ScaleFactor)0, -0x1b827588), r8);       //    cmp byte ptr [r20+r18*1-0x1b827588], r8b    IID25
-    __ cmpw(Address(r9, r22, (Address::ScaleFactor)3, +0x564ead70), r31);       //    cmp word ptr [r9+r22*8+0x564ead70], r31w    IID26
-    __ cmpl(Address(r10, r24, (Address::ScaleFactor)2, +0xf08ffec), rcx);       //    cmp dword ptr [r10+r24*4+0xf08ffec], ecx    IID27
-    __ orb(Address(r27, r15, (Address::ScaleFactor)0, +0xf18eac7), r19);        //    or byte ptr [r27+r15*1+0xf18eac7], r19b    IID28
-    __ orl(Address(r16, r31, (Address::ScaleFactor)2, +0x3a452790), r12);       //    or dword ptr [r16+r31*4+0x3a452790], r12d    IID29
-    __ xorb(Address(r20, r13, (Address::ScaleFactor)0, +0x61dde6b7), r10);      //    xor byte ptr [r20+r13*1+0x61dde6b7], r10b    IID30
-    __ xorl(Address(r27, -0x77a99463), rbx);                                    //    xor dword ptr [r27-0x77a99463], ebx    IID31
-    __ subl(Address(r9, r11, (Address::ScaleFactor)0, +0x4e20f145), r10);       //    sub dword ptr [r9+r11*1+0x4e20f145], r10d    IID32
-    __ movb(Address(r23, r23, (Address::ScaleFactor)0, -0x3f51b77), r10);       //    mov byte ptr [r23+r23*1-0x3f51b77], r10b    IID33
-    __ movl(Address(r31, r22, (Address::ScaleFactor)0, +0xfac5466), r30);       //    mov dword ptr [r31+r22*1+0xfac5466], r30d    IID34
-    __ xaddb(Address(rbx, -0x70025991), r31);                                   //    xadd byte ptr [rbx-0x70025991], r31b    IID35
-    __ xaddw(Address(r17, r26, (Address::ScaleFactor)1, -0x530c0221), r29);     //    xadd word ptr [r17+r26*2-0x530c0221], r29w    IID36
-    __ xaddl(Address(r9, r21, (Address::ScaleFactor)0, -0x7b7336bf), r17);      //    xadd dword ptr [r9+r21*1-0x7b7336bf], r17d    IID37
-    __ adcl(Address(r24, r12, (Address::ScaleFactor)2, +0x691b07e5), 65536);    //    adc dword ptr [r24+r12*4+0x691b07e5], 65536    IID38
-    __ andl(Address(r14, r9, (Address::ScaleFactor)0, -0x115d5957), 16);        //    and dword ptr [r14+r9*1-0x115d5957], 16    IID39
-    __ addb(Address(r21, -0x1d3e83ad), 64);                                     //    add byte ptr [r21-0x1d3e83ad], 64    IID40
-    __ addw(Address(r12, +0x3a7acf9a), 4096);                                   //    add word ptr [r12+0x3a7acf9a], 4096    IID41
-    __ addl(Address(r30, r14, (Address::ScaleFactor)1, -0x2073ed16), 256);      //    add dword ptr [r30+r14*2-0x2073ed16], 256    IID42
-    __ cmpb(Address(r28, r18, (Address::ScaleFactor)0, +0x6fd326d5), 16);       //    cmp byte ptr [r28+r18*1+0x6fd326d5], 16    IID43
-    __ cmpw(Address(r12, r14, (Address::ScaleFactor)1, +0x2ae6568f), 256);      //    cmp word ptr [r12+r14*2+0x2ae6568f], 256    IID44
-    __ cmpl(Address(r24, r30, (Address::ScaleFactor)3, -0x11b9aeac), 1048576);  //    cmp dword ptr [r24+r30*8-0x11b9aeac], 1048576    IID45
-    __ sarl(Address(r22, r30, (Address::ScaleFactor)2, +0x60cb9115), 1);        //    sar dword ptr [r22+r30*4+0x60cb9115], 1    IID46
-    __ sall(Address(r31, r8, (Address::ScaleFactor)1, +0x236d8ab9), 16);        //    sal dword ptr [r31+r8*2+0x236d8ab9], 16    IID47
-    __ sbbl(Address(r21, r12, (Address::ScaleFactor)1, -0x7d9b9f18), 16777216); //    sbb dword ptr [r21+r12*2-0x7d9b9f18], 16777216    IID48
-    __ shrl(Address(r29, r17, (Address::ScaleFactor)0, -0x7c54f216), 8);        //    shr dword ptr [r29+r17*1-0x7c54f216], 8    IID49
-    __ subl(Address(r8, r27, (Address::ScaleFactor)2, -0x1190e2c6), 16);        //    sub dword ptr [r8+r27*4-0x1190e2c6], 16    IID50
-    __ xorl(Address(rdx, +0x50dd3396), 1048576);                                //    xor dword ptr [rdx+0x50dd3396], 1048576    IID51
-    __ orb(Address(r20, -0x7dd1f614), 64);                                      //    or byte ptr [r20-0x7dd1f614], 64    IID52
-    __ orl(Address(r18, +0x6f852a9f), 16);                                      //    or dword ptr [r18+0x6f852a9f], 16    IID53
-    __ movb(Address(r20, r8, (Address::ScaleFactor)2, +0x436e2aa), 1);          //    mov byte ptr [r20+r8*4+0x436e2aa], 1    IID54
-    __ movl(Address(rcx, r14, (Address::ScaleFactor)1, +0x883df84), 16);        //    mov dword ptr [rcx+r14*2+0x883df84], 16    IID55
-    __ testb(Address(r11, r10, (Address::ScaleFactor)1, -0x1fc2039b), 16);      //    test byte ptr [r11+r10*2-0x1fc2039b], 16    IID56
-    __ testl(Address(r29, +0x73b9f003), 67108864);                              //    test dword ptr [r29+0x73b9f003], 67108864    IID57
-    __ cmpl_imm32(Address(r29, rcx, (Address::ScaleFactor)2, +0x4ca2b092), 4194304); //    cmp dword ptr [r29+rcx*4+0x4ca2b092], 4194304    IID58
-    __ addl(r8, Address(rdx, r24, (Address::ScaleFactor)2, -0x1e1524dc));       //    add r8d, dword ptr [rdx+r24*4-0x1e1524dc]    IID59
-    __ andl(r19, Address(r20, r20, (Address::ScaleFactor)1, +0x6286892));       //    and r19d, dword ptr [r20+r20*2+0x6286892]    IID60
-    __ cmpb(r11, Address(r13, -0x42e0bf9e));                                    //    cmp r11b, byte ptr [r13-0x42e0bf9e]    IID61
-    __ cmpl(r20, Address(rbx, r30, (Address::ScaleFactor)3, -0x30497735));      //    cmp r20d, dword ptr [rbx+r30*8-0x30497735]    IID62
-    __ lzcntl(r8, Address(rdx, r9, (Address::ScaleFactor)1, +0xe2e99e));        //    lzcnt r8d, dword ptr [rdx+r9*2+0xe2e99e]    IID63
-    __ orl(r9, Address(r29, r25, (Address::ScaleFactor)1, +0x50169f63));        //    or r9d, dword ptr [r29+r25*2+0x50169f63]    IID64
-    __ adcl(r17, Address(r31, r21, (Address::ScaleFactor)3, +0x79efd170));      //    adc r17d, dword ptr [r31+r21*8+0x79efd170]    IID65
-    __ imull(r23, Address(r8, -0xa521f73));                                     //    imul r23d, dword ptr [r8-0xa521f73]    IID66
-    __ popcntl(r30, Address(r10, +0x44352901));                                 //    popcnt r30d, dword ptr [r10+0x44352901]    IID67
-    __ sbbl(r16, Address(r18, r14, (Address::ScaleFactor)1, -0xda8278a));       //    sbb r16d, dword ptr [r18+r14*2-0xda8278a]    IID68
-    __ subl(r17, Address(r22, +0x2d63aab3));                                    //    sub r17d, dword ptr [r22+0x2d63aab3]    IID69
-    __ tzcntl(r23, Address(r21, r11, (Address::ScaleFactor)0, -0x18bc7469));    //    tzcnt r23d, dword ptr [r21+r11*1-0x18bc7469]    IID70
-    __ xorb(r9, Address(r19, rdx, (Address::ScaleFactor)0, -0x5f6207ed));       //    xor r9b, byte ptr [r19+rdx*1-0x5f6207ed]    IID71
-    __ xorw(r11, Address(r21, r10, (Address::ScaleFactor)2, -0x63c79f2b));      //    xor r11w, word ptr [r21+r10*4-0x63c79f2b]    IID72
-    __ xorl(r29, Address(r31, rcx, (Address::ScaleFactor)3, +0x34d93c0f));      //    xor r29d, dword ptr [r31+rcx*8+0x34d93c0f]    IID73
-    __ movb(r17, Address(r8, r18, (Address::ScaleFactor)2, -0x38ff3ad7));       //    mov r17b, byte ptr [r8+r18*4-0x38ff3ad7]    IID74
-    __ movl(r31, Address(r20, r11, (Address::ScaleFactor)2, -0x1d23470c));      //    mov r31d, dword ptr [r20+r11*4-0x1d23470c]    IID75
-    __ leal(r31, Address(rbx, r12, (Address::ScaleFactor)2, -0x3b4a4215));      //    lea r31d, dword ptr [rbx+r12*4-0x3b4a4215]    IID76
-    __ xchgb(r20, Address(r30, r24, (Address::ScaleFactor)0, -0x5c4e82bc));     //    xchg r20b, byte ptr [r30+r24*1-0x5c4e82bc]    IID77
-    __ xchgw(r13, Address(r10, r21, (Address::ScaleFactor)3, +0x19bd4a03));     //    xchg r13w, word ptr [r10+r21*8+0x19bd4a03]    IID78
-    __ xchgl(r23, Address(r16, r13, (Address::ScaleFactor)2, -0x6a0293d6));     //    xchg r23d, dword ptr [r16+r13*4-0x6a0293d6]    IID79
-    __ testl(r13, Address(r9, +0x34a6ff61));                                    //    test r13d, dword ptr [r9+0x34a6ff61]    IID80
-    __ addb(r23, 4);                                                            //    add r23b, 4    IID81
-    __ addl(r28, 65536);                                                        //    add r28d, 65536    IID82
-#endif // _LP64
-    __ andl(rdx, 65536);                                                        //    and edx, 65536    IID83
-#ifdef _LP64
-    __ adcl(r27, 1048576);                                                      //    adc r27d, 1048576    IID84
-    __ cmpb(r13, 4);                                                            //    cmp r13b, 4    IID85
-    __ cmpl(r29, 268435456);                                                    //    cmp r29d, 268435456    IID86
-    __ rcll(r20, 16);                                                           //    rcl r20d, 16    IID87
-    __ roll(r25, 2);                                                            //    rol r25d, 2    IID88
+    __ shldl(r12, r22);                                                         //    {load}shld r12d, r22d    IID0
+    __ shrdl(r21, r15);                                                         //    {load}shrd r21d, r15d    IID1
+    __ adcl(r27, r24);                                                          //    {load}adc r27d, r24d    IID2
+    __ cmpl(r31, r29);                                                          //    {load}cmp r31d, r29d    IID3
+    __ imull(r8, rdx);                                                          //    {load}imul r8d, edx    IID4
+    __ popcntl(r8, r16);                                                        //    {load}popcnt r8d, r16d    IID5
+    __ sbbl(rcx, r11);                                                          //    {load}sbb ecx, r11d    IID6
+    __ subl(r18, r30);                                                          //    {load}sub r18d, r30d    IID7
+    __ tzcntl(r16, r14);                                                        //    {load}tzcnt r16d, r14d    IID8
+    __ lzcntl(r30, rbx);                                                        //    {load}lzcnt r30d, ebx    IID9
+    __ addl(r12, r8);                                                           //    {load}add r12d, r8d    IID10
+    __ andl(r19, r15);                                                          //    {load}and r19d, r15d    IID11
+    __ orl(r26, r18);                                                           //    {load}or r26d, r18d    IID12
+    __ xorl(r19, r22);                                                          //    {load}xor r19d, r22d    IID13
+    __ movl(r14, r17);                                                          //    {load}mov r14d, r17d    IID14
+    __ bsfl(r20, r29);                                                          //    {load}bsf r20d, r29d    IID15
+    __ bsrl(r9, r27);                                                           //    {load}bsr r9d, r27d    IID16
+    __ xchgl(r15, r24);                                                         //    {load}xchg r15d, r24d    IID17
+    __ testl(r21, r11);                                                         //    {load}test r21d, r11d    IID18
+    __ addb(Address(r9, -0x73feffaa), r18);                                     //    add byte ptr [r9-0x73feffaa], r18b    IID19
+    __ addw(Address(r19, r15, (Address::ScaleFactor)0, -0x5e89f90c), r26);      //    add word ptr [r19+r15*1-0x5e89f90c], r26w    IID20
+    __ addl(Address(r20, r12, (Address::ScaleFactor)3, -0x5cc4103c), r21);      //    add dword ptr [r20+r12*8-0x5cc4103c], r21d    IID21
+    __ adcl(Address(rbx, r13, (Address::ScaleFactor)2, -0x2b74f9bd), r22);      //    adc dword ptr [rbx+r13*4-0x2b74f9bd], r22d    IID22
+    __ andb(Address(r14, +0x6205f27c), r30);                                    //    and byte ptr [r14+0x6205f27c], r30b    IID23
+    __ andl(Address(r29, rbx, (Address::ScaleFactor)3, -0x78b1f32a), r29);      //    and dword ptr [r29+rbx*8-0x78b1f32a], r29d    IID24
+    __ cmpb(Address(r23, r22, (Address::ScaleFactor)0, +0x3375d32), r27);       //    cmp byte ptr [r23+r22*1+0x3375d32], r27b    IID25
+    __ cmpw(Address(r27, r16, (Address::ScaleFactor)1, -0x28a77155), r15);      //    cmp word ptr [r27+r16*2-0x28a77155], r15w    IID26
+    __ cmpl(Address(r29, r25, (Address::ScaleFactor)1, -0x54626655), r21);      //    cmp dword ptr [r29+r25*2-0x54626655], r21d    IID27
+    __ orb(Address(r11, r25, (Address::ScaleFactor)3, +0xab498c3), rcx);        //    or byte ptr [r11+r25*8+0xab498c3], cl    IID28
+    __ orl(Address(r23, r30, (Address::ScaleFactor)0, +0x4d806ea0), r20);       //    or dword ptr [r23+r30*1+0x4d806ea0], r20d    IID29
+    __ xorb(Address(r12, r9, (Address::ScaleFactor)3, -0x2bf5b0e9), rbx);       //    xor byte ptr [r12+r9*8-0x2bf5b0e9], bl    IID30
+    __ xorl(Address(r16, r16, (Address::ScaleFactor)1, -0x2a7d9754), r19);      //    xor dword ptr [r16+r16*2-0x2a7d9754], r19d    IID31
+    __ subl(Address(r29, r15, (Address::ScaleFactor)2, -0x55a7da9d), r25);      //    sub dword ptr [r29+r15*4-0x55a7da9d], r25d    IID32
+    __ movb(Address(r13, r26, (Address::ScaleFactor)1, -0x5c442d70), r15);      //    mov byte ptr [r13+r26*2-0x5c442d70], r15b    IID33
+    __ movl(Address(r9, r8, (Address::ScaleFactor)0, -0x35b475e4), r20);        //    mov dword ptr [r9+r8*1-0x35b475e4], r20d    IID34
+    __ xaddb(Address(r10, -0x13ca898f), r22);                                   //    xadd byte ptr [r10-0x13ca898f], r22b    IID35
+    __ xaddw(Address(r17, r16, (Address::ScaleFactor)3, +0x46adddb8), r12);     //    xadd word ptr [r17+r16*8+0x46adddb8], r12w    IID36
+    __ xaddl(Address(r30, +0x454d6731), r31);                                   //    xadd dword ptr [r30+0x454d6731], r31d    IID37
+    __ adcl(Address(r13, r25, (Address::ScaleFactor)3, -0x2c70c098), 4096);     //    adc dword ptr [r13+r25*8-0x2c70c098], 4096    IID38
+    __ andl(Address(r30, r9, (Address::ScaleFactor)3, +0x28d9e535), 16777216);  //    and dword ptr [r30+r9*8+0x28d9e535], 16777216    IID39
+    __ addb(Address(r20, r29, (Address::ScaleFactor)0, -0x1c59007c), 4);        //    add byte ptr [r20+r29*1-0x1c59007c], 4    IID40
+    __ addw(Address(rbx, r22, (Address::ScaleFactor)0, -0x10a08289), 4096);     //    add word ptr [rbx+r22*1-0x10a08289], 4096    IID41
+    __ addl(Address(r18, r18, (Address::ScaleFactor)2, +0x19b94ca2), 256);      //    add dword ptr [r18+r18*4+0x19b94ca2], 256    IID42
+    __ cmpb(Address(r22, r17, (Address::ScaleFactor)1, +0x41a9f28a), 16);       //    cmp byte ptr [r22+r17*2+0x41a9f28a], 16    IID43
+    __ cmpw(Address(r18, r15, (Address::ScaleFactor)2, +0xf2e8b83), 1024);      //    cmp word ptr [r18+r15*4+0xf2e8b83], 1024    IID44
+    __ cmpl(Address(r24, -0x78764a55), 65536);                                  //    cmp dword ptr [r24-0x78764a55], 65536    IID45
+    __ sarl(Address(r12, r30, (Address::ScaleFactor)1, +0xfb953d0), 1);         //    sar dword ptr [r12+r30*2+0xfb953d0], 1    IID46
+    __ sall(Address(r10, r9, (Address::ScaleFactor)0, +0x362d3e3d), 2);         //    sal dword ptr [r10+r9*1+0x362d3e3d], 2    IID47
+    __ sbbl(Address(r10, r20, (Address::ScaleFactor)1, +0x3be9dda1), 256);      //    sbb dword ptr [r10+r20*2+0x3be9dda1], 256    IID48
+    __ shrl(Address(r20, rcx, (Address::ScaleFactor)2, +0x4cede69d), 2);        //    shr dword ptr [r20+rcx*4+0x4cede69d], 2    IID49
+    __ subl(Address(r30, -0x1a8d9f97), 268435456);                              //    sub dword ptr [r30-0x1a8d9f97], 268435456    IID50
+    __ xorl(Address(r11, -0x27038f48), 16);                                     //    xor dword ptr [r11-0x27038f48], 16    IID51
+    __ orb(Address(rdx, r19, (Address::ScaleFactor)3, -0x18ff3fa4), 64);        //    or byte ptr [rdx+r19*8-0x18ff3fa4], 64    IID52
+    __ orl(Address(r19, -0x25588e31), 16);                                      //    or dword ptr [r19-0x25588e31], 16    IID53
+    __ movb(Address(r21, -0x4e1a5d59), 16);                                     //    mov byte ptr [r21-0x4e1a5d59], 16    IID54
+    __ movl(Address(r22, -0x6e91ff19), 268435456);                              //    mov dword ptr [r22-0x6e91ff19], 268435456    IID55
+    __ testb(Address(r29, -0x5e98c4c2), 1);                                     //    test byte ptr [r29-0x5e98c4c2], 1    IID56
+    __ testl(Address(r10, rcx, (Address::ScaleFactor)2, +0x2ec26eed), 67108864); //    test dword ptr [r10+rcx*4+0x2ec26eed], 67108864    IID57
+    __ cmpl_imm32(Address(r10, rbx, (Address::ScaleFactor)2, -0x133fff6e), 16777216); //    cmp dword ptr [r10+rbx*4-0x133fff6e], 16777216    IID58
+    __ addl(r24, Address(r21, r22, (Address::ScaleFactor)0, -0x288426e1));      //    add r24d, dword ptr [r21+r22*1-0x288426e1]    IID59
+    __ andl(r28, Address(r23, rcx, (Address::ScaleFactor)3, +0x1fdf4486));      //    and r28d, dword ptr [r23+rcx*8+0x1fdf4486]    IID60
+    __ cmpb(r13, Address(r22, +0x5721c974));                                    //    cmp r13b, byte ptr [r22+0x5721c974]    IID61
+    __ cmpl(r21, Address(rbx, r24, (Address::ScaleFactor)1, -0x7efba0fe));      //    cmp r21d, dword ptr [rbx+r24*2-0x7efba0fe]    IID62
+    __ lzcntl(r10, Address(rdx, r14, (Address::ScaleFactor)0, +0x1f9fa862));    //    lzcnt r10d, dword ptr [rdx+r14*1+0x1f9fa862]    IID63
+    __ orl(r12, Address(r11, r8, (Address::ScaleFactor)1, +0x3840466e));        //    or r12d, dword ptr [r11+r8*2+0x3840466e]    IID64
+    __ adcl(r28, Address(r28, r11, (Address::ScaleFactor)0, +0x4aea6a91));      //    adc r28d, dword ptr [r28+r11*1+0x4aea6a91]    IID65
+    __ imull(r19, Address(r8, r27, (Address::ScaleFactor)3, -0x7d0eb0fa));      //    imul r19d, dword ptr [r8+r27*8-0x7d0eb0fa]    IID66
+    __ popcntl(rcx, Address(r17, +0x6dfb7df8));                                 //    popcnt ecx, dword ptr [r17+0x6dfb7df8]    IID67
+    __ sbbl(rdx, Address(r19, r22, (Address::ScaleFactor)0, +0x7e90f232));      //    sbb edx, dword ptr [r19+r22*1+0x7e90f232]    IID68
+    __ subl(r17, Address(r16, -0x1bb206d4));                                    //    sub r17d, dword ptr [r16-0x1bb206d4]    IID69
+    __ tzcntl(r16, Address(r27, r24, (Address::ScaleFactor)3, -0x64cf395e));    //    tzcnt r16d, dword ptr [r27+r24*8-0x64cf395e]    IID70
+    __ xorb(r22, Address(r11, r29, (Address::ScaleFactor)3, -0x185b1ffd));      //    xor r22b, byte ptr [r11+r29*8-0x185b1ffd]    IID71
+    __ xorw(r13, Address(r24, r27, (Address::ScaleFactor)0, -0x4d404400));      //    xor r13w, word ptr [r24+r27*1-0x4d404400]    IID72
+    __ xorl(r14, Address(rcx, -0x6c367083));                                    //    xor r14d, dword ptr [rcx-0x6c367083]    IID73
+    __ movb(r13, Address(r27, r22, (Address::ScaleFactor)0, -0x29d87e21));      //    mov r13b, byte ptr [r27+r22*1-0x29d87e21]    IID74
+    __ movl(r18, Address(r27, +0x3c8204b3));                                    //    mov r18d, dword ptr [r27+0x3c8204b3]    IID75
+    __ leal(r13, Address(rbx, r15, (Address::ScaleFactor)3, -0x7b46c241));      //    lea r13d, dword ptr [rbx+r15*8-0x7b46c241]    IID76
+    __ xchgb(r25, Address(r23, r19, (Address::ScaleFactor)0, -0x7e27b8b4));     //    xchg r25b, byte ptr [r23+r19*1-0x7e27b8b4]    IID77
+    __ xchgw(r26, Address(r11, -0x2c88ec60));                                   //    xchg r26w, word ptr [r11-0x2c88ec60]    IID78
+    __ xchgl(r18, Address(r30, r28, (Address::ScaleFactor)2, +0x1008843));      //    xchg r18d, dword ptr [r30+r28*4+0x1008843]    IID79
+    __ testl(r21, Address(r8, +0x6669fd21));                                    //    test r21d, dword ptr [r8+0x6669fd21]    IID80
+    __ addb(r31, 4);                                                            //    add r31b, 4    IID81
+    __ addl(r11, 16777216);                                                     //    add r11d, 16777216    IID82
+    __ andl(r25, 1);                                                            //    and r25d, 1    IID83
+    __ adcl(r17, 16777216);                                                     //    adc r17d, 16777216    IID84
+    __ cmpb(r18, 4);                                                            //    cmp r18b, 4    IID85
+    __ cmpl(r9, 256);                                                           //    cmp r9d, 256    IID86
+    __ rcll(r17, 2);                                                            //    rcl r17d, 2    IID87
+    __ roll(r13, 16);                                                           //    rol r13d, 16    IID88
+    __ rorl(r27, 2);                                                            //    ror r27d, 2    IID89
+    __ sarl(r24, 8);                                                            //    sar r24d, 8    IID90
+    __ sall(r19, 16);                                                           //    sal r19d, 16    IID91
+    __ sbbl(r19, 1048576);                                                      //    sbb r19d, 1048576    IID92
+    __ shll(r20, 16);                                                           //    shl r20d, 16    IID93
+    __ shrl(r27, 4);                                                            //    shr r27d, 4    IID94
+    __ subl(r24, 16);                                                           //    sub r24d, 16    IID95
+    __ xorl(r27, 1048576);                                                      //    xor r27d, 1048576    IID96
+    __ movl(r21, 1);                                                            //    mov r21d, 1    IID97
+    __ testb(r31, 16);                                                          //    test r31b, 16    IID98
+    __ testl(r9, 4194304);                                                      //    test r9d, 4194304    IID99
+    __ subl_imm32(r30, 65536);                                                  //    sub r30d, 65536    IID100
+    __ cmovl(Assembler::Condition::overflow, r14, Address(r19, -0x50bc8441));   //    cmovo r14d, dword ptr [r19-0x50bc8441]    IID101
+    __ cmovl(Assembler::Condition::noOverflow, r15, Address(r10, r21, (Address::ScaleFactor)1, -0x49cea2b3)); //    cmovno r15d, dword ptr [r10+r21*2-0x49cea2b3]    IID102
+    __ cmovl(Assembler::Condition::below, rbx, Address(r14, +0x6909ad63));      //    cmovb ebx, dword ptr [r14+0x6909ad63]    IID103
+    __ cmovl(Assembler::Condition::aboveEqual, r16, Address(r9, r17, (Address::ScaleFactor)2, -0x6dcba209)); //    cmovae r16d, dword ptr [r9+r17*4-0x6dcba209]    IID104
+    __ cmovl(Assembler::Condition::zero, r13, Address(r11, +0x955a68e));        //    cmovz r13d, dword ptr [r11+0x955a68e]    IID105
+    __ cmovl(Assembler::Condition::notZero, r17, Address(r29, r9, (Address::ScaleFactor)0, -0x5829d35b)); //    cmovnz r17d, dword ptr [r29+r9*1-0x5829d35b]    IID106
+    __ cmovl(Assembler::Condition::belowEqual, r8, Address(r21, r30, (Address::ScaleFactor)3, -0x59a28591)); //    cmovbe r8d, dword ptr [r21+r30*8-0x59a28591]    IID107
+    __ cmovl(Assembler::Condition::above, r22, Address(r19, r10, (Address::ScaleFactor)1, -0x38931205)); //    cmova r22d, dword ptr [r19+r10*2-0x38931205]    IID108
+    __ cmovl(Assembler::Condition::negative, r25, Address(r23, r18, (Address::ScaleFactor)0, -0x6a417c17)); //    cmovs r25d, dword ptr [r23+r18*1-0x6a417c17]    IID109
+    __ cmovl(Assembler::Condition::positive, rbx, Address(r10, r9, (Address::ScaleFactor)3, +0x7bd43bff)); //    cmovns ebx, dword ptr [r10+r9*8+0x7bd43bff]    IID110
+    __ cmovl(Assembler::Condition::parity, rdx, Address(r8, r14, (Address::ScaleFactor)3, +0x3410bc6b)); //    cmovp edx, dword ptr [r8+r14*8+0x3410bc6b]    IID111
+    __ cmovl(Assembler::Condition::noParity, r12, Address(rcx, r9, (Address::ScaleFactor)2, +0x4a663482)); //    cmovnp r12d, dword ptr [rcx+r9*4+0x4a663482]    IID112
+    __ cmovl(Assembler::Condition::less, r21, Address(r13, r22, (Address::ScaleFactor)1, -0x638eaf19)); //    cmovl r21d, dword ptr [r13+r22*2-0x638eaf19]    IID113
+    __ cmovl(Assembler::Condition::greaterEqual, r19, Address(r25, r24, (Address::ScaleFactor)1, -0x5aa808c5)); //    cmovge r19d, dword ptr [r25+r24*2-0x5aa808c5]    IID114
+    __ cmovl(Assembler::Condition::lessEqual, rcx, Address(rcx, +0x4497f29));   //    cmovle ecx, dword ptr [rcx+0x4497f29]    IID115
+    __ cmovl(Assembler::Condition::greater, rcx, Address(r13, r17, (Address::ScaleFactor)3, +0x2a779b38)); //    cmovg ecx, dword ptr [r13+r17*8+0x2a779b38]    IID116
+    __ setb(Assembler::Condition::overflow, r22);                               //    seto r22b    IID117
+    __ setb(Assembler::Condition::noOverflow, r27);                             //    setno r27b    IID118
+    __ setb(Assembler::Condition::below, r20);                                  //    setb r20b    IID119
+    __ setb(Assembler::Condition::aboveEqual, r12);                             //    setae r12b    IID120
 #endif // _LP64
-    __ rorl(rdx, 4);                                                            //    ror edx, 4    IID89
-    __ sarl(rcx, 1);                                                            //    sar ecx, 1    IID90
+    __ setb(Assembler::Condition::zero, rdx);                                   //    setz dl    IID121
 #ifdef _LP64
-    __ sall(r19, 16);                                                           //    sal r19d, 16    IID91
-    __ sbbl(r9, 1);                                                             //    sbb r9d, 1    IID92
-    __ shll(r20, 8);                                                            //    shl r20d, 8    IID93
+    __ setb(Assembler::Condition::notZero, r17);                                //    setnz r17b    IID122
+    __ setb(Assembler::Condition::belowEqual, r9);                              //    setbe r9b    IID123
 #endif // _LP64
-    __ shrl(rcx, 1);                                                            //    shr ecx, 1    IID94
+    __ setb(Assembler::Condition::above, rcx);                                  //    seta cl    IID124
 #ifdef _LP64
-    __ subl(r19, 16777216);                                                     //    sub r19d, 16777216    IID95
-    __ xorl(r16, 4096);                                                         //    xor r16d, 4096    IID96
-    __ movl(r24, 65536);                                                        //    mov r24d, 65536    IID97
-    __ testb(r20, 64);                                                          //    test r20b, 64    IID98
-    __ testl(r28, 16777216);                                                    //    test r28d, 16777216    IID99
-    __ subl_imm32(r29, 262144);                                                 //    sub r29d, 262144    IID100
-    __ cmovl(Assembler::Condition::overflow, r8, Address(r26, r28, (Address::ScaleFactor)1, +0x210f06d)); //    cmovo r8d, dword ptr [r26+r28*2+0x210f06d]    IID101
-    __ cmovl(Assembler::Condition::noOverflow, rbx, Address(r18, rbx, (Address::ScaleFactor)0, -0x264fce2a)); //    cmovno ebx, dword ptr [r18+rbx*1-0x264fce2a]    IID102
-    __ cmovl(Assembler::Condition::below, r29, Address(r17, r24, (Address::ScaleFactor)0, +0x46c06acb)); //    cmovb r29d, dword ptr [r17+r24*1+0x46c06acb]    IID103
-    __ cmovl(Assembler::Condition::aboveEqual, r17, Address(r25, r11, (Address::ScaleFactor)3, -0x3b21f455)); //    cmovae r17d, dword ptr [r25+r11*8-0x3b21f455]    IID104
-    __ cmovl(Assembler::Condition::zero, r23, Address(r20, r31, (Address::ScaleFactor)0, -0x5a03317b)); //    cmovz r23d, dword ptr [r20+r31*1-0x5a03317b]    IID105
-    __ cmovl(Assembler::Condition::notZero, r31, Address(r31, r15, (Address::ScaleFactor)2, -0x53fc2e65)); //    cmovnz r31d, dword ptr [r31+r15*4-0x53fc2e65]    IID106
-    __ cmovl(Assembler::Condition::belowEqual, r28, Address(rdx, rcx, (Address::ScaleFactor)3, -0x3bc9229f)); //    cmovbe r28d, dword ptr [rdx+rcx*8-0x3bc9229f]    IID107
-    __ cmovl(Assembler::Condition::above, r31, Address(rdx, r19, (Address::ScaleFactor)3, +0x7bf1761c)); //    cmova r31d, dword ptr [rdx+r19*8+0x7bf1761c]    IID108
-    __ cmovl(Assembler::Condition::negative, rdx, Address(r17, r18, (Address::ScaleFactor)0, -0x1da2fc03)); //    cmovs edx, dword ptr [r17+r18*1-0x1da2fc03]    IID109
-    __ cmovl(Assembler::Condition::positive, r9, Address(r21, r23, (Address::ScaleFactor)2, -0x2799454a)); //    cmovns r9d, dword ptr [r21+r23*4-0x2799454a]    IID110
-    __ cmovl(Assembler::Condition::parity, r27, Address(r13, -0x654c249c));     //    cmovp r27d, dword ptr [r13-0x654c249c]    IID111
-    __ cmovl(Assembler::Condition::noParity, rdx, Address(r24, r10, (Address::ScaleFactor)3, +0x6c96beb2)); //    cmovnp edx, dword ptr [r24+r10*8+0x6c96beb2]    IID112
-    __ cmovl(Assembler::Condition::less, r9, Address(rcx, r8, (Address::ScaleFactor)3, +0x573e1892)); //    cmovl r9d, dword ptr [rcx+r8*8+0x573e1892]    IID113
-    __ cmovl(Assembler::Condition::greaterEqual, r31, Address(r26, r14, (Address::ScaleFactor)2, +0x717110b1)); //    cmovge r31d, dword ptr [r26+r14*4+0x717110b1]    IID114
-    __ cmovl(Assembler::Condition::lessEqual, r24, Address(r19, r14, (Address::ScaleFactor)2, +0x119faad7)); //    cmovle r24d, dword ptr [r19+r14*4+0x119faad7]    IID115
-    __ cmovl(Assembler::Condition::greater, r12, Address(r13, r12, (Address::ScaleFactor)0, +0xd537805)); //    cmovg r12d, dword ptr [r13+r12*1+0xd537805]    IID116
-    __ setb(Assembler::Condition::overflow, r10);                               //    seto r10b    IID117
+    __ setb(Assembler::Condition::negative, r15);                               //    sets r15b    IID125
+    __ setb(Assembler::Condition::positive, r27);                               //    setns r27b    IID126
+    __ setb(Assembler::Condition::parity, r17);                                 //    setp r17b    IID127
+    __ setb(Assembler::Condition::noParity, r17);                               //    setnp r17b    IID128
+    __ setb(Assembler::Condition::less, r28);                                   //    setl r28b    IID129
+    __ setb(Assembler::Condition::greaterEqual, r20);                           //    setge r20b    IID130
+    __ setb(Assembler::Condition::lessEqual, r31);                              //    setle r31b    IID131
 #endif // _LP64
-    __ setb(Assembler::Condition::noOverflow, rbx);                             //    setno bl    IID118
+    __ setb(Assembler::Condition::greater, rdx);                                //    setg dl    IID132
 #ifdef _LP64
-    __ setb(Assembler::Condition::below, r13);                                  //    setb r13b    IID119
-    __ setb(Assembler::Condition::aboveEqual, r23);                             //    setae r23b    IID120
-    __ setb(Assembler::Condition::zero, r24);                                   //    setz r24b    IID121
-    __ setb(Assembler::Condition::notZero, r15);                                //    setnz r15b    IID122
-    __ setb(Assembler::Condition::belowEqual, r21);                             //    setbe r21b    IID123
-    __ setb(Assembler::Condition::above, r17);                                  //    seta r17b    IID124
-    __ setb(Assembler::Condition::negative, r10);                               //    sets r10b    IID125
-    __ setb(Assembler::Condition::positive, r24);                               //    setns r24b    IID126
-    __ setb(Assembler::Condition::parity, r16);                                 //    setp r16b    IID127
-    __ setb(Assembler::Condition::noParity, r28);                               //    setnp r28b    IID128
-    __ setb(Assembler::Condition::less, r11);                                   //    setl r11b    IID129
-    __ setb(Assembler::Condition::greaterEqual, r25);                           //    setge r25b    IID130
-    __ setb(Assembler::Condition::lessEqual, r18);                              //    setle r18b    IID131
-    __ setb(Assembler::Condition::greater, r14);                                //    setg r14b    IID132
-    __ divl(r30);                                                               //    div r30d    IID133
-    __ idivl(r23);                                                              //    idiv r23d    IID134
-    __ imull(r28);                                                              //    imul r28d    IID135
-    __ mull(r31);                                                               //    mul r31d    IID136
-    __ negl(r27);                                                               //    neg r27d    IID137
-    __ notl(r16);                                                               //    not r16d    IID138
+    __ divl(r9);                                                                //    div r9d    IID133
+    __ idivl(r28);                                                              //    idiv r28d    IID134
+    __ imull(r26);                                                              //    imul r26d    IID135
+    __ mull(r15);                                                               //    mul r15d    IID136
+    __ negl(r31);                                                               //    neg r31d    IID137
+    __ notl(r10);                                                               //    not r10d    IID138
 #endif // _LP64
-    __ roll(rdx);                                                               //    rol edx, cl    IID139
+    __ roll(rcx);                                                               //    rol ecx, cl    IID139
 #ifdef _LP64
-    __ rorl(r12);                                                               //    ror r12d, cl    IID140
-    __ sarl(r14);                                                               //    sar r14d, cl    IID141
-    __ sall(r19);                                                               //    sal r19d, cl    IID142
-    __ shll(r10);                                                               //    shl r10d, cl    IID143
-    __ shrl(r20);                                                               //    shr r20d, cl    IID144
+    __ rorl(r23);                                                               //    ror r23d, cl    IID140
+    __ sarl(r22);                                                               //    sar r22d, cl    IID141
+    __ sall(r8);                                                                //    sal r8d, cl    IID142
+    __ shll(r20);                                                               //    shl r20d, cl    IID143
+    __ shrl(r8);                                                                //    shr r8d, cl    IID144
+    __ incrementl(r29);                                                         //    inc r29d    IID145
+    __ decrementl(r15);                                                         //    dec r15d    IID146
+    __ mull(Address(r27, rdx, (Address::ScaleFactor)3, +0x199d009c));           //    mul dword ptr [r27+rdx*8+0x199d009c]    IID147
+    __ negl(Address(r11, r9, (Address::ScaleFactor)1, -0x7f781439));            //    neg dword ptr [r11+r9*2-0x7f781439]    IID148
+    __ sarl(Address(r24, r22, (Address::ScaleFactor)1, -0x1cabc40a));           //    sar dword ptr [r24+r22*2-0x1cabc40a], cl    IID149
+    __ sall(Address(r24, +0x57bb4bfb));                                         //    sal dword ptr [r24+0x57bb4bfb], cl    IID150
+    __ shrl(Address(r31, +0x5490e5af));                                         //    shr dword ptr [r31+0x5490e5af], cl    IID151
+    __ incrementl(Address(r27, r13, (Address::ScaleFactor)1, +0x2366d44f));     //    inc dword ptr [r27+r13*2+0x2366d44f]    IID152
+    __ decrementl(Address(r28, +0x1e7c7207));                                   //    dec dword ptr [r28+0x1e7c7207]    IID153
+    __ imull(r14, Address(r14, r17, (Address::ScaleFactor)3, +0x13a05771), 268435456); //    imul r14d, dword ptr [r14+r17*8+0x13a05771], 268435456    IID154
+    __ imull(r18, r23, 16);                                                     //    imul r18d, r23d, 16    IID155
+    __ shldl(r24, r31, 4);                                                      //    shld r24d, r31d, 4    IID156
+    __ shrdl(r11, r30, 2);                                                      //    shrd r11d, r30d, 2    IID157
+    __ movzbl(rbx, Address(r23, r24, (Address::ScaleFactor)1, -0x5cb6670d));    //    movzx ebx, byte ptr [r23+r24*2-0x5cb6670d]    IID158
+    __ movzwl(r20, Address(rcx, r16, (Address::ScaleFactor)0, -0x64733fd2));    //    movzx r20d, word ptr [rcx+r16*1-0x64733fd2]    IID159
+    __ movsbl(r12, Address(r29, r15, (Address::ScaleFactor)2, +0x60d6eee5));    //    movsx r12d, byte ptr [r29+r15*4+0x60d6eee5]    IID160
+    __ movswl(r14, Address(r31, r9, (Address::ScaleFactor)3, +0x1aa5948));      //    movsx r14d, word ptr [r31+r9*8+0x1aa5948]    IID161
+    __ movzbl(r13, r29);                                                        //    movzx r13d, r29b    IID162
+    __ movzwl(r15, r12);                                                        //    movzx r15d, r12w    IID163
+    __ movsbl(r15, r25);                                                        //    movsx r15d, r25b    IID164
+    __ movswl(r27, r24);                                                        //    movsx r27d, r24w    IID165
+    __ cmpxchgb(r24, Address(r28, r25, (Address::ScaleFactor)0, +0x33efa575));  //    cmpxchg byte ptr [r28+r25*1+0x33efa575], r24b    IID166
+    __ cmpxchgw(r13, Address(rcx, r15, (Address::ScaleFactor)2, +0x2ac1ae4));   //    cmpxchg word ptr [rcx+r15*4+0x2ac1ae4], r13w    IID167
+    __ cmpxchgl(r8, Address(r26, r11, (Address::ScaleFactor)1, -0x5b6bd4de));   //    cmpxchg dword ptr [r26+r11*2-0x5b6bd4de], r8d    IID168
+    __ eidivl(r30, false);                                                      //    {EVEX}idiv r30d    IID169
+    __ eidivl(r12, true);                                                       //    {NF}idiv r12d    IID170
+    __ edivl(r17, false);                                                       //    {EVEX}div r17d    IID171
+    __ edivl(r17, true);                                                        //    {NF}div r17d    IID172
 #endif // _LP64
-    __ incrementl(rbx);                                                         //    inc ebx    IID145
+    __ eimull(rcx, false);                                                      //    {EVEX}imul ecx    IID173
 #ifdef _LP64
-    __ decrementl(r14);                                                         //    dec r14d    IID146
-    __ mull(Address(r12, -0x57a4fa5e));                                         //    mul dword ptr [r12-0x57a4fa5e]    IID147
-    __ negl(Address(rbx, -0x3db4cfc7));                                         //    neg dword ptr [rbx-0x3db4cfc7]    IID148
-    __ sarl(Address(r21, -0x7e70ad30));                                         //    sar dword ptr [r21-0x7e70ad30], cl    IID149
-    __ sall(Address(r21, r28, (Address::ScaleFactor)3, -0x23456bc9));           //    sal dword ptr [r21+r28*8-0x23456bc9], cl    IID150
-    __ shrl(Address(r11, r13, (Address::ScaleFactor)1, -0xe00fc44));            //    shr dword ptr [r11+r13*2-0xe00fc44], cl    IID151
-    __ incrementl(Address(r19, -0x5e6ad56a));                                   //    inc dword ptr [r19-0x5e6ad56a]    IID152
-    __ decrementl(Address(rcx, r20, (Address::ScaleFactor)0, -0x2530b9c4));     //    dec dword ptr [rcx+r20*1-0x2530b9c4]    IID153
-    __ imull(r17, Address(r8, r24, (Address::ScaleFactor)1, +0x2efecf26), 1048576); //    imul r17d, dword ptr [r8+r24*2+0x2efecf26], 1048576    IID154
-    __ imull(r9, r8, 268435456);                                                //    imul r9d, r8d, 268435456    IID155
-    __ shldl(r10, r15, 8);                                                      //    shld r10d, r15d, 8    IID156
-    __ shrdl(r29, r22, 2);                                                      //    shrd r29d, r22d, 2    IID157
-    __ movzbl(r14, Address(r19, -0x6c33584));                                   //    movzx r14d, byte ptr [r19-0x6c33584]    IID158
-    __ movzwl(r25, Address(r12, r27, (Address::ScaleFactor)0, +0x2d05fa44));    //    movzx r25d, word ptr [r12+r27*1+0x2d05fa44]    IID159
-    __ movsbl(r12, Address(r30, r15, (Address::ScaleFactor)0, +0x65bccac1));    //    movsx r12d, byte ptr [r30+r15*1+0x65bccac1]    IID160
-    __ movswl(r26, Address(r10, r24, (Address::ScaleFactor)0, +0x1d707459));    //    movsx r26d, word ptr [r10+r24*1+0x1d707459]    IID161
-    __ movzbl(r18, r8);                                                         //    movzx r18d, r8b    IID162
-    __ movzwl(r31, r9);                                                         //    movzx r31d, r9w    IID163
-    __ movsbl(r15, r22);                                                        //    movsx r15d, r22b    IID164
-    __ movswl(r24, r24);                                                        //    movsx r24d, r24w    IID165
-    __ cmpxchgb(r18, Address(r12, r28, (Address::ScaleFactor)1, -0x4855a65f));  //    cmpxchg byte ptr [r12+r28*2-0x4855a65f], r18b    IID166
-    __ cmpxchgw(r28, Address(rdx, r14, (Address::ScaleFactor)3, +0x16f5a558));  //    cmpxchg word ptr [rdx+r14*8+0x16f5a558], r28w    IID167
-    __ cmpxchgl(rdx, Address(r18, rdx, (Address::ScaleFactor)1, +0x50258d9c));  //    cmpxchg dword ptr [r18+rdx*2+0x50258d9c], edx    IID168
+    __ eimull(r13, true);                                                       //    {NF}imul r13d    IID174
+    __ emull(r23, false);                                                       //    {EVEX}mul r23d    IID175
+    __ emull(r25, true);                                                        //    {NF}mul r25d    IID176
+    __ emull(Address(r22, r10, (Address::ScaleFactor)1, -0x3d379b56), false);   //    {EVEX}mul dword ptr [r22+r10*2-0x3d379b56]    IID177
+    __ emull(Address(r11, -0x3249efaf), true);                                  //    {NF}mul dword ptr [r11-0x3249efaf]    IID178
+    __ elzcntl(r9, r16, false);                                                 //    {EVEX}lzcnt r9d, r16d    IID179
+    __ elzcntl(r23, r28, true);                                                 //    {NF}lzcnt r23d, r28d    IID180
+    __ enegl(r8, r30, false);                                                   //    {EVEX}neg r8d, r30d    IID181
+    __ enegl(r23, r11, true);                                                   //    {NF}neg r23d, r11d    IID182
+    __ epopcntl(r13, r16, false);                                               //    {EVEX}popcnt r13d, r16d    IID183
+    __ epopcntl(r11, r11, true);                                                //    {NF}popcnt r11d, r11d    IID184
+    __ enotl(r26, rcx);                                                         //    {EVEX}not r26d, ecx    IID185
+    __ eroll(rbx, r10, false);                                                  //    {EVEX}rol ebx, r10d, cl    IID186
+    __ eroll(r14, r29, true);                                                   //    {NF}rol r14d, r29d, cl    IID187
+    __ erorl(r15, r20, false);                                                  //    {EVEX}ror r15d, r20d, cl    IID188
+    __ erorl(r17, r12, true);                                                   //    {NF}ror r17d, r12d, cl    IID189
+    __ esall(r12, rbx, false);                                                  //    {EVEX}sal r12d, ebx, cl    IID190
+    __ esall(r23, r27, true);                                                   //    {NF}sal r23d, r27d, cl    IID191
+    __ esarl(r29, r20, false);                                                  //    {EVEX}sar r29d, r20d, cl    IID192
+    __ esarl(r28, rdx, true);                                                   //    {NF}sar r28d, edx, cl    IID193
+    __ edecl(r8, r27, false);                                                   //    {EVEX}dec r8d, r27d    IID194
+    __ edecl(rbx, r15, true);                                                   //    {NF}dec ebx, r15d    IID195
+    __ eincl(r11, r27, false);                                                  //    {EVEX}inc r11d, r27d    IID196
+    __ eincl(r29, r25, true);                                                   //    {NF}inc r29d, r25d    IID197
+    __ eshll(r12, r8, false);                                                   //    {EVEX}shl r12d, r8d, cl    IID198
+    __ eshll(r11, r18, true);                                                   //    {NF}shl r11d, r18d, cl    IID199
+    __ eshrl(rdx, r13, false);                                                  //    {EVEX}shr edx, r13d, cl    IID200
+    __ eshrl(r23, r24, true);                                                   //    {NF}shr r23d, r24d, cl    IID201
+    __ etzcntl(r15, r15, false);                                                //    {EVEX}tzcnt r15d, r15d    IID202
+    __ etzcntl(r26, r28, true);                                                 //    {NF}tzcnt r26d, r28d    IID203
+    __ elzcntl(rbx, Address(r25, r14, (Address::ScaleFactor)0, +0x1c13fdb6), false); //    {EVEX}lzcnt ebx, dword ptr [r25+r14*1+0x1c13fdb6]    IID204
+    __ elzcntl(r9, Address(r31, r28, (Address::ScaleFactor)3, -0x30bf8b7f), true); //    {NF}lzcnt r9d, dword ptr [r31+r28*8-0x30bf8b7f]    IID205
+    __ enegl(r8, Address(r25, -0x9c80fe2), false);                              //    {EVEX}neg r8d, dword ptr [r25-0x9c80fe2]    IID206
+    __ enegl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true); //    {NF}neg r22d, dword ptr [r27+r19*4+0x38f27c09]    IID207
+    __ epopcntl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false); //    {EVEX}popcnt r21d, dword ptr [r14+r30*4+0x39f92c7b]    IID208
+    __ epopcntl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true); //    {NF}popcnt r26d, dword ptr [r23+r14*8-0x602e1b3d]    IID209
+    __ esall(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false); //    {EVEX}sal r25d, dword ptr [r28+r23*2+0x4ff120ef], cl    IID210
+    __ esall(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true); //    {NF}sal r29d, dword ptr [r24+r16*8-0x6821bb43], cl    IID211
+    __ esarl(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false); //    {EVEX}sar r23d, dword ptr [r11+r31*4+0x7f4224bb], cl    IID212
+    __ esarl(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true); //    {NF}sar r12d, dword ptr [r23+r31*2-0x28f87a8], cl    IID213
+    __ edecl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false); //    {EVEX}dec r19d, dword ptr [r16+r30*2-0x27b89e0d]    IID214
+    __ edecl(r26, Address(r25, +0x3d145d48), true);                             //    {NF}dec r26d, dword ptr [r25+0x3d145d48]    IID215
+    __ eincl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false); //    {EVEX}inc r13d, dword ptr [r27+r24*2+0x625f3862]    IID216
+    __ eincl(r11, Address(r22, +0x765904a6), true);                             //    {NF}inc r11d, dword ptr [r22+0x765904a6]    IID217
+    __ eshrl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false); //    {EVEX}shr r25d, dword ptr [rdx+r17*2-0x7d50376f], cl    IID218
+    __ eshrl(r22, Address(r12, -0x50325da9), true);                             //    {NF}shr r22d, dword ptr [r12-0x50325da9], cl    IID219
+    __ etzcntl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false); //    {EVEX}tzcnt r13d, dword ptr [r13+r20*1-0xbf3e86c]    IID220
+    __ etzcntl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true); //    {NF}tzcnt r26d, dword ptr [r14+r19*2-0x24c59cb9]    IID221
+    __ eaddl(r22, Address(r27, r31, (Address::ScaleFactor)2, -0x7f80902f), 1048576, false); //    {EVEX}add r22d, dword ptr [r27+r31*4-0x7f80902f], 1048576    IID222
+    __ eaddl(r31, Address(rdx, r21, (Address::ScaleFactor)3, -0x557cc036), 268435456, true); //    {NF}add r31d, dword ptr [rdx+r21*8-0x557cc036], 268435456    IID223
+    __ eandl(r10, Address(r26, +0x4e6bebf9), 4096, false);                      //    {EVEX}and r10d, dword ptr [r26+0x4e6bebf9], 4096    IID224
+    __ eandl(r13, Address(r30, +0x14f1a5fd), 256, true);                        //    {NF}and r13d, dword ptr [r30+0x14f1a5fd], 256    IID225
+    __ eimull(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false); //    {EVEX}imul r27d, dword ptr [r29+r8*1+0x37988799], 1    IID226
+    __ eimull(r27, Address(r9, -0x446d2dc1), 256, true);                        //    {NF}imul r27d, dword ptr [r9-0x446d2dc1], 256    IID227
+    __ eorl(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false); //    {EVEX}or r17d, dword ptr [r20+r25*1+0x4957b5db], 16    IID228
+    __ eorl(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true); //    {NF}or r25d, dword ptr [r29+r31*2+0x3c26a53e], 1    IID229
+    __ eorb(r15, Address(r9, -0x25974a1e), 64, false);                          //    {EVEX}or r15b, byte ptr [r9-0x25974a1e], 64    IID230
+    __ eorb(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4, true); //    {NF}or r11b, byte ptr [r16+r15*4+0x66a0329f], 4    IID231
+    __ esall(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false); //    {EVEX}sal ecx, dword ptr [rcx+r27*1+0x38c6485e], 1    IID232
+    __ esall(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 8, true); //    {NF}sal r25d, dword ptr [r8+r10*1+0x79131c34], 8    IID233
+    __ esarl(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false); //    {EVEX}sar r13d, dword ptr [r9+r31*4+0x12718ba9], 2    IID234
+    __ esarl(r15, Address(r25, -0x505836f3), 16, true);                         //    {NF}sar r15d, dword ptr [r25-0x505836f3], 16    IID235
+    __ eshrl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false); //    {EVEX}shr r15d, dword ptr [rcx+r19*1+0xc5c1510], 1    IID236
+    __ eshrl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true); //    {NF}shr r13d, dword ptr [r29+r21*4-0x6c67309c], 8    IID237
+    __ esubl(rbx, Address(r12, r8, (Address::ScaleFactor)1, -0x3575087f), 4096, false); //    {EVEX}sub ebx, dword ptr [r12+r8*2-0x3575087f], 4096    IID238
+    __ esubl(r28, Address(rbx, r21, (Address::ScaleFactor)3, -0x55f83db8), 65536, true); //    {NF}sub r28d, dword ptr [rbx+r21*8-0x55f83db8], 65536    IID239
+    __ exorl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false); //    {EVEX}xor r30d, dword ptr [r21+r26*1+0x3b4d14e1], 1    IID240
+    __ exorl(r28, Address(r18, -0x452348a1), 16777216, true);                   //    {NF}xor r28d, dword ptr [r18-0x452348a1], 16777216    IID241
+    __ eaddl(r18, Address(rdx, r10, (Address::ScaleFactor)2, -0x161e1d47), r16, false); //    {EVEX}add r18d, dword ptr [rdx+r10*4-0x161e1d47], r16d    IID242
+    __ eaddl(r27, Address(r25, r18, (Address::ScaleFactor)3, -0x679bb823), rdx, true); //    {NF}add r27d, dword ptr [r25+r18*8-0x679bb823], edx    IID243
+    __ eorl(r27, Address(r31, r29, (Address::ScaleFactor)3, +0x19ed7934), r9, false); //    {EVEX}or r27d, dword ptr [r31+r29*8+0x19ed7934], r9d    IID244
+    __ eorl(r22, Address(r8, r16, (Address::ScaleFactor)2, -0x1bf71f78), r17, true); //    {NF}or r22d, dword ptr [r8+r16*4-0x1bf71f78], r17d    IID245
+    __ eorb(rcx, Address(r15, r28, (Address::ScaleFactor)3, -0x6a4a3934), r16, false); //    {EVEX}or cl, byte ptr [r15+r28*8-0x6a4a3934], r16b    IID246
+    __ eorb(r28, Address(r23, r12, (Address::ScaleFactor)2, +0x3c2449f7), r16, true); //    {NF}or r28b, byte ptr [r23+r12*4+0x3c2449f7], r16b    IID247
+    __ esubl(r22, Address(r27, r10, (Address::ScaleFactor)1, -0x3c29396f), r9, false); //    {EVEX}sub r22d, dword ptr [r27+r10*2-0x3c29396f], r9d    IID248
+    __ esubl(r10, Address(r16, -0x165064ff), r17, true);                        //    {NF}sub r10d, dword ptr [r16-0x165064ff], r17d    IID249
+    __ exorl(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false); //    {EVEX}xor r28d, dword ptr [r30+r11*1+0x17281e3a], r20d    IID250
+    __ exorl(rdx, Address(rbx, r31, (Address::ScaleFactor)3, +0x7753d0dc), r17, true); //    {NF}xor edx, dword ptr [rbx+r31*8+0x7753d0dc], r17d    IID251
+    __ exorb(r9, Address(r31, +0x72a4f58e), r30, false);                        //    {EVEX}xor r9b, byte ptr [r31+0x72a4f58e], r30b    IID252
+    __ exorb(r24, Address(r25, r15, (Address::ScaleFactor)0, +0x20fc1a0a), r16, true); //    {NF}xor r24b, byte ptr [r25+r15*1+0x20fc1a0a], r16b    IID253
+    __ eaddl(r12, rbx, 65536, false);                                           //    {EVEX}add r12d, ebx, 65536    IID254
+    __ eaddl(r20, r24, 4096, true);                                             //    {NF}add r20d, r24d, 4096    IID255
+    __ eandl(r18, r26, 1048576, false);                                         //    {EVEX}and r18d, r26d, 1048576    IID256
+    __ eandl(r29, r13, 1, true);                                                //    {NF}and r29d, r13d, 1    IID257
+    __ eimull(rcx, r31, 65536, false);                                          //    {EVEX}imul ecx, r31d, 65536    IID258
+    __ eimull(r23, r29, 65536, true);                                           //    {NF}imul r23d, r29d, 65536    IID259
+    __ eorl(r23, r23, 1048576, false);                                          //    {EVEX}or r23d, r23d, 1048576    IID260
+    __ eorl(r21, r9, 268435456, true);                                          //    {NF}or r21d, r9d, 268435456    IID261
+    __ ercll(r13, rdx, 4);                                                      //    {EVEX}rcl r13d, edx, 4    IID262
+    __ eroll(r15, r31, 8, false);                                               //    {EVEX}rol r15d, r31d, 8    IID263
+    __ eroll(r8, r9, 2, true);                                                  //    {NF}rol r8d, r9d, 2    IID264
+    __ erorl(r9, r15, 8, false);                                                //    {EVEX}ror r9d, r15d, 8    IID265
+    __ erorl(r21, r12, 8, true);                                                //    {NF}ror r21d, r12d, 8    IID266
+    __ esall(r19, r27, 1, false);                                               //    {EVEX}sal r19d, r27d, 1    IID267
+    __ esall(r10, r11, 16, true);                                               //    {NF}sal r10d, r11d, 16    IID268
+    __ esarl(r8, rdx, 8, false);                                                //    {EVEX}sar r8d, edx, 8    IID269
+    __ esarl(r22, r30, 4, true);                                                //    {NF}sar r22d, r30d, 4    IID270
+    __ eshll(r25, r31, 16, false);                                              //    {EVEX}shl r25d, r31d, 16    IID271
+    __ eshll(r10, r9, 8, true);                                                 //    {NF}shl r10d, r9d, 8    IID272
+    __ eshrl(r13, r8, 4, false);                                                //    {EVEX}shr r13d, r8d, 4    IID273
+    __ eshrl(r16, r21, 16, true);                                               //    {NF}shr r16d, r21d, 16    IID274
+    __ esubl(r26, r23, 16777216, false);                                        //    {EVEX}sub r26d, r23d, 16777216    IID275
+    __ esubl(r26, r14, 1048576, true);                                          //    {NF}sub r26d, r14d, 1048576    IID276
+    __ exorl(r27, r26, 256, false);                                             //    {EVEX}xor r27d, r26d, 256    IID277
+    __ exorl(r22, r9, 1, true);                                                 //    {NF}xor r22d, r9d, 1    IID278
+    __ esubl_imm32(r22, r30, 268435456, false);                                 //    {EVEX}sub r22d, r30d, 268435456    IID279
+    __ esubl_imm32(r8, r16, 4194304, true);                                     //    {NF}sub r8d, r16d, 4194304    IID280
+    __ eaddl(r20, r29, Address(r11, r12, (Address::ScaleFactor)1, +0xac0980), false); //    {EVEX}add r20d, r29d, dword ptr [r11+r12*2+0xac0980]    IID281
+    __ eaddl(r18, rbx, Address(r9, r18, (Address::ScaleFactor)1, +0x434a125d), true); //    {NF}add r18d, ebx, dword ptr [r9+r18*2+0x434a125d]    IID282
+    __ eandl(r14, r15, Address(r14, r19, (Address::ScaleFactor)2, +0x15a5a5ee), false); //    {EVEX}and r14d, r15d, dword ptr [r14+r19*4+0x15a5a5ee]    IID283
+    __ eandl(r28, r31, Address(r24, r12, (Address::ScaleFactor)3, -0x6d6d7e68), true); //    {NF}and r28d, r31d, dword ptr [r24+r12*8-0x6d6d7e68]    IID284
+    __ eimull(r24, r13, Address(r24, r25, (Address::ScaleFactor)3, +0x784673fd), false); //    {EVEX}imul r24d, r13d, dword ptr [r24+r25*8+0x784673fd]    IID285
+    __ eimull(r24, r21, Address(r8, r13, (Address::ScaleFactor)2, -0x63663889), true); //    {NF}imul r24d, r21d, dword ptr [r8+r13*4-0x63663889]    IID286
+    __ eorl(r12, r24, Address(r30, -0x67526556), false);                        //    {EVEX}or r12d, r24d, dword ptr [r30-0x67526556]    IID287
+    __ eorl(r13, r13, Address(rbx, r25, (Address::ScaleFactor)2, -0x5f394dd9), true); //    {NF}or r13d, r13d, dword ptr [rbx+r25*4-0x5f394dd9]    IID288
+    __ esubl(r26, r25, Address(r25, rdx, (Address::ScaleFactor)3, -0x2e39f79a), false); //    {EVEX}sub r26d, r25d, dword ptr [r25+rdx*8-0x2e39f79a]    IID289
+    __ esubl(r28, r8, Address(rdx, r24, (Address::ScaleFactor)3, -0xed99a54), true); //    {NF}sub r28d, r8d, dword ptr [rdx+r24*8-0xed99a54]    IID290
+    __ exorl(r31, r22, Address(r30, r20, (Address::ScaleFactor)3, +0x3ac41cbd), false); //    {EVEX}xor r31d, r22d, dword ptr [r30+r20*8+0x3ac41cbd]    IID291
+    __ exorl(r24, r30, Address(r13, r17, (Address::ScaleFactor)1, +0x1efdc2e3), true); //    {NF}xor r24d, r30d, dword ptr [r13+r17*2+0x1efdc2e3]    IID292
+    __ exorb(r16, r16, Address(r9, r15, (Address::ScaleFactor)1, +0x769feb34), false); //    {EVEX}xor r16b, r16b, byte ptr [r9+r15*2+0x769feb34]    IID293
+    __ exorb(r19, r25, Address(r10, +0x2239b429), true);                        //    {NF}xor r19b, r25b, byte ptr [r10+0x2239b429]    IID294
+    __ exorw(r25, r19, Address(r16, r24, (Address::ScaleFactor)1, +0x1c71faea), false); //    {EVEX}xor r25w, r19w, word ptr [r16+r24*2+0x1c71faea]    IID295
+    __ exorw(r19, r10, Address(r28, -0x299a0cfd), true);                        //    {NF}xor r19w, r10w, word ptr [r28-0x299a0cfd]    IID296
+    __ eaddl(rbx, r23, r24, false);                                             //    {load}{EVEX}add ebx, r23d, r24d    IID297
+    __ eaddl(r28, r14, r24, true);                                              //    {load}{NF}add r28d, r14d, r24d    IID298
+    __ eandl(r30, r31, r26, false);                                             //    {load}{EVEX}and r30d, r31d, r26d    IID299
+    __ eandl(r12, r31, r23, true);                                              //    {load}{NF}and r12d, r31d, r23d    IID300
+    __ eimull(r9, r20, r10, false);                                             //    {load}{EVEX}imul r9d, r20d, r10d    IID301
+    __ eimull(r13, r30, r9, true);                                              //    {load}{NF}imul r13d, r30d, r9d    IID302
+    __ eorw(r25, r19, r23, false);                                              //    {load}{EVEX}or r25w, r19w, r23w    IID303
+    __ eorw(r12, r16, rdx, true);                                               //    {load}{NF}or r12w, r16w, dx    IID304
+    __ eorl(r31, r17, r9, false);                                               //    {load}{EVEX}or r31d, r17d, r9d    IID305
+    __ eorl(r15, r13, rbx, true);                                               //    {load}{NF}or r15d, r13d, ebx    IID306
+    __ eshldl(r28, rbx, r29, false);                                            //    {load}{EVEX}shld r28d, ebx, r29d, cl    IID307
+    __ eshldl(r22, rbx, r8, true);                                              //    {load}{NF}shld r22d, ebx, r8d, cl    IID308
+    __ eshrdl(r8, r11, r16, false);                                             //    {load}{EVEX}shrd r8d, r11d, r16d, cl    IID309
+    __ eshrdl(r13, r12, r15, true);                                             //    {load}{NF}shrd r13d, r12d, r15d, cl    IID310
+    __ esubl(r17, r23, r31, false);                                             //    {load}{EVEX}sub r17d, r23d, r31d    IID311
+    __ esubl(r20, r22, r26, true);                                              //    {load}{NF}sub r20d, r22d, r26d    IID312
+    __ exorl(r10, r25, r19, false);                                             //    {load}{EVEX}xor r10d, r25d, r19d    IID313
+    __ exorl(r11, r19, r30, true);                                              //    {load}{NF}xor r11d, r19d, r30d    IID314
+    __ eshldl(r12, r10, rdx, 1, false);                                         //    {EVEX}shld r12d, r10d, edx, 1    IID315
+    __ eshldl(r20, r30, r18, 16, true);                                         //    {NF}shld r20d, r30d, r18d, 16    IID316
+    __ eshrdl(r18, r25, r18, 8, false);                                         //    {EVEX}shrd r18d, r25d, r18d, 8    IID317
+    __ eshrdl(r19, r16, r25, 1, true);                                          //    {NF}shrd r19d, r16d, r25d, 1    IID318
+    __ ecmovl (Assembler::Condition::overflow, r11, r31, r24);                  //    cmovo r11d, r31d, r24d    IID319
+    __ ecmovl (Assembler::Condition::noOverflow, r14, r30, r16);                //    cmovno r14d, r30d, r16d    IID320
+    __ ecmovl (Assembler::Condition::below, r9, r11, r26);                      //    cmovb r9d, r11d, r26d    IID321
+    __ ecmovl (Assembler::Condition::aboveEqual, r27, rdx, r31);                //    cmovae r27d, edx, r31d    IID322
+    __ ecmovl (Assembler::Condition::zero, r24, r29, r10);                      //    cmovz r24d, r29d, r10d    IID323
+    __ ecmovl (Assembler::Condition::notZero, rcx, r21, r15);                   //    cmovnz ecx, r21d, r15d    IID324
+    __ ecmovl (Assembler::Condition::belowEqual, r23, r17, r26);                //    cmovbe r23d, r17d, r26d    IID325
+    __ ecmovl (Assembler::Condition::above, r20, r27, r13);                     //    cmova r20d, r27d, r13d    IID326
+    __ ecmovl (Assembler::Condition::negative, r15, r22, r15);                  //    cmovs r15d, r22d, r15d    IID327
+    __ ecmovl (Assembler::Condition::positive, r29, r26, r18);                  //    cmovns r29d, r26d, r18d    IID328
+    __ ecmovl (Assembler::Condition::parity, r9, r9, r22);                      //    cmovp r9d, r9d, r22d    IID329
+    __ ecmovl (Assembler::Condition::noParity, r30, r23, r11);                  //    cmovnp r30d, r23d, r11d    IID330
+    __ ecmovl (Assembler::Condition::less, r20, r11, rbx);                      //    cmovl r20d, r11d, ebx    IID331
+    __ ecmovl (Assembler::Condition::greaterEqual, r28, r16, r20);              //    cmovge r28d, r16d, r20d    IID332
+    __ ecmovl (Assembler::Condition::lessEqual, r17, r24, r22);                 //    cmovle r17d, r24d, r22d    IID333
+    __ ecmovl (Assembler::Condition::greater, r16, r15, r15);                   //    cmovg r16d, r15d, r15d    IID334
+    __ ecmovl (Assembler::Condition::overflow, r28, r25, Address(r29, r16, (Address::ScaleFactor)2, -0x3c9110ad)); //    cmovo r28d, r25d, dword ptr [r29+r16*4-0x3c9110ad]    IID335
+    __ ecmovl (Assembler::Condition::noOverflow, r23, r15, Address(rbx, r30, (Address::ScaleFactor)3, +0x1cbc58bd)); //    cmovno r23d, r15d, dword ptr [rbx+r30*8+0x1cbc58bd]    IID336
+    __ ecmovl (Assembler::Condition::below, r26, rbx, Address(r12, rcx, (Address::ScaleFactor)3, +0x84e581a)); //    cmovb r26d, ebx, dword ptr [r12+rcx*8+0x84e581a]    IID337
+    __ ecmovl (Assembler::Condition::aboveEqual, rcx, r24, Address(r17, +0x5cece92d)); //    cmovae ecx, r24d, dword ptr [r17+0x5cece92d]    IID338
+    __ ecmovl (Assembler::Condition::zero, r26, r24, Address(r24, r12, (Address::ScaleFactor)3, +0x507746a2)); //    cmovz r26d, r24d, dword ptr [r24+r12*8+0x507746a2]    IID339
+    __ ecmovl (Assembler::Condition::notZero, r8, r15, Address(rcx, r19, (Address::ScaleFactor)0, -0xf035c76)); //    cmovnz r8d, r15d, dword ptr [rcx+r19*1-0xf035c76]    IID340
+    __ ecmovl (Assembler::Condition::belowEqual, rdx, r23, Address(r22, r27, (Address::ScaleFactor)0, -0x12fe3534)); //    cmovbe edx, r23d, dword ptr [r22+r27*1-0x12fe3534]    IID341
+    __ ecmovl (Assembler::Condition::above, r30, r19, Address(r13, r28, (Address::ScaleFactor)0, +0x73b8ee9d)); //    cmova r30d, r19d, dword ptr [r13+r28*1+0x73b8ee9d]    IID342
+    __ ecmovl (Assembler::Condition::negative, r22, r30, Address(r16, rcx, (Address::ScaleFactor)0, +0x22aac146)); //    cmovs r22d, r30d, dword ptr [r16+rcx*1+0x22aac146]    IID343
+    __ ecmovl (Assembler::Condition::positive, r17, r30, Address(r17, r9, (Address::ScaleFactor)2, +0x79db2b1)); //    cmovns r17d, r30d, dword ptr [r17+r9*4+0x79db2b1]    IID344
+    __ ecmovl (Assembler::Condition::parity, r26, rdx, Address(r14, r16, (Address::ScaleFactor)1, -0x8242011)); //    cmovp r26d, edx, dword ptr [r14+r16*2-0x8242011]    IID345
+    __ ecmovl (Assembler::Condition::noParity, r11, r19, Address(r14, r31, (Address::ScaleFactor)1, -0x4ff251cc)); //    cmovnp r11d, r19d, dword ptr [r14+r31*2-0x4ff251cc]    IID346
+    __ ecmovl (Assembler::Condition::less, r20, r18, Address(r13, r16, (Address::ScaleFactor)2, -0x19efc6e2)); //    cmovl r20d, r18d, dword ptr [r13+r16*4-0x19efc6e2]    IID347
+    __ ecmovl (Assembler::Condition::greaterEqual, r19, r13, Address(r13, r23, (Address::ScaleFactor)1, +0x611b7714)); //    cmovge r19d, r13d, dword ptr [r13+r23*2+0x611b7714]    IID348
+    __ ecmovl (Assembler::Condition::lessEqual, r29, r13, Address(r17, r17, (Address::ScaleFactor)3, +0x3a94a93f)); //    cmovle r29d, r13d, dword ptr [r17+r17*8+0x3a94a93f]    IID349
+    __ ecmovl (Assembler::Condition::greater, r13, r29, Address(r15, r23, (Address::ScaleFactor)1, +0x76d43532)); //    cmovg r13d, r29d, dword ptr [r15+r23*2+0x76d43532]    IID350
 #endif // _LP64
 #ifdef _LP64
-    __ adcq(r9, rbx);                                                           //    {load}adc r9, rbx    IID169
-    __ cmpq(r26, r24);                                                          //    {load}cmp r26, r24    IID170
-    __ imulq(r14, rdx);                                                         //    {load}imul r14, rdx    IID171
-    __ popcntq(r25, r30);                                                       //    {load}popcnt r25, r30    IID172
-    __ sbbq(r24, r19);                                                          //    {load}sbb r24, r19    IID173
-    __ subq(r15, r11);                                                          //    {load}sub r15, r11    IID174
-    __ tzcntq(r18, r21);                                                        //    {load}tzcnt r18, r21    IID175
-    __ lzcntq(r15, r27);                                                        //    {load}lzcnt r15, r27    IID176
-    __ addq(r21, r20);                                                          //    {load}add r21, r20    IID177
-    __ andq(r11, r26);                                                          //    {load}and r11, r26    IID178
-    __ orq(r29, r15);                                                           //    {load}or r29, r15    IID179
-    __ xorq(r24, r21);                                                          //    {load}xor r24, r21    IID180
-    __ movq(r14, r13);                                                          //    {load}mov r14, r13    IID181
-    __ bsfq(r11, r22);                                                          //    {load}bsf r11, r22    IID182
-    __ bsrq(r14, r23);                                                          //    {load}bsr r14, r23    IID183
-    __ btq(r22, rcx);                                                           //    {load}bt r22, rcx    IID184
-    __ xchgq(r25, r29);                                                         //    {load}xchg r25, r29    IID185
-    __ testq(r15, r8);                                                          //    {load}test r15, r8    IID186
-    __ addq(Address(r14, r10, (Address::ScaleFactor)3, -0x36e6fa02), r16);      //    add qword ptr [r14+r10*8-0x36e6fa02], r16    IID187
-    __ andq(Address(rbx, r8, (Address::ScaleFactor)3, -0x279a21b8), r18);       //    and qword ptr [rbx+r8*8-0x279a21b8], r18    IID188
-    __ cmpq(Address(r24, +0x62c3c9ef), r13);                                    //    cmp qword ptr [r24+0x62c3c9ef], r13    IID189
-    __ orq(Address(r11, r22, (Address::ScaleFactor)2, +0x419fb378), r11);       //    or qword ptr [r11+r22*4+0x419fb378], r11    IID190
-    __ xorq(Address(r25, r14, (Address::ScaleFactor)2, -0x32b449dd), r13);      //    xor qword ptr [r25+r14*4-0x32b449dd], r13    IID191
-    __ subq(Address(r28, r31, (Address::ScaleFactor)3, +0x6ce1d361), r19);      //    sub qword ptr [r28+r31*8+0x6ce1d361], r19    IID192
-    __ movq(Address(r25, r25, (Address::ScaleFactor)2, -0x3f5767c), r11);       //    mov qword ptr [r25+r25*4-0x3f5767c], r11    IID193
-    __ xaddq(Address(r19, r17, (Address::ScaleFactor)3, +0x1febf06c), r20);     //    xadd qword ptr [r19+r17*8+0x1febf06c], r20    IID194
-    __ andq(Address(r26, r17, (Address::ScaleFactor)1, -0x6b865f05), 65536);    //    and qword ptr [r26+r17*2-0x6b865f05], 65536    IID195
-    __ addq(Address(r27, -0x6ec95d87), 65536);                                  //    add qword ptr [r27-0x6ec95d87], 65536    IID196
-    __ cmpq(Address(rbx, r26, (Address::ScaleFactor)2, -0x1eabea4), 1048576);   //    cmp qword ptr [rbx+r26*4-0x1eabea4], 1048576    IID197
-    __ sarq(Address(rbx, r19, (Address::ScaleFactor)0, +0x3c3c3de8), 8);        //    sar qword ptr [rbx+r19*1+0x3c3c3de8], 8    IID198
-    __ salq(Address(r20, r23, (Address::ScaleFactor)1, +0x68519b6d), 8);        //    sal qword ptr [r20+r23*2+0x68519b6d], 8    IID199
-    __ sbbq(Address(r31, r22, (Address::ScaleFactor)0, -0x7b3d1e85), 16);       //    sbb qword ptr [r31+r22*1-0x7b3d1e85], 16    IID200
-    __ shrq(Address(r15, r18, (Address::ScaleFactor)3, +0x4d9d824), 4);         //    shr qword ptr [r15+r18*8+0x4d9d824], 4    IID201
-    __ subq(Address(rdx, r29, (Address::ScaleFactor)2, +0x7e4aea85), 1);        //    sub qword ptr [rdx+r29*4+0x7e4aea85], 1    IID202
-    __ xorq(Address(r23, r10, (Address::ScaleFactor)1, +0x2895c620), 16777216); //    xor qword ptr [r23+r10*2+0x2895c620], 16777216    IID203
-    __ orq(Address(r14, r13, (Address::ScaleFactor)0, -0x771b399b), 1);         //    or qword ptr [r14+r13*1-0x771b399b], 1    IID204
-    __ movq(Address(r22, -0x63459b5a), 256);                                    //    mov qword ptr [r22-0x63459b5a], 256    IID205
-    __ testq(Address(r13, -0xb9691c5), -1);                                     //    test qword ptr [r13-0xb9691c5], -1    IID206
-    __ addq(r17, Address(r15, -0x51b64b0d));                                    //    add r17, qword ptr [r15-0x51b64b0d]    IID207
-    __ andq(rcx, Address(r16, rcx, (Address::ScaleFactor)3, -0x1c8e4b54));      //    and rcx, qword ptr [r16+rcx*8-0x1c8e4b54]    IID208
-    __ cmpq(r23, Address(r17, rcx, (Address::ScaleFactor)3, -0x44705560));      //    cmp r23, qword ptr [r17+rcx*8-0x44705560]    IID209
-    __ lzcntq(r19, Address(r19, +0x487fe792));                                  //    lzcnt r19, qword ptr [r19+0x487fe792]    IID210
-    __ orq(r11, Address(r17, -0x65de4329));                                     //    or r11, qword ptr [r17-0x65de4329]    IID211
-    __ adcq(r29, Address(r9, -0x7092dc03));                                     //    adc r29, qword ptr [r9-0x7092dc03]    IID212
-    __ imulq(r9, Address(r26, r26, (Address::ScaleFactor)3, -0x118287f7));      //    imul r9, qword ptr [r26+r26*8-0x118287f7]    IID213
-    __ popcntq(r19, Address(r15, r19, (Address::ScaleFactor)1, -0x6e31ef95));   //    popcnt r19, qword ptr [r15+r19*2-0x6e31ef95]    IID214
-    __ sbbq(r30, Address(r23, -0x46545c5e));                                    //    sbb r30, qword ptr [r23-0x46545c5e]    IID215
-    __ subq(r23, Address(r31, r18, (Address::ScaleFactor)3, +0x663c37d8));      //    sub r23, qword ptr [r31+r18*8+0x663c37d8]    IID216
-    __ tzcntq(r24, Address(r24, r25, (Address::ScaleFactor)3, -0x465a78f1));    //    tzcnt r24, qword ptr [r24+r25*8-0x465a78f1]    IID217
-    __ xorq(r14, Address(r15, r19, (Address::ScaleFactor)1, +0x4196affa));      //    xor r14, qword ptr [r15+r19*2+0x4196affa]    IID218
-    __ movq(rdx, Address(r25, r29, (Address::ScaleFactor)1, +0x115a6157));      //    mov rdx, qword ptr [r25+r29*2+0x115a6157]    IID219
-    __ leaq(r19, Address(r28, r31, (Address::ScaleFactor)2, +0x6b82f933));      //    lea r19, qword ptr [r28+r31*4+0x6b82f933]    IID220
-    __ cvttsd2siq(rcx, Address(r24, r21, (Address::ScaleFactor)3, -0x39dc99eb)); //    cvttsd2si rcx, qword ptr [r24+r21*8-0x39dc99eb]    IID221
-    __ xchgq(r29, Address(r17, r24, (Address::ScaleFactor)3, +0x5902f01d));     //    xchg r29, qword ptr [r17+r24*8+0x5902f01d]    IID222
-    __ testq(r12, Address(r24, r29, (Address::ScaleFactor)2, +0x8865bfc));      //    test r12, qword ptr [r24+r29*4+0x8865bfc]    IID223
-    __ addq(r10, 16);                                                           //    add r10, 16    IID224
-    __ andq(r26, 256);                                                          //    and r26, 256    IID225
-    __ adcq(rcx, 1);                                                            //    adc rcx, 1    IID226
-    __ cmpq(r21, 65536);                                                        //    cmp r21, 65536    IID227
-    __ rclq(r28, 4);                                                            //    rcl r28, 4    IID228
-    __ rcrq(r28, 16);                                                           //    rcr r28, 16    IID229
-    __ rolq(r18, 1);                                                            //    rol r18, 1    IID230
-    __ rorq(r26, 2);                                                            //    ror r26, 2    IID231
-    __ sarq(r19, 2);                                                            //    sar r19, 2    IID232
-    __ salq(r14, 8);                                                            //    sal r14, 8    IID233
-    __ sbbq(r10, 65536);                                                        //    sbb r10, 65536    IID234
-    __ shlq(r30, 1);                                                            //    shl r30, 1    IID235
-    __ shrq(r15, 8);                                                            //    shr r15, 8    IID236
-    __ subq(r21, 1048576);                                                      //    sub r21, 1048576    IID237
-    __ xorq(rbx, 268435456);                                                    //    xor rbx, 268435456    IID238
-    __ movq(r19, 16);                                                           //    mov r19, 16    IID239
-    __ mov64(r19, 17179869184);                                                 //    mov r19, 17179869184    IID240
-    __ btq(r21, 1);                                                             //    bt r21, 1    IID241
-    __ testq(r15, -65536);                                                      //    test r15, -65536    IID242
-    __ orq_imm32(r21, 1073741824);                                              //    or r21, 1073741824    IID243
-    __ subq_imm32(r19, 65536);                                                  //    sub r19, 65536    IID244
-    __ cmovq(Assembler::Condition::overflow, r15, Address(r29, -0x5c98219a));   //    cmovo r15, qword ptr [r29-0x5c98219a]    IID245
-    __ cmovq(Assembler::Condition::noOverflow, rcx, Address(r21, +0x22cc581));  //    cmovno rcx, qword ptr [r21+0x22cc581]    IID246
-    __ cmovq(Assembler::Condition::below, r15, Address(r29, r13, (Address::ScaleFactor)2, -0x5e968fb9)); //    cmovb r15, qword ptr [r29+r13*4-0x5e968fb9]    IID247
-    __ cmovq(Assembler::Condition::aboveEqual, r26, Address(r24, +0x440c6894)); //    cmovae r26, qword ptr [r24+0x440c6894]    IID248
-    __ cmovq(Assembler::Condition::zero, r17, Address(r23, r26, (Address::ScaleFactor)3, +0x23558b4e)); //    cmovz r17, qword ptr [r23+r26*8+0x23558b4e]    IID249
-    __ cmovq(Assembler::Condition::notZero, r9, Address(r16, r29, (Address::ScaleFactor)3, -0x1289a3c9)); //    cmovnz r9, qword ptr [r16+r29*8-0x1289a3c9]    IID250
-    __ cmovq(Assembler::Condition::belowEqual, r8, Address(r11, -0x49e134cc));  //    cmovbe r8, qword ptr [r11-0x49e134cc]    IID251
-    __ cmovq(Assembler::Condition::above, r26, Address(r11, r20, (Address::ScaleFactor)1, -0x3ef9057a)); //    cmova r26, qword ptr [r11+r20*2-0x3ef9057a]    IID252
-    __ cmovq(Assembler::Condition::negative, r11, Address(r26, r13, (Address::ScaleFactor)2, +0x4bd18f9f)); //    cmovs r11, qword ptr [r26+r13*4+0x4bd18f9f]    IID253
-    __ cmovq(Assembler::Condition::positive, r8, Address(r9, r11, (Address::ScaleFactor)3, +0x4b42a528)); //    cmovns r8, qword ptr [r9+r11*8+0x4b42a528]    IID254
-    __ cmovq(Assembler::Condition::parity, r12, Address(r19, r9, (Address::ScaleFactor)1, +0x68559a1c)); //    cmovp r12, qword ptr [r19+r9*2+0x68559a1c]    IID255
-    __ cmovq(Assembler::Condition::noParity, r22, Address(r18, r17, (Address::ScaleFactor)1, +0x2c4d8e80)); //    cmovnp r22, qword ptr [r18+r17*2+0x2c4d8e80]    IID256
-    __ cmovq(Assembler::Condition::less, r26, Address(r18, r30, (Address::ScaleFactor)0, -0x2ae8896e)); //    cmovl r26, qword ptr [r18+r30*1-0x2ae8896e]    IID257
-    __ cmovq(Assembler::Condition::greaterEqual, r22, Address(r11, +0x4fefa622)); //    cmovge r22, qword ptr [r11+0x4fefa622]    IID258
-    __ cmovq(Assembler::Condition::lessEqual, r28, Address(r18, r27, (Address::ScaleFactor)1, +0x6b7a8c34)); //    cmovle r28, qword ptr [r18+r27*2+0x6b7a8c34]    IID259
-    __ cmovq(Assembler::Condition::greater, r20, Address(r23, r20, (Address::ScaleFactor)0, -0x12e725c5)); //    cmovg r20, qword ptr [r23+r20*1-0x12e725c5]    IID260
-    __ call(r9);                                                                //    call r9    IID261
-    __ divq(r22);                                                               //    div r22    IID262
-    __ idivq(r29);                                                              //    idiv r29    IID263
-    __ imulq(rbx);                                                              //    imul rbx    IID264
-    __ mulq(r27);                                                               //    mul r27    IID265
-    __ negq(rbx);                                                               //    neg rbx    IID266
-    __ notq(r17);                                                               //    not r17    IID267
-    __ rolq(r25);                                                               //    rol r25, cl    IID268
-    __ rorq(rbx);                                                               //    ror rbx, cl    IID269
-    __ sarq(r17);                                                               //    sar r17, cl    IID270
-    __ salq(r28);                                                               //    sal r28, cl    IID271
-    __ shlq(r28);                                                               //    shl r28, cl    IID272
-    __ shrq(r30);                                                               //    shr r30, cl    IID273
-    __ incrementq(r27);                                                         //    inc r27    IID274
-    __ decrementq(rdx);                                                         //    dec rdx    IID275
-    __ pushp(r27);                                                              //    pushp r27    IID276
-    __ popp(r10);                                                               //    popp r10    IID277
-    __ call(Address(r27, -0x22db8705));                                         //    call qword ptr [r27-0x22db8705]    IID278
-    __ mulq(Address(r27, r21, (Address::ScaleFactor)0, -0x1f59ff9c));           //    mul qword ptr [r27+r21*1-0x1f59ff9c]    IID279
-    __ negq(Address(r19, rcx, (Address::ScaleFactor)3, +0x7a47b812));           //    neg qword ptr [r19+rcx*8+0x7a47b812]    IID280
-    __ sarq(Address(r18, r21, (Address::ScaleFactor)1, -0x48857a46));           //    sar qword ptr [r18+r21*2-0x48857a46], cl    IID281
-    __ salq(Address(r24, -0x7a2bda2c));                                         //    sal qword ptr [r24-0x7a2bda2c], cl    IID282
-    __ shrq(Address(r24, +0x1abd92f));                                          //    shr qword ptr [r24+0x1abd92f], cl    IID283
-    __ incrementq(Address(r9, r9, (Address::ScaleFactor)3, +0x31a92520));       //    inc qword ptr [r9+r9*8+0x31a92520]    IID284
-    __ decrementq(Address(r9, r8, (Address::ScaleFactor)0, +0x7f14b4bd));       //    dec qword ptr [r9+r8*1+0x7f14b4bd]    IID285
-    __ imulq(r14, Address(r29, r15, (Address::ScaleFactor)1, +0x5281cf9c), 256); //    imul r14, qword ptr [r29+r15*2+0x5281cf9c], 256    IID286
-    __ imulq(r16, r28, 1048576);                                                //    imul r16, r28, 1048576    IID287
-    __ shldq(r17, r24, 2);                                                      //    shld r17, r24, 2    IID288
-    __ shrdq(r16, r11, 2);                                                      //    shrd r16, r11, 2    IID289
-    __ pop2(r10, r11);                                                          //    {load}pop2 r11, r10    IID290
-    __ pop2p(r15, r24);                                                         //    {load}pop2p r24, r15    IID291
-    __ push2(r28, r11);                                                         //    {load}push2 r11, r28    IID292
-    __ push2p(r12, r31);                                                        //    {load}push2p r31, r12    IID293
-    __ movzbq(r24, Address(r22, r16, (Address::ScaleFactor)0, +0x511be837));    //    movzx r24, byte ptr [r22+r16*1+0x511be837]    IID294
-    __ movzwq(r15, Address(r15, r26, (Address::ScaleFactor)2, -0x38794ee));     //    movzx r15, word ptr [r15+r26*4-0x38794ee]    IID295
-    __ movsbq(r15, Address(r25, r16, (Address::ScaleFactor)3, -0x7a092741));    //    movsx r15, byte ptr [r25+r16*8-0x7a092741]    IID296
-    __ movswq(rdx, Address(r28, r19, (Address::ScaleFactor)2, +0x79da6a));      //    movsx rdx, word ptr [r28+r19*4+0x79da6a]    IID297
-    __ movzbq(r27, r9);                                                         //    movzx r27, r9b    IID298
-    __ movzwq(r25, r21);                                                        //    movzx r25, r21w    IID299
-    __ movsbq(r14, r12);                                                        //    movsx r14, r12b    IID300
-    __ movswq(r23, r11);                                                        //    movsx r23, r11w    IID301
-    __ cmpxchgq(r30, Address(r12, -0x65a974df));                                //    cmpxchg qword ptr [r12-0x65a974df], r30    IID302
+    __ adcq(r15, r13);                                                          //    {load}adc r15, r13    IID351
+    __ cmpq(r9, r12);                                                           //    {load}cmp r9, r12    IID352
+    __ imulq(r15, r21);                                                         //    {load}imul r15, r21    IID353
+    __ popcntq(r12, r9);                                                        //    {load}popcnt r12, r9    IID354
+    __ sbbq(r17, r23);                                                          //    {load}sbb r17, r23    IID355
+    __ subq(rdx, r16);                                                          //    {load}sub rdx, r16    IID356
+    __ tzcntq(r29, r10);                                                        //    {load}tzcnt r29, r10    IID357
+    __ lzcntq(r21, r17);                                                        //    {load}lzcnt r21, r17    IID358
+    __ addq(r29, r18);                                                          //    {load}add r29, r18    IID359
+    __ andq(r28, r24);                                                          //    {load}and r28, r24    IID360
+    __ orq(r10, r20);                                                           //    {load}or r10, r20    IID361
+    __ xorq(r27, r10);                                                          //    {load}xor r27, r10    IID362
+    __ movq(r14, r11);                                                          //    {load}mov r14, r11    IID363
+    __ bsfq(r27, rcx);                                                          //    {load}bsf r27, rcx    IID364
+    __ bsrq(r22, r15);                                                          //    {load}bsr r22, r15    IID365
+    __ btq(r31, r30);                                                           //    {load}bt r31, r30    IID366
+    __ xchgq(r19, r19);                                                         //    {load}xchg r19, r19    IID367
+    __ testq(r26, r21);                                                         //    {load}test r26, r21    IID368
+    __ addq(Address(r26, r20, (Address::ScaleFactor)1, -0x4096149c), r14);      //    add qword ptr [r26+r20*2-0x4096149c], r14    IID369
+    __ andq(Address(r28, r20, (Address::ScaleFactor)2, +0x1bd8898a), r23);      //    and qword ptr [r28+r20*4+0x1bd8898a], r23    IID370
+    __ cmpq(Address(r15, r19, (Address::ScaleFactor)2, +0x39eee631), r10);      //    cmp qword ptr [r15+r19*4+0x39eee631], r10    IID371
+    __ orq(Address(r13, rdx, (Address::ScaleFactor)3, +0x1a49859), r13);        //    or qword ptr [r13+rdx*8+0x1a49859], r13    IID372
+    __ xorq(Address(r21, +0x5fe8636), r24);                                     //    xor qword ptr [r21+0x5fe8636], r24    IID373
+    __ subq(Address(r30, r23, (Address::ScaleFactor)2, -0x56643cc1), r25);      //    sub qword ptr [r30+r23*4-0x56643cc1], r25    IID374
+    __ movq(Address(r21, r26, (Address::ScaleFactor)3, +0x7e8544ab), r31);      //    mov qword ptr [r21+r26*8+0x7e8544ab], r31    IID375
+    __ xaddq(Address(rcx, r24, (Address::ScaleFactor)3, -0x79ca4889), rbx);     //    xadd qword ptr [rcx+r24*8-0x79ca4889], rbx    IID376
+    __ andq(Address(r13, r31, (Address::ScaleFactor)3, -0xd72b030), 256);       //    and qword ptr [r13+r31*8-0xd72b030], 256    IID377
+    __ addq(Address(r16, +0x534d775e), 268435456);                              //    add qword ptr [r16+0x534d775e], 268435456    IID378
+    __ cmpq(Address(r20, r15, (Address::ScaleFactor)2, -0x7cb22277), 268435456); //    cmp qword ptr [r20+r15*4-0x7cb22277], 268435456    IID379
+    __ sarq(Address(r9, r23, (Address::ScaleFactor)2, -0x72f6d86e), 4);         //    sar qword ptr [r9+r23*4-0x72f6d86e], 4    IID380
+    __ salq(Address(r11, r24, (Address::ScaleFactor)1, -0x22826f95), 4);        //    sal qword ptr [r11+r24*2-0x22826f95], 4    IID381
+    __ sbbq(Address(r14, r30, (Address::ScaleFactor)1, +0x1b43fc34), 268435456); //    sbb qword ptr [r14+r30*2+0x1b43fc34], 268435456    IID382
+    __ shrq(Address(r26, r21, (Address::ScaleFactor)0, -0x3bae50c3), 8);        //    shr qword ptr [r26+r21*1-0x3bae50c3], 8    IID383
+    __ subq(Address(r22, r10, (Address::ScaleFactor)3, +0x47e1403), 65536);     //    sub qword ptr [r22+r10*8+0x47e1403], 65536    IID384
+    __ xorq(Address(rdx, r19, (Address::ScaleFactor)3, -0x644a5318), 1);        //    xor qword ptr [rdx+r19*8-0x644a5318], 1    IID385
+    __ orq(Address(r30, r31, (Address::ScaleFactor)1, +0x2c93c783), 256);       //    or qword ptr [r30+r31*2+0x2c93c783], 256    IID386
+    __ movq(Address(r26, r24, (Address::ScaleFactor)2, -0x534785f), 65536);     //    mov qword ptr [r26+r24*4-0x534785f], 65536    IID387
+    __ testq(Address(r14, r30, (Address::ScaleFactor)1, +0x3932e147), -256);    //    test qword ptr [r14+r30*2+0x3932e147], -256    IID388
+    __ addq(r30, Address(r30, r24, (Address::ScaleFactor)3, -0x66e0235e));      //    add r30, qword ptr [r30+r24*8-0x66e0235e]    IID389
+    __ andq(r15, Address(r26, +0x36456e42));                                    //    and r15, qword ptr [r26+0x36456e42]    IID390
+    __ cmpq(r10, Address(r18, +0x5044bed));                                     //    cmp r10, qword ptr [r18+0x5044bed]    IID391
+    __ lzcntq(r31, Address(r12, rdx, (Address::ScaleFactor)2, -0x1707b7d4));    //    lzcnt r31, qword ptr [r12+rdx*4-0x1707b7d4]    IID392
+    __ orq(r16, Address(r20, r23, (Address::ScaleFactor)2, -0x26783729));       //    or r16, qword ptr [r20+r23*4-0x26783729]    IID393
+    __ adcq(r31, Address(r30, r31, (Address::ScaleFactor)0, +0x1ec3265d));      //    adc r31, qword ptr [r30+r31*1+0x1ec3265d]    IID394
+    __ imulq(r16, Address(rdx, r26, (Address::ScaleFactor)0, +0x3586831b));     //    imul r16, qword ptr [rdx+r26*1+0x3586831b]    IID395
+    __ popcntq(r12, Address(r18, -0x3c3e9f7a));                                 //    popcnt r12, qword ptr [r18-0x3c3e9f7a]    IID396
+    __ sbbq(rcx, Address(r8, r21, (Address::ScaleFactor)3, +0x6b1515ab));       //    sbb rcx, qword ptr [r8+r21*8+0x6b1515ab]    IID397
+    __ subq(r29, Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d));      //    sub r29, qword ptr [rcx+r23*4+0x4ff06c4d]    IID398
+    __ tzcntq(r26, Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189));    //    tzcnt r26, qword ptr [r24+r10*2-0x75d9a189]    IID399
+    __ xorq(r17, Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c));      //    xor r17, qword ptr [rbx+rbx*1+0x4033d59c]    IID400
+    __ movq(r18, Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d));      //    mov r18, qword ptr [r22+r12*8-0x3893347d]    IID401
+    __ leaq(r12, Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560));      //    lea r12, qword ptr [r20+r23*8+0x4b311560]    IID402
+    __ cvttsd2siq(r29, Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657)); //    cvttsd2si r29, qword ptr [r10+r28*4+0x5c3a2657]    IID403
+    __ xchgq(r22, Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f));     //    xchg r22, qword ptr [r13+r25*8+0x1a3d6f3f]    IID404
+    __ testq(r25, Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8));     //    test r25, qword ptr [r17+r24*8-0x35addbd8]    IID405
+    __ addq(r18, 1);                                                            //    add r18, 1    IID406
+    __ andq(r13, 16777216);                                                     //    and r13, 16777216    IID407
+    __ adcq(r13, 65536);                                                        //    adc r13, 65536    IID408
+    __ cmpq(r10, 65536);                                                        //    cmp r10, 65536    IID409
+    __ rclq(r20, 2);                                                            //    rcl r20, 2    IID410
+    __ rcrq(r9, 16);                                                            //    rcr r9, 16    IID411
+    __ rolq(r8, 1);                                                             //    rol r8, 1    IID412
+    __ rorq(r25, 2);                                                            //    ror r25, 2    IID413
+    __ sarq(r22, 8);                                                            //    sar r22, 8    IID414
+    __ salq(r17, 1);                                                            //    sal r17, 1    IID415
+    __ sbbq(r31, 16);                                                           //    sbb r31, 16    IID416
+    __ shlq(r27, 4);                                                            //    shl r27, 4    IID417
+    __ shrq(r28, 2);                                                            //    shr r28, 2    IID418
+    __ subq(rcx, 16777216);                                                     //    sub rcx, 16777216    IID419
+    __ xorq(r27, 1048576);                                                      //    xor r27, 1048576    IID420
+    __ movq(r20, 268435456);                                                    //    mov r20, 268435456    IID421
+    __ mov64(r27, 4503599627370496);                                            //    mov r27, 4503599627370496    IID422
+    __ btq(r22, 4);                                                             //    bt r22, 4    IID423
+    __ testq(r8, -4096);                                                        //    test r8, -4096    IID424
+    __ orq_imm32(r28, 1048576);                                                 //    or r28, 1048576    IID425
+    __ subq_imm32(r13, 65536);                                                  //    sub r13, 65536    IID426
+    __ cmovq(Assembler::Condition::overflow, r16, Address(r16, -0x1389a3eb));   //    cmovo r16, qword ptr [r16-0x1389a3eb]    IID427
+    __ cmovq(Assembler::Condition::noOverflow, rbx, Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615)); //    cmovno rbx, qword ptr [r29+r8*1+0x1d022615]    IID428
+    __ cmovq(Assembler::Condition::below, rdx, Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2)); //    cmovb rdx, qword ptr [r12+r28*2-0x34c898e2]    IID429
+    __ cmovq(Assembler::Condition::aboveEqual, r27, Address(r10, rcx, (Address::ScaleFactor)3, -0x1ef7abf1)); //    cmovae r27, qword ptr [r10+rcx*8-0x1ef7abf1]    IID430
+    __ cmovq(Assembler::Condition::zero, r14, Address(r13, r29, (Address::ScaleFactor)2, -0x7c4c8369)); //    cmovz r14, qword ptr [r13+r29*4-0x7c4c8369]    IID431
+    __ cmovq(Assembler::Condition::notZero, r15, Address(r23, rcx, (Address::ScaleFactor)2, -0x6bd22ccf)); //    cmovnz r15, qword ptr [r23+rcx*4-0x6bd22ccf]    IID432
+    __ cmovq(Assembler::Condition::belowEqual, r24, Address(r15, r10, (Address::ScaleFactor)1, -0x7ffb3d09)); //    cmovbe r24, qword ptr [r15+r10*2-0x7ffb3d09]    IID433
+    __ cmovq(Assembler::Condition::above, r23, Address(r11, +0x276a863b));      //    cmova r23, qword ptr [r11+0x276a863b]    IID434
+    __ cmovq(Assembler::Condition::negative, r28, Address(r29, +0x3fb4396e));   //    cmovs r28, qword ptr [r29+0x3fb4396e]    IID435
+    __ cmovq(Assembler::Condition::positive, r26, Address(r27, rcx, (Address::ScaleFactor)3, +0x4ddea61c)); //    cmovns r26, qword ptr [r27+rcx*8+0x4ddea61c]    IID436
+    __ cmovq(Assembler::Condition::parity, r10, Address(r22, r19, (Address::ScaleFactor)1, +0x2a126966)); //    cmovp r10, qword ptr [r22+r19*2+0x2a126966]    IID437
+    __ cmovq(Assembler::Condition::noParity, r12, Address(r10, +0x3d7c59f));    //    cmovnp r12, qword ptr [r10+0x3d7c59f]    IID438
+    __ cmovq(Assembler::Condition::less, r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d)); //    cmovl r10, qword ptr [r8+r8*8-0xe61862d]    IID439
+    __ cmovq(Assembler::Condition::greaterEqual, r23, Address(r29, -0x777ed96d)); //    cmovge r23, qword ptr [r29-0x777ed96d]    IID440
+    __ cmovq(Assembler::Condition::lessEqual, rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb)); //    cmovle rcx, qword ptr [rbx+r19*2+0x53c601cb]    IID441
+    __ cmovq(Assembler::Condition::greater, r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073)); //    cmovg r14, qword ptr [r17+rbx*1-0x768bf073]    IID442
+    __ call(r29);                                                               //    call r29    IID443
+    __ divq(r10);                                                               //    div r10    IID444
+    __ idivq(r19);                                                              //    idiv r19    IID445
+    __ imulq(r15);                                                              //    imul r15    IID446
+    __ mulq(r27);                                                               //    mul r27    IID447
+    __ negq(r20);                                                               //    neg r20    IID448
+    __ notq(r10);                                                               //    not r10    IID449
+    __ rolq(r16);                                                               //    rol r16, cl    IID450
+    __ rorq(r27);                                                               //    ror r27, cl    IID451
+    __ sarq(r9);                                                                //    sar r9, cl    IID452
+    __ salq(r13);                                                               //    sal r13, cl    IID453
+    __ shlq(r14);                                                               //    shl r14, cl    IID454
+    __ shrq(r18);                                                               //    shr r18, cl    IID455
+    __ incrementq(r28);                                                         //    inc r28    IID456
+    __ decrementq(r28);                                                         //    dec r28    IID457
+    __ pushp(r22);                                                              //    pushp r22    IID458
+    __ popp(r8);                                                                //    popp r8    IID459
+    __ call(Address(r12, +0x64cc424e));                                         //    call qword ptr [r12+0x64cc424e]    IID460
+    __ mulq(Address(r26, r29, (Address::ScaleFactor)0, -0x466f085f));           //    mul qword ptr [r26+r29*1-0x466f085f]    IID461
+    __ negq(Address(r21, r24, (Address::ScaleFactor)0, +0x2037df0b));           //    neg qword ptr [r21+r24*1+0x2037df0b]    IID462
+    __ sarq(Address(r12, r31, (Address::ScaleFactor)3, -0x57d225aa));           //    sar qword ptr [r12+r31*8-0x57d225aa], cl    IID463
+    __ salq(Address(r20, -0x1ea02f90));                                         //    sal qword ptr [r20-0x1ea02f90], cl    IID464
+    __ shrq(Address(r13, r20, (Address::ScaleFactor)3, +0x171081f2));           //    shr qword ptr [r13+r20*8+0x171081f2], cl    IID465
+    __ incrementq(Address(r31, +0x13a808db));                                   //    inc qword ptr [r31+0x13a808db]    IID466
+    __ decrementq(Address(r19, -0x180d3ea1));                                   //    dec qword ptr [r19-0x180d3ea1]    IID467
+    __ imulq(r17, Address(r16, -0x2af2fd58), 4096);                             //    imul r17, qword ptr [r16-0x2af2fd58], 4096    IID468
+    __ imulq(r28, r25, 16);                                                     //    imul r28, r25, 16    IID469
+    __ shldq(r27, r13, 16);                                                     //    shld r27, r13, 16    IID470
+    __ shrdq(r8, r10, 16);                                                      //    shrd r8, r10, 16    IID471
+    __ pop2(r14, r8);                                                           //    {load}pop2 r8, r14    IID472
+    __ pop2p(r18, rbx);                                                         //    {load}pop2p rbx, r18    IID473
+    __ push2(r23, r19);                                                         //    {load}push2 r19, r23    IID474
+    __ push2p(r12, rbx);                                                        //    {load}push2p rbx, r12    IID475
+    __ movzbq(r9, Address(r14, r23, (Address::ScaleFactor)3, -0x428d2646));     //    movzx r9, byte ptr [r14+r23*8-0x428d2646]    IID476
+    __ movzwq(r28, Address(r9, rcx, (Address::ScaleFactor)2, -0x72611661));     //    movzx r28, word ptr [r9+rcx*4-0x72611661]    IID477
+    __ movsbq(rbx, Address(r24, r21, (Address::ScaleFactor)2, +0x3a6be990));    //    movsx rbx, byte ptr [r24+r21*4+0x3a6be990]    IID478
+    __ movswq(r16, Address(r22, r10, (Address::ScaleFactor)0, +0x7ef8bdd));     //    movsx r16, word ptr [r22+r10*1+0x7ef8bdd]    IID479
+    __ movzbq(r28, r14);                                                        //    movzx r28, r14b    IID480
+    __ movzwq(r13, r28);                                                        //    movzx r13, r28w    IID481
+    __ movsbq(r11, rdx);                                                        //    movsx r11, dl    IID482
+    __ movswq(r12, r26);                                                        //    movsx r12, r26w    IID483
+    __ cmpxchgq(r20, Address(r10, -0xbd2a8da));                                 //    cmpxchg qword ptr [r10-0xbd2a8da], r20    IID484
+    __ eidivq(r15, false);                                                      //    {EVEX}idiv r15    IID485
+    __ eidivq(r23, true);                                                       //    {NF}idiv r23    IID486
+    __ edivq(r14, false);                                                       //    {EVEX}div r14    IID487
+    __ edivq(r14, true);                                                        //    {NF}div r14    IID488
+    __ eimulq(r15, false);                                                      //    {EVEX}imul r15    IID489
+    __ eimulq(r20, true);                                                       //    {NF}imul r20    IID490
+    __ emulq(rcx, false);                                                       //    {EVEX}mul rcx    IID491
+    __ emulq(r21, true);                                                        //    {NF}mul r21    IID492
+    __ emulq(Address(r16, r10, (Address::ScaleFactor)3, +0x5f66ac1e), false);   //    {EVEX}mul qword ptr [r16+r10*8+0x5f66ac1e]    IID493
+    __ emulq(Address(r21, r22, (Address::ScaleFactor)3, -0xbbc807d), true);     //    {NF}mul qword ptr [r21+r22*8-0xbbc807d]    IID494
+    __ eimulq(r22, r26, false);                                                 //    {EVEX}imul r22, r26    IID495
+    __ eimulq(r25, r21, true);                                                  //    {NF}imul r25, r21    IID496
+    __ elzcntq(r20, r13, false);                                                //    {EVEX}lzcnt r20, r13    IID497
+    __ elzcntq(r25, r19, true);                                                 //    {NF}lzcnt r25, r19    IID498
+    __ enegq(r21, r30, false);                                                  //    {EVEX}neg r21, r30    IID499
+    __ enegq(r29, r11, true);                                                   //    {NF}neg r29, r11    IID500
+    __ enotq(r22, r8);                                                          //    {EVEX}not r22, r8    IID501
+    __ epopcntq(r12, r19, false);                                               //    {EVEX}popcnt r12, r19    IID502
+    __ epopcntq(r29, r23, true);                                                //    {NF}popcnt r29, r23    IID503
+    __ erolq(r28, r24, false);                                                  //    {EVEX}rol r28, r24, cl    IID504
+    __ erolq(rdx, r20, true);                                                   //    {NF}rol rdx, r20, cl    IID505
+    __ erorq(rbx, r30, false);                                                  //    {EVEX}ror rbx, r30, cl    IID506
+    __ erorq(r10, r15, true);                                                   //    {NF}ror r10, r15, cl    IID507
+    __ esalq(r17, r13, false);                                                  //    {EVEX}sal r17, r13, cl    IID508
+    __ esalq(r21, r24, true);                                                   //    {NF}sal r21, r24, cl    IID509
+    __ esarq(r31, r12, false);                                                  //    {EVEX}sar r31, r12, cl    IID510
+    __ esarq(rdx, r24, true);                                                   //    {NF}sar rdx, r24, cl    IID511
+    __ edecq(r21, r24, false);                                                  //    {EVEX}dec r21, r24    IID512
+    __ edecq(r15, r31, true);                                                   //    {NF}dec r15, r31    IID513
+    __ eincq(r10, rbx, false);                                                  //    {EVEX}inc r10, rbx    IID514
+    __ eincq(r18, r8, true);                                                    //    {NF}inc r18, r8    IID515
+    __ eshlq(r10, r26, false);                                                  //    {EVEX}shl r10, r26, cl    IID516
+    __ eshlq(r28, r14, true);                                                   //    {NF}shl r28, r14, cl    IID517
+    __ eshrq(r10, r19, false);                                                  //    {EVEX}shr r10, r19, cl    IID518
+    __ eshrq(r28, r21, true);                                                   //    {NF}shr r28, r21, cl    IID519
+    __ etzcntq(r21, r22, false);                                                //    {EVEX}tzcnt r21, r22    IID520
+    __ etzcntq(r16, r23, true);                                                 //    {NF}tzcnt r16, r23    IID521
+    __ eimulq(r11, Address(r18, r9, (Address::ScaleFactor)2, -0x132285a1), false); //    {EVEX}imul r11, qword ptr [r18+r9*4-0x132285a1]    IID522
+    __ eimulq(r13, Address(r24, r15, (Address::ScaleFactor)3, +0x48f50ca0), true); //    {NF}imul r13, qword ptr [r24+r15*8+0x48f50ca0]    IID523
+    __ elzcntq(r9, Address(r13, +0x2115cf0e), false);                           //    {EVEX}lzcnt r9, qword ptr [r13+0x2115cf0e]    IID524
+    __ elzcntq(r27, Address(r30, +0x49cabbb), true);                            //    {NF}lzcnt r27, qword ptr [r30+0x49cabbb]    IID525
+    __ enegq(r21, Address(r13, r31, (Address::ScaleFactor)2, +0x50a8f4d2), false); //    {EVEX}neg r21, qword ptr [r13+r31*4+0x50a8f4d2]    IID526
+    __ enegq(r22, Address(r18, r20, (Address::ScaleFactor)1, -0x5da0584c), true); //    {NF}neg r22, qword ptr [r18+r20*2-0x5da0584c]    IID527
+    __ epopcntq(r14, Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1), false); //    {EVEX}popcnt r14, qword ptr [rbx+r22*4-0x606349d1]    IID528
+    __ epopcntq(r26, Address(r23, r22, (Address::ScaleFactor)3, -0x72c66c23), true); //    {NF}popcnt r26, qword ptr [r23+r22*8-0x72c66c23]    IID529
+    __ esalq(r26, Address(r9, +0x334aba09), false);                             //    {EVEX}sal r26, qword ptr [r9+0x334aba09], cl    IID530
+    __ esalq(r9, Address(r9, r30, (Address::ScaleFactor)3, -0x219a6102), true); //    {NF}sal r9, qword ptr [r9+r30*8-0x219a6102], cl    IID531
+    __ esarq(r25, Address(r20, -0x2131bab1), false);                            //    {EVEX}sar r25, qword ptr [r20-0x2131bab1], cl    IID532
+    __ esarq(r16, Address(r28, r16, (Address::ScaleFactor)1, +0x48c483b9), true); //    {NF}sar r16, qword ptr [r28+r16*2+0x48c483b9], cl    IID533
+    __ edecq(r30, Address(r9, r16, (Address::ScaleFactor)0, -0x88ce84f), false); //    {EVEX}dec r30, qword ptr [r9+r16*1-0x88ce84f]    IID534
+    __ edecq(r11, Address(r30, r29, (Address::ScaleFactor)2, +0x3eeb8fd0), true); //    {NF}dec r11, qword ptr [r30+r29*4+0x3eeb8fd0]    IID535
+    __ eincq(r26, Address(r29, r10, (Address::ScaleFactor)3, +0x3ef4822e), false); //    {EVEX}inc r26, qword ptr [r29+r10*8+0x3ef4822e]    IID536
+    __ eincq(r29, Address(r19, r20, (Address::ScaleFactor)2, -0x3f0f3db9), true); //    {NF}inc r29, qword ptr [r19+r20*4-0x3f0f3db9]    IID537
+    __ eshrq(r8, Address(r30, r20, (Address::ScaleFactor)0, +0x15b56a17), false); //    {EVEX}shr r8, qword ptr [r30+r20*1+0x15b56a17], cl    IID538
+    __ eshrq(r26, Address(r11, -0x2de86561), true);                             //    {NF}shr r26, qword ptr [r11-0x2de86561], cl    IID539
+    __ etzcntq(r11, Address(rcx, r30, (Address::ScaleFactor)1, -0x32ffb1c2), false); //    {EVEX}tzcnt r11, qword ptr [rcx+r30*2-0x32ffb1c2]    IID540
+    __ etzcntq(r23, Address(r9, r12, (Address::ScaleFactor)1, -0x54823e69), true); //    {NF}tzcnt r23, qword ptr [r9+r12*2-0x54823e69]    IID541
+    __ eaddq(r20, Address(r13, rcx, (Address::ScaleFactor)3, -0x46116c0d), r15, false); //    {EVEX}add r20, qword ptr [r13+rcx*8-0x46116c0d], r15    IID542
+    __ eaddq(r13, Address(r9, r23, (Address::ScaleFactor)1, -0x286c7605), r16, true); //    {NF}add r13, qword ptr [r9+r23*2-0x286c7605], r16    IID543
+    __ eandq(r21, Address(r30, r17, (Address::ScaleFactor)0, +0xf4e30b2), r29, false); //    {EVEX}and r21, qword ptr [r30+r17*1+0xf4e30b2], r29    IID544
+    __ eandq(r30, Address(r17, r31, (Address::ScaleFactor)0, +0x3ab9dec4), r17, true); //    {NF}and r30, qword ptr [r17+r31*1+0x3ab9dec4], r17    IID545
+    __ eorq(r10, Address(r27, r30, (Address::ScaleFactor)1, -0x197f1266), r28, false); //    {EVEX}or r10, qword ptr [r27+r30*2-0x197f1266], r28    IID546
+    __ eorq(r9, Address(r29, r30, (Address::ScaleFactor)0, -0x24ea9b08), r11, true); //    {NF}or r9, qword ptr [r29+r30*1-0x24ea9b08], r11    IID547
+    __ esubq(r15, Address(r14, -0x4f44bf90), r16, false);                       //    {EVEX}sub r15, qword ptr [r14-0x4f44bf90], r16    IID548
+    __ esubq(rcx, Address(r21, r18, (Address::ScaleFactor)1, -0x11d0ac8f), r28, true); //    {NF}sub rcx, qword ptr [r21+r18*2-0x11d0ac8f], r28    IID549
+    __ exorq(r19, Address(r19, r18, (Address::ScaleFactor)0, -0xa5e55ec), r8, false); //    {EVEX}xor r19, qword ptr [r19+r18*1-0xa5e55ec], r8    IID550
+    __ exorq(r28, Address(r17, r28, (Address::ScaleFactor)1, -0x6eb42fe0), r16, true); //    {NF}xor r28, qword ptr [r17+r28*2-0x6eb42fe0], r16    IID551
+    __ eaddq(r17, Address(r18, -0x60ab1105), 16777216, false);                  //    {EVEX}add r17, qword ptr [r18-0x60ab1105], 16777216    IID552
+    __ eaddq(r25, Address(r19, r25, (Address::ScaleFactor)0, +0x122444d9), 65536, true); //    {NF}add r25, qword ptr [r19+r25*1+0x122444d9], 65536    IID553
+    __ eandq(r30, Address(r9, r28, (Address::ScaleFactor)1, -0x25b00cf3), 4096, false); //    {EVEX}and r30, qword ptr [r9+r28*2-0x25b00cf3], 4096    IID554
+    __ eandq(r9, Address(r22, rbx, (Address::ScaleFactor)1, -0x7e465026), 268435456, true); //    {NF}and r9, qword ptr [r22+rbx*2-0x7e465026], 268435456    IID555
+    __ eimulq(r12, Address(r25, r25, (Address::ScaleFactor)1, -0x432d68cc), 1, false); //    {EVEX}imul r12, qword ptr [r25+r25*2-0x432d68cc], 1    IID556
+    __ eimulq(r15, Address(r17, r31, (Address::ScaleFactor)3, -0x2b97565e), 16, true); //    {NF}imul r15, qword ptr [r17+r31*8-0x2b97565e], 16    IID557
+    __ eorq(r28, Address(rdx, r31, (Address::ScaleFactor)0, +0x3f1363b1), 256, false); //    {EVEX}or r28, qword ptr [rdx+r31*1+0x3f1363b1], 256    IID558
+    __ eorq(r16, Address(r12, r23, (Address::ScaleFactor)3, -0x1785863c), 16777216, true); //    {NF}or r16, qword ptr [r12+r23*8-0x1785863c], 16777216    IID559
+    __ esalq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), 2, false); //    {EVEX}sal r8, qword ptr [r14+r24*4-0x714290a5], 2    IID560
+    __ esalq(r8, Address(r15, r14, (Address::ScaleFactor)2, +0x21f13243), 16, true); //    {NF}sal r8, qword ptr [r15+r14*4+0x21f13243], 16    IID561
+    __ esarq(r10, Address(r13, r29, (Address::ScaleFactor)0, +0x7d04cb72), 2, false); //    {EVEX}sar r10, qword ptr [r13+r29*1+0x7d04cb72], 2    IID562
+    __ esarq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), 8, true); //    {NF}sar r11, qword ptr [r21+r31*8-0x2176b4dc], 8    IID563
+    __ eshrq(rcx, Address(r16, r12, (Address::ScaleFactor)1, +0x260c9a38), 4, false); //    {EVEX}shr rcx, qword ptr [r16+r12*2+0x260c9a38], 4    IID564
+    __ eshrq(r22, Address(r26, r9, (Address::ScaleFactor)0, -0x5e56bb62), 8, true); //    {NF}shr r22, qword ptr [r26+r9*1-0x5e56bb62], 8    IID565
+    __ esubq(r31, Address(rbx, r28, (Address::ScaleFactor)1, +0x2b00bb10), 1, false); //    {EVEX}sub r31, qword ptr [rbx+r28*2+0x2b00bb10], 1    IID566
+    __ esubq(r21, Address(r31, -0x6c10f4ad), 4096, true);                       //    {NF}sub r21, qword ptr [r31-0x6c10f4ad], 4096    IID567
+    __ exorq(r11, Address(r23, r30, (Address::ScaleFactor)1, +0x51a6026b), 65536, false); //    {EVEX}xor r11, qword ptr [r23+r30*2+0x51a6026b], 65536    IID568
+    __ exorq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), 16, true); //    {NF}xor r14, qword ptr [r27+r10*4-0x34ad9bab], 16    IID569
+    __ eaddq(r20, r23, 16777216, false);                                        //    {EVEX}add r20, r23, 16777216    IID570
+    __ eaddq(r9, r21, 4096, true);                                              //    {NF}add r9, r21, 4096    IID571
+    __ eandq(r20, rdx, 16, false);                                              //    {EVEX}and r20, rdx, 16    IID572
+    __ eandq(r14, r19, 16, true);                                               //    {NF}and r14, r19, 16    IID573
+    __ eimulq(r27, r17, 16, false);                                             //    {EVEX}imul r27, r17, 16    IID574
+    __ eimulq(r30, r13, 256, true);                                             //    {NF}imul r30, r13, 256    IID575
+    __ eorq(r19, r15, 16777216, false);                                         //    {EVEX}or r19, r15, 16777216    IID576
+    __ eorq(r16, r28, 268435456, true);                                         //    {NF}or r16, r28, 268435456    IID577
+    __ erclq(rbx, r24, 2);                                                      //    {EVEX}rcl rbx, r24, 2    IID578
+    __ erolq(r15, r20, 16, false);                                              //    {EVEX}rol r15, r20, 16    IID579
+    __ erolq(r11, rcx, 16, true);                                               //    {NF}rol r11, rcx, 16    IID580
+    __ erorq(r13, r26, 16, false);                                              //    {EVEX}ror r13, r26, 16    IID581
+    __ erorq(r19, r20, 4, true);                                                //    {NF}ror r19, r20, 4    IID582
+    __ esalq(r19, r28, 16, false);                                              //    {EVEX}sal r19, r28, 16    IID583
+    __ esalq(r25, r18, 4, true);                                                //    {NF}sal r25, r18, 4    IID584
+    __ esarq(r10, r27, 4, false);                                               //    {EVEX}sar r10, r27, 4    IID585
+    __ esarq(rdx, r22, 8, true);                                                //    {NF}sar rdx, r22, 8    IID586
+    __ eshlq(r28, r15, 1, false);                                               //    {EVEX}shl r28, r15, 1    IID587
+    __ eshlq(rbx, r12, 4, true);                                                //    {NF}shl rbx, r12, 4    IID588
+    __ eshrq(r26, r11, 1, false);                                               //    {EVEX}shr r26, r11, 1    IID589
+    __ eshrq(rdx, r31, 8, true);                                                //    {NF}shr rdx, r31, 8    IID590
+    __ esubq(r21, rbx, 1048576, false);                                         //    {EVEX}sub r21, rbx, 1048576    IID591
+    __ esubq(r25, r28, 65536, true);                                            //    {NF}sub r25, r28, 65536    IID592
+    __ exorq(r22, r14, 1, false);                                               //    {EVEX}xor r22, r14, 1    IID593
+    __ exorq(r11, r30, 1048576, true);                                          //    {NF}xor r11, r30, 1048576    IID594
+    __ eorq_imm32(r20, r19, 1048576, false);                                    //    {EVEX}or r20, r19, 1048576    IID595
+    __ eorq_imm32(r25, r13, 268435456, false);                                  //    {EVEX}or r25, r13, 268435456    IID596
+    __ esubq_imm32(r25, r25, 268435456, false);                                 //    {EVEX}sub r25, r25, 268435456    IID597
+    __ esubq_imm32(r18, r11, 4194304, true);                                    //    {NF}sub r18, r11, 4194304    IID598
+    __ eaddq(r10, r18, Address(r20, +0x756f453), false);                        //    {EVEX}add r10, r18, qword ptr [r20+0x756f453]    IID599
+    __ eaddq(rbx, r27, Address(r22, r21, (Address::ScaleFactor)0, -0x25abeab7), true); //    {NF}add rbx, r27, qword ptr [r22+r21*1-0x25abeab7]    IID600
+    __ eandq(rdx, r31, Address(r9, r20, (Address::ScaleFactor)3, -0x4cfe39c), false); //    {EVEX}and rdx, r31, qword ptr [r9+r20*8-0x4cfe39c]    IID601
+    __ eandq(r16, r25, Address(r14, r27, (Address::ScaleFactor)0, +0x7c6654d9), true); //    {NF}and r16, r25, qword ptr [r14+r27*1+0x7c6654d9]    IID602
+    __ eorq(r29, rcx, Address(r15, r23, (Address::ScaleFactor)0, +0x45b7f72d), false); //    {EVEX}or r29, rcx, qword ptr [r15+r23*1+0x45b7f72d]    IID603
+    __ eorq(r19, r17, Address(r13, r22, (Address::ScaleFactor)1, -0x750c1996), true); //    {NF}or r19, r17, qword ptr [r13+r22*2-0x750c1996]    IID604
+    __ eimulq(r13, r8, Address(r31, r23, (Address::ScaleFactor)1, -0x2211b6b2), false); //    {EVEX}imul r13, r8, qword ptr [r31+r23*2-0x2211b6b2]    IID605
+    __ eimulq(r11, r28, Address(r13, r11, (Address::ScaleFactor)3, +0x5c0013ab), true); //    {NF}imul r11, r28, qword ptr [r13+r11*8+0x5c0013ab]    IID606
+    __ esubq(rdx, r18, Address(r18, rcx, (Address::ScaleFactor)0, +0x59557e71), false); //    {EVEX}sub rdx, r18, qword ptr [r18+rcx*1+0x59557e71]    IID607
+    __ esubq(r27, r11, Address(r22, -0x28469649), true);                        //    {NF}sub r27, r11, qword ptr [r22-0x28469649]    IID608
+    __ exorq(r10, r9, Address(r24, +0x49691d54), false);                        //    {EVEX}xor r10, r9, qword ptr [r24+0x49691d54]    IID609
+    __ exorq(r24, r12, Address(r19, +0x22d529aa), true);                        //    {NF}xor r24, r12, qword ptr [r19+0x22d529aa]    IID610
+    __ eaddq(r20, r9, r10, false);                                              //    {load}{EVEX}add r20, r9, r10    IID611
+    __ eaddq(r18, r17, r26, true);                                              //    {load}{NF}add r18, r17, r26    IID612
+    __ eadcxq(r21, r16, r19);                                                   //    {load}{EVEX}adcx r21, r16, r19    IID613
+    __ eadoxq(rbx, r14, r27);                                                   //    {load}{EVEX}adox rbx, r14, r27    IID614
+    __ eandq(r9, r12, r22, false);                                              //    {load}{EVEX}and r9, r12, r22    IID615
+    __ eandq(r17, r25, r10, true);                                              //    {load}{NF}and r17, r25, r10    IID616
+    __ eimulq(r12, r15, r14, false);                                            //    {load}{EVEX}imul r12, r15, r14    IID617
+    __ eimulq(r29, r18, r16, true);                                             //    {load}{NF}imul r29, r18, r16    IID618
+    __ eorq(r11, r9, r10, false);                                               //    {load}{EVEX}or r11, r9, r10    IID619
+    __ eorq(r25, r13, r16, true);                                               //    {load}{NF}or r25, r13, r16    IID620
+    __ esubq(r11, r21, r25, false);                                             //    {load}{EVEX}sub r11, r21, r25    IID621
+    __ esubq(rdx, r20, rbx, true);                                              //    {load}{NF}sub rdx, r20, rbx    IID622
+    __ exorq(r25, r21, r26, false);                                             //    {load}{EVEX}xor r25, r21, r26    IID623
+    __ exorq(r23, r27, r21, true);                                              //    {load}{NF}xor r23, r27, r21    IID624
+    __ eshldq(r10, r12, r31, 2, false);                                         //    {EVEX}shld r10, r12, r31, 2    IID625
+    __ eshldq(r23, r16, r29, 2, true);                                          //    {NF}shld r23, r16, r29, 2    IID626
+    __ eshrdq(r19, r24, r23, 4, false);                                         //    {EVEX}shrd r19, r24, r23, 4    IID627
+    __ eshrdq(r21, r15, r25, 4, true);                                          //    {NF}shrd r21, r15, r25, 4    IID628
+    __ ecmovq (Assembler::Condition::overflow, r9, r29, rdx);                   //    cmovo r9, r29, rdx    IID629
+    __ ecmovq (Assembler::Condition::noOverflow, r11, r25, r19);                //    cmovno r11, r25, r19    IID630
+    __ ecmovq (Assembler::Condition::below, r10, r16, r17);                     //    cmovb r10, r16, r17    IID631
+    __ ecmovq (Assembler::Condition::aboveEqual, r8, r23, r31);                 //    cmovae r8, r23, r31    IID632
+    __ ecmovq (Assembler::Condition::zero, r9, r31, rbx);                       //    cmovz r9, r31, rbx    IID633
+    __ ecmovq (Assembler::Condition::notZero, r16, r29, r9);                    //    cmovnz r16, r29, r9    IID634
+    __ ecmovq (Assembler::Condition::belowEqual, r24, r10, r9);                 //    cmovbe r24, r10, r9    IID635
+    __ ecmovq (Assembler::Condition::above, r22, r28, r26);                     //    cmova r22, r28, r26    IID636
+    __ ecmovq (Assembler::Condition::negative, r18, r25, r20);                  //    cmovs r18, r25, r20    IID637
+    __ ecmovq (Assembler::Condition::positive, r16, r21, rbx);                  //    cmovns r16, r21, rbx    IID638
+    __ ecmovq (Assembler::Condition::parity, r28, r22, r19);                    //    cmovp r28, r22, r19    IID639
+    __ ecmovq (Assembler::Condition::noParity, r13, r15, rdx);                  //    cmovnp r13, r15, rdx    IID640
+    __ ecmovq (Assembler::Condition::less, r8, r22, r14);                       //    cmovl r8, r22, r14    IID641
+    __ ecmovq (Assembler::Condition::greaterEqual, r12, r24, r14);              //    cmovge r12, r24, r14    IID642
+    __ ecmovq (Assembler::Condition::lessEqual, r24, r13, r21);                 //    cmovle r24, r13, r21    IID643
+    __ ecmovq (Assembler::Condition::greater, rbx, rbx, r27);                   //    cmovg rbx, rbx, r27    IID644
+    __ ecmovq (Assembler::Condition::overflow, r14, r17, Address(r24, r27, (Address::ScaleFactor)3, +0x9d508f0)); //    cmovo r14, r17, qword ptr [r24+r27*8+0x9d508f0]    IID645
+    __ ecmovq (Assembler::Condition::noOverflow, r13, r15, Address(r31, r21, (Address::ScaleFactor)2, +0x6ef2c74a)); //    cmovno r13, r15, qword ptr [r31+r21*4+0x6ef2c74a]    IID646
+    __ ecmovq (Assembler::Condition::below, r13, r27, Address(r31, r25, (Address::ScaleFactor)1, +0x734fe9ab)); //    cmovb r13, r27, qword ptr [r31+r25*2+0x734fe9ab]    IID647
+    __ ecmovq (Assembler::Condition::aboveEqual, r15, r22, Address(r14, r29, (Address::ScaleFactor)2, -0x67d8bdfb)); //    cmovae r15, r22, qword ptr [r14+r29*4-0x67d8bdfb]    IID648
+    __ ecmovq (Assembler::Condition::zero, r30, r23, Address(r15, r28, (Address::ScaleFactor)1, -0x2686219)); //    cmovz r30, r23, qword ptr [r15+r28*2-0x2686219]    IID649
+    __ ecmovq (Assembler::Condition::notZero, r12, r9, Address(r9, r25, (Address::ScaleFactor)3, +0x52aab6b)); //    cmovnz r12, r9, qword ptr [r9+r25*8+0x52aab6b]    IID650
+    __ ecmovq (Assembler::Condition::belowEqual, r9, r25, Address(r8, r8, (Address::ScaleFactor)3, -0x1e42bd95)); //    cmovbe r9, r25, qword ptr [r8+r8*8-0x1e42bd95]    IID651
+    __ ecmovq (Assembler::Condition::above, rcx, r20, Address(r27, rbx, (Address::ScaleFactor)2, +0x46823c58)); //    cmova rcx, r20, qword ptr [r27+rbx*4+0x46823c58]    IID652
+    __ ecmovq (Assembler::Condition::negative, rbx, r12, Address(r21, -0x635b8c8)); //    cmovs rbx, r12, qword ptr [r21-0x635b8c8]    IID653
+    __ ecmovq (Assembler::Condition::positive, r23, rbx, Address(r27, r26, (Address::ScaleFactor)3, +0x922bcc0)); //    cmovns r23, rbx, qword ptr [r27+r26*8+0x922bcc0]    IID654
+    __ ecmovq (Assembler::Condition::parity, r25, r9, Address(r23, +0xd2a14ec)); //    cmovp r25, r9, qword ptr [r23+0xd2a14ec]    IID655
+    __ ecmovq (Assembler::Condition::noParity, r11, r19, Address(r11, -0xfb95a9d)); //    cmovnp r11, r19, qword ptr [r11-0xfb95a9d]    IID656
+    __ ecmovq (Assembler::Condition::less, r13, r18, Address(r28, r19, (Address::ScaleFactor)0, +0x716b9b7e)); //    cmovl r13, r18, qword ptr [r28+r19*1+0x716b9b7e]    IID657
+    __ ecmovq (Assembler::Condition::greaterEqual, r21, r16, Address(rcx, r29, (Address::ScaleFactor)0, -0x5af0441e)); //    cmovge r21, r16, qword ptr [rcx+r29*1-0x5af0441e]    IID658
+    __ ecmovq (Assembler::Condition::lessEqual, r12, r31, Address(r20, r26, (Address::ScaleFactor)0, +0xe0b7fb1)); //    cmovle r12, r31, qword ptr [r20+r26*1+0xe0b7fb1]    IID659
+    __ ecmovq (Assembler::Condition::greater, r15, r24, Address(r30, +0x2d3b7b4f)); //    cmovg r15, r24, qword ptr [r30+0x2d3b7b4f]    IID660
 #endif // _LP64
 
   static const uint8_t insns[] =
   {
 #ifdef _LP64
-    0xd5, 0x94, 0xa5, 0xf6,                                                          // IID0
-#endif // _LP64
-    0x0f, 0xad, 0xd9,                                                                // IID1
-#ifdef _LP64
-    0xd5, 0x54, 0x13, 0xc2,                                                          // IID2
-    0xd5, 0x14, 0x3b, 0xc3,                                                          // IID3
-    0xd5, 0xd4, 0xaf, 0xcb,                                                          // IID4
-    0xf3, 0xd5, 0xc1, 0xb8, 0xdf,                                                    // IID5
-    0xd5, 0x50, 0x1b, 0xeb,                                                          // IID6
-    0xd5, 0x51, 0x2b, 0xcd,                                                          // IID7
-    0xf3, 0xd5, 0xc0, 0xbc, 0xea,                                                    // IID8
-    0xf3, 0xd5, 0x90, 0xbd, 0xcf,                                                    // IID9
-    0x45, 0x03, 0xd3,                                                                // IID10
-    0xd5, 0x41, 0x23, 0xee,                                                          // IID11
-    0xd5, 0x15, 0x0b, 0xe6,                                                          // IID12
-    0xd5, 0x51, 0x33, 0xde,                                                          // IID13
-    0xd5, 0x45, 0x8b, 0xdb,                                                          // IID14
-    0x45, 0x0f, 0xbc, 0xd4,                                                          // IID15
-    0xd5, 0xc1, 0xbd, 0xc2,                                                          // IID16
-    0xd5, 0x51, 0x87, 0xc4,                                                          // IID17
-    0xd5, 0x54, 0x85, 0xc8,                                                          // IID18
-    0xd5, 0x11, 0x00, 0x8c, 0x53, 0x23, 0x47, 0x30, 0x6f,                            // IID19
-    0x66, 0xd5, 0x50, 0x01, 0x8c, 0x8b, 0x57, 0x4c, 0x24, 0x17,                      // IID20
-    0xd5, 0x70, 0x01, 0x9c, 0x47, 0x19, 0xf4, 0x8d, 0x13,                            // IID21
-    0x43, 0x11, 0x8c, 0xd8, 0x8d, 0x85, 0xb0, 0xe9,                                  // IID22
-    0xd5, 0x60, 0x20, 0xb4, 0xca, 0x81, 0xf1, 0xf7, 0x4d,                            // IID23
-    0xd5, 0x41, 0x21, 0xbf, 0x97, 0xb8, 0x77, 0xbe,                                  // IID24
-    0xd5, 0x34, 0x38, 0x84, 0x14, 0x78, 0x8a, 0x7d, 0xe4,                            // IID25
-    0x66, 0xd5, 0x65, 0x39, 0xbc, 0xf1, 0x70, 0xad, 0x4e, 0x56,                      // IID26
-    0xd5, 0x23, 0x39, 0x8c, 0x82, 0xec, 0xff, 0x08, 0x0f,                            // IID27
-    0xd5, 0x53, 0x08, 0x9c, 0x3b, 0xc7, 0xea, 0x18, 0x0f,                            // IID28
-    0xd5, 0x36, 0x09, 0xa4, 0xb8, 0x90, 0x27, 0x45, 0x3a,                            // IID29
-    0xd5, 0x16, 0x30, 0x94, 0x2c, 0xb7, 0xe6, 0xdd, 0x61,                            // IID30
-    0xd5, 0x11, 0x31, 0x9b, 0x9d, 0x6b, 0x56, 0x88,                                  // IID31
-    0x47, 0x29, 0x94, 0x19, 0x45, 0xf1, 0x20, 0x4e,                                  // IID32
-    0xd5, 0x34, 0x88, 0x94, 0x3f, 0x89, 0xe4, 0x0a, 0xfc,                            // IID33
-    0xd5, 0x75, 0x89, 0xb4, 0x37, 0x66, 0x54, 0xac, 0x0f,                            // IID34
-    0xd5, 0xc4, 0xc0, 0xbb, 0x6f, 0xa6, 0xfd, 0x8f,                                  // IID35
-    0x66, 0xd5, 0xf6, 0xc1, 0xac, 0x51, 0xdf, 0xfd, 0xf3, 0xac,                      // IID36
-    0xd5, 0xe1, 0xc1, 0x8c, 0x29, 0x41, 0xc9, 0x8c, 0x84,                            // IID37
-    0xd5, 0x13, 0x81, 0x94, 0xa0, 0xe5, 0x07, 0x1b, 0x69, 0x00, 0x00, 0x01, 0x00,    // IID38
-    0x43, 0x83, 0xa4, 0x0e, 0xa9, 0xa6, 0xa2, 0xee, 0x10,                            // IID39
-    0xd5, 0x10, 0x80, 0x85, 0x53, 0x7c, 0xc1, 0xe2, 0x40,                            // IID40
-    0x66, 0x41, 0x81, 0x84, 0x24, 0x9a, 0xcf, 0x7a, 0x3a, 0x00, 0x10,                // IID41
-    0xd5, 0x13, 0x81, 0x84, 0x76, 0xea, 0x12, 0x8c, 0xdf, 0x00, 0x01, 0x00, 0x00,    // IID42
-    0xd5, 0x31, 0x80, 0xbc, 0x14, 0xd5, 0x26, 0xd3, 0x6f, 0x10,                      // IID43
-    0x66, 0x43, 0x81, 0xbc, 0x74, 0x8f, 0x56, 0xe6, 0x2a, 0x00, 0x01,                // IID44
-    0xd5, 0x33, 0x81, 0xbc, 0xf0, 0x54, 0x51, 0x46, 0xee, 0x00, 0x00, 0x10, 0x00,    // IID45
-    0xd5, 0x32, 0xd1, 0xbc, 0xb6, 0x15, 0x91, 0xcb, 0x60,                            // IID46
-    0xd5, 0x13, 0xc1, 0xa4, 0x47, 0xb9, 0x8a, 0x6d, 0x23, 0x10,                      // IID47
-    0xd5, 0x12, 0x81, 0x9c, 0x65, 0xe8, 0x60, 0x64, 0x82, 0x00, 0x00, 0x00, 0x01,    // IID48
-    0xd5, 0x31, 0xc1, 0xac, 0x0d, 0xea, 0x0d, 0xab, 0x83, 0x08,                      // IID49
-    0xd5, 0x23, 0x83, 0xac, 0x98, 0x3a, 0x1d, 0x6f, 0xee, 0x10,                      // IID50
-    0x81, 0xb2, 0x96, 0x33, 0xdd, 0x50, 0x00, 0x00, 0x10, 0x00,                      // IID51
-    0xd5, 0x10, 0x80, 0x8c, 0x24, 0xec, 0x09, 0x2e, 0x82, 0x40,                      // IID52
-    0xd5, 0x10, 0x83, 0x8a, 0x9f, 0x2a, 0x85, 0x6f, 0x10,                            // IID53
-    0xd5, 0x12, 0xc6, 0x84, 0x84, 0xaa, 0xe2, 0x36, 0x04, 0x01,                      // IID54
-    0x42, 0xc7, 0x84, 0x71, 0x84, 0xdf, 0x83, 0x08, 0x10, 0x00, 0x00, 0x00,          // IID55
-    0x43, 0xf6, 0x84, 0x53, 0x65, 0xfc, 0x3d, 0xe0, 0x10,                            // IID56
-    0xd5, 0x11, 0xf7, 0x85, 0x03, 0xf0, 0xb9, 0x73, 0x00, 0x00, 0x00, 0x04,          // IID57
-    0xd5, 0x11, 0x81, 0xbc, 0x8d, 0x92, 0xb0, 0xa2, 0x4c, 0x00, 0x00, 0x40, 0x00,    // IID58
-    0xd5, 0x26, 0x03, 0x84, 0x82, 0x24, 0xdb, 0xea, 0xe1,                            // IID59
-    0xd5, 0x70, 0x23, 0x9c, 0x64, 0x92, 0x68, 0x28, 0x06,                            // IID60
-    0x45, 0x3a, 0x9d, 0x62, 0x40, 0x1f, 0xbd,                                        // IID61
-    0xd5, 0x62, 0x3b, 0xa4, 0xf3, 0xcb, 0x88, 0xb6, 0xcf,                            // IID62
-    0xf3, 0x46, 0x0f, 0xbd, 0x84, 0x4a, 0x9e, 0xe9, 0xe2, 0x00,                      // IID63
-    0xd5, 0x37, 0x0b, 0x8c, 0x4d, 0x63, 0x9f, 0x16, 0x50,                            // IID64
-    0xd5, 0x71, 0x13, 0x8c, 0xef, 0x70, 0xd1, 0xef, 0x79,                            // IID65
-    0xd5, 0xc1, 0xaf, 0xb8, 0x8d, 0xe0, 0xad, 0xf5,                                  // IID66
-    0xf3, 0xd5, 0xc5, 0xb8, 0xb2, 0x01, 0x29, 0x35, 0x44,                            // IID67
-    0xd5, 0x52, 0x1b, 0x84, 0x72, 0x76, 0xd8, 0x57, 0xf2,                            // IID68
-    0xd5, 0x50, 0x2b, 0x8e, 0xb3, 0xaa, 0x63, 0x2d,                                  // IID69
-    0xf3, 0xd5, 0xd2, 0xbc, 0xbc, 0x1d, 0x97, 0x8b, 0x43, 0xe7,                      // IID70
-    0xd5, 0x14, 0x32, 0x8c, 0x13, 0x13, 0xf8, 0x9d, 0xa0,                            // IID71
-    0x66, 0xd5, 0x16, 0x33, 0x9c, 0x95, 0xd5, 0x60, 0x38, 0x9c,                      // IID72
-    0xd5, 0x55, 0x33, 0xac, 0xcf, 0x0f, 0x3c, 0xd9, 0x34,                            // IID73
-    0xd5, 0x61, 0x8a, 0x8c, 0x90, 0x29, 0xc5, 0x00, 0xc7,                            // IID74
-    0xd5, 0x56, 0x8b, 0xbc, 0x9c, 0xf4, 0xb8, 0xdc, 0xe2,                            // IID75
-    0xd5, 0x46, 0x8d, 0xbc, 0xa3, 0xeb, 0xbd, 0xb5, 0xc4,                            // IID76
-    0xd5, 0x73, 0x86, 0xa4, 0x06, 0x44, 0x7d, 0xb1, 0xa3,                            // IID77
-    0x66, 0xd5, 0x25, 0x87, 0xac, 0xea, 0x03, 0x4a, 0xbd, 0x19,                      // IID78
-    0xd5, 0x52, 0x87, 0xbc, 0xa8, 0x2a, 0x6c, 0xfd, 0x95,                            // IID79
-    0x45, 0x85, 0xa9, 0x61, 0xff, 0xa6, 0x34,                                        // IID80
-    0xd5, 0x10, 0x80, 0xc7, 0x04,                                                    // IID81
-    0xd5, 0x11, 0x81, 0xc4, 0x00, 0x00, 0x01, 0x00,                                  // IID82
-#endif // _LP64
-    0x81, 0xe2, 0x00, 0x00, 0x01, 0x00,                                              // IID83
-#ifdef _LP64
-    0xd5, 0x11, 0x81, 0xd3, 0x00, 0x00, 0x10, 0x00,                                  // IID84
-    0x41, 0x80, 0xfd, 0x04,                                                          // IID85
-    0xd5, 0x11, 0x81, 0xfd, 0x00, 0x00, 0x00, 0x10,                                  // IID86
-    0xd5, 0x10, 0xc1, 0xd4, 0x10,                                                    // IID87
-    0xd5, 0x11, 0xc1, 0xc1, 0x02,                                                    // IID88
+    0xd5, 0xc1, 0xa5, 0xf4,                                                          // IID0
+    0xd5, 0x94, 0xad, 0xfd,                                                          // IID1
+    0xd5, 0x55, 0x13, 0xd8,                                                          // IID2
+    0xd5, 0x55, 0x3b, 0xfd,                                                          // IID3
+    0x44, 0x0f, 0xaf, 0xc2,                                                          // IID4
+    0xf3, 0xd5, 0x94, 0xb8, 0xc0,                                                    // IID5
+    0x41, 0x1b, 0xcb,                                                                // IID6
+    0xd5, 0x51, 0x2b, 0xd6,                                                          // IID7
+    0xf3, 0xd5, 0xc1, 0xbc, 0xc6,                                                    // IID8
+    0xf3, 0xd5, 0xc4, 0xbd, 0xf3,                                                    // IID9
+    0x45, 0x03, 0xe0,                                                                // IID10
+    0xd5, 0x41, 0x23, 0xdf,                                                          // IID11
+    0xd5, 0x54, 0x0b, 0xd2,                                                          // IID12
+    0xd5, 0x50, 0x33, 0xde,                                                          // IID13
+    0xd5, 0x14, 0x8b, 0xf1,                                                          // IID14
+    0xd5, 0xd1, 0xbc, 0xe5,                                                          // IID15
+    0xd5, 0x95, 0xbd, 0xcb,                                                          // IID16
+    0xd5, 0x15, 0x87, 0xf8,                                                          // IID17
+    0xd5, 0x41, 0x85, 0xeb,                                                          // IID18
+    0xd5, 0x41, 0x00, 0x91, 0x56, 0x00, 0x01, 0x8c,                                  // IID19
+    0x66, 0xd5, 0x56, 0x01, 0x94, 0x3b, 0xf4, 0x06, 0x76, 0xa1,                      // IID20
+    0xd5, 0x52, 0x01, 0xac, 0xe4, 0xc4, 0xef, 0x3b, 0xa3,                            // IID21
+    0xd5, 0x42, 0x11, 0xb4, 0xab, 0x43, 0x06, 0x8b, 0xd4,                            // IID22
+    0xd5, 0x45, 0x20, 0xb6, 0x7c, 0xf2, 0x05, 0x62,                                  // IID23
+    0xd5, 0x55, 0x21, 0xac, 0xdd, 0xd6, 0x0c, 0x4e, 0x87,                            // IID24
+    0xd5, 0x74, 0x38, 0x9c, 0x37, 0x32, 0x5d, 0x37, 0x03,                            // IID25
+    0x66, 0xd5, 0x35, 0x39, 0xbc, 0x43, 0xab, 0x8e, 0x58, 0xd7,                      // IID26
+    0xd5, 0x73, 0x39, 0xac, 0x4d, 0xab, 0x99, 0x9d, 0xab,                            // IID27
+    0xd5, 0x23, 0x08, 0x8c, 0xcb, 0xc3, 0x98, 0xb4, 0x0a,                            // IID28
+    0xd5, 0x72, 0x09, 0xa4, 0x37, 0xa0, 0x6e, 0x80, 0x4d,                            // IID29
+    0x43, 0x30, 0x9c, 0xcc, 0x17, 0x4f, 0x0a, 0xd4,                                  // IID30
+    0xd5, 0x70, 0x31, 0x9c, 0x40, 0xac, 0x68, 0x82, 0xd5,                            // IID31
+    0xd5, 0x57, 0x29, 0x8c, 0xbd, 0x63, 0x25, 0x58, 0xaa,                            // IID32
+    0xd5, 0x27, 0x88, 0xbc, 0x55, 0x90, 0xd2, 0xbb, 0xa3,                            // IID33
+    0xd5, 0x43, 0x89, 0xa4, 0x01, 0x1c, 0x8a, 0x4b, 0xca,                            // IID34
+    0xd5, 0xc1, 0xc0, 0xb2, 0x71, 0x76, 0x35, 0xec,                                  // IID35
+    0x66, 0xd5, 0xb4, 0xc1, 0xa4, 0xc1, 0xb8, 0xdd, 0xad, 0x46,                      // IID36
+    0xd5, 0xd5, 0xc1, 0xbe, 0x31, 0x67, 0x4d, 0x45,                                  // IID37
+    0xd5, 0x23, 0x81, 0x94, 0xcd, 0x68, 0x3f, 0x8f, 0xd3, 0x00, 0x10, 0x00, 0x00,    // IID38
+    0xd5, 0x13, 0x81, 0xa4, 0xce, 0x35, 0xe5, 0xd9, 0x28, 0x00, 0x00, 0x00, 0x01,    // IID39
+    0xd5, 0x32, 0x80, 0x84, 0x2c, 0x84, 0xff, 0xa6, 0xe3, 0x04,                      // IID40
+    0x66, 0xd5, 0x20, 0x81, 0x84, 0x33, 0x77, 0x7d, 0x5f, 0xef, 0x00, 0x10,          // IID41
+    0xd5, 0x30, 0x81, 0x84, 0x92, 0xa2, 0x4c, 0xb9, 0x19, 0x00, 0x01, 0x00, 0x00,    // IID42
+    0xd5, 0x30, 0x80, 0xbc, 0x4e, 0x8a, 0xf2, 0xa9, 0x41, 0x10,                      // IID43
+    0x66, 0xd5, 0x12, 0x81, 0xbc, 0xba, 0x83, 0x8b, 0x2e, 0x0f, 0x00, 0x04,          // IID44
+    0xd5, 0x11, 0x81, 0xb8, 0xab, 0xb5, 0x89, 0x87, 0x00, 0x00, 0x01, 0x00,          // IID45
+    0xd5, 0x23, 0xd1, 0xbc, 0x74, 0xd0, 0x53, 0xb9, 0x0f,                            // IID46
+    0x43, 0xc1, 0xa4, 0x0a, 0x3d, 0x3e, 0x2d, 0x36, 0x02,                            // IID47
+    0xd5, 0x21, 0x81, 0x9c, 0x62, 0xa1, 0xdd, 0xe9, 0x3b, 0x00, 0x01, 0x00, 0x00,    // IID48
+    0xd5, 0x10, 0xc1, 0xac, 0x8c, 0x9d, 0xe6, 0xed, 0x4c, 0x02,                      // IID49
+    0xd5, 0x11, 0x81, 0xae, 0x69, 0x60, 0x72, 0xe5, 0x00, 0x00, 0x00, 0x10,          // IID50
+    0x41, 0x83, 0xb3, 0xb8, 0x70, 0xfc, 0xd8, 0x10,                                  // IID51
+    0xd5, 0x20, 0x80, 0x8c, 0xda, 0x5c, 0xc0, 0x00, 0xe7, 0x40,                      // IID52
+    0xd5, 0x10, 0x83, 0x8b, 0xcf, 0x71, 0xa7, 0xda, 0x10,                            // IID53
+    0xd5, 0x10, 0xc6, 0x85, 0xa7, 0xa2, 0xe5, 0xb1, 0x10,                            // IID54
+    0xd5, 0x10, 0xc7, 0x86, 0xe7, 0x00, 0x6e, 0x91, 0x00, 0x00, 0x00, 0x10,          // IID55
+    0xd5, 0x11, 0xf6, 0x85, 0x3e, 0x3b, 0x67, 0xa1, 0x01,                            // IID56
+    0x41, 0xf7, 0x84, 0x8a, 0xed, 0x6e, 0xc2, 0x2e, 0x00, 0x00, 0x00, 0x04,          // IID57
+    0x41, 0x81, 0xbc, 0x9a, 0x92, 0x00, 0xc0, 0xec, 0x00, 0x00, 0x00, 0x01,          // IID58
+    0xd5, 0x74, 0x03, 0x84, 0x35, 0x1f, 0xd9, 0x7b, 0xd7,                            // IID59
+    0xd5, 0x54, 0x23, 0xa4, 0xcf, 0x86, 0x44, 0xdf, 0x1f,                            // IID60
+    0xd5, 0x14, 0x3a, 0xae, 0x74, 0xc9, 0x21, 0x57,                                  // IID61
+    0xd5, 0x62, 0x3b, 0xac, 0x43, 0x02, 0x5f, 0x04, 0x81,                            // IID62
+    0xf3, 0x46, 0x0f, 0xbd, 0x94, 0x32, 0x62, 0xa8, 0x9f, 0x1f,                      // IID63
+    0x47, 0x0b, 0xa4, 0x43, 0x6e, 0x46, 0x40, 0x38,                                  // IID64
+    0xd5, 0x57, 0x13, 0xa4, 0x1c, 0x91, 0x6a, 0xea, 0x4a,                            // IID65
+    0xd5, 0xe3, 0xaf, 0x9c, 0xd8, 0x06, 0x4f, 0xf1, 0x82,                            // IID66
+    0xf3, 0xd5, 0x90, 0xb8, 0x89, 0xf8, 0x7d, 0xfb, 0x6d,                            // IID67
+    0xd5, 0x30, 0x1b, 0x94, 0x33, 0x32, 0xf2, 0x90, 0x7e,                            // IID68
+    0xd5, 0x50, 0x2b, 0x88, 0x2c, 0xf9, 0x4d, 0xe4,                                  // IID69
+    0xf3, 0xd5, 0xf3, 0xbc, 0x84, 0xc3, 0xa2, 0xc6, 0x30, 0x9b,                      // IID70
+    0xd5, 0x63, 0x32, 0xb4, 0xeb, 0x03, 0xe0, 0xa4, 0xe7,                            // IID71
+    0x66, 0xd5, 0x37, 0x33, 0xac, 0x18, 0x00, 0xbc, 0xbf, 0xb2,                      // IID72
+    0x44, 0x33, 0xb1, 0x7d, 0x8f, 0xc9, 0x93,                                        // IID73
+    0xd5, 0x35, 0x8a, 0xac, 0x33, 0xdf, 0x81, 0x27, 0xd6,                            // IID74
+    0xd5, 0x51, 0x8b, 0x93, 0xb3, 0x04, 0x82, 0x3c,                                  // IID75
+    0x46, 0x8d, 0xac, 0xfb, 0xbf, 0x3d, 0xb9, 0x84,                                  // IID76
+    0xd5, 0x74, 0x86, 0x8c, 0x1f, 0x4c, 0x47, 0xd8, 0x81,                            // IID77
+    0x66, 0xd5, 0x45, 0x87, 0x93, 0xa0, 0x13, 0x77, 0xd3,                            // IID78
+    0xd5, 0x73, 0x87, 0x94, 0xa6, 0x43, 0x88, 0x00, 0x01,                            // IID79
+    0xd5, 0x41, 0x85, 0xa8, 0x21, 0xfd, 0x69, 0x66,                                  // IID80
+    0xd5, 0x11, 0x80, 0xc7, 0x04,                                                    // IID81
+    0x41, 0x81, 0xc3, 0x00, 0x00, 0x00, 0x01,                                        // IID82
+    0xd5, 0x11, 0x83, 0xe1, 0x01,                                                    // IID83
+    0xd5, 0x10, 0x81, 0xd1, 0x00, 0x00, 0x00, 0x01,                                  // IID84
+    0xd5, 0x10, 0x80, 0xfa, 0x04,                                                    // IID85
+    0x41, 0x81, 0xf9, 0x00, 0x01, 0x00, 0x00,                                        // IID86
+    0xd5, 0x10, 0xc1, 0xd1, 0x02,                                                    // IID87
+    0x41, 0xc1, 0xc5, 0x10,                                                          // IID88
+    0xd5, 0x11, 0xc1, 0xcb, 0x02,                                                    // IID89
+    0xd5, 0x11, 0xc1, 0xf8, 0x08,                                                    // IID90
+    0xd5, 0x10, 0xc1, 0xe3, 0x10,                                                    // IID91
+    0xd5, 0x10, 0x81, 0xdb, 0x00, 0x00, 0x10, 0x00,                                  // IID92
+    0xd5, 0x10, 0xc1, 0xe4, 0x10,                                                    // IID93
+    0xd5, 0x11, 0xc1, 0xeb, 0x04,                                                    // IID94
+    0xd5, 0x11, 0x83, 0xe8, 0x10,                                                    // IID95
+    0xd5, 0x11, 0x81, 0xf3, 0x00, 0x00, 0x10, 0x00,                                  // IID96
+    0xd5, 0x10, 0xbd, 0x01, 0x00, 0x00, 0x00,                                        // IID97
+    0xd5, 0x11, 0xf6, 0xc7, 0x10,                                                    // IID98
+    0x41, 0xf7, 0xc1, 0x00, 0x00, 0x40, 0x00,                                        // IID99
+    0xd5, 0x11, 0x81, 0xee, 0x00, 0x00, 0x01, 0x00,                                  // IID100
+    0xd5, 0x94, 0x40, 0xb3, 0xbf, 0x7b, 0x43, 0xaf,                                  // IID101
+    0xd5, 0xa5, 0x41, 0xbc, 0x6a, 0x4d, 0x5d, 0x31, 0xb6,                            // IID102
+    0x41, 0x0f, 0x42, 0x9e, 0x63, 0xad, 0x09, 0x69,                                  // IID103
+    0xd5, 0xe1, 0x43, 0x84, 0x89, 0xf7, 0x5d, 0x34, 0x92,                            // IID104
+    0x45, 0x0f, 0x44, 0xab, 0x8e, 0xa6, 0x55, 0x09,                                  // IID105
+    0xd5, 0xd3, 0x45, 0x8c, 0x0d, 0xa5, 0x2c, 0xd6, 0xa7,                            // IID106
+    0xd5, 0xb6, 0x46, 0x84, 0xf5, 0x6f, 0x7a, 0x5d, 0xa6,                            // IID107
+    0xd5, 0xd2, 0x47, 0xb4, 0x53, 0xfb, 0xed, 0x6c, 0xc7,                            // IID108
+    0xd5, 0xf4, 0x48, 0x8c, 0x17, 0xe9, 0x83, 0xbe, 0x95,                            // IID109
+    0x43, 0x0f, 0x49, 0x9c, 0xca, 0xff, 0x3b, 0xd4, 0x7b,                            // IID110
+    0x43, 0x0f, 0x4a, 0x94, 0xf0, 0x6b, 0xbc, 0x10, 0x34,                            // IID111
+    0x46, 0x0f, 0x4b, 0xa4, 0x89, 0x82, 0x34, 0x66, 0x4a,                            // IID112
+    0xd5, 0xe1, 0x4c, 0xac, 0x75, 0xe7, 0x50, 0x71, 0x9c,                            // IID113
+    0xd5, 0xf3, 0x4d, 0x9c, 0x41, 0x3b, 0xf7, 0x57, 0xa5,                            // IID114
+    0x0f, 0x4e, 0x89, 0x29, 0x7f, 0x49, 0x04,                                        // IID115
+    0xd5, 0xa1, 0x4f, 0x8c, 0xcd, 0x38, 0x9b, 0x77, 0x2a,                            // IID116
+    0xd5, 0x90, 0x90, 0xc6,                                                          // IID117
+    0xd5, 0x91, 0x91, 0xc3,                                                          // IID118
+    0xd5, 0x90, 0x92, 0xc4,                                                          // IID119
+    0x41, 0x0f, 0x93, 0xc4,                                                          // IID120
 #endif // _LP64
-    0xc1, 0xca, 0x04,                                                                // IID89
-    0xd1, 0xf9,                                                                      // IID90
+    0x0f, 0x94, 0xc2,                                                                // IID121
 #ifdef _LP64
-    0xd5, 0x10, 0xc1, 0xe3, 0x10,                                                    // IID91
-    0x41, 0x83, 0xd9, 0x01,                                                          // IID92
-    0xd5, 0x10, 0xc1, 0xe4, 0x08,                                                    // IID93
+    0xd5, 0x90, 0x95, 0xc1,                                                          // IID122
+    0x41, 0x0f, 0x96, 0xc1,                                                          // IID123
 #endif // _LP64
-    0xd1, 0xe9,                                                                      // IID94
+    0x0f, 0x97, 0xc1,                                                                // IID124
 #ifdef _LP64
-    0xd5, 0x10, 0x81, 0xeb, 0x00, 0x00, 0x00, 0x01,                                  // IID95
-    0xd5, 0x10, 0x81, 0xf0, 0x00, 0x10, 0x00, 0x00,                                  // IID96
-    0xd5, 0x11, 0xb8, 0x00, 0x00, 0x01, 0x00,                                        // IID97
-    0xd5, 0x10, 0xf6, 0xc4, 0x40,                                                    // IID98
-    0xd5, 0x11, 0xf7, 0xc4, 0x00, 0x00, 0x00, 0x01,                                  // IID99
-    0xd5, 0x11, 0x81, 0xed, 0x00, 0x00, 0x04, 0x00,                                  // IID100
-    0xd5, 0xb7, 0x40, 0x84, 0x62, 0x6d, 0xf0, 0x10, 0x02,                            // IID101
-    0xd5, 0x90, 0x41, 0x9c, 0x1a, 0xd6, 0x31, 0xb0, 0xd9,                            // IID102
-    0xd5, 0xf6, 0x42, 0xac, 0x01, 0xcb, 0x6a, 0xc0, 0x46,                            // IID103
-    0xd5, 0xd3, 0x43, 0x8c, 0xd9, 0xab, 0x0b, 0xde, 0xc4,                            // IID104
-    0xd5, 0xf2, 0x44, 0xbc, 0x3c, 0x85, 0xce, 0xfc, 0xa5,                            // IID105
-    0xd5, 0xd7, 0x45, 0xbc, 0xbf, 0x9b, 0xd1, 0x03, 0xac,                            // IID106
-    0xd5, 0xc4, 0x46, 0xa4, 0xca, 0x61, 0xdd, 0x36, 0xc4,                            // IID107
-    0xd5, 0xe4, 0x47, 0xbc, 0xda, 0x1c, 0x76, 0xf1, 0x7b,                            // IID108
-    0xd5, 0xb0, 0x48, 0x94, 0x11, 0xfd, 0x03, 0x5d, 0xe2,                            // IID109
-    0xd5, 0xb4, 0x49, 0x8c, 0xbd, 0xb6, 0xba, 0x66, 0xd8,                            // IID110
-    0xd5, 0xc5, 0x4a, 0x9d, 0x64, 0xdb, 0xb3, 0x9a,                                  // IID111
-    0xd5, 0x93, 0x4b, 0x94, 0xd0, 0xb2, 0xbe, 0x96, 0x6c,                            // IID112
-    0x46, 0x0f, 0x4c, 0x8c, 0xc1, 0x92, 0x18, 0x3e, 0x57,                            // IID113
-    0xd5, 0xd7, 0x4d, 0xbc, 0xb2, 0xb1, 0x10, 0x71, 0x71,                            // IID114
-    0xd5, 0xd6, 0x4e, 0x84, 0xb3, 0xd7, 0xaa, 0x9f, 0x11,                            // IID115
-    0x47, 0x0f, 0x4f, 0xa4, 0x25, 0x05, 0x78, 0x53, 0x0d,                            // IID116
-    0x41, 0x0f, 0x90, 0xc2,                                                          // IID117
+    0x41, 0x0f, 0x98, 0xc7,                                                          // IID125
+    0xd5, 0x91, 0x99, 0xc3,                                                          // IID126
+    0xd5, 0x90, 0x9a, 0xc1,                                                          // IID127
+    0xd5, 0x90, 0x9b, 0xc1,                                                          // IID128
+    0xd5, 0x91, 0x9c, 0xc4,                                                          // IID129
+    0xd5, 0x90, 0x9d, 0xc4,                                                          // IID130
+    0xd5, 0x91, 0x9e, 0xc7,                                                          // IID131
 #endif // _LP64
-    0x0f, 0x91, 0xc3,                                                                // IID118
+    0x0f, 0x9f, 0xc2,                                                                // IID132
 #ifdef _LP64
-    0x41, 0x0f, 0x92, 0xc5,                                                          // IID119
-    0xd5, 0x90, 0x93, 0xc7,                                                          // IID120
-    0xd5, 0x91, 0x94, 0xc0,                                                          // IID121
-    0x41, 0x0f, 0x95, 0xc7,                                                          // IID122
-    0xd5, 0x90, 0x96, 0xc5,                                                          // IID123
-    0xd5, 0x90, 0x97, 0xc1,                                                          // IID124
-    0x41, 0x0f, 0x98, 0xc2,                                                          // IID125
-    0xd5, 0x91, 0x99, 0xc0,                                                          // IID126
-    0xd5, 0x90, 0x9a, 0xc0,                                                          // IID127
-    0xd5, 0x91, 0x9b, 0xc4,                                                          // IID128
-    0x41, 0x0f, 0x9c, 0xc3,                                                          // IID129
-    0xd5, 0x91, 0x9d, 0xc1,                                                          // IID130
-    0xd5, 0x90, 0x9e, 0xc2,                                                          // IID131
-    0x41, 0x0f, 0x9f, 0xc6,                                                          // IID132
-    0xd5, 0x11, 0xf7, 0xf6,                                                          // IID133
-    0xd5, 0x10, 0xf7, 0xff,                                                          // IID134
-    0xd5, 0x11, 0xf7, 0xec,                                                          // IID135
-    0xd5, 0x11, 0xf7, 0xe7,                                                          // IID136
-    0xd5, 0x11, 0xf7, 0xdb,                                                          // IID137
-    0xd5, 0x10, 0xf7, 0xd0,                                                          // IID138
+    0x41, 0xf7, 0xf1,                                                                // IID133
+    0xd5, 0x11, 0xf7, 0xfc,                                                          // IID134
+    0xd5, 0x11, 0xf7, 0xea,                                                          // IID135
+    0x41, 0xf7, 0xe7,                                                                // IID136
+    0xd5, 0x11, 0xf7, 0xdf,                                                          // IID137
+    0x41, 0xf7, 0xd2,                                                                // IID138
 #endif // _LP64
-    0xd3, 0xc2,                                                                      // IID139
+    0xd3, 0xc1,                                                                      // IID139
 #ifdef _LP64
-    0x41, 0xd3, 0xcc,                                                                // IID140
-    0x41, 0xd3, 0xfe,                                                                // IID141
-    0xd5, 0x10, 0xd3, 0xe3,                                                          // IID142
-    0x41, 0xd3, 0xe2,                                                                // IID143
-    0xd5, 0x10, 0xd3, 0xec,                                                          // IID144
+    0xd5, 0x10, 0xd3, 0xcf,                                                          // IID140
+    0xd5, 0x10, 0xd3, 0xfe,                                                          // IID141
+    0x41, 0xd3, 0xe0,                                                                // IID142
+    0xd5, 0x10, 0xd3, 0xe4,                                                          // IID143
+    0x41, 0xd3, 0xe8,                                                                // IID144
+    0xd5, 0x11, 0xff, 0xc5,                                                          // IID145
+    0x41, 0xff, 0xcf,                                                                // IID146
+    0xd5, 0x11, 0xf7, 0xa4, 0xd3, 0x9c, 0x00, 0x9d, 0x19,                            // IID147
+    0x43, 0xf7, 0x9c, 0x4b, 0xc7, 0xeb, 0x87, 0x80,                                  // IID148
+    0xd5, 0x31, 0xd3, 0xbc, 0x70, 0xf6, 0x3b, 0x54, 0xe3,                            // IID149
+    0xd5, 0x11, 0xd3, 0xa0, 0xfb, 0x4b, 0xbb, 0x57,                                  // IID150
+    0xd5, 0x11, 0xd3, 0xaf, 0xaf, 0xe5, 0x90, 0x54,                                  // IID151
+    0xd5, 0x13, 0xff, 0x84, 0x6b, 0x4f, 0xd4, 0x66, 0x23,                            // IID152
+    0xd5, 0x11, 0xff, 0x8c, 0x24, 0x07, 0x72, 0x7c, 0x1e,                            // IID153
+    0xd5, 0x25, 0x69, 0xb4, 0xce, 0x71, 0x57, 0xa0, 0x13, 0x00, 0x00, 0x00, 0x10,    // IID154
+    0xd5, 0x50, 0x6b, 0xd7, 0x10,                                                    // IID155
+    0xd5, 0xd5, 0xa4, 0xf8, 0x04,                                                    // IID156
+    0xd5, 0xc5, 0xac, 0xf3, 0x02,                                                    // IID157
+    0xd5, 0xb2, 0xb6, 0x9c, 0x47, 0xf3, 0x98, 0x49, 0xa3,                            // IID158
+    0xd5, 0xe0, 0xb7, 0xa4, 0x01, 0x2e, 0xc0, 0x8c, 0x9b,                            // IID159
+    0xd5, 0x97, 0xbe, 0xa4, 0xbd, 0xe5, 0xee, 0xd6, 0x60,                            // IID160
+    0xd5, 0x97, 0xbf, 0xb4, 0xcf, 0x48, 0x59, 0xaa, 0x01,                            // IID161
+    0xd5, 0x95, 0xb6, 0xed,                                                          // IID162
+    0x45, 0x0f, 0xb7, 0xfc,                                                          // IID163
+    0xd5, 0x95, 0xbe, 0xf9,                                                          // IID164
+    0xd5, 0xd5, 0xbf, 0xd8,                                                          // IID165
+    0xd5, 0xf7, 0xb0, 0x84, 0x0c, 0x75, 0xa5, 0xef, 0x33,                            // IID166
+    0x66, 0x46, 0x0f, 0xb1, 0xac, 0xb9, 0xe4, 0x1a, 0xac, 0x02,                      // IID167
+    0xd5, 0x97, 0xb1, 0x84, 0x5a, 0x22, 0x2b, 0x94, 0xa4,                            // IID168
+    0x62, 0xdc, 0x7c, 0x08, 0xf7, 0xfe,                                              // IID169
+    0x62, 0xd4, 0x7c, 0x0c, 0xf7, 0xfc,                                              // IID170
+    0x62, 0xfc, 0x7c, 0x08, 0xf7, 0xf1,                                              // IID171
+    0x62, 0xfc, 0x7c, 0x0c, 0xf7, 0xf1,                                              // IID172
 #endif // _LP64
-    0xff, 0xc3,                                                                      // IID145
+    0x62, 0xf4, 0x7c, 0x08, 0xf7, 0xe9,                                              // IID173
 #ifdef _LP64
-    0x41, 0xff, 0xce,                                                                // IID146
-    0x41, 0xf7, 0xa4, 0x24, 0xa2, 0x05, 0x5b, 0xa8,                                  // IID147
-    0xf7, 0x9b, 0x39, 0x30, 0x4b, 0xc2,                                              // IID148
-    0xd5, 0x10, 0xd3, 0xbd, 0xd0, 0x52, 0x8f, 0x81,                                  // IID149
-    0xd5, 0x32, 0xd3, 0xa4, 0xe5, 0x37, 0x94, 0xba, 0xdc,                            // IID150
-    0x43, 0xd3, 0xac, 0x6b, 0xbc, 0x03, 0xff, 0xf1,                                  // IID151
-    0xd5, 0x10, 0xff, 0x83, 0x96, 0x2a, 0x95, 0xa1,                                  // IID152
-    0xd5, 0x20, 0xff, 0x8c, 0x21, 0x3c, 0x46, 0xcf, 0xda,                            // IID153
-    0xd5, 0x63, 0x69, 0x8c, 0x40, 0x26, 0xcf, 0xfe, 0x2e, 0x00, 0x00, 0x10, 0x00,    // IID154
-    0x45, 0x69, 0xc8, 0x00, 0x00, 0x00, 0x10,                                        // IID155
-    0x45, 0x0f, 0xa4, 0xfa, 0x08,                                                    // IID156
-    0xd5, 0xd1, 0xac, 0xf5, 0x02,                                                    // IID157
-    0xd5, 0x94, 0xb6, 0xb3, 0x7c, 0xca, 0x3c, 0xf9,                                  // IID158
-    0xd5, 0xe7, 0xb7, 0x8c, 0x1c, 0x44, 0xfa, 0x05, 0x2d,                            // IID159
-    0xd5, 0x97, 0xbe, 0xa4, 0x3e, 0xc1, 0xca, 0xbc, 0x65,                            // IID160
-    0xd5, 0xe7, 0xbf, 0x94, 0x02, 0x59, 0x74, 0x70, 0x1d,                            // IID161
-    0xd5, 0xc1, 0xb6, 0xd0,                                                          // IID162
-    0xd5, 0xc5, 0xb7, 0xf9,                                                          // IID163
-    0xd5, 0x94, 0xbe, 0xfe,                                                          // IID164
-    0xd5, 0xd5, 0xbf, 0xc0,                                                          // IID165
-    0xd5, 0xe3, 0xb0, 0x94, 0x64, 0xa1, 0x59, 0xaa, 0xb7,                            // IID166
-    0x66, 0xd5, 0xc6, 0xb1, 0xa4, 0xf2, 0x58, 0xa5, 0xf5, 0x16,                      // IID167
-    0xd5, 0x90, 0xb1, 0x94, 0x52, 0x9c, 0x8d, 0x25, 0x50,                            // IID168
-    0x4c, 0x13, 0xcb,                                                                // IID169
-    0xd5, 0x5d, 0x3b, 0xd0,                                                          // IID170
-    0x4c, 0x0f, 0xaf, 0xf2,                                                          // IID171
-    0xf3, 0xd5, 0xdd, 0xb8, 0xce,                                                    // IID172
-    0xd5, 0x5c, 0x1b, 0xc3,                                                          // IID173
-    0x4d, 0x2b, 0xfb,                                                                // IID174
-    0xf3, 0xd5, 0xd8, 0xbc, 0xd5,                                                    // IID175
-    0xf3, 0xd5, 0x9d, 0xbd, 0xfb,                                                    // IID176
-    0xd5, 0x58, 0x03, 0xec,                                                          // IID177
-    0xd5, 0x1d, 0x23, 0xda,                                                          // IID178
-    0xd5, 0x4d, 0x0b, 0xef,                                                          // IID179
-    0xd5, 0x5c, 0x33, 0xc5,                                                          // IID180
-    0x4d, 0x8b, 0xf5,                                                                // IID181
-    0xd5, 0x9c, 0xbc, 0xde,                                                          // IID182
-    0xd5, 0x9c, 0xbd, 0xf7,                                                          // IID183
-    0xd5, 0x98, 0xa3, 0xce,                                                          // IID184
-    0xd5, 0x5d, 0x87, 0xcd,                                                          // IID185
-    0x4d, 0x85, 0xf8,                                                                // IID186
-    0xd5, 0x4b, 0x01, 0x84, 0xd6, 0xfe, 0x05, 0x19, 0xc9,                            // IID187
-    0xd5, 0x4a, 0x21, 0x94, 0xc3, 0x48, 0xde, 0x65, 0xd8,                            // IID188
-    0xd5, 0x1d, 0x39, 0xa8, 0xef, 0xc9, 0xc3, 0x62,                                  // IID189
-    0xd5, 0x2d, 0x09, 0x9c, 0xb3, 0x78, 0xb3, 0x9f, 0x41,                            // IID190
-    0xd5, 0x1f, 0x31, 0xac, 0xb1, 0x23, 0xb6, 0x4b, 0xcd,                            // IID191
-    0xd5, 0x7b, 0x29, 0x9c, 0xfc, 0x61, 0xd3, 0xe1, 0x6c,                            // IID192
-    0xd5, 0x3f, 0x89, 0x9c, 0x89, 0x84, 0x89, 0x0a, 0xfc,                            // IID193
-    0xd5, 0xf8, 0xc1, 0xa4, 0xcb, 0x6c, 0xf0, 0xeb, 0x1f,                            // IID194
-    0xd5, 0x39, 0x81, 0xa4, 0x4a, 0xfb, 0xa0, 0x79, 0x94, 0x00, 0x00, 0x01, 0x00,    // IID195
-    0xd5, 0x19, 0x81, 0x83, 0x79, 0xa2, 0x36, 0x91, 0x00, 0x00, 0x01, 0x00,          // IID196
-    0xd5, 0x2a, 0x81, 0xbc, 0x93, 0x5c, 0x41, 0x15, 0xfe, 0x00, 0x00, 0x10, 0x00,    // IID197
-    0xd5, 0x28, 0xc1, 0xbc, 0x1b, 0xe8, 0x3d, 0x3c, 0x3c, 0x08,                      // IID198
-    0xd5, 0x38, 0xc1, 0xa4, 0x7c, 0x6d, 0x9b, 0x51, 0x68, 0x08,                      // IID199
-    0xd5, 0x39, 0x83, 0x9c, 0x37, 0x7b, 0xe1, 0xc2, 0x84, 0x10,                      // IID200
-    0xd5, 0x29, 0xc1, 0xac, 0xd7, 0x24, 0xd8, 0xd9, 0x04, 0x04,                      // IID201
-    0xd5, 0x2a, 0x83, 0xac, 0xaa, 0x85, 0xea, 0x4a, 0x7e, 0x01,                      // IID202
-    0xd5, 0x1a, 0x81, 0xb4, 0x57, 0x20, 0xc6, 0x95, 0x28, 0x00, 0x00, 0x00, 0x01,    // IID203
-    0x4b, 0x83, 0x8c, 0x2e, 0x65, 0xc6, 0xe4, 0x88, 0x01,                            // IID204
-    0xd5, 0x18, 0xc7, 0x86, 0xa6, 0x64, 0xba, 0x9c, 0x00, 0x01, 0x00, 0x00,          // IID205
-    0x49, 0xf7, 0x85, 0x3b, 0x6e, 0x69, 0xf4, 0xff, 0xff, 0xff, 0xff,                // IID206
-    0xd5, 0x49, 0x03, 0x8f, 0xf3, 0xb4, 0x49, 0xae,                                  // IID207
-    0xd5, 0x18, 0x23, 0x8c, 0xc8, 0xac, 0xb4, 0x71, 0xe3,                            // IID208
-    0xd5, 0x58, 0x3b, 0xbc, 0xc9, 0xa0, 0xaa, 0x8f, 0xbb,                            // IID209
-    0xf3, 0xd5, 0xd8, 0xbd, 0x9b, 0x92, 0xe7, 0x7f, 0x48,                            // IID210
-    0xd5, 0x1c, 0x0b, 0x99, 0xd7, 0xbc, 0x21, 0x9a,                                  // IID211
-    0xd5, 0x4d, 0x13, 0xa9, 0xfd, 0x23, 0x6d, 0x8f,                                  // IID212
-    0xd5, 0xbf, 0xaf, 0x8c, 0xd2, 0x09, 0x78, 0x7d, 0xee,                            // IID213
-    0xf3, 0xd5, 0xe9, 0xb8, 0x9c, 0x5f, 0x6b, 0x10, 0xce, 0x91,                      // IID214
-    0xd5, 0x5c, 0x1b, 0xb7, 0xa2, 0xa3, 0xab, 0xb9,                                  // IID215
-    0xd5, 0x79, 0x2b, 0xbc, 0xd7, 0xd8, 0x37, 0x3c, 0x66,                            // IID216
-    0xf3, 0xd5, 0xff, 0xbc, 0x84, 0xc8, 0x0f, 0x87, 0xa5, 0xb9,                      // IID217
-    0xd5, 0x2d, 0x33, 0xb4, 0x5f, 0xfa, 0xaf, 0x96, 0x41,                            // IID218
-    0xd5, 0x3b, 0x8b, 0x94, 0x69, 0x57, 0x61, 0x5a, 0x11,                            // IID219
-    0xd5, 0x7b, 0x8d, 0x9c, 0xbc, 0x33, 0xf9, 0x82, 0x6b,                            // IID220
-    0xf2, 0xd5, 0xb9, 0x2c, 0x8c, 0xe8, 0x15, 0x66, 0x23, 0xc6,                      // IID221
-    0xd5, 0x7e, 0x87, 0xac, 0xc1, 0x1d, 0xf0, 0x02, 0x59,                            // IID222
-    0xd5, 0x3f, 0x85, 0xa4, 0xa8, 0xfc, 0x5b, 0x86, 0x08,                            // IID223
-    0x49, 0x83, 0xc2, 0x10,                                                          // IID224
-    0xd5, 0x19, 0x81, 0xe2, 0x00, 0x01, 0x00, 0x00,                                  // IID225
-    0x48, 0x83, 0xd1, 0x01,                                                          // IID226
-    0xd5, 0x18, 0x81, 0xfd, 0x00, 0x00, 0x01, 0x00,                                  // IID227
-    0xd5, 0x19, 0xc1, 0xd4, 0x04,                                                    // IID228
-    0xd5, 0x19, 0xc1, 0xdc, 0x10,                                                    // IID229
-    0xd5, 0x18, 0xd1, 0xc2,                                                          // IID230
-    0xd5, 0x19, 0xc1, 0xca, 0x02,                                                    // IID231
-    0xd5, 0x18, 0xc1, 0xfb, 0x02,                                                    // IID232
-    0x49, 0xc1, 0xe6, 0x08,                                                          // IID233
-    0x49, 0x81, 0xda, 0x00, 0x00, 0x01, 0x00,                                        // IID234
-    0xd5, 0x19, 0xd1, 0xe6,                                                          // IID235
-    0x49, 0xc1, 0xef, 0x08,                                                          // IID236
-    0xd5, 0x18, 0x81, 0xed, 0x00, 0x00, 0x10, 0x00,                                  // IID237
-    0x48, 0x81, 0xf3, 0x00, 0x00, 0x00, 0x10,                                        // IID238
-    0xd5, 0x18, 0xc7, 0xc3, 0x10, 0x00, 0x00, 0x00,                                  // IID239
-    0xd5, 0x18, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,                // IID240
-    0xd5, 0x98, 0xba, 0xe5, 0x01,                                                    // IID241
-    0x49, 0xf7, 0xc7, 0x00, 0x00, 0xff, 0xff,                                        // IID242
-    0xd5, 0x18, 0x81, 0xcd, 0x00, 0x00, 0x00, 0x40,                                  // IID243
-    0xd5, 0x18, 0x81, 0xeb, 0x00, 0x00, 0x01, 0x00,                                  // IID244
-    0xd5, 0x9d, 0x40, 0xbd, 0x66, 0xde, 0x67, 0xa3,                                  // IID245
-    0xd5, 0x98, 0x41, 0x8d, 0x81, 0xc5, 0x2c, 0x02,                                  // IID246
-    0xd5, 0x9f, 0x42, 0xbc, 0xad, 0x47, 0x70, 0x69, 0xa1,                            // IID247
-    0xd5, 0xdd, 0x43, 0x90, 0x94, 0x68, 0x0c, 0x44,                                  // IID248
-    0xd5, 0xfa, 0x44, 0x8c, 0xd7, 0x4e, 0x8b, 0x55, 0x23,                            // IID249
-    0xd5, 0xbe, 0x45, 0x8c, 0xe8, 0x37, 0x5c, 0x76, 0xed,                            // IID250
-    0x4d, 0x0f, 0x46, 0x83, 0x34, 0xcb, 0x1e, 0xb6,                                  // IID251
-    0xd5, 0xed, 0x47, 0x94, 0x63, 0x86, 0xfa, 0x06, 0xc1,                            // IID252
-    0xd5, 0x9f, 0x48, 0x9c, 0xaa, 0x9f, 0x8f, 0xd1, 0x4b,                            // IID253
-    0x4f, 0x0f, 0x49, 0x84, 0xd9, 0x28, 0xa5, 0x42, 0x4b,                            // IID254
-    0xd5, 0x9e, 0x4a, 0xa4, 0x4b, 0x1c, 0x9a, 0x55, 0x68,                            // IID255
-    0xd5, 0xf8, 0x4b, 0xb4, 0x4a, 0x80, 0x8e, 0x4d, 0x2c,                            // IID256
-    0xd5, 0xfe, 0x4c, 0x94, 0x32, 0x92, 0x76, 0x17, 0xd5,                            // IID257
-    0xd5, 0xc9, 0x4d, 0xb3, 0x22, 0xa6, 0xef, 0x4f,                                  // IID258
-    0xd5, 0xfe, 0x4e, 0xa4, 0x5a, 0x34, 0x8c, 0x7a, 0x6b,                            // IID259
-    0xd5, 0xf8, 0x4f, 0xa4, 0x27, 0x3b, 0xda, 0x18, 0xed,                            // IID260
-    0x41, 0xff, 0xd1,                                                                // IID261
-    0xd5, 0x18, 0xf7, 0xf6,                                                          // IID262
-    0xd5, 0x19, 0xf7, 0xfd,                                                          // IID263
-    0x48, 0xf7, 0xeb,                                                                // IID264
-    0xd5, 0x19, 0xf7, 0xe3,                                                          // IID265
-    0x48, 0xf7, 0xdb,                                                                // IID266
-    0xd5, 0x18, 0xf7, 0xd1,                                                          // IID267
-    0xd5, 0x19, 0xd3, 0xc1,                                                          // IID268
-    0x48, 0xd3, 0xcb,                                                                // IID269
-    0xd5, 0x18, 0xd3, 0xf9,                                                          // IID270
-    0xd5, 0x19, 0xd3, 0xe4,                                                          // IID271
-    0xd5, 0x19, 0xd3, 0xe4,                                                          // IID272
-    0xd5, 0x19, 0xd3, 0xee,                                                          // IID273
-    0xd5, 0x19, 0xff, 0xc3,                                                          // IID274
-    0x48, 0xff, 0xca,                                                                // IID275
-    0xd5, 0x19, 0x53,                                                                // IID276
-    0xd5, 0x09, 0x5a,                                                                // IID277
-    0xd5, 0x11, 0xff, 0x93, 0xfb, 0x78, 0x24, 0xdd,                                  // IID278
-    0xd5, 0x39, 0xf7, 0xa4, 0x2b, 0x64, 0x00, 0xa6, 0xe0,                            // IID279
-    0xd5, 0x18, 0xf7, 0x9c, 0xcb, 0x12, 0xb8, 0x47, 0x7a,                            // IID280
-    0xd5, 0x38, 0xd3, 0xbc, 0x6a, 0xba, 0x85, 0x7a, 0xb7,                            // IID281
-    0xd5, 0x19, 0xd3, 0xa0, 0xd4, 0x25, 0xd4, 0x85,                                  // IID282
-    0xd5, 0x19, 0xd3, 0xa8, 0x2f, 0xd9, 0xab, 0x01,                                  // IID283
-    0x4b, 0xff, 0x84, 0xc9, 0x20, 0x25, 0xa9, 0x31,                                  // IID284
-    0x4b, 0xff, 0x8c, 0x01, 0xbd, 0xb4, 0x14, 0x7f,                                  // IID285
-    0xd5, 0x1f, 0x69, 0xb4, 0x7d, 0x9c, 0xcf, 0x81, 0x52, 0x00, 0x01, 0x00, 0x00,    // IID286
-    0xd5, 0x59, 0x69, 0xc4, 0x00, 0x00, 0x10, 0x00,                                  // IID287
-    0xd5, 0xdc, 0xa4, 0xc1, 0x02,                                                    // IID288
-    0xd5, 0x9c, 0xac, 0xd8, 0x02,                                                    // IID289
-    0x62, 0xd4, 0x24, 0x18, 0x8f, 0xc2,                                              // IID290
-    0x62, 0xd4, 0xbc, 0x10, 0x8f, 0xc7,                                              // IID291
-    0x62, 0xdc, 0x24, 0x18, 0xff, 0xf4,                                              // IID292
-    0x62, 0xd4, 0x84, 0x10, 0xff, 0xf4,                                              // IID293
-    0xd5, 0xfc, 0xb6, 0x84, 0x06, 0x37, 0xe8, 0x1b, 0x51,                            // IID294
-    0xd5, 0xaf, 0xb7, 0xbc, 0x97, 0x12, 0x6b, 0x78, 0xfc,                            // IID295
-    0xd5, 0xbd, 0xbe, 0xbc, 0xc1, 0xbf, 0xd8, 0xf6, 0x85,                            // IID296
-    0xd5, 0xb9, 0xbf, 0x94, 0x9c, 0x6a, 0xda, 0x79, 0x00,                            // IID297
-    0xd5, 0xcd, 0xb6, 0xd9,                                                          // IID298
-    0xd5, 0xdc, 0xb7, 0xcd,                                                          // IID299
-    0x4d, 0x0f, 0xbe, 0xf4,                                                          // IID300
-    0xd5, 0xc9, 0xbf, 0xfb,                                                          // IID301
-    0xd5, 0xcd, 0xb1, 0xb4, 0x24, 0x21, 0x8b, 0x56, 0x9a,                            // IID302
+    0x62, 0xd4, 0x7c, 0x0c, 0xf7, 0xed,                                              // IID174
+    0x62, 0xfc, 0x7c, 0x08, 0xf7, 0xe7,                                              // IID175
+    0x62, 0xdc, 0x7c, 0x0c, 0xf7, 0xe1,                                              // IID176
+    0x62, 0xbc, 0x7c, 0x08, 0xf7, 0xa4, 0x56, 0xaa, 0x64, 0xc8, 0xc2,                // IID177
+    0x62, 0xd4, 0x7c, 0x0c, 0xf7, 0xa3, 0x51, 0x10, 0xb6, 0xcd,                      // IID178
+    0x62, 0x7c, 0x7c, 0x08, 0xf5, 0xc8,                                              // IID179
+    0x62, 0xcc, 0x7c, 0x0c, 0xf5, 0xfc,                                              // IID180
+    0x62, 0xdc, 0x3c, 0x18, 0xf7, 0xde,                                              // IID181
+    0x62, 0xd4, 0x44, 0x14, 0xf7, 0xdb,                                              // IID182
+    0x62, 0x7c, 0x7c, 0x08, 0x88, 0xe8,                                              // IID183
+    0x62, 0x54, 0x7c, 0x0c, 0x88, 0xdb,                                              // IID184
+    0x62, 0xf4, 0x2c, 0x10, 0xf7, 0xd1,                                              // IID185
+    0x62, 0xd4, 0x64, 0x18, 0xd3, 0xc2,                                              // IID186
+    0x62, 0xdc, 0x0c, 0x1c, 0xd3, 0xc5,                                              // IID187
+    0x62, 0xfc, 0x04, 0x18, 0xd3, 0xcc,                                              // IID188
+    0x62, 0xd4, 0x74, 0x14, 0xd3, 0xcc,                                              // IID189
+    0x62, 0xf4, 0x1c, 0x18, 0xd3, 0xe3,                                              // IID190
+    0x62, 0xdc, 0x44, 0x14, 0xd3, 0xe3,                                              // IID191
+    0x62, 0xfc, 0x14, 0x10, 0xd3, 0xfc,                                              // IID192
+    0x62, 0xf4, 0x1c, 0x14, 0xd3, 0xfa,                                              // IID193
+    0x62, 0xdc, 0x3c, 0x18, 0xff, 0xcb,                                              // IID194
+    0x62, 0xd4, 0x64, 0x1c, 0xff, 0xcf,                                              // IID195
+    0x62, 0xdc, 0x24, 0x18, 0xff, 0xc3,                                              // IID196
+    0x62, 0xdc, 0x14, 0x14, 0xff, 0xc1,                                              // IID197
+    0x62, 0xd4, 0x1c, 0x18, 0xd3, 0xe0,                                              // IID198
+    0x62, 0xfc, 0x24, 0x1c, 0xd3, 0xe2,                                              // IID199
+    0x62, 0xd4, 0x6c, 0x18, 0xd3, 0xed,                                              // IID200
+    0x62, 0xdc, 0x44, 0x14, 0xd3, 0xe8,                                              // IID201
+    0x62, 0x54, 0x7c, 0x08, 0xf4, 0xff,                                              // IID202
+    0x62, 0x4c, 0x7c, 0x0c, 0xf4, 0xd4,                                              // IID203
+    0x62, 0x9c, 0x7c, 0x08, 0xf5, 0x9c, 0x31, 0xb6, 0xfd, 0x13, 0x1c,                // IID204
+    0x62, 0x1c, 0x78, 0x0c, 0xf5, 0x8c, 0xe7, 0x81, 0x74, 0x40, 0xcf,                // IID205
+    0x62, 0xdc, 0x3c, 0x18, 0xf7, 0x99, 0x1e, 0xf0, 0x37, 0xf6,                      // IID206
+    0x62, 0xdc, 0x48, 0x14, 0xf7, 0x9c, 0x9b, 0x09, 0x7c, 0xf2, 0x38,                // IID207
+    0x62, 0x84, 0x78, 0x08, 0x88, 0xac, 0xb6, 0x7b, 0x2c, 0xf9, 0x39,                // IID208
+    0x62, 0x2c, 0x7c, 0x0c, 0x88, 0x94, 0xf7, 0xc3, 0xe4, 0xd1, 0x9f,                // IID209
+    0x62, 0xdc, 0x30, 0x10, 0xd3, 0xa4, 0x7c, 0xef, 0x20, 0xf1, 0x4f,                // IID210
+    0x62, 0xdc, 0x10, 0x14, 0xd3, 0xa4, 0xc0, 0xbd, 0x44, 0xde, 0x97,                // IID211
+    0x62, 0x94, 0x40, 0x10, 0xd3, 0xbc, 0xbb, 0xbb, 0x24, 0x42, 0x7f,                // IID212
+    0x62, 0xbc, 0x18, 0x1c, 0xd3, 0xbc, 0x7f, 0x58, 0x78, 0x70, 0xfd,                // IID213
+    0x62, 0xbc, 0x60, 0x10, 0xff, 0x8c, 0x70, 0xf3, 0x61, 0x47, 0xd8,                // IID214
+    0x62, 0xdc, 0x2c, 0x14, 0xff, 0x89, 0x48, 0x5d, 0x14, 0x3d,                      // IID215
+    0x62, 0x9c, 0x10, 0x18, 0xff, 0x84, 0x43, 0x62, 0x38, 0x5f, 0x62,                // IID216
+    0x62, 0xfc, 0x24, 0x1c, 0xff, 0x86, 0xa6, 0x04, 0x59, 0x76,                      // IID217
+    0x62, 0xf4, 0x30, 0x10, 0xd3, 0xac, 0x4a, 0x91, 0xc8, 0xaf, 0x82,                // IID218
+    0x62, 0xd4, 0x4c, 0x14, 0xd3, 0xac, 0x24, 0x57, 0xa2, 0xcd, 0xaf,                // IID219
+    0x62, 0x54, 0x78, 0x08, 0xf4, 0xac, 0x25, 0x94, 0x17, 0x0c, 0xf4,                // IID220
+    0x62, 0x44, 0x78, 0x0c, 0xf4, 0x94, 0x5e, 0x47, 0x63, 0x3a, 0xdb,                // IID221
+    0x62, 0x9c, 0x48, 0x10, 0x81, 0x84, 0xbb, 0xd1, 0x6f, 0x7f, 0x80, 0x00, 0x00, 0x10, 0x00, // IID222
+    0x62, 0xf4, 0x00, 0x14, 0x81, 0x84, 0xea, 0xca, 0x3f, 0x83, 0xaa, 0x00, 0x00, 0x00, 0x10, // IID223
+    0x62, 0xdc, 0x2c, 0x18, 0x81, 0xa2, 0xf9, 0xeb, 0x6b, 0x4e, 0x00, 0x10, 0x00, 0x00, // IID224
+    0x62, 0xdc, 0x14, 0x1c, 0x81, 0xa6, 0xfd, 0xa5, 0xf1, 0x14, 0x00, 0x01, 0x00, 0x00, // IID225
+    0x62, 0x0c, 0x7c, 0x08, 0x6b, 0x9c, 0x05, 0x99, 0x87, 0x98, 0x37, 0x01,          // IID226
+    0x62, 0x44, 0x7c, 0x0c, 0x69, 0x99, 0x3f, 0xd2, 0x92, 0xbb, 0x00, 0x01, 0x00, 0x00, // IID227
+    0x62, 0xbc, 0x70, 0x10, 0x83, 0x8c, 0x0c, 0xdb, 0xb5, 0x57, 0x49, 0x10,          // IID228
+    0x62, 0x9c, 0x30, 0x14, 0x83, 0x8c, 0x7d, 0x3e, 0xa5, 0x26, 0x3c, 0x01,          // IID229
+    0x62, 0xd4, 0x04, 0x18, 0x80, 0x89, 0xe2, 0xb5, 0x68, 0xda, 0x40,                // IID230
+    0x62, 0xbc, 0x24, 0x1c, 0x80, 0x8c, 0xb8, 0x9f, 0x32, 0xa0, 0x66, 0x04,          // IID231
+    0x62, 0xb4, 0x70, 0x18, 0xd1, 0xa4, 0x19, 0x5e, 0x48, 0xc6, 0x38,                // IID232
+    0x62, 0x94, 0x34, 0x14, 0xc1, 0xa4, 0x10, 0x34, 0x1c, 0x13, 0x79, 0x08,          // IID233
+    0x62, 0x94, 0x10, 0x18, 0xc1, 0xbc, 0xb9, 0xa9, 0x8b, 0x71, 0x12, 0x02,          // IID234
+    0x62, 0xdc, 0x04, 0x1c, 0xc1, 0xb9, 0x0d, 0xc9, 0xa7, 0xaf, 0x10,                // IID235
+    0x62, 0xf4, 0x00, 0x18, 0xd1, 0xac, 0x19, 0x10, 0x15, 0x5c, 0x0c,                // IID236
+    0x62, 0xdc, 0x10, 0x1c, 0xc1, 0xac, 0xad, 0x64, 0xcf, 0x98, 0x93, 0x08,          // IID237
+    0x62, 0x94, 0x64, 0x18, 0x81, 0xac, 0x44, 0x81, 0xf7, 0x8a, 0xca, 0x00, 0x10, 0x00, 0x00, // IID238
+    0x62, 0xf4, 0x18, 0x14, 0x81, 0xac, 0xeb, 0x48, 0xc2, 0x07, 0xaa, 0x00, 0x00, 0x01, 0x00, // IID239
+    0x62, 0xbc, 0x08, 0x10, 0x83, 0xb4, 0x15, 0xe1, 0x14, 0x4d, 0x3b, 0x01,          // IID240
+    0x62, 0xfc, 0x1c, 0x14, 0x81, 0xb2, 0x5f, 0xb7, 0xdc, 0xba, 0x00, 0x00, 0x00, 0x01, // IID241
+    0x62, 0xa4, 0x6c, 0x10, 0x01, 0x84, 0x92, 0xb9, 0xe2, 0xe1, 0xe9,                // IID242
+    0x62, 0xdc, 0x20, 0x14, 0x01, 0x94, 0xd1, 0xdd, 0x47, 0x64, 0x98,                // IID243
+    0x62, 0x1c, 0x20, 0x10, 0x09, 0x8c, 0xef, 0x34, 0x79, 0xed, 0x19,                // IID244
+    0x62, 0xc4, 0x48, 0x14, 0x09, 0x8c, 0x80, 0x88, 0xe0, 0x08, 0xe4,                // IID245
+    0x62, 0x84, 0x70, 0x18, 0x08, 0x84, 0xe7, 0xcc, 0xc6, 0xb5, 0x95,                // IID246
+    0x62, 0xac, 0x1c, 0x14, 0x08, 0x84, 0xa7, 0xf7, 0x49, 0x24, 0x3c,                // IID247
+    0x62, 0x1c, 0x4c, 0x10, 0x29, 0x8c, 0x53, 0x91, 0xc6, 0xd6, 0xc3,                // IID248
+    0x62, 0xec, 0x2c, 0x1c, 0x29, 0x88, 0x01, 0x9b, 0xaf, 0xe9,                      // IID249
+    0x62, 0x8c, 0x1c, 0x10, 0x31, 0xa4, 0x1e, 0x3a, 0x1e, 0x28, 0x17,                // IID250
+    0x62, 0xa4, 0x68, 0x1c, 0x31, 0x8c, 0xfb, 0xdc, 0xd0, 0x53, 0x77,                // IID251
+    0x62, 0x4c, 0x34, 0x18, 0x30, 0xb7, 0x8e, 0xf5, 0xa4, 0x72,                      // IID252
+    0x62, 0x8c, 0x3c, 0x14, 0x30, 0x84, 0x39, 0x0a, 0x1a, 0xfc, 0x20,                // IID253
+    0x62, 0xf4, 0x1c, 0x18, 0x81, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID254
+    0x62, 0xdc, 0x5c, 0x14, 0x81, 0xc0, 0x00, 0x10, 0x00, 0x00,                      // IID255
+    0x62, 0xdc, 0x6c, 0x10, 0x81, 0xe2, 0x00, 0x00, 0x10, 0x00,                      // IID256
+    0x62, 0xd4, 0x14, 0x14, 0x83, 0xe5, 0x01,                                        // IID257
+    0x62, 0xdc, 0x7c, 0x08, 0x69, 0xcf, 0x00, 0x00, 0x01, 0x00,                      // IID258
+    0x62, 0xcc, 0x7c, 0x0c, 0x69, 0xfd, 0x00, 0x00, 0x01, 0x00,                      // IID259
+    0x62, 0xfc, 0x44, 0x10, 0x81, 0xcf, 0x00, 0x00, 0x10, 0x00,                      // IID260
+    0x62, 0xd4, 0x54, 0x14, 0x81, 0xc9, 0x00, 0x00, 0x00, 0x10,                      // IID261
+    0x62, 0xf4, 0x14, 0x18, 0xc1, 0xd2, 0x04,                                        // IID262
+    0x62, 0xdc, 0x04, 0x18, 0xc1, 0xc7, 0x08,                                        // IID263
+    0x62, 0xd4, 0x3c, 0x1c, 0xc1, 0xc1, 0x02,                                        // IID264
+    0x62, 0xd4, 0x34, 0x18, 0xc1, 0xcf, 0x08,                                        // IID265
+    0x62, 0xd4, 0x54, 0x14, 0xc1, 0xcc, 0x08,                                        // IID266
+    0x62, 0xdc, 0x64, 0x10, 0xd1, 0xe3,                                              // IID267
+    0x62, 0xd4, 0x2c, 0x1c, 0xc1, 0xe3, 0x10,                                        // IID268
+    0x62, 0xf4, 0x3c, 0x18, 0xc1, 0xfa, 0x08,                                        // IID269
+    0x62, 0xdc, 0x4c, 0x14, 0xc1, 0xfe, 0x04,                                        // IID270
+    0x62, 0xdc, 0x34, 0x10, 0xc1, 0xe7, 0x10,                                        // IID271
+    0x62, 0xd4, 0x2c, 0x1c, 0xc1, 0xe1, 0x08,                                        // IID272
+    0x62, 0xd4, 0x14, 0x18, 0xc1, 0xe8, 0x04,                                        // IID273
+    0x62, 0xfc, 0x7c, 0x14, 0xc1, 0xed, 0x10,                                        // IID274
+    0x62, 0xfc, 0x2c, 0x10, 0x81, 0xef, 0x00, 0x00, 0x00, 0x01,                      // IID275
+    0x62, 0xd4, 0x2c, 0x14, 0x81, 0xee, 0x00, 0x00, 0x10, 0x00,                      // IID276
+    0x62, 0xdc, 0x24, 0x10, 0x81, 0xf2, 0x00, 0x01, 0x00, 0x00,                      // IID277
+    0x62, 0xd4, 0x4c, 0x14, 0x83, 0xf1, 0x01,                                        // IID278
+    0x62, 0xdc, 0x4c, 0x10, 0x81, 0xee, 0x00, 0x00, 0x00, 0x10,                      // IID279
+    0x62, 0xfc, 0x3c, 0x1c, 0x81, 0xe8, 0x00, 0x00, 0x40, 0x00,                      // IID280
+    0x62, 0x04, 0x5c, 0x10, 0x03, 0xac, 0x63, 0x80, 0x09, 0xac, 0x00,                // IID281
+    0x62, 0xd4, 0x68, 0x14, 0x03, 0x9c, 0x51, 0x5d, 0x12, 0x4a, 0x43,                // IID282
+    0x62, 0x54, 0x08, 0x18, 0x23, 0xbc, 0x9e, 0xee, 0xa5, 0xa5, 0x15,                // IID283
+    0x62, 0x0c, 0x1c, 0x14, 0x23, 0xbc, 0xe0, 0x98, 0x81, 0x92, 0x92,                // IID284
+    0x62, 0x1c, 0x38, 0x10, 0xaf, 0xac, 0xc8, 0xfd, 0x73, 0x46, 0x78,                // IID285
+    0x62, 0x84, 0x3c, 0x14, 0xaf, 0xac, 0xa8, 0x77, 0xc7, 0x99, 0x9c,                // IID286
+    0x62, 0x4c, 0x1c, 0x18, 0x0b, 0x86, 0xaa, 0x9a, 0xad, 0x98,                      // IID287
+    0x62, 0x34, 0x10, 0x1c, 0x0b, 0xac, 0x8b, 0x27, 0xb2, 0xc6, 0xa0,                // IID288
+    0x62, 0x4c, 0x2c, 0x10, 0x2b, 0x8c, 0xd1, 0x66, 0x08, 0xc6, 0xd1,                // IID289
+    0x62, 0x34, 0x18, 0x14, 0x2b, 0x84, 0xc2, 0xac, 0x65, 0x26, 0xf1,                // IID290
+    0x62, 0xcc, 0x00, 0x10, 0x33, 0xb4, 0xe6, 0xbd, 0x1c, 0xc4, 0x3a,                // IID291
+    0x62, 0x44, 0x38, 0x14, 0x33, 0xb4, 0x4d, 0xe3, 0xc2, 0xfd, 0x1e,                // IID292
+    0x62, 0x84, 0x7c, 0x10, 0x32, 0x84, 0x79, 0x34, 0xeb, 0x9f, 0x76,                // IID293
+    0x62, 0x44, 0x64, 0x14, 0x32, 0x8a, 0x29, 0xb4, 0x39, 0x22,                      // IID294
+    0x62, 0xac, 0x31, 0x10, 0x33, 0x9c, 0x40, 0xea, 0xfa, 0x71, 0x1c,                // IID295
+    0x62, 0x5c, 0x65, 0x14, 0x33, 0x94, 0x24, 0x03, 0xf3, 0x65, 0xd6,                // IID296
+    0x62, 0xcc, 0x64, 0x18, 0x03, 0xf8,                                              // IID297
+    0x62, 0x5c, 0x1c, 0x14, 0x03, 0xf0,                                              // IID298
+    0x62, 0x4c, 0x0c, 0x10, 0x23, 0xfa,                                              // IID299
+    0x62, 0x6c, 0x1c, 0x1c, 0x23, 0xff,                                              // IID300
+    0x62, 0xc4, 0x34, 0x18, 0xaf, 0xe2,                                              // IID301
+    0x62, 0x44, 0x14, 0x1c, 0xaf, 0xf1,                                              // IID302
+    0x62, 0xec, 0x35, 0x10, 0x0b, 0xdf,                                              // IID303
+    0x62, 0xe4, 0x1d, 0x1c, 0x0b, 0xc2,                                              // IID304
+    0x62, 0xc4, 0x04, 0x10, 0x0b, 0xc9,                                              // IID305
+    0x62, 0x74, 0x04, 0x1c, 0x0b, 0xeb,                                              // IID306
+    0x62, 0x64, 0x1c, 0x10, 0xa5, 0xeb,                                              // IID307
+    0x62, 0x74, 0x4c, 0x14, 0xa5, 0xc3,                                              // IID308
+    0x62, 0xc4, 0x3c, 0x18, 0xad, 0xc3,                                              // IID309
+    0x62, 0x54, 0x14, 0x1c, 0xad, 0xfc,                                              // IID310
+    0x62, 0xcc, 0x74, 0x10, 0x2b, 0xff,                                              // IID311
+    0x62, 0xcc, 0x5c, 0x14, 0x2b, 0xf2,                                              // IID312
+    0x62, 0x6c, 0x2c, 0x18, 0x33, 0xcb,                                              // IID313
+    0x62, 0xcc, 0x24, 0x1c, 0x33, 0xde,                                              // IID314
+    0x62, 0xd4, 0x1c, 0x18, 0x24, 0xd2, 0x01,                                        // IID315
+    0x62, 0xcc, 0x5c, 0x14, 0x24, 0xd6, 0x10,                                        // IID316
+    0x62, 0xcc, 0x6c, 0x10, 0x2c, 0xd1, 0x08,                                        // IID317
+    0x62, 0x6c, 0x64, 0x14, 0x2c, 0xc8, 0x01,                                        // IID318
+    0x62, 0x4c, 0x24, 0x18, 0x40, 0xf8,                                              // IID319
+    0x62, 0x6c, 0x0c, 0x18, 0x41, 0xf0,                                              // IID320
+    0x62, 0x5c, 0x34, 0x18, 0x42, 0xda,                                              // IID321
+    0x62, 0xdc, 0x24, 0x10, 0x43, 0xd7,                                              // IID322
+    0x62, 0x44, 0x3c, 0x10, 0x44, 0xea,                                              // IID323
+    0x62, 0xc4, 0x74, 0x18, 0x45, 0xef,                                              // IID324
+    0x62, 0xcc, 0x44, 0x10, 0x46, 0xca,                                              // IID325
+    0x62, 0x44, 0x5c, 0x10, 0x47, 0xdd,                                              // IID326
+    0x62, 0xc4, 0x04, 0x18, 0x48, 0xf7,                                              // IID327
+    0x62, 0x6c, 0x14, 0x10, 0x49, 0xd2,                                              // IID328
+    0x62, 0x7c, 0x34, 0x18, 0x4a, 0xce,                                              // IID329
+    0x62, 0xc4, 0x0c, 0x10, 0x4b, 0xfb,                                              // IID330
+    0x62, 0x74, 0x5c, 0x10, 0x4c, 0xdb,                                              // IID331
+    0x62, 0xec, 0x1c, 0x10, 0x4d, 0xc4,                                              // IID332
+    0x62, 0x6c, 0x74, 0x10, 0x4e, 0xc6,                                              // IID333
+    0x62, 0x54, 0x7c, 0x10, 0x4f, 0xff,                                              // IID334
+    0x62, 0x4c, 0x18, 0x10, 0x40, 0x8c, 0x85, 0x53, 0xef, 0x6e, 0xc3,                // IID335
+    0x62, 0x34, 0x40, 0x10, 0x41, 0xbc, 0xf3, 0xbd, 0x58, 0xbc, 0x1c,                // IID336
+    0x62, 0xd4, 0x2c, 0x10, 0x42, 0x9c, 0xcc, 0x1a, 0x58, 0x4e, 0x08,                // IID337
+    0x62, 0x6c, 0x74, 0x18, 0x43, 0x81, 0x2d, 0xe9, 0xec, 0x5c,                      // IID338
+    0x62, 0x0c, 0x2c, 0x10, 0x44, 0x84, 0xe0, 0xa2, 0x46, 0x77, 0x50,                // IID339
+    0x62, 0x74, 0x38, 0x18, 0x45, 0xbc, 0x19, 0x8a, 0xa3, 0xfc, 0xf0,                // IID340
+    0x62, 0xac, 0x68, 0x18, 0x46, 0xbc, 0x1e, 0xcc, 0xca, 0x01, 0xed,                // IID341
+    0x62, 0x84, 0x08, 0x10, 0x47, 0x9c, 0x25, 0x9d, 0xee, 0xb8, 0x73,                // IID342
+    0x62, 0x6c, 0x4c, 0x10, 0x48, 0xb4, 0x08, 0x46, 0xc1, 0xaa, 0x22,                // IID343
+    0x62, 0x2c, 0x74, 0x10, 0x49, 0xb4, 0x89, 0xb1, 0xb2, 0x9d, 0x07,                // IID344
+    0x62, 0xd4, 0x28, 0x10, 0x4a, 0x94, 0x46, 0xef, 0xdf, 0xdb, 0xf7,                // IID345
+    0x62, 0x84, 0x20, 0x18, 0x4b, 0x9c, 0x7e, 0x34, 0xae, 0x0d, 0xb0,                // IID346
+    0x62, 0xc4, 0x58, 0x10, 0x4c, 0x94, 0x85, 0x1e, 0x39, 0x10, 0xe6,                // IID347
+    0x62, 0x54, 0x60, 0x10, 0x4d, 0xac, 0x7d, 0x14, 0x77, 0x1b, 0x61,                // IID348
+    0x62, 0x7c, 0x10, 0x10, 0x4e, 0xac, 0xc9, 0x3f, 0xa9, 0x94, 0x3a,                // IID349
+    0x62, 0x44, 0x10, 0x18, 0x4f, 0xac, 0x7f, 0x32, 0x35, 0xd4, 0x76,                // IID350
+    0x4d, 0x13, 0xfd,                                                                // IID351
+    0x4d, 0x3b, 0xcc,                                                                // IID352
+    0xd5, 0x9c, 0xaf, 0xfd,                                                          // IID353
+    0xf3, 0x4d, 0x0f, 0xb8, 0xe1,                                                    // IID354
+    0xd5, 0x58, 0x1b, 0xcf,                                                          // IID355
+    0xd5, 0x18, 0x2b, 0xd0,                                                          // IID356
+    0xf3, 0xd5, 0xcd, 0xbc, 0xea,                                                    // IID357
+    0xf3, 0xd5, 0xd8, 0xbd, 0xe9,                                                    // IID358
+    0xd5, 0x5c, 0x03, 0xea,                                                          // IID359
+    0xd5, 0x5d, 0x23, 0xe0,                                                          // IID360
+    0xd5, 0x1c, 0x0b, 0xd4,                                                          // IID361
+    0xd5, 0x4d, 0x33, 0xda,                                                          // IID362
+    0x4d, 0x8b, 0xf3,                                                                // IID363
+    0xd5, 0xcc, 0xbc, 0xd9,                                                          // IID364
+    0xd5, 0xc9, 0xbd, 0xf7,                                                          // IID365
+    0xd5, 0xdd, 0xa3, 0xf7,                                                          // IID366
+    0xd5, 0x58, 0x87, 0xdb,                                                          // IID367
+    0xd5, 0x5c, 0x85, 0xd5,                                                          // IID368
+    0xd5, 0x3d, 0x01, 0xb4, 0x62, 0x64, 0xeb, 0x69, 0xbf,                            // IID369
+    0xd5, 0x79, 0x21, 0xbc, 0xa4, 0x8a, 0x89, 0xd8, 0x1b,                            // IID370
+    0xd5, 0x2d, 0x39, 0x94, 0x9f, 0x31, 0xe6, 0xee, 0x39,                            // IID371
+    0x4d, 0x09, 0xac, 0xd5, 0x59, 0x98, 0xa4, 0x01,                                  // IID372
+    0xd5, 0x5c, 0x31, 0x85, 0x36, 0x86, 0xfe, 0x05,                                  // IID373
+    0xd5, 0x7d, 0x29, 0x8c, 0xbe, 0x3f, 0xc3, 0x9b, 0xa9,                            // IID374
+    0xd5, 0x7e, 0x89, 0xbc, 0xd5, 0xab, 0x44, 0x85, 0x7e,                            // IID375
+    0xd5, 0xaa, 0xc1, 0x9c, 0xc1, 0x77, 0xb7, 0x35, 0x86,                            // IID376
+    0xd5, 0x2b, 0x81, 0xa4, 0xfd, 0xd0, 0x4f, 0x8d, 0xf2, 0x00, 0x01, 0x00, 0x00,    // IID377
+    0xd5, 0x18, 0x81, 0x80, 0x5e, 0x77, 0x4d, 0x53, 0x00, 0x00, 0x00, 0x10,          // IID378
+    0xd5, 0x1a, 0x81, 0xbc, 0xbc, 0x89, 0xdd, 0x4d, 0x83, 0x00, 0x00, 0x00, 0x10,    // IID379
+    0xd5, 0x29, 0xc1, 0xbc, 0xb9, 0x92, 0x27, 0x09, 0x8d, 0x04,                      // IID380
+    0xd5, 0x2b, 0xc1, 0xa4, 0x43, 0x6b, 0x90, 0x7d, 0xdd, 0x04,                      // IID381
+    0xd5, 0x2b, 0x81, 0x9c, 0x76, 0x34, 0xfc, 0x43, 0x1b, 0x00, 0x00, 0x00, 0x10,    // IID382
+    0xd5, 0x39, 0xc1, 0xac, 0x2a, 0x3d, 0xaf, 0x51, 0xc4, 0x08,                      // IID383
+    0xd5, 0x1a, 0x81, 0xac, 0xd6, 0x03, 0x14, 0x7e, 0x04, 0x00, 0x00, 0x01, 0x00,    // IID384
+    0xd5, 0x28, 0x83, 0xb4, 0xda, 0xe8, 0xac, 0xb5, 0x9b, 0x01,                      // IID385
+    0xd5, 0x3b, 0x81, 0x8c, 0x7e, 0x83, 0xc7, 0x93, 0x2c, 0x00, 0x01, 0x00, 0x00,    // IID386
+    0xd5, 0x3b, 0xc7, 0x84, 0x82, 0xa1, 0x87, 0xcb, 0xfa, 0x00, 0x00, 0x01, 0x00,    // IID387
+    0xd5, 0x2b, 0xf7, 0x84, 0x76, 0x47, 0xe1, 0x32, 0x39, 0x00, 0xff, 0xff, 0xff,    // IID388
+    0xd5, 0x7f, 0x03, 0xb4, 0xc6, 0xa2, 0xdc, 0x1f, 0x99,                            // IID389
+    0xd5, 0x1d, 0x23, 0xba, 0x42, 0x6e, 0x45, 0x36,                                  // IID390
+    0xd5, 0x1c, 0x3b, 0x92, 0xed, 0x4b, 0x04, 0x05,                                  // IID391
+    0xf3, 0xd5, 0xcd, 0xbd, 0xbc, 0x94, 0x2c, 0x48, 0xf8, 0xe8,                      // IID392
+    0xd5, 0x78, 0x0b, 0x84, 0xbc, 0xd7, 0xc8, 0x87, 0xd9,                            // IID393
+    0xd5, 0x7f, 0x13, 0xbc, 0x3e, 0x5d, 0x26, 0xc3, 0x1e,                            // IID394
+    0xd5, 0xea, 0xaf, 0x84, 0x12, 0x1b, 0x83, 0x86, 0x35,                            // IID395
+    0xf3, 0xd5, 0x9c, 0xb8, 0xa2, 0x86, 0x60, 0xc1, 0xc3,                            // IID396
+    0xd5, 0x29, 0x1b, 0x8c, 0xe8, 0xab, 0x15, 0x15, 0x6b,                            // IID397
+    0xd5, 0x6c, 0x2b, 0xac, 0xb9, 0x4d, 0x6c, 0xf0, 0x4f,                            // IID398
+    0xf3, 0xd5, 0xdf, 0xbc, 0x94, 0x50, 0x77, 0x5e, 0x26, 0x8a,                      // IID399
+    0xd5, 0x48, 0x33, 0x8c, 0x1b, 0x9c, 0xd5, 0x33, 0x40,                            // IID400
+    0xd5, 0x5a, 0x8b, 0x94, 0xe6, 0x83, 0xcb, 0x6c, 0xc7,                            // IID401
+    0xd5, 0x3c, 0x8d, 0xa4, 0xfc, 0x60, 0x15, 0x31, 0x4b,                            // IID402
+    0xf2, 0xd5, 0xef, 0x2c, 0xac, 0xa2, 0x57, 0x26, 0x3a, 0x5c,                      // IID403
+    0xd5, 0x6b, 0x87, 0xb4, 0xcd, 0x3f, 0x6f, 0x3d, 0x1a,                            // IID404
+    0xd5, 0x7e, 0x85, 0x8c, 0xc1, 0x28, 0x24, 0x52, 0xca,                            // IID405
+    0xd5, 0x18, 0x83, 0xc2, 0x01,                                                    // IID406
+    0x49, 0x81, 0xe5, 0x00, 0x00, 0x00, 0x01,                                        // IID407
+    0x49, 0x81, 0xd5, 0x00, 0x00, 0x01, 0x00,                                        // IID408
+    0x49, 0x81, 0xfa, 0x00, 0x00, 0x01, 0x00,                                        // IID409
+    0xd5, 0x18, 0xc1, 0xd4, 0x02,                                                    // IID410
+    0x49, 0xc1, 0xd9, 0x10,                                                          // IID411
+    0x49, 0xd1, 0xc0,                                                                // IID412
+    0xd5, 0x19, 0xc1, 0xc9, 0x02,                                                    // IID413
+    0xd5, 0x18, 0xc1, 0xfe, 0x08,                                                    // IID414
+    0xd5, 0x18, 0xd1, 0xe1,                                                          // IID415
+    0xd5, 0x19, 0x83, 0xdf, 0x10,                                                    // IID416
+    0xd5, 0x19, 0xc1, 0xe3, 0x04,                                                    // IID417
+    0xd5, 0x19, 0xc1, 0xec, 0x02,                                                    // IID418
+    0x48, 0x81, 0xe9, 0x00, 0x00, 0x00, 0x01,                                        // IID419
+    0xd5, 0x19, 0x81, 0xf3, 0x00, 0x00, 0x10, 0x00,                                  // IID420
+    0xd5, 0x18, 0xc7, 0xc4, 0x00, 0x00, 0x00, 0x10,                                  // IID421
+    0xd5, 0x19, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,                // IID422
+    0xd5, 0x98, 0xba, 0xe6, 0x04,                                                    // IID423
+    0x49, 0xf7, 0xc0, 0x00, 0xf0, 0xff, 0xff,                                        // IID424
+    0xd5, 0x19, 0x81, 0xcc, 0x00, 0x00, 0x10, 0x00,                                  // IID425
+    0x49, 0x81, 0xed, 0x00, 0x00, 0x01, 0x00,                                        // IID426
+    0xd5, 0xd8, 0x40, 0x80, 0x15, 0x5c, 0x76, 0xec,                                  // IID427
+    0xd5, 0x9b, 0x41, 0x9c, 0x05, 0x15, 0x26, 0x02, 0x1d,                            // IID428
+    0xd5, 0xab, 0x42, 0x94, 0x64, 0x1e, 0x67, 0x37, 0xcb,                            // IID429
+    0xd5, 0xcd, 0x43, 0x9c, 0xca, 0x0f, 0x54, 0x08, 0xe1,                            // IID430
+    0xd5, 0xaf, 0x44, 0xb4, 0xad, 0x97, 0x7c, 0xb3, 0x83,                            // IID431
+    0xd5, 0x9c, 0x45, 0xbc, 0x8f, 0x31, 0xd3, 0x2d, 0x94,                            // IID432
+    0xd5, 0xcf, 0x46, 0x84, 0x57, 0xf7, 0xc2, 0x04, 0x80,                            // IID433
+    0xd5, 0xc9, 0x47, 0xbb, 0x3b, 0x86, 0x6a, 0x27,                                  // IID434
+    0xd5, 0xdd, 0x48, 0xa5, 0x6e, 0x39, 0xb4, 0x3f,                                  // IID435
+    0xd5, 0xdd, 0x49, 0x94, 0xcb, 0x1c, 0xa6, 0xde, 0x4d,                            // IID436
+    0xd5, 0xbc, 0x4a, 0x94, 0x5e, 0x66, 0x69, 0x12, 0x2a,                            // IID437
+    0x4d, 0x0f, 0x4b, 0xa2, 0x9f, 0xc5, 0xd7, 0x03,                                  // IID438
+    0x4f, 0x0f, 0x4c, 0x94, 0xc0, 0xd3, 0x79, 0x9e, 0xf1,                            // IID439
+    0xd5, 0xd9, 0x4d, 0xbd, 0x93, 0x26, 0x81, 0x88,                                  // IID440
+    0xd5, 0xa8, 0x4e, 0x8c, 0x5b, 0xcb, 0x01, 0xc6, 0x53,                            // IID441
+    0xd5, 0x9c, 0x4f, 0xb4, 0x19, 0x8d, 0x0f, 0x74, 0x89,                            // IID442
+    0xd5, 0x11, 0xff, 0xd5,                                                          // IID443
+    0x49, 0xf7, 0xf2,                                                                // IID444
+    0xd5, 0x18, 0xf7, 0xfb,                                                          // IID445
+    0x49, 0xf7, 0xef,                                                                // IID446
+    0xd5, 0x19, 0xf7, 0xe3,                                                          // IID447
+    0xd5, 0x18, 0xf7, 0xdc,                                                          // IID448
+    0x49, 0xf7, 0xd2,                                                                // IID449
+    0xd5, 0x18, 0xd3, 0xc0,                                                          // IID450
+    0xd5, 0x19, 0xd3, 0xcb,                                                          // IID451
+    0x49, 0xd3, 0xf9,                                                                // IID452
+    0x49, 0xd3, 0xe5,                                                                // IID453
+    0x49, 0xd3, 0xe6,                                                                // IID454
+    0xd5, 0x18, 0xd3, 0xea,                                                          // IID455
+    0xd5, 0x19, 0xff, 0xc4,                                                          // IID456
+    0xd5, 0x19, 0xff, 0xcc,                                                          // IID457
+    0xd5, 0x18, 0x56,                                                                // IID458
+    0xd5, 0x09, 0x58,                                                                // IID459
+    0x41, 0xff, 0x94, 0x24, 0x4e, 0x42, 0xcc, 0x64,                                  // IID460
+    0xd5, 0x3b, 0xf7, 0xa4, 0x2a, 0xa1, 0xf7, 0x90, 0xb9,                            // IID461
+    0xd5, 0x3a, 0xf7, 0x9c, 0x05, 0x0b, 0xdf, 0x37, 0x20,                            // IID462
+    0xd5, 0x2b, 0xd3, 0xbc, 0xfc, 0x56, 0xda, 0x2d, 0xa8,                            // IID463
+    0xd5, 0x18, 0xd3, 0xa4, 0x24, 0x70, 0xd0, 0x5f, 0xe1,                            // IID464
+    0xd5, 0x29, 0xd3, 0xac, 0xe5, 0xf2, 0x81, 0x10, 0x17,                            // IID465
+    0xd5, 0x19, 0xff, 0x87, 0xdb, 0x08, 0xa8, 0x13,                                  // IID466
+    0xd5, 0x18, 0xff, 0x8b, 0x5f, 0xc1, 0xf2, 0xe7,                                  // IID467
+    0xd5, 0x58, 0x69, 0x88, 0xa8, 0x02, 0x0d, 0xd5, 0x00, 0x10, 0x00, 0x00,          // IID468
+    0xd5, 0x5d, 0x6b, 0xe1, 0x10,                                                    // IID469
+    0xd5, 0x9d, 0xa4, 0xeb, 0x10,                                                    // IID470
+    0x4d, 0x0f, 0xac, 0xd0, 0x10,                                                    // IID471
+    0x62, 0xd4, 0x3c, 0x18, 0x8f, 0xc6,                                              // IID472
+    0x62, 0xfc, 0xe4, 0x18, 0x8f, 0xc2,                                              // IID473
+    0x62, 0xfc, 0x64, 0x10, 0xff, 0xf7,                                              // IID474
+    0x62, 0xd4, 0xe4, 0x18, 0xff, 0xf4,                                              // IID475
+    0xd5, 0xad, 0xb6, 0x8c, 0xfe, 0xba, 0xd9, 0x72, 0xbd,                            // IID476
+    0xd5, 0xcd, 0xb7, 0xa4, 0x89, 0x9f, 0xe9, 0x9e, 0x8d,                            // IID477
+    0xd5, 0xb9, 0xbe, 0x9c, 0xa8, 0x90, 0xe9, 0x6b, 0x3a,                            // IID478
+    0xd5, 0xda, 0xbf, 0x84, 0x16, 0xdd, 0x8b, 0xef, 0x07,                            // IID479
+    0xd5, 0xcd, 0xb6, 0xe6,                                                          // IID480
+    0xd5, 0x9d, 0xb7, 0xec,                                                          // IID481
+    0x4c, 0x0f, 0xbe, 0xda,                                                          // IID482
+    0xd5, 0x9d, 0xbf, 0xe2,                                                          // IID483
+    0xd5, 0xc9, 0xb1, 0xa2, 0x26, 0x57, 0x2d, 0xf4,                                  // IID484
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xff,                                              // IID485
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xff,                                              // IID486
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xf6,                                              // IID487
+    0x62, 0xd4, 0xfc, 0x0c, 0xf7, 0xf6,                                              // IID488
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xef,                                              // IID489
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xec,                                              // IID490
+    0x62, 0xf4, 0xfc, 0x08, 0xf7, 0xe1,                                              // IID491
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xe5,                                              // IID492
+    0x62, 0xbc, 0xfc, 0x08, 0xf7, 0xa4, 0xd0, 0x1e, 0xac, 0x66, 0x5f,                // IID493
+    0x62, 0xfc, 0xf8, 0x0c, 0xf7, 0xa4, 0xf5, 0x83, 0x7f, 0x43, 0xf4,                // IID494
+    0x62, 0xcc, 0xfc, 0x08, 0xaf, 0xf2,                                              // IID495
+    0x62, 0x6c, 0xfc, 0x0c, 0xaf, 0xcd,                                              // IID496
+    0x62, 0xc4, 0xfc, 0x08, 0xf5, 0xe5,                                              // IID497
+    0x62, 0x6c, 0xfc, 0x0c, 0xf5, 0xcb,                                              // IID498
+    0x62, 0xdc, 0xd4, 0x10, 0xf7, 0xde,                                              // IID499
+    0x62, 0xd4, 0x94, 0x14, 0xf7, 0xdb,                                              // IID500
+    0x62, 0xd4, 0xcc, 0x10, 0xf7, 0xd0,                                              // IID501
+    0x62, 0x7c, 0xfc, 0x08, 0x88, 0xe3,                                              // IID502
+    0x62, 0x6c, 0xfc, 0x0c, 0x88, 0xef,                                              // IID503
+    0x62, 0xdc, 0x9c, 0x10, 0xd3, 0xc0,                                              // IID504
+    0x62, 0xfc, 0xec, 0x1c, 0xd3, 0xc4,                                              // IID505
+    0x62, 0xdc, 0xe4, 0x18, 0xd3, 0xce,                                              // IID506
+    0x62, 0xd4, 0xac, 0x1c, 0xd3, 0xcf,                                              // IID507
+    0x62, 0xd4, 0xf4, 0x10, 0xd3, 0xe5,                                              // IID508
+    0x62, 0xdc, 0xd4, 0x14, 0xd3, 0xe0,                                              // IID509
+    0x62, 0xd4, 0x84, 0x10, 0xd3, 0xfc,                                              // IID510
+    0x62, 0xdc, 0xec, 0x1c, 0xd3, 0xf8,                                              // IID511
+    0x62, 0xdc, 0xd4, 0x10, 0xff, 0xc8,                                              // IID512
+    0x62, 0xdc, 0x84, 0x1c, 0xff, 0xcf,                                              // IID513
+    0x62, 0xf4, 0xac, 0x18, 0xff, 0xc3,                                              // IID514
+    0x62, 0xd4, 0xec, 0x14, 0xff, 0xc0,                                              // IID515
+    0x62, 0xdc, 0xac, 0x18, 0xd3, 0xe2,                                              // IID516
+    0x62, 0xd4, 0x9c, 0x14, 0xd3, 0xe6,                                              // IID517
+    0x62, 0xfc, 0xac, 0x18, 0xd3, 0xeb,                                              // IID518
+    0x62, 0xfc, 0x9c, 0x14, 0xd3, 0xed,                                              // IID519
+    0x62, 0xec, 0xfc, 0x08, 0xf4, 0xee,                                              // IID520
+    0x62, 0xec, 0xfc, 0x0c, 0xf4, 0xc7,                                              // IID521
+    0x62, 0x3c, 0xfc, 0x08, 0xaf, 0x9c, 0x8a, 0x5f, 0x7a, 0xdd, 0xec,                // IID522
+    0x62, 0x1c, 0xfc, 0x0c, 0xaf, 0xac, 0xf8, 0xa0, 0x0c, 0xf5, 0x48,                // IID523
+    0x62, 0x54, 0xfc, 0x08, 0xf5, 0x8d, 0x0e, 0xcf, 0x15, 0x21,                      // IID524
+    0x62, 0x4c, 0xfc, 0x0c, 0xf5, 0x9e, 0xbb, 0xab, 0x9c, 0x04,                      // IID525
+    0x62, 0x94, 0xd0, 0x10, 0xf7, 0x9c, 0xbd, 0xd2, 0xf4, 0xa8, 0x50,                // IID526
+    0x62, 0xfc, 0xc8, 0x14, 0xf7, 0x9c, 0x62, 0xb4, 0xa7, 0x5f, 0xa2,                // IID527
+    0x62, 0x74, 0xf8, 0x08, 0x88, 0xb4, 0xb3, 0x2f, 0xb6, 0x9c, 0x9f,                // IID528
+    0x62, 0x6c, 0xf8, 0x0c, 0x88, 0x94, 0xf7, 0xdd, 0x93, 0x39, 0x8d,                // IID529
+    0x62, 0xd4, 0xac, 0x10, 0xd3, 0xa1, 0x09, 0xba, 0x4a, 0x33,                      // IID530
+    0x62, 0x94, 0xb0, 0x1c, 0xd3, 0xa4, 0xf1, 0xfe, 0x9e, 0x65, 0xde,                // IID531
+    0x62, 0xfc, 0xb4, 0x10, 0xd3, 0xbc, 0x24, 0x4f, 0x45, 0xce, 0xde,                // IID532
+    0x62, 0xdc, 0xf8, 0x14, 0xd3, 0xbc, 0x44, 0xb9, 0x83, 0xc4, 0x48,                // IID533
+    0x62, 0xd4, 0x88, 0x10, 0xff, 0x8c, 0x01, 0xb1, 0x17, 0x73, 0xf7,                // IID534
+    0x62, 0x9c, 0xa0, 0x1c, 0xff, 0x8c, 0xae, 0xd0, 0x8f, 0xeb, 0x3e,                // IID535
+    0x62, 0x9c, 0xac, 0x10, 0xff, 0x84, 0xd5, 0x2e, 0x82, 0xf4, 0x3e,                // IID536
+    0x62, 0xfc, 0x90, 0x14, 0xff, 0x84, 0xa3, 0x47, 0xc2, 0xf0, 0xc0,                // IID537
+    0x62, 0xdc, 0xb8, 0x18, 0xd3, 0xac, 0x26, 0x17, 0x6a, 0xb5, 0x15,                // IID538
+    0x62, 0xd4, 0xac, 0x14, 0xd3, 0xab, 0x9f, 0x9a, 0x17, 0xd2,                      // IID539
+    0x62, 0x34, 0xf8, 0x08, 0xf4, 0x9c, 0x71, 0x3e, 0x4e, 0x00, 0xcd,                // IID540
+    0x62, 0x84, 0xfc, 0x0c, 0xf4, 0xbc, 0x61, 0x97, 0xc1, 0x7d, 0xab,                // IID541
+    0x62, 0x54, 0xdc, 0x10, 0x01, 0xbc, 0xcd, 0xf3, 0x93, 0xee, 0xb9,                // IID542
+    0x62, 0xc4, 0x90, 0x1c, 0x01, 0x84, 0x79, 0xfb, 0x89, 0x93, 0xd7,                // IID543
+    0x62, 0x4c, 0xd0, 0x10, 0x21, 0xac, 0x0e, 0xb2, 0x30, 0x4e, 0x0f,                // IID544
+    0x62, 0xac, 0x88, 0x14, 0x21, 0x8c, 0x39, 0xc4, 0xde, 0xb9, 0x3a,                // IID545
+    0x62, 0x0c, 0xa8, 0x18, 0x09, 0xa4, 0x73, 0x9a, 0xed, 0x80, 0xe6,                // IID546
+    0x62, 0x1c, 0xb0, 0x1c, 0x09, 0x9c, 0x35, 0xf8, 0x64, 0x15, 0xdb,                // IID547
+    0x62, 0xc4, 0x84, 0x18, 0x29, 0x86, 0x70, 0x40, 0xbb, 0xb0,                      // IID548
+    0x62, 0x6c, 0xf0, 0x1c, 0x29, 0xa4, 0x55, 0x71, 0x53, 0x2f, 0xee,                // IID549
+    0x62, 0x7c, 0xe0, 0x10, 0x31, 0x84, 0x13, 0x14, 0xaa, 0xa1, 0xf5,                // IID550
+    0x62, 0xac, 0x98, 0x14, 0x31, 0x84, 0x61, 0x20, 0xd0, 0x4b, 0x91,                // IID551
+    0x62, 0xfc, 0xf4, 0x10, 0x81, 0x82, 0xfb, 0xee, 0x54, 0x9f, 0x00, 0x00, 0x00, 0x01, // IID552
+    0x62, 0xbc, 0xb0, 0x14, 0x81, 0x84, 0x0b, 0xd9, 0x44, 0x24, 0x12, 0x00, 0x00, 0x01, 0x00, // IID553
+    0x62, 0x94, 0x88, 0x10, 0x81, 0xa4, 0x61, 0x0d, 0xf3, 0x4f, 0xda, 0x00, 0x10, 0x00, 0x00, // IID554
+    0x62, 0xfc, 0xb4, 0x1c, 0x81, 0xa4, 0x5e, 0xda, 0xaf, 0xb9, 0x81, 0x00, 0x00, 0x00, 0x10, // IID555
+    0x62, 0x1c, 0xf8, 0x08, 0x6b, 0xa4, 0x49, 0x34, 0x97, 0xd2, 0xbc, 0x01,          // IID556
+    0x62, 0x3c, 0xf8, 0x0c, 0x6b, 0xbc, 0xf9, 0xa2, 0xa9, 0x68, 0xd4, 0x10,          // IID557
+    0x62, 0xb4, 0x98, 0x10, 0x81, 0x8c, 0x3a, 0xb1, 0x63, 0x13, 0x3f, 0x00, 0x01, 0x00, 0x00, // IID558
+    0x62, 0xd4, 0xf8, 0x14, 0x81, 0x8c, 0xfc, 0xc4, 0x79, 0x7a, 0xe8, 0x00, 0x00, 0x00, 0x01, // IID559
+    0x62, 0x94, 0xb8, 0x18, 0xc1, 0xa4, 0x86, 0x5b, 0x6f, 0xbd, 0x8e, 0x02,          // IID560
+    0x62, 0x94, 0xbc, 0x1c, 0xc1, 0xa4, 0xb7, 0x43, 0x32, 0xf1, 0x21, 0x10,          // IID561
+    0x62, 0x94, 0xa8, 0x18, 0xc1, 0xbc, 0x2d, 0x72, 0xcb, 0x04, 0x7d, 0x02,          // IID562
+    0x62, 0xbc, 0xa0, 0x1c, 0xc1, 0xbc, 0xfd, 0x24, 0x4b, 0x89, 0xde, 0x08,          // IID563
+    0x62, 0xbc, 0xf4, 0x18, 0xc1, 0xac, 0x60, 0x38, 0x9a, 0x0c, 0x26, 0x04,          // IID564
+    0x62, 0x9c, 0xcc, 0x14, 0xc1, 0xac, 0x0a, 0x9e, 0x44, 0xa9, 0xa1, 0x08,          // IID565
+    0x62, 0xb4, 0x80, 0x10, 0x83, 0xac, 0x63, 0x10, 0xbb, 0x00, 0x2b, 0x01,          // IID566
+    0x62, 0xdc, 0xd4, 0x14, 0x81, 0xaf, 0x53, 0x0b, 0xef, 0x93, 0x00, 0x10, 0x00, 0x00, // IID567
+    0x62, 0xbc, 0xa0, 0x18, 0x81, 0xb4, 0x77, 0x6b, 0x02, 0xa6, 0x51, 0x00, 0x00, 0x01, 0x00, // IID568
+    0x62, 0x9c, 0x8c, 0x1c, 0x83, 0xb4, 0x93, 0x55, 0x64, 0x52, 0xcb, 0x10,          // IID569
+    0x62, 0xfc, 0xdc, 0x10, 0x81, 0xc7, 0x00, 0x00, 0x00, 0x01,                      // IID570
+    0x62, 0xfc, 0xb4, 0x1c, 0x81, 0xc5, 0x00, 0x10, 0x00, 0x00,                      // IID571
+    0x62, 0xf4, 0xdc, 0x10, 0x83, 0xe2, 0x10,                                        // IID572
+    0x62, 0xfc, 0x8c, 0x1c, 0x83, 0xe3, 0x10,                                        // IID573
+    0x62, 0x6c, 0xfc, 0x08, 0x6b, 0xd9, 0x10,                                        // IID574
+    0x62, 0x44, 0xfc, 0x0c, 0x69, 0xf5, 0x00, 0x01, 0x00, 0x00,                      // IID575
+    0x62, 0xd4, 0xe4, 0x10, 0x81, 0xcf, 0x00, 0x00, 0x00, 0x01,                      // IID576
+    0x62, 0xdc, 0xfc, 0x14, 0x81, 0xcc, 0x00, 0x00, 0x00, 0x10,                      // IID577
+    0x62, 0xdc, 0xe4, 0x18, 0xc1, 0xd0, 0x02,                                        // IID578
+    0x62, 0xfc, 0x84, 0x18, 0xc1, 0xc4, 0x10,                                        // IID579
+    0x62, 0xf4, 0xa4, 0x1c, 0xc1, 0xc1, 0x10,                                        // IID580
+    0x62, 0xdc, 0x94, 0x18, 0xc1, 0xca, 0x10,                                        // IID581
+    0x62, 0xfc, 0xe4, 0x14, 0xc1, 0xcc, 0x04,                                        // IID582
+    0x62, 0xdc, 0xe4, 0x10, 0xc1, 0xe4, 0x10,                                        // IID583
+    0x62, 0xfc, 0xb4, 0x14, 0xc1, 0xe2, 0x04,                                        // IID584
+    0x62, 0xdc, 0xac, 0x18, 0xc1, 0xfb, 0x04,                                        // IID585
+    0x62, 0xfc, 0xec, 0x1c, 0xc1, 0xfe, 0x08,                                        // IID586
+    0x62, 0xd4, 0x9c, 0x10, 0xd1, 0xe7,                                              // IID587
+    0x62, 0xd4, 0xe4, 0x1c, 0xc1, 0xe4, 0x04,                                        // IID588
+    0x62, 0xd4, 0xac, 0x10, 0xd1, 0xeb,                                              // IID589
+    0x62, 0xdc, 0xec, 0x1c, 0xc1, 0xef, 0x08,                                        // IID590
+    0x62, 0xf4, 0xd4, 0x10, 0x81, 0xeb, 0x00, 0x00, 0x10, 0x00,                      // IID591
+    0x62, 0xdc, 0xb4, 0x14, 0x81, 0xec, 0x00, 0x00, 0x01, 0x00,                      // IID592
+    0x62, 0xd4, 0xcc, 0x10, 0x83, 0xf6, 0x01,                                        // IID593
+    0x62, 0xdc, 0xa4, 0x1c, 0x81, 0xf6, 0x00, 0x00, 0x10, 0x00,                      // IID594
+    0x62, 0xfc, 0xdc, 0x10, 0x81, 0xcb, 0x00, 0x00, 0x10, 0x00,                      // IID595
+    0x62, 0xd4, 0xb4, 0x10, 0x81, 0xcd, 0x00, 0x00, 0x00, 0x10,                      // IID596
+    0x62, 0xdc, 0xb4, 0x10, 0x81, 0xe9, 0x00, 0x00, 0x00, 0x10,                      // IID597
+    0x62, 0xd4, 0xec, 0x14, 0x81, 0xeb, 0x00, 0x00, 0x40, 0x00,                      // IID598
+    0x62, 0xec, 0xac, 0x18, 0x03, 0x94, 0x24, 0x53, 0xf4, 0x56, 0x07,                // IID599
+    0x62, 0x6c, 0xe0, 0x1c, 0x03, 0x9c, 0x2e, 0x49, 0x15, 0x54, 0xda,                // IID600
+    0x62, 0x44, 0xe8, 0x18, 0x23, 0xbc, 0xe1, 0x64, 0x1c, 0x30, 0xfb,                // IID601
+    0x62, 0x04, 0xf8, 0x14, 0x23, 0x8c, 0x1e, 0xd9, 0x54, 0x66, 0x7c,                // IID602
+    0x62, 0xd4, 0x90, 0x10, 0x0b, 0x8c, 0x3f, 0x2d, 0xf7, 0xb7, 0x45,                // IID603
+    0x62, 0xc4, 0xe0, 0x14, 0x0b, 0x8c, 0x75, 0x6a, 0xe6, 0xf3, 0x8a,                // IID604
+    0x62, 0x5c, 0x90, 0x18, 0xaf, 0x84, 0x7f, 0x4e, 0x49, 0xee, 0xdd,                // IID605
+    0x62, 0x04, 0xa4, 0x1c, 0xaf, 0xa4, 0xdd, 0xab, 0x13, 0x00, 0x5c,                // IID606
+    0x62, 0xec, 0xec, 0x18, 0x2b, 0x94, 0x0a, 0x71, 0x7e, 0x55, 0x59,                // IID607
+    0x62, 0x7c, 0xa4, 0x14, 0x2b, 0x9e, 0xb7, 0x69, 0xb9, 0xd7,                      // IID608
+    0x62, 0x5c, 0xac, 0x18, 0x33, 0x88, 0x54, 0x1d, 0x69, 0x49,                      // IID609
+    0x62, 0x7c, 0xbc, 0x14, 0x33, 0xa3, 0xaa, 0x29, 0xd5, 0x22,                      // IID610
+    0x62, 0x54, 0xdc, 0x10, 0x03, 0xca,                                              // IID611
+    0x62, 0xcc, 0xec, 0x14, 0x03, 0xca,                                              // IID612
+    0x62, 0xec, 0xd5, 0x10, 0x66, 0xc3,                                              // IID613
+    0x62, 0x5c, 0xe6, 0x18, 0x66, 0xf3,                                              // IID614
+    0x62, 0x7c, 0xb4, 0x18, 0x23, 0xe6,                                              // IID615
+    0x62, 0x44, 0xf4, 0x14, 0x23, 0xca,                                              // IID616
+    0x62, 0x54, 0x9c, 0x18, 0xaf, 0xfe,                                              // IID617
+    0x62, 0xec, 0x94, 0x14, 0xaf, 0xd0,                                              // IID618
+    0x62, 0x54, 0xa4, 0x18, 0x0b, 0xca,                                              // IID619
+    0x62, 0x7c, 0xb4, 0x14, 0x0b, 0xe8,                                              // IID620
+    0x62, 0xcc, 0xa4, 0x18, 0x2b, 0xe9,                                              // IID621
+    0x62, 0xe4, 0xec, 0x1c, 0x2b, 0xe3,                                              // IID622
+    0x62, 0xcc, 0xb4, 0x10, 0x33, 0xea,                                              // IID623
+    0x62, 0x6c, 0xc4, 0x14, 0x33, 0xdd,                                              // IID624
+    0x62, 0x44, 0xac, 0x18, 0x24, 0xfc, 0x02,                                        // IID625
+    0x62, 0x6c, 0xc4, 0x14, 0x24, 0xe8, 0x02,                                        // IID626
+    0x62, 0xcc, 0xe4, 0x10, 0x2c, 0xf8, 0x04,                                        // IID627
+    0x62, 0x44, 0xd4, 0x14, 0x2c, 0xcf, 0x04,                                        // IID628
+    0x62, 0x64, 0xb4, 0x18, 0x40, 0xea,                                              // IID629
+    0x62, 0x6c, 0xa4, 0x18, 0x41, 0xcb,                                              // IID630
+    0x62, 0xec, 0xac, 0x18, 0x42, 0xc1,                                              // IID631
+    0x62, 0xcc, 0xbc, 0x18, 0x43, 0xff,                                              // IID632
+    0x62, 0x64, 0xb4, 0x18, 0x44, 0xfb,                                              // IID633
+    0x62, 0x44, 0xfc, 0x10, 0x45, 0xe9,                                              // IID634
+    0x62, 0x54, 0xbc, 0x10, 0x46, 0xd1,                                              // IID635
+    0x62, 0x4c, 0xcc, 0x10, 0x47, 0xe2,                                              // IID636
+    0x62, 0x6c, 0xec, 0x10, 0x48, 0xcc,                                              // IID637
+    0x62, 0xe4, 0xfc, 0x10, 0x49, 0xeb,                                              // IID638
+    0x62, 0xec, 0x9c, 0x10, 0x4a, 0xf3,                                              // IID639
+    0x62, 0x74, 0x94, 0x18, 0x4b, 0xfa,                                              // IID640
+    0x62, 0xc4, 0xbc, 0x18, 0x4c, 0xf6,                                              // IID641
+    0x62, 0x44, 0x9c, 0x18, 0x4d, 0xc6,                                              // IID642
+    0x62, 0x7c, 0xbc, 0x10, 0x4e, 0xed,                                              // IID643
+    0x62, 0xdc, 0xe4, 0x18, 0x4f, 0xdb,                                              // IID644
+    0x62, 0x8c, 0x88, 0x18, 0x40, 0x8c, 0xd8, 0xf0, 0x08, 0xd5, 0x09,                // IID645
+    0x62, 0x5c, 0x90, 0x18, 0x41, 0xbc, 0xaf, 0x4a, 0xc7, 0xf2, 0x6e,                // IID646
+    0x62, 0x0c, 0x90, 0x18, 0x42, 0x9c, 0x4f, 0xab, 0xe9, 0x4f, 0x73,                // IID647
+    0x62, 0x84, 0x80, 0x18, 0x43, 0xb4, 0xae, 0x05, 0x42, 0x27, 0x98,                // IID648
+    0x62, 0x84, 0x88, 0x10, 0x44, 0xbc, 0x67, 0xe7, 0x9d, 0x97, 0xfd,                // IID649
+    0x62, 0x14, 0x98, 0x18, 0x45, 0x8c, 0xc9, 0x6b, 0xab, 0x2a, 0x05,                // IID650
+    0x62, 0x04, 0xb4, 0x18, 0x46, 0x8c, 0xc0, 0x6b, 0x42, 0xbd, 0xe1,                // IID651
+    0x62, 0xcc, 0xf4, 0x18, 0x47, 0xa4, 0x9b, 0x58, 0x3c, 0x82, 0x46,                // IID652
+    0x62, 0x7c, 0xe4, 0x18, 0x48, 0xa5, 0x38, 0x47, 0xca, 0xf9,                      // IID653
+    0x62, 0x9c, 0xc0, 0x10, 0x49, 0x9c, 0xd3, 0xc0, 0xbc, 0x22, 0x09,                // IID654
+    0x62, 0x7c, 0xb4, 0x10, 0x4a, 0x8f, 0xec, 0x14, 0x2a, 0x0d,                      // IID655
+    0x62, 0xc4, 0xa4, 0x18, 0x4b, 0x9b, 0x63, 0xa5, 0x46, 0xf0,                      // IID656
+    0x62, 0xcc, 0x90, 0x18, 0x4c, 0x94, 0x1c, 0x7e, 0x9b, 0x6b, 0x71,                // IID657
+    0x62, 0xa4, 0xd0, 0x10, 0x4d, 0x84, 0x29, 0xe2, 0xbb, 0x0f, 0xa5,                // IID658
+    0x62, 0x2c, 0x98, 0x18, 0x4e, 0xbc, 0x14, 0xb1, 0x7f, 0x0b, 0x0e,                // IID659
+    0x62, 0x4c, 0x84, 0x18, 0x4f, 0x86, 0x4f, 0x7b, 0x3b, 0x2d,                      // IID660
 #endif // _LP64
   };
 
@@ -649,14 +1357,12 @@
   {
 #ifdef _LP64
     4,    // IID0
-#endif // _LP64
-    3,    // IID1
-#ifdef _LP64
+    4,    // IID1
     4,    // IID2
     4,    // IID3
     4,    // IID4
     5,    // IID5
-    4,    // IID6
+    3,    // IID6
     4,    // IID7
     5,    // IID8
     5,    // IID9
@@ -669,120 +1375,116 @@
     4,    // IID16
     4,    // IID17
     4,    // IID18
-    9,    // IID19
+    8,    // IID19
     10,   // IID20
     9,    // IID21
-    8,    // IID22
-    9,    // IID23
-    8,    // IID24
+    9,    // IID22
+    8,    // IID23
+    9,    // IID24
     9,    // IID25
     10,   // IID26
     9,    // IID27
     9,    // IID28
     9,    // IID29
-    9,    // IID30
-    8,    // IID31
-    8,    // IID32
+    8,    // IID30
+    9,    // IID31
+    9,    // IID32
     9,    // IID33
     9,    // IID34
     8,    // IID35
     10,   // IID36
-    9,    // IID37
+    8,    // IID37
     13,   // IID38
-    9,    // IID39
-    9,    // IID40
-    11,   // IID41
+    13,   // IID39
+    10,   // IID40
+    12,   // IID41
     13,   // IID42
     10,   // IID43
-    11,   // IID44
-    13,   // IID45
+    12,   // IID44
+    12,   // IID45
     9,    // IID46
-    10,   // IID47
+    9,    // IID47
     13,   // IID48
     10,   // IID49
-    10,   // IID50
-    10,   // IID51
+    12,   // IID50
+    8,    // IID51
     10,   // IID52
     9,    // IID53
-    10,   // IID54
+    9,    // IID54
     12,   // IID55
     9,    // IID56
     12,   // IID57
-    13,   // IID58
+    12,   // IID58
     9,    // IID59
     9,    // IID60
-    7,    // IID61
+    8,    // IID61
     9,    // IID62
     10,   // IID63
-    9,    // IID64
+    8,    // IID64
     9,    // IID65
-    8,    // IID66
+    9,    // IID66
     9,    // IID67
     9,    // IID68
     8,    // IID69
     10,   // IID70
     9,    // IID71
     10,   // IID72
-    9,    // IID73
+    7,    // IID73
     9,    // IID74
-    9,    // IID75
-    9,    // IID76
+    8,    // IID75
+    8,    // IID76
     9,    // IID77
-    10,   // IID78
+    9,    // IID78
     9,    // IID79
-    7,    // IID80
+    8,    // IID80
     5,    // IID81
-    8,    // IID82
-#endif // _LP64
-    6,    // IID83
-#ifdef _LP64
+    7,    // IID82
+    5,    // IID83
     8,    // IID84
-    4,    // IID85
-    8,    // IID86
+    5,    // IID85
+    7,    // IID86
     5,    // IID87
-    5,    // IID88
-#endif // _LP64
-    3,    // IID89
-    2,    // IID90
-#ifdef _LP64
+    4,    // IID88
+    5,    // IID89
+    5,    // IID90
     5,    // IID91
-    4,    // IID92
+    8,    // IID92
     5,    // IID93
-#endif // _LP64
-    2,    // IID94
-#ifdef _LP64
-    8,    // IID95
+    5,    // IID94
+    5,    // IID95
     8,    // IID96
     7,    // IID97
     5,    // IID98
-    8,    // IID99
+    7,    // IID99
     8,    // IID100
-    9,    // IID101
+    8,    // IID101
     9,    // IID102
-    9,    // IID103
+    8,    // IID103
     9,    // IID104
-    9,    // IID105
+    8,    // IID105
     9,    // IID106
     9,    // IID107
     9,    // IID108
     9,    // IID109
     9,    // IID110
-    8,    // IID111
+    9,    // IID111
     9,    // IID112
     9,    // IID113
     9,    // IID114
-    9,    // IID115
+    7,    // IID115
     9,    // IID116
     4,    // IID117
-#endif // _LP64
-    3,    // IID118
-#ifdef _LP64
+    4,    // IID118
     4,    // IID119
     4,    // IID120
-    4,    // IID121
+#endif // _LP64
+    3,    // IID121
+#ifdef _LP64
     4,    // IID122
     4,    // IID123
-    4,    // IID124
+#endif // _LP64
+    3,    // IID124
+#ifdef _LP64
     4,    // IID125
     4,    // IID126
     4,    // IID127
@@ -790,37 +1492,37 @@
     4,    // IID129
     4,    // IID130
     4,    // IID131
-    4,    // IID132
-    4,    // IID133
+#endif // _LP64
+    3,    // IID132
+#ifdef _LP64
+    3,    // IID133
     4,    // IID134
     4,    // IID135
-    4,    // IID136
+    3,    // IID136
     4,    // IID137
-    4,    // IID138
+    3,    // IID138
 #endif // _LP64
     2,    // IID139
 #ifdef _LP64
-    3,    // IID140
-    3,    // IID141
-    4,    // IID142
-    3,    // IID143
-    4,    // IID144
-#endif // _LP64
-    2,    // IID145
-#ifdef _LP64
+    4,    // IID140
+    4,    // IID141
+    3,    // IID142
+    4,    // IID143
+    3,    // IID144
+    4,    // IID145
     3,    // IID146
-    8,    // IID147
-    6,    // IID148
-    8,    // IID149
-    9,    // IID150
+    9,    // IID147
+    8,    // IID148
+    9,    // IID149
+    8,    // IID150
     8,    // IID151
-    8,    // IID152
+    9,    // IID152
     9,    // IID153
     13,   // IID154
-    7,    // IID155
+    5,    // IID155
     5,    // IID156
     5,    // IID157
-    8,    // IID158
+    9,    // IID158
     9,    // IID159
     9,    // IID160
     9,    // IID161
@@ -831,463 +1533,1177 @@
     9,    // IID166
     10,   // IID167
     9,    // IID168
-    3,    // IID169
-    4,    // IID170
-    4,    // IID171
-    5,    // IID172
-    4,    // IID173
-    3,    // IID174
-    5,    // IID175
-    5,    // IID176
-    4,    // IID177
-    4,    // IID178
-    4,    // IID179
-    4,    // IID180
-    3,    // IID181
-    4,    // IID182
-    4,    // IID183
-    4,    // IID184
-    4,    // IID185
-    3,    // IID186
-    9,    // IID187
-    9,    // IID188
-    8,    // IID189
-    9,    // IID190
-    9,    // IID191
-    9,    // IID192
-    9,    // IID193
-    9,    // IID194
-    13,   // IID195
-    12,   // IID196
-    13,   // IID197
-    10,   // IID198
-    10,   // IID199
-    10,   // IID200
-    10,   // IID201
-    10,   // IID202
-    13,   // IID203
-    9,    // IID204
-    12,   // IID205
-    11,   // IID206
-    8,    // IID207
-    9,    // IID208
-    9,    // IID209
-    9,    // IID210
-    8,    // IID211
-    8,    // IID212
-    9,    // IID213
-    10,   // IID214
-    8,    // IID215
-    9,    // IID216
+    6,    // IID169
+    6,    // IID170
+    6,    // IID171
+    6,    // IID172
+#endif // _LP64
+    6,    // IID173
+#ifdef _LP64
+    6,    // IID174
+    6,    // IID175
+    6,    // IID176
+    11,   // IID177
+    10,   // IID178
+    6,    // IID179
+    6,    // IID180
+    6,    // IID181
+    6,    // IID182
+    6,    // IID183
+    6,    // IID184
+    6,    // IID185
+    6,    // IID186
+    6,    // IID187
+    6,    // IID188
+    6,    // IID189
+    6,    // IID190
+    6,    // IID191
+    6,    // IID192
+    6,    // IID193
+    6,    // IID194
+    6,    // IID195
+    6,    // IID196
+    6,    // IID197
+    6,    // IID198
+    6,    // IID199
+    6,    // IID200
+    6,    // IID201
+    6,    // IID202
+    6,    // IID203
+    11,   // IID204
+    11,   // IID205
+    10,   // IID206
+    11,   // IID207
+    11,   // IID208
+    11,   // IID209
+    11,   // IID210
+    11,   // IID211
+    11,   // IID212
+    11,   // IID213
+    11,   // IID214
+    10,   // IID215
+    11,   // IID216
     10,   // IID217
-    9,    // IID218
-    9,    // IID219
-    9,    // IID220
-    10,   // IID221
-    9,    // IID222
-    9,    // IID223
-    4,    // IID224
-    8,    // IID225
-    4,    // IID226
-    8,    // IID227
-    5,    // IID228
-    5,    // IID229
-    4,    // IID230
-    5,    // IID231
-    5,    // IID232
-    4,    // IID233
-    7,    // IID234
-    4,    // IID235
-    4,    // IID236
-    8,    // IID237
-    7,    // IID238
-    8,    // IID239
-    11,   // IID240
-    5,    // IID241
-    7,    // IID242
-    8,    // IID243
-    8,    // IID244
-    8,    // IID245
-    8,    // IID246
-    9,    // IID247
-    8,    // IID248
-    9,    // IID249
-    9,    // IID250
-    8,    // IID251
-    9,    // IID252
-    9,    // IID253
-    9,    // IID254
-    9,    // IID255
-    9,    // IID256
-    9,    // IID257
-    8,    // IID258
-    9,    // IID259
-    9,    // IID260
-    3,    // IID261
-    4,    // IID262
-    4,    // IID263
-    3,    // IID264
-    4,    // IID265
-    3,    // IID266
-    4,    // IID267
-    4,    // IID268
-    3,    // IID269
-    4,    // IID270
-    4,    // IID271
-    4,    // IID272
-    4,    // IID273
-    4,    // IID274
-    3,    // IID275
-    3,    // IID276
-    3,    // IID277
-    8,    // IID278
-    9,    // IID279
-    9,    // IID280
-    9,    // IID281
-    8,    // IID282
-    8,    // IID283
-    8,    // IID284
-    8,    // IID285
-    13,   // IID286
-    8,    // IID287
-    5,    // IID288
-    5,    // IID289
-    6,    // IID290
-    6,    // IID291
-    6,    // IID292
-    6,    // IID293
-    9,    // IID294
-    9,    // IID295
-    9,    // IID296
-    9,    // IID297
-    4,    // IID298
-    4,    // IID299
-    4,    // IID300
-    4,    // IID301
-    9,    // IID302
+    11,   // IID218
+    11,   // IID219
+    11,   // IID220
+    11,   // IID221
+    15,   // IID222
+    15,   // IID223
+    14,   // IID224
+    14,   // IID225
+    12,   // IID226
+    14,   // IID227
+    12,   // IID228
+    12,   // IID229
+    11,   // IID230
+    12,   // IID231
+    11,   // IID232
+    12,   // IID233
+    12,   // IID234
+    11,   // IID235
+    11,   // IID236
+    12,   // IID237
+    15,   // IID238
+    15,   // IID239
+    12,   // IID240
+    14,   // IID241
+    11,   // IID242
+    11,   // IID243
+    11,   // IID244
+    11,   // IID245
+    11,   // IID246
+    11,   // IID247
+    11,   // IID248
+    10,   // IID249
+    11,   // IID250
+    11,   // IID251
+    10,   // IID252
+    11,   // IID253
+    10,   // IID254
+    10,   // IID255
+    10,   // IID256
+    7,    // IID257
+    10,   // IID258
+    10,   // IID259
+    10,   // IID260
+    10,   // IID261
+    7,    // IID262
+    7,    // IID263
+    7,    // IID264
+    7,    // IID265
+    7,    // IID266
+    6,    // IID267
+    7,    // IID268
+    7,    // IID269
+    7,    // IID270
+    7,    // IID271
+    7,    // IID272
+    7,    // IID273
+    7,    // IID274
+    10,   // IID275
+    10,   // IID276
+    10,   // IID277
+    7,    // IID278
+    10,   // IID279
+    10,   // IID280
+    11,   // IID281
+    11,   // IID282
+    11,   // IID283
+    11,   // IID284
+    11,   // IID285
+    11,   // IID286
+    10,   // IID287
+    11,   // IID288
+    11,   // IID289
+    11,   // IID290
+    11,   // IID291
+    11,   // IID292
+    11,   // IID293
+    10,   // IID294
+    11,   // IID295
+    11,   // IID296
+    6,    // IID297
+    6,    // IID298
+    6,    // IID299
+    6,    // IID300
+    6,    // IID301
+    6,    // IID302
+    6,    // IID303
+    6,    // IID304
+    6,    // IID305
+    6,    // IID306
+    6,    // IID307
+    6,    // IID308
+    6,    // IID309
+    6,    // IID310
+    6,    // IID311
+    6,    // IID312
+    6,    // IID313
+    6,    // IID314
+    7,    // IID315
+    7,    // IID316
+    7,    // IID317
+    7,    // IID318
+    6,    // IID319
+    6,    // IID320
+    6,    // IID321
+    6,    // IID322
+    6,    // IID323
+    6,    // IID324
+    6,    // IID325
+    6,    // IID326
+    6,    // IID327
+    6,    // IID328
+    6,    // IID329
+    6,    // IID330
+    6,    // IID331
+    6,    // IID332
+    6,    // IID333
+    6,    // IID334
+    11,   // IID335
+    11,   // IID336
+    11,   // IID337
+    10,   // IID338
+    11,   // IID339
+    11,   // IID340
+    11,   // IID341
+    11,   // IID342
+    11,   // IID343
+    11,   // IID344
+    11,   // IID345
+    11,   // IID346
+    11,   // IID347
+    11,   // IID348
+    11,   // IID349
+    11,   // IID350
+    3,    // IID351
+    3,    // IID352
+    4,    // IID353
+    5,    // IID354
+    4,    // IID355
+    4,    // IID356
+    5,    // IID357
+    5,    // IID358
+    4,    // IID359
+    4,    // IID360
+    4,    // IID361
+    4,    // IID362
+    3,    // IID363
+    4,    // IID364
+    4,    // IID365
+    4,    // IID366
+    4,    // IID367
+    4,    // IID368
+    9,    // IID369
+    9,    // IID370
+    9,    // IID371
+    8,    // IID372
+    8,    // IID373
+    9,    // IID374
+    9,    // IID375
+    9,    // IID376
+    13,   // IID377
+    12,   // IID378
+    13,   // IID379
+    10,   // IID380
+    10,   // IID381
+    13,   // IID382
+    10,   // IID383
+    13,   // IID384
+    10,   // IID385
+    13,   // IID386
+    13,   // IID387
+    13,   // IID388
+    9,    // IID389
+    8,    // IID390
+    8,    // IID391
+    10,   // IID392
+    9,    // IID393
+    9,    // IID394
+    9,    // IID395
+    9,    // IID396
+    9,    // IID397
+    9,    // IID398
+    10,   // IID399
+    9,    // IID400
+    9,    // IID401
+    9,    // IID402
+    10,   // IID403
+    9,    // IID404
+    9,    // IID405
+    5,    // IID406
+    7,    // IID407
+    7,    // IID408
+    7,    // IID409
+    5,    // IID410
+    4,    // IID411
+    3,    // IID412
+    5,    // IID413
+    5,    // IID414
+    4,    // IID415
+    5,    // IID416
+    5,    // IID417
+    5,    // IID418
+    7,    // IID419
+    8,    // IID420
+    8,    // IID421
+    11,   // IID422
+    5,    // IID423
+    7,    // IID424
+    8,    // IID425
+    7,    // IID426
+    8,    // IID427
+    9,    // IID428
+    9,    // IID429
+    9,    // IID430
+    9,    // IID431
+    9,    // IID432
+    9,    // IID433
+    8,    // IID434
+    8,    // IID435
+    9,    // IID436
+    9,    // IID437
+    8,    // IID438
+    9,    // IID439
+    8,    // IID440
+    9,    // IID441
+    9,    // IID442
+    4,    // IID443
+    3,    // IID444
+    4,    // IID445
+    3,    // IID446
+    4,    // IID447
+    4,    // IID448
+    3,    // IID449
+    4,    // IID450
+    4,    // IID451
+    3,    // IID452
+    3,    // IID453
+    3,    // IID454
+    4,    // IID455
+    4,    // IID456
+    4,    // IID457
+    3,    // IID458
+    3,    // IID459
+    8,    // IID460
+    9,    // IID461
+    9,    // IID462
+    9,    // IID463
+    9,    // IID464
+    9,    // IID465
+    8,    // IID466
+    8,    // IID467
+    12,   // IID468
+    5,    // IID469
+    5,    // IID470
+    5,    // IID471
+    6,    // IID472
+    6,    // IID473
+    6,    // IID474
+    6,    // IID475
+    9,    // IID476
+    9,    // IID477
+    9,    // IID478
+    9,    // IID479
+    4,    // IID480
+    4,    // IID481
+    4,    // IID482
+    4,    // IID483
+    8,    // IID484
+    6,    // IID485
+    6,    // IID486
+    6,    // IID487
+    6,    // IID488
+    6,    // IID489
+    6,    // IID490
+    6,    // IID491
+    6,    // IID492
+    11,   // IID493
+    11,   // IID494
+    6,    // IID495
+    6,    // IID496
+    6,    // IID497
+    6,    // IID498
+    6,    // IID499
+    6,    // IID500
+    6,    // IID501
+    6,    // IID502
+    6,    // IID503
+    6,    // IID504
+    6,    // IID505
+    6,    // IID506
+    6,    // IID507
+    6,    // IID508
+    6,    // IID509
+    6,    // IID510
+    6,    // IID511
+    6,    // IID512
+    6,    // IID513
+    6,    // IID514
+    6,    // IID515
+    6,    // IID516
+    6,    // IID517
+    6,    // IID518
+    6,    // IID519
+    6,    // IID520
+    6,    // IID521
+    11,   // IID522
+    11,   // IID523
+    10,   // IID524
+    10,   // IID525
+    11,   // IID526
+    11,   // IID527
+    11,   // IID528
+    11,   // IID529
+    10,   // IID530
+    11,   // IID531
+    11,   // IID532
+    11,   // IID533
+    11,   // IID534
+    11,   // IID535
+    11,   // IID536
+    11,   // IID537
+    11,   // IID538
+    10,   // IID539
+    11,   // IID540
+    11,   // IID541
+    11,   // IID542
+    11,   // IID543
+    11,   // IID544
+    11,   // IID545
+    11,   // IID546
+    11,   // IID547
+    10,   // IID548
+    11,   // IID549
+    11,   // IID550
+    11,   // IID551
+    14,   // IID552
+    15,   // IID553
+    15,   // IID554
+    15,   // IID555
+    12,   // IID556
+    12,   // IID557
+    15,   // IID558
+    15,   // IID559
+    12,   // IID560
+    12,   // IID561
+    12,   // IID562
+    12,   // IID563
+    12,   // IID564
+    12,   // IID565
+    12,   // IID566
+    14,   // IID567
+    15,   // IID568
+    12,   // IID569
+    10,   // IID570
+    10,   // IID571
+    7,    // IID572
+    7,    // IID573
+    7,    // IID574
+    10,   // IID575
+    10,   // IID576
+    10,   // IID577
+    7,    // IID578
+    7,    // IID579
+    7,    // IID580
+    7,    // IID581
+    7,    // IID582
+    7,    // IID583
+    7,    // IID584
+    7,    // IID585
+    7,    // IID586
+    6,    // IID587
+    7,    // IID588
+    6,    // IID589
+    7,    // IID590
+    10,   // IID591
+    10,   // IID592
+    7,    // IID593
+    10,   // IID594
+    10,   // IID595
+    10,   // IID596
+    10,   // IID597
+    10,   // IID598
+    11,   // IID599
+    11,   // IID600
+    11,   // IID601
+    11,   // IID602
+    11,   // IID603
+    11,   // IID604
+    11,   // IID605
+    11,   // IID606
+    11,   // IID607
+    10,   // IID608
+    10,   // IID609
+    10,   // IID610
+    6,    // IID611
+    6,    // IID612
+    6,    // IID613
+    6,    // IID614
+    6,    // IID615
+    6,    // IID616
+    6,    // IID617
+    6,    // IID618
+    6,    // IID619
+    6,    // IID620
+    6,    // IID621
+    6,    // IID622
+    6,    // IID623
+    6,    // IID624
+    7,    // IID625
+    7,    // IID626
+    7,    // IID627
+    7,    // IID628
+    6,    // IID629
+    6,    // IID630
+    6,    // IID631
+    6,    // IID632
+    6,    // IID633
+    6,    // IID634
+    6,    // IID635
+    6,    // IID636
+    6,    // IID637
+    6,    // IID638
+    6,    // IID639
+    6,    // IID640
+    6,    // IID641
+    6,    // IID642
+    6,    // IID643
+    6,    // IID644
+    11,   // IID645
+    11,   // IID646
+    11,   // IID647
+    11,   // IID648
+    11,   // IID649
+    11,   // IID650
+    11,   // IID651
+    11,   // IID652
+    10,   // IID653
+    11,   // IID654
+    10,   // IID655
+    10,   // IID656
+    11,   // IID657
+    11,   // IID658
+    11,   // IID659
+    10,   // IID660
 #endif // _LP64
   };
 
   static const char* insns_strs[] =
   {
 #ifdef _LP64
-    "__ shldl(r22, r14);",                                                                // IID0
-#endif // _LP64
-    "__ shrdl(rcx, rbx);",                                                                // IID1
-#ifdef _LP64
-    "__ adcl(r24, r18);",                                                                 // IID2
-    "__ cmpl(r8, r19);",                                                                  // IID3
-    "__ imull(r25, r19);",                                                                // IID4
-    "__ popcntl(r19, r15);",                                                              // IID5
-    "__ sbbl(r21, r19);",                                                                 // IID6
-    "__ subl(r17, r29);",                                                                 // IID7
-    "__ tzcntl(r21, rdx);",                                                               // IID8
-    "__ lzcntl(rcx, r23);",                                                               // IID9
-    "__ addl(r10, r11);",                                                                 // IID10
-    "__ andl(r21, r14);",                                                                 // IID11
-    "__ orl(r12, r30);",                                                                  // IID12
-    "__ xorl(r19, r30);",                                                                 // IID13
-    "__ movl(r27, r11);",                                                                 // IID14
-    "__ bsfl(r10, r12);",                                                                 // IID15
-    "__ bsrl(r16, r10);",                                                                 // IID16
-    "__ xchgl(r16, r28);",                                                                // IID17
-    "__ testl(r25, r16);",                                                                // IID18
-    "__ addb(Address(r27, rdx, (Address::ScaleFactor)1, +0x6f304723), rcx);",             // IID19
-    "__ addw(Address(r19, rcx, (Address::ScaleFactor)2, +0x17244c57), r17);",             // IID20
-    "__ addl(Address(r23, r16, (Address::ScaleFactor)1, +0x138df419), r19);",             // IID21
-    "__ adcl(Address(r8, r11, (Address::ScaleFactor)3, -0x164f7a73), rcx);",              // IID22
-    "__ andb(Address(rdx, r17, (Address::ScaleFactor)3, +0x4df7f181), r22);",             // IID23
-    "__ andl(Address(r15, -0x41884769), r23);",                                           // IID24
-    "__ cmpb(Address(r20, r18, (Address::ScaleFactor)0, -0x1b827588), r8);",              // IID25
-    "__ cmpw(Address(r9, r22, (Address::ScaleFactor)3, +0x564ead70), r31);",              // IID26
-    "__ cmpl(Address(r10, r24, (Address::ScaleFactor)2, +0xf08ffec), rcx);",              // IID27
-    "__ orb(Address(r27, r15, (Address::ScaleFactor)0, +0xf18eac7), r19);",               // IID28
-    "__ orl(Address(r16, r31, (Address::ScaleFactor)2, +0x3a452790), r12);",              // IID29
-    "__ xorb(Address(r20, r13, (Address::ScaleFactor)0, +0x61dde6b7), r10);",             // IID30
-    "__ xorl(Address(r27, -0x77a99463), rbx);",                                           // IID31
-    "__ subl(Address(r9, r11, (Address::ScaleFactor)0, +0x4e20f145), r10);",              // IID32
-    "__ movb(Address(r23, r23, (Address::ScaleFactor)0, -0x3f51b77), r10);",              // IID33
-    "__ movl(Address(r31, r22, (Address::ScaleFactor)0, +0xfac5466), r30);",              // IID34
-    "__ xaddb(Address(rbx, -0x70025991), r31);",                                          // IID35
-    "__ xaddw(Address(r17, r26, (Address::ScaleFactor)1, -0x530c0221), r29);",            // IID36
-    "__ xaddl(Address(r9, r21, (Address::ScaleFactor)0, -0x7b7336bf), r17);",             // IID37
-    "__ adcl(Address(r24, r12, (Address::ScaleFactor)2, +0x691b07e5), 65536);",           // IID38
-    "__ andl(Address(r14, r9, (Address::ScaleFactor)0, -0x115d5957), 16);",               // IID39
-    "__ addb(Address(r21, -0x1d3e83ad), 64);",                                            // IID40
-    "__ addw(Address(r12, +0x3a7acf9a), 4096);",                                          // IID41
-    "__ addl(Address(r30, r14, (Address::ScaleFactor)1, -0x2073ed16), 256);",             // IID42
-    "__ cmpb(Address(r28, r18, (Address::ScaleFactor)0, +0x6fd326d5), 16);",              // IID43
-    "__ cmpw(Address(r12, r14, (Address::ScaleFactor)1, +0x2ae6568f), 256);",             // IID44
-    "__ cmpl(Address(r24, r30, (Address::ScaleFactor)3, -0x11b9aeac), 1048576);",         // IID45
-    "__ sarl(Address(r22, r30, (Address::ScaleFactor)2, +0x60cb9115), 1);",               // IID46
-    "__ sall(Address(r31, r8, (Address::ScaleFactor)1, +0x236d8ab9), 16);",               // IID47
-    "__ sbbl(Address(r21, r12, (Address::ScaleFactor)1, -0x7d9b9f18), 16777216);",        // IID48
-    "__ shrl(Address(r29, r17, (Address::ScaleFactor)0, -0x7c54f216), 8);",               // IID49
-    "__ subl(Address(r8, r27, (Address::ScaleFactor)2, -0x1190e2c6), 16);",               // IID50
-    "__ xorl(Address(rdx, +0x50dd3396), 1048576);",                                       // IID51
-    "__ orb(Address(r20, -0x7dd1f614), 64);",                                             // IID52
-    "__ orl(Address(r18, +0x6f852a9f), 16);",                                             // IID53
-    "__ movb(Address(r20, r8, (Address::ScaleFactor)2, +0x436e2aa), 1);",                 // IID54
-    "__ movl(Address(rcx, r14, (Address::ScaleFactor)1, +0x883df84), 16);",               // IID55
-    "__ testb(Address(r11, r10, (Address::ScaleFactor)1, -0x1fc2039b), 16);",             // IID56
-    "__ testl(Address(r29, +0x73b9f003), 67108864);",                                     // IID57
-    "__ cmpl_imm32(Address(r29, rcx, (Address::ScaleFactor)2, +0x4ca2b092), 4194304);",   // IID58
-    "__ addl(r8, Address(rdx, r24, (Address::ScaleFactor)2, -0x1e1524dc));",              // IID59
-    "__ andl(r19, Address(r20, r20, (Address::ScaleFactor)1, +0x6286892));",              // IID60
-    "__ cmpb(r11, Address(r13, -0x42e0bf9e));",                                           // IID61
-    "__ cmpl(r20, Address(rbx, r30, (Address::ScaleFactor)3, -0x30497735));",             // IID62
-    "__ lzcntl(r8, Address(rdx, r9, (Address::ScaleFactor)1, +0xe2e99e));",               // IID63
-    "__ orl(r9, Address(r29, r25, (Address::ScaleFactor)1, +0x50169f63));",               // IID64
-    "__ adcl(r17, Address(r31, r21, (Address::ScaleFactor)3, +0x79efd170));",             // IID65
-    "__ imull(r23, Address(r8, -0xa521f73));",                                            // IID66
-    "__ popcntl(r30, Address(r10, +0x44352901));",                                        // IID67
-    "__ sbbl(r16, Address(r18, r14, (Address::ScaleFactor)1, -0xda8278a));",              // IID68
-    "__ subl(r17, Address(r22, +0x2d63aab3));",                                           // IID69
-    "__ tzcntl(r23, Address(r21, r11, (Address::ScaleFactor)0, -0x18bc7469));",           // IID70
-    "__ xorb(r9, Address(r19, rdx, (Address::ScaleFactor)0, -0x5f6207ed));",              // IID71
-    "__ xorw(r11, Address(r21, r10, (Address::ScaleFactor)2, -0x63c79f2b));",             // IID72
-    "__ xorl(r29, Address(r31, rcx, (Address::ScaleFactor)3, +0x34d93c0f));",             // IID73
-    "__ movb(r17, Address(r8, r18, (Address::ScaleFactor)2, -0x38ff3ad7));",              // IID74
-    "__ movl(r31, Address(r20, r11, (Address::ScaleFactor)2, -0x1d23470c));",             // IID75
-    "__ leal(r31, Address(rbx, r12, (Address::ScaleFactor)2, -0x3b4a4215));",             // IID76
-    "__ xchgb(r20, Address(r30, r24, (Address::ScaleFactor)0, -0x5c4e82bc));",            // IID77
-    "__ xchgw(r13, Address(r10, r21, (Address::ScaleFactor)3, +0x19bd4a03));",            // IID78
-    "__ xchgl(r23, Address(r16, r13, (Address::ScaleFactor)2, -0x6a0293d6));",            // IID79
-    "__ testl(r13, Address(r9, +0x34a6ff61));",                                           // IID80
-    "__ addb(r23, 4);",                                                                   // IID81
-    "__ addl(r28, 65536);",                                                               // IID82
-#endif // _LP64
-    "__ andl(rdx, 65536);",                                                               // IID83
-#ifdef _LP64
-    "__ adcl(r27, 1048576);",                                                             // IID84
-    "__ cmpb(r13, 4);",                                                                   // IID85
-    "__ cmpl(r29, 268435456);",                                                           // IID86
-    "__ rcll(r20, 16);",                                                                  // IID87
-    "__ roll(r25, 2);",                                                                   // IID88
+    "__ shldl(r12, r22);",                                                                // IID0
+    "__ shrdl(r21, r15);",                                                                // IID1
+    "__ adcl(r27, r24);",                                                                 // IID2
+    "__ cmpl(r31, r29);",                                                                 // IID3
+    "__ imull(r8, rdx);",                                                                 // IID4
+    "__ popcntl(r8, r16);",                                                               // IID5
+    "__ sbbl(rcx, r11);",                                                                 // IID6
+    "__ subl(r18, r30);",                                                                 // IID7
+    "__ tzcntl(r16, r14);",                                                               // IID8
+    "__ lzcntl(r30, rbx);",                                                               // IID9
+    "__ addl(r12, r8);",                                                                  // IID10
+    "__ andl(r19, r15);",                                                                 // IID11
+    "__ orl(r26, r18);",                                                                  // IID12
+    "__ xorl(r19, r22);",                                                                 // IID13
+    "__ movl(r14, r17);",                                                                 // IID14
+    "__ bsfl(r20, r29);",                                                                 // IID15
+    "__ bsrl(r9, r27);",                                                                  // IID16
+    "__ xchgl(r15, r24);",                                                                // IID17
+    "__ testl(r21, r11);",                                                                // IID18
+    "__ addb(Address(r9, -0x73feffaa), r18);",                                            // IID19
+    "__ addw(Address(r19, r15, (Address::ScaleFactor)0, -0x5e89f90c), r26);",             // IID20
+    "__ addl(Address(r20, r12, (Address::ScaleFactor)3, -0x5cc4103c), r21);",             // IID21
+    "__ adcl(Address(rbx, r13, (Address::ScaleFactor)2, -0x2b74f9bd), r22);",             // IID22
+    "__ andb(Address(r14, +0x6205f27c), r30);",                                           // IID23
+    "__ andl(Address(r29, rbx, (Address::ScaleFactor)3, -0x78b1f32a), r29);",             // IID24
+    "__ cmpb(Address(r23, r22, (Address::ScaleFactor)0, +0x3375d32), r27);",              // IID25
+    "__ cmpw(Address(r27, r16, (Address::ScaleFactor)1, -0x28a77155), r15);",             // IID26
+    "__ cmpl(Address(r29, r25, (Address::ScaleFactor)1, -0x54626655), r21);",             // IID27
+    "__ orb(Address(r11, r25, (Address::ScaleFactor)3, +0xab498c3), rcx);",               // IID28
+    "__ orl(Address(r23, r30, (Address::ScaleFactor)0, +0x4d806ea0), r20);",              // IID29
+    "__ xorb(Address(r12, r9, (Address::ScaleFactor)3, -0x2bf5b0e9), rbx);",              // IID30
+    "__ xorl(Address(r16, r16, (Address::ScaleFactor)1, -0x2a7d9754), r19);",             // IID31
+    "__ subl(Address(r29, r15, (Address::ScaleFactor)2, -0x55a7da9d), r25);",             // IID32
+    "__ movb(Address(r13, r26, (Address::ScaleFactor)1, -0x5c442d70), r15);",             // IID33
+    "__ movl(Address(r9, r8, (Address::ScaleFactor)0, -0x35b475e4), r20);",               // IID34
+    "__ xaddb(Address(r10, -0x13ca898f), r22);",                                          // IID35
+    "__ xaddw(Address(r17, r16, (Address::ScaleFactor)3, +0x46adddb8), r12);",            // IID36
+    "__ xaddl(Address(r30, +0x454d6731), r31);",                                          // IID37
+    "__ adcl(Address(r13, r25, (Address::ScaleFactor)3, -0x2c70c098), 4096);",            // IID38
+    "__ andl(Address(r30, r9, (Address::ScaleFactor)3, +0x28d9e535), 16777216);",         // IID39
+    "__ addb(Address(r20, r29, (Address::ScaleFactor)0, -0x1c59007c), 4);",               // IID40
+    "__ addw(Address(rbx, r22, (Address::ScaleFactor)0, -0x10a08289), 4096);",            // IID41
+    "__ addl(Address(r18, r18, (Address::ScaleFactor)2, +0x19b94ca2), 256);",             // IID42
+    "__ cmpb(Address(r22, r17, (Address::ScaleFactor)1, +0x41a9f28a), 16);",              // IID43
+    "__ cmpw(Address(r18, r15, (Address::ScaleFactor)2, +0xf2e8b83), 1024);",             // IID44
+    "__ cmpl(Address(r24, -0x78764a55), 65536);",                                         // IID45
+    "__ sarl(Address(r12, r30, (Address::ScaleFactor)1, +0xfb953d0), 1);",                // IID46
+    "__ sall(Address(r10, r9, (Address::ScaleFactor)0, +0x362d3e3d), 2);",                // IID47
+    "__ sbbl(Address(r10, r20, (Address::ScaleFactor)1, +0x3be9dda1), 256);",             // IID48
+    "__ shrl(Address(r20, rcx, (Address::ScaleFactor)2, +0x4cede69d), 2);",               // IID49
+    "__ subl(Address(r30, -0x1a8d9f97), 268435456);",                                     // IID50
+    "__ xorl(Address(r11, -0x27038f48), 16);",                                            // IID51
+    "__ orb(Address(rdx, r19, (Address::ScaleFactor)3, -0x18ff3fa4), 64);",               // IID52
+    "__ orl(Address(r19, -0x25588e31), 16);",                                             // IID53
+    "__ movb(Address(r21, -0x4e1a5d59), 16);",                                            // IID54
+    "__ movl(Address(r22, -0x6e91ff19), 268435456);",                                     // IID55
+    "__ testb(Address(r29, -0x5e98c4c2), 1);",                                            // IID56
+    "__ testl(Address(r10, rcx, (Address::ScaleFactor)2, +0x2ec26eed), 67108864);",       // IID57
+    "__ cmpl_imm32(Address(r10, rbx, (Address::ScaleFactor)2, -0x133fff6e), 16777216);",  // IID58
+    "__ addl(r24, Address(r21, r22, (Address::ScaleFactor)0, -0x288426e1));",             // IID59
+    "__ andl(r28, Address(r23, rcx, (Address::ScaleFactor)3, +0x1fdf4486));",             // IID60
+    "__ cmpb(r13, Address(r22, +0x5721c974));",                                           // IID61
+    "__ cmpl(r21, Address(rbx, r24, (Address::ScaleFactor)1, -0x7efba0fe));",             // IID62
+    "__ lzcntl(r10, Address(rdx, r14, (Address::ScaleFactor)0, +0x1f9fa862));",           // IID63
+    "__ orl(r12, Address(r11, r8, (Address::ScaleFactor)1, +0x3840466e));",               // IID64
+    "__ adcl(r28, Address(r28, r11, (Address::ScaleFactor)0, +0x4aea6a91));",             // IID65
+    "__ imull(r19, Address(r8, r27, (Address::ScaleFactor)3, -0x7d0eb0fa));",             // IID66
+    "__ popcntl(rcx, Address(r17, +0x6dfb7df8));",                                        // IID67
+    "__ sbbl(rdx, Address(r19, r22, (Address::ScaleFactor)0, +0x7e90f232));",             // IID68
+    "__ subl(r17, Address(r16, -0x1bb206d4));",                                           // IID69
+    "__ tzcntl(r16, Address(r27, r24, (Address::ScaleFactor)3, -0x64cf395e));",           // IID70
+    "__ xorb(r22, Address(r11, r29, (Address::ScaleFactor)3, -0x185b1ffd));",             // IID71
+    "__ xorw(r13, Address(r24, r27, (Address::ScaleFactor)0, -0x4d404400));",             // IID72
+    "__ xorl(r14, Address(rcx, -0x6c367083));",                                           // IID73
+    "__ movb(r13, Address(r27, r22, (Address::ScaleFactor)0, -0x29d87e21));",             // IID74
+    "__ movl(r18, Address(r27, +0x3c8204b3));",                                           // IID75
+    "__ leal(r13, Address(rbx, r15, (Address::ScaleFactor)3, -0x7b46c241));",             // IID76
+    "__ xchgb(r25, Address(r23, r19, (Address::ScaleFactor)0, -0x7e27b8b4));",            // IID77
+    "__ xchgw(r26, Address(r11, -0x2c88ec60));",                                          // IID78
+    "__ xchgl(r18, Address(r30, r28, (Address::ScaleFactor)2, +0x1008843));",             // IID79
+    "__ testl(r21, Address(r8, +0x6669fd21));",                                           // IID80
+    "__ addb(r31, 4);",                                                                   // IID81
+    "__ addl(r11, 16777216);",                                                            // IID82
+    "__ andl(r25, 1);",                                                                   // IID83
+    "__ adcl(r17, 16777216);",                                                            // IID84
+    "__ cmpb(r18, 4);",                                                                   // IID85
+    "__ cmpl(r9, 256);",                                                                  // IID86
+    "__ rcll(r17, 2);",                                                                   // IID87
+    "__ roll(r13, 16);",                                                                  // IID88
+    "__ rorl(r27, 2);",                                                                   // IID89
+    "__ sarl(r24, 8);",                                                                   // IID90
+    "__ sall(r19, 16);",                                                                  // IID91
+    "__ sbbl(r19, 1048576);",                                                             // IID92
+    "__ shll(r20, 16);",                                                                  // IID93
+    "__ shrl(r27, 4);",                                                                   // IID94
+    "__ subl(r24, 16);",                                                                  // IID95
+    "__ xorl(r27, 1048576);",                                                             // IID96
+    "__ movl(r21, 1);",                                                                   // IID97
+    "__ testb(r31, 16);",                                                                 // IID98
+    "__ testl(r9, 4194304);",                                                             // IID99
+    "__ subl_imm32(r30, 65536);",                                                         // IID100
+    "__ cmovl(Assembler::Condition::overflow, r14, Address(r19, -0x50bc8441));",          // IID101
+    "__ cmovl(Assembler::Condition::noOverflow, r15, Address(r10, r21, (Address::ScaleFactor)1, -0x49cea2b3));", // IID102
+    "__ cmovl(Assembler::Condition::below, rbx, Address(r14, +0x6909ad63));",             // IID103
+    "__ cmovl(Assembler::Condition::aboveEqual, r16, Address(r9, r17, (Address::ScaleFactor)2, -0x6dcba209));", // IID104
+    "__ cmovl(Assembler::Condition::zero, r13, Address(r11, +0x955a68e));",               // IID105
+    "__ cmovl(Assembler::Condition::notZero, r17, Address(r29, r9, (Address::ScaleFactor)0, -0x5829d35b));", // IID106
+    "__ cmovl(Assembler::Condition::belowEqual, r8, Address(r21, r30, (Address::ScaleFactor)3, -0x59a28591));", // IID107
+    "__ cmovl(Assembler::Condition::above, r22, Address(r19, r10, (Address::ScaleFactor)1, -0x38931205));", // IID108
+    "__ cmovl(Assembler::Condition::negative, r25, Address(r23, r18, (Address::ScaleFactor)0, -0x6a417c17));", // IID109
+    "__ cmovl(Assembler::Condition::positive, rbx, Address(r10, r9, (Address::ScaleFactor)3, +0x7bd43bff));", // IID110
+    "__ cmovl(Assembler::Condition::parity, rdx, Address(r8, r14, (Address::ScaleFactor)3, +0x3410bc6b));", // IID111
+    "__ cmovl(Assembler::Condition::noParity, r12, Address(rcx, r9, (Address::ScaleFactor)2, +0x4a663482));", // IID112
+    "__ cmovl(Assembler::Condition::less, r21, Address(r13, r22, (Address::ScaleFactor)1, -0x638eaf19));", // IID113
+    "__ cmovl(Assembler::Condition::greaterEqual, r19, Address(r25, r24, (Address::ScaleFactor)1, -0x5aa808c5));", // IID114
+    "__ cmovl(Assembler::Condition::lessEqual, rcx, Address(rcx, +0x4497f29));",          // IID115
+    "__ cmovl(Assembler::Condition::greater, rcx, Address(r13, r17, (Address::ScaleFactor)3, +0x2a779b38));", // IID116
+    "__ setb(Assembler::Condition::overflow, r22);",                                      // IID117
+    "__ setb(Assembler::Condition::noOverflow, r27);",                                    // IID118
+    "__ setb(Assembler::Condition::below, r20);",                                         // IID119
+    "__ setb(Assembler::Condition::aboveEqual, r12);",                                    // IID120
 #endif // _LP64
-    "__ rorl(rdx, 4);",                                                                   // IID89
-    "__ sarl(rcx, 1);",                                                                   // IID90
+    "__ setb(Assembler::Condition::zero, rdx);",                                          // IID121
 #ifdef _LP64
-    "__ sall(r19, 16);",                                                                  // IID91
-    "__ sbbl(r9, 1);",                                                                    // IID92
-    "__ shll(r20, 8);",                                                                   // IID93
+    "__ setb(Assembler::Condition::notZero, r17);",                                       // IID122
+    "__ setb(Assembler::Condition::belowEqual, r9);",                                     // IID123
 #endif // _LP64
-    "__ shrl(rcx, 1);",                                                                   // IID94
+    "__ setb(Assembler::Condition::above, rcx);",                                         // IID124
 #ifdef _LP64
-    "__ subl(r19, 16777216);",                                                            // IID95
-    "__ xorl(r16, 4096);",                                                                // IID96
-    "__ movl(r24, 65536);",                                                               // IID97
-    "__ testb(r20, 64);",                                                                 // IID98
-    "__ testl(r28, 16777216);",                                                           // IID99
-    "__ subl_imm32(r29, 262144);",                                                        // IID100
-    "__ cmovl(Assembler::Condition::overflow, r8, Address(r26, r28, (Address::ScaleFactor)1, +0x210f06d));", // IID101
-    "__ cmovl(Assembler::Condition::noOverflow, rbx, Address(r18, rbx, (Address::ScaleFactor)0, -0x264fce2a));", // IID102
-    "__ cmovl(Assembler::Condition::below, r29, Address(r17, r24, (Address::ScaleFactor)0, +0x46c06acb));", // IID103
-    "__ cmovl(Assembler::Condition::aboveEqual, r17, Address(r25, r11, (Address::ScaleFactor)3, -0x3b21f455));", // IID104
-    "__ cmovl(Assembler::Condition::zero, r23, Address(r20, r31, (Address::ScaleFactor)0, -0x5a03317b));", // IID105
-    "__ cmovl(Assembler::Condition::notZero, r31, Address(r31, r15, (Address::ScaleFactor)2, -0x53fc2e65));", // IID106
-    "__ cmovl(Assembler::Condition::belowEqual, r28, Address(rdx, rcx, (Address::ScaleFactor)3, -0x3bc9229f));", // IID107
-    "__ cmovl(Assembler::Condition::above, r31, Address(rdx, r19, (Address::ScaleFactor)3, +0x7bf1761c));", // IID108
-    "__ cmovl(Assembler::Condition::negative, rdx, Address(r17, r18, (Address::ScaleFactor)0, -0x1da2fc03));", // IID109
-    "__ cmovl(Assembler::Condition::positive, r9, Address(r21, r23, (Address::ScaleFactor)2, -0x2799454a));", // IID110
-    "__ cmovl(Assembler::Condition::parity, r27, Address(r13, -0x654c249c));",            // IID111
-    "__ cmovl(Assembler::Condition::noParity, rdx, Address(r24, r10, (Address::ScaleFactor)3, +0x6c96beb2));", // IID112
-    "__ cmovl(Assembler::Condition::less, r9, Address(rcx, r8, (Address::ScaleFactor)3, +0x573e1892));", // IID113
-    "__ cmovl(Assembler::Condition::greaterEqual, r31, Address(r26, r14, (Address::ScaleFactor)2, +0x717110b1));", // IID114
-    "__ cmovl(Assembler::Condition::lessEqual, r24, Address(r19, r14, (Address::ScaleFactor)2, +0x119faad7));", // IID115
-    "__ cmovl(Assembler::Condition::greater, r12, Address(r13, r12, (Address::ScaleFactor)0, +0xd537805));", // IID116
-    "__ setb(Assembler::Condition::overflow, r10);",                                      // IID117
+    "__ setb(Assembler::Condition::negative, r15);",                                      // IID125
+    "__ setb(Assembler::Condition::positive, r27);",                                      // IID126
+    "__ setb(Assembler::Condition::parity, r17);",                                        // IID127
+    "__ setb(Assembler::Condition::noParity, r17);",                                      // IID128
+    "__ setb(Assembler::Condition::less, r28);",                                          // IID129
+    "__ setb(Assembler::Condition::greaterEqual, r20);",                                  // IID130
+    "__ setb(Assembler::Condition::lessEqual, r31);",                                     // IID131
 #endif // _LP64
-    "__ setb(Assembler::Condition::noOverflow, rbx);",                                    // IID118
+    "__ setb(Assembler::Condition::greater, rdx);",                                       // IID132
 #ifdef _LP64
-    "__ setb(Assembler::Condition::below, r13);",                                         // IID119
-    "__ setb(Assembler::Condition::aboveEqual, r23);",                                    // IID120
-    "__ setb(Assembler::Condition::zero, r24);",                                          // IID121
-    "__ setb(Assembler::Condition::notZero, r15);",                                       // IID122
-    "__ setb(Assembler::Condition::belowEqual, r21);",                                    // IID123
-    "__ setb(Assembler::Condition::above, r17);",                                         // IID124
-    "__ setb(Assembler::Condition::negative, r10);",                                      // IID125
-    "__ setb(Assembler::Condition::positive, r24);",                                      // IID126
-    "__ setb(Assembler::Condition::parity, r16);",                                        // IID127
-    "__ setb(Assembler::Condition::noParity, r28);",                                      // IID128
-    "__ setb(Assembler::Condition::less, r11);",                                          // IID129
-    "__ setb(Assembler::Condition::greaterEqual, r25);",                                  // IID130
-    "__ setb(Assembler::Condition::lessEqual, r18);",                                     // IID131
-    "__ setb(Assembler::Condition::greater, r14);",                                       // IID132
-    "__ divl(r30);",                                                                      // IID133
-    "__ idivl(r23);",                                                                     // IID134
-    "__ imull(r28);",                                                                     // IID135
-    "__ mull(r31);",                                                                      // IID136
-    "__ negl(r27);",                                                                      // IID137
-    "__ notl(r16);",                                                                      // IID138
+    "__ divl(r9);",                                                                       // IID133
+    "__ idivl(r28);",                                                                     // IID134
+    "__ imull(r26);",                                                                     // IID135
+    "__ mull(r15);",                                                                      // IID136
+    "__ negl(r31);",                                                                      // IID137
+    "__ notl(r10);",                                                                      // IID138
 #endif // _LP64
-    "__ roll(rdx);",                                                                      // IID139
+    "__ roll(rcx);",                                                                      // IID139
 #ifdef _LP64
-    "__ rorl(r12);",                                                                      // IID140
-    "__ sarl(r14);",                                                                      // IID141
-    "__ sall(r19);",                                                                      // IID142
-    "__ shll(r10);",                                                                      // IID143
-    "__ shrl(r20);",                                                                      // IID144
+    "__ rorl(r23);",                                                                      // IID140
+    "__ sarl(r22);",                                                                      // IID141
+    "__ sall(r8);",                                                                       // IID142
+    "__ shll(r20);",                                                                      // IID143
+    "__ shrl(r8);",                                                                       // IID144
+    "__ incrementl(r29);",                                                                // IID145
+    "__ decrementl(r15);",                                                                // IID146
+    "__ mull(Address(r27, rdx, (Address::ScaleFactor)3, +0x199d009c));",                  // IID147
+    "__ negl(Address(r11, r9, (Address::ScaleFactor)1, -0x7f781439));",                   // IID148
+    "__ sarl(Address(r24, r22, (Address::ScaleFactor)1, -0x1cabc40a));",                  // IID149
+    "__ sall(Address(r24, +0x57bb4bfb));",                                                // IID150
+    "__ shrl(Address(r31, +0x5490e5af));",                                                // IID151
+    "__ incrementl(Address(r27, r13, (Address::ScaleFactor)1, +0x2366d44f));",            // IID152
+    "__ decrementl(Address(r28, +0x1e7c7207));",                                          // IID153
+    "__ imull(r14, Address(r14, r17, (Address::ScaleFactor)3, +0x13a05771), 268435456);", // IID154
+    "__ imull(r18, r23, 16);",                                                            // IID155
+    "__ shldl(r24, r31, 4);",                                                             // IID156
+    "__ shrdl(r11, r30, 2);",                                                             // IID157
+    "__ movzbl(rbx, Address(r23, r24, (Address::ScaleFactor)1, -0x5cb6670d));",           // IID158
+    "__ movzwl(r20, Address(rcx, r16, (Address::ScaleFactor)0, -0x64733fd2));",           // IID159
+    "__ movsbl(r12, Address(r29, r15, (Address::ScaleFactor)2, +0x60d6eee5));",           // IID160
+    "__ movswl(r14, Address(r31, r9, (Address::ScaleFactor)3, +0x1aa5948));",             // IID161
+    "__ movzbl(r13, r29);",                                                               // IID162
+    "__ movzwl(r15, r12);",                                                               // IID163
+    "__ movsbl(r15, r25);",                                                               // IID164
+    "__ movswl(r27, r24);",                                                               // IID165
+    "__ cmpxchgb(r24, Address(r28, r25, (Address::ScaleFactor)0, +0x33efa575));",         // IID166
+    "__ cmpxchgw(r13, Address(rcx, r15, (Address::ScaleFactor)2, +0x2ac1ae4));",          // IID167
+    "__ cmpxchgl(r8, Address(r26, r11, (Address::ScaleFactor)1, -0x5b6bd4de));",          // IID168
+    "__ eidivl(r30, false);",                                                             // IID169
+    "__ eidivl(r12, true);",                                                              // IID170
+    "__ edivl(r17, false);",                                                              // IID171
+    "__ edivl(r17, true);",                                                               // IID172
 #endif // _LP64
-    "__ incrementl(rbx);",                                                                // IID145
+    "__ eimull(rcx, false);",                                                             // IID173
 #ifdef _LP64
-    "__ decrementl(r14);",                                                                // IID146
-    "__ mull(Address(r12, -0x57a4fa5e));",                                                // IID147
-    "__ negl(Address(rbx, -0x3db4cfc7));",                                                // IID148
-    "__ sarl(Address(r21, -0x7e70ad30));",                                                // IID149
-    "__ sall(Address(r21, r28, (Address::ScaleFactor)3, -0x23456bc9));",                  // IID150
-    "__ shrl(Address(r11, r13, (Address::ScaleFactor)1, -0xe00fc44));",                   // IID151
-    "__ incrementl(Address(r19, -0x5e6ad56a));",                                          // IID152
-    "__ decrementl(Address(rcx, r20, (Address::ScaleFactor)0, -0x2530b9c4));",            // IID153
-    "__ imull(r17, Address(r8, r24, (Address::ScaleFactor)1, +0x2efecf26), 1048576);",    // IID154
-    "__ imull(r9, r8, 268435456);",                                                       // IID155
-    "__ shldl(r10, r15, 8);",                                                             // IID156
-    "__ shrdl(r29, r22, 2);",                                                             // IID157
-    "__ movzbl(r14, Address(r19, -0x6c33584));",                                          // IID158
-    "__ movzwl(r25, Address(r12, r27, (Address::ScaleFactor)0, +0x2d05fa44));",           // IID159
-    "__ movsbl(r12, Address(r30, r15, (Address::ScaleFactor)0, +0x65bccac1));",           // IID160
-    "__ movswl(r26, Address(r10, r24, (Address::ScaleFactor)0, +0x1d707459));",           // IID161
-    "__ movzbl(r18, r8);",                                                                // IID162
-    "__ movzwl(r31, r9);",                                                                // IID163
-    "__ movsbl(r15, r22);",                                                               // IID164
-    "__ movswl(r24, r24);",                                                               // IID165
-    "__ cmpxchgb(r18, Address(r12, r28, (Address::ScaleFactor)1, -0x4855a65f));",         // IID166
-    "__ cmpxchgw(r28, Address(rdx, r14, (Address::ScaleFactor)3, +0x16f5a558));",         // IID167
-    "__ cmpxchgl(rdx, Address(r18, rdx, (Address::ScaleFactor)1, +0x50258d9c));",         // IID168
-    "__ adcq(r9, rbx);",                                                                  // IID169
-    "__ cmpq(r26, r24);",                                                                 // IID170
-    "__ imulq(r14, rdx);",                                                                // IID171
-    "__ popcntq(r25, r30);",                                                              // IID172
-    "__ sbbq(r24, r19);",                                                                 // IID173
-    "__ subq(r15, r11);",                                                                 // IID174
-    "__ tzcntq(r18, r21);",                                                               // IID175
-    "__ lzcntq(r15, r27);",                                                               // IID176
-    "__ addq(r21, r20);",                                                                 // IID177
-    "__ andq(r11, r26);",                                                                 // IID178
-    "__ orq(r29, r15);",                                                                  // IID179
-    "__ xorq(r24, r21);",                                                                 // IID180
-    "__ movq(r14, r13);",                                                                 // IID181
-    "__ bsfq(r11, r22);",                                                                 // IID182
-    "__ bsrq(r14, r23);",                                                                 // IID183
-    "__ btq(r22, rcx);",                                                                  // IID184
-    "__ xchgq(r25, r29);",                                                                // IID185
-    "__ testq(r15, r8);",                                                                 // IID186
-    "__ addq(Address(r14, r10, (Address::ScaleFactor)3, -0x36e6fa02), r16);",             // IID187
-    "__ andq(Address(rbx, r8, (Address::ScaleFactor)3, -0x279a21b8), r18);",              // IID188
-    "__ cmpq(Address(r24, +0x62c3c9ef), r13);",                                           // IID189
-    "__ orq(Address(r11, r22, (Address::ScaleFactor)2, +0x419fb378), r11);",              // IID190
-    "__ xorq(Address(r25, r14, (Address::ScaleFactor)2, -0x32b449dd), r13);",             // IID191
-    "__ subq(Address(r28, r31, (Address::ScaleFactor)3, +0x6ce1d361), r19);",             // IID192
-    "__ movq(Address(r25, r25, (Address::ScaleFactor)2, -0x3f5767c), r11);",              // IID193
-    "__ xaddq(Address(r19, r17, (Address::ScaleFactor)3, +0x1febf06c), r20);",            // IID194
-    "__ andq(Address(r26, r17, (Address::ScaleFactor)1, -0x6b865f05), 65536);",           // IID195
-    "__ addq(Address(r27, -0x6ec95d87), 65536);",                                         // IID196
-    "__ cmpq(Address(rbx, r26, (Address::ScaleFactor)2, -0x1eabea4), 1048576);",          // IID197
-    "__ sarq(Address(rbx, r19, (Address::ScaleFactor)0, +0x3c3c3de8), 8);",               // IID198
-    "__ salq(Address(r20, r23, (Address::ScaleFactor)1, +0x68519b6d), 8);",               // IID199
-    "__ sbbq(Address(r31, r22, (Address::ScaleFactor)0, -0x7b3d1e85), 16);",              // IID200
-    "__ shrq(Address(r15, r18, (Address::ScaleFactor)3, +0x4d9d824), 4);",                // IID201
-    "__ subq(Address(rdx, r29, (Address::ScaleFactor)2, +0x7e4aea85), 1);",               // IID202
-    "__ xorq(Address(r23, r10, (Address::ScaleFactor)1, +0x2895c620), 16777216);",        // IID203
-    "__ orq(Address(r14, r13, (Address::ScaleFactor)0, -0x771b399b), 1);",                // IID204
-    "__ movq(Address(r22, -0x63459b5a), 256);",                                           // IID205
-    "__ testq(Address(r13, -0xb9691c5), -1);",                                            // IID206
-    "__ addq(r17, Address(r15, -0x51b64b0d));",                                           // IID207
-    "__ andq(rcx, Address(r16, rcx, (Address::ScaleFactor)3, -0x1c8e4b54));",             // IID208
-    "__ cmpq(r23, Address(r17, rcx, (Address::ScaleFactor)3, -0x44705560));",             // IID209
-    "__ lzcntq(r19, Address(r19, +0x487fe792));",                                         // IID210
-    "__ orq(r11, Address(r17, -0x65de4329));",                                            // IID211
-    "__ adcq(r29, Address(r9, -0x7092dc03));",                                            // IID212
-    "__ imulq(r9, Address(r26, r26, (Address::ScaleFactor)3, -0x118287f7));",             // IID213
-    "__ popcntq(r19, Address(r15, r19, (Address::ScaleFactor)1, -0x6e31ef95));",          // IID214
-    "__ sbbq(r30, Address(r23, -0x46545c5e));",                                           // IID215
-    "__ subq(r23, Address(r31, r18, (Address::ScaleFactor)3, +0x663c37d8));",             // IID216
-    "__ tzcntq(r24, Address(r24, r25, (Address::ScaleFactor)3, -0x465a78f1));",           // IID217
-    "__ xorq(r14, Address(r15, r19, (Address::ScaleFactor)1, +0x4196affa));",             // IID218
-    "__ movq(rdx, Address(r25, r29, (Address::ScaleFactor)1, +0x115a6157));",             // IID219
-    "__ leaq(r19, Address(r28, r31, (Address::ScaleFactor)2, +0x6b82f933));",             // IID220
-    "__ cvttsd2siq(rcx, Address(r24, r21, (Address::ScaleFactor)3, -0x39dc99eb));",       // IID221
-    "__ xchgq(r29, Address(r17, r24, (Address::ScaleFactor)3, +0x5902f01d));",            // IID222
-    "__ testq(r12, Address(r24, r29, (Address::ScaleFactor)2, +0x8865bfc));",             // IID223
-    "__ addq(r10, 16);",                                                                  // IID224
-    "__ andq(r26, 256);",                                                                 // IID225
-    "__ adcq(rcx, 1);",                                                                   // IID226
-    "__ cmpq(r21, 65536);",                                                               // IID227
-    "__ rclq(r28, 4);",                                                                   // IID228
-    "__ rcrq(r28, 16);",                                                                  // IID229
-    "__ rolq(r18, 1);",                                                                   // IID230
-    "__ rorq(r26, 2);",                                                                   // IID231
-    "__ sarq(r19, 2);",                                                                   // IID232
-    "__ salq(r14, 8);",                                                                   // IID233
-    "__ sbbq(r10, 65536);",                                                               // IID234
-    "__ shlq(r30, 1);",                                                                   // IID235
-    "__ shrq(r15, 8);",                                                                   // IID236
-    "__ subq(r21, 1048576);",                                                             // IID237
-    "__ xorq(rbx, 268435456);",                                                           // IID238
-    "__ movq(r19, 16);",                                                                  // IID239
-    "__ mov64(r19, 17179869184);",                                                        // IID240
-    "__ btq(r21, 1);",                                                                    // IID241
-    "__ testq(r15, -65536);",                                                             // IID242
-    "__ orq_imm32(r21, 1073741824);",                                                     // IID243
-    "__ subq_imm32(r19, 65536);",                                                         // IID244
-    "__ cmovq(Assembler::Condition::overflow, r15, Address(r29, -0x5c98219a));",          // IID245
-    "__ cmovq(Assembler::Condition::noOverflow, rcx, Address(r21, +0x22cc581));",         // IID246
-    "__ cmovq(Assembler::Condition::below, r15, Address(r29, r13, (Address::ScaleFactor)2, -0x5e968fb9));", // IID247
-    "__ cmovq(Assembler::Condition::aboveEqual, r26, Address(r24, +0x440c6894));",        // IID248
-    "__ cmovq(Assembler::Condition::zero, r17, Address(r23, r26, (Address::ScaleFactor)3, +0x23558b4e));", // IID249
-    "__ cmovq(Assembler::Condition::notZero, r9, Address(r16, r29, (Address::ScaleFactor)3, -0x1289a3c9));", // IID250
-    "__ cmovq(Assembler::Condition::belowEqual, r8, Address(r11, -0x49e134cc));",         // IID251
-    "__ cmovq(Assembler::Condition::above, r26, Address(r11, r20, (Address::ScaleFactor)1, -0x3ef9057a));", // IID252
-    "__ cmovq(Assembler::Condition::negative, r11, Address(r26, r13, (Address::ScaleFactor)2, +0x4bd18f9f));", // IID253
-    "__ cmovq(Assembler::Condition::positive, r8, Address(r9, r11, (Address::ScaleFactor)3, +0x4b42a528));", // IID254
-    "__ cmovq(Assembler::Condition::parity, r12, Address(r19, r9, (Address::ScaleFactor)1, +0x68559a1c));", // IID255
-    "__ cmovq(Assembler::Condition::noParity, r22, Address(r18, r17, (Address::ScaleFactor)1, +0x2c4d8e80));", // IID256
-    "__ cmovq(Assembler::Condition::less, r26, Address(r18, r30, (Address::ScaleFactor)0, -0x2ae8896e));", // IID257
-    "__ cmovq(Assembler::Condition::greaterEqual, r22, Address(r11, +0x4fefa622));",      // IID258
-    "__ cmovq(Assembler::Condition::lessEqual, r28, Address(r18, r27, (Address::ScaleFactor)1, +0x6b7a8c34));", // IID259
-    "__ cmovq(Assembler::Condition::greater, r20, Address(r23, r20, (Address::ScaleFactor)0, -0x12e725c5));", // IID260
-    "__ call(r9);",                                                                       // IID261
-    "__ divq(r22);",                                                                      // IID262
-    "__ idivq(r29);",                                                                     // IID263
-    "__ imulq(rbx);",                                                                     // IID264
-    "__ mulq(r27);",                                                                      // IID265
-    "__ negq(rbx);",                                                                      // IID266
-    "__ notq(r17);",                                                                      // IID267
-    "__ rolq(r25);",                                                                      // IID268
-    "__ rorq(rbx);",                                                                      // IID269
-    "__ sarq(r17);",                                                                      // IID270
-    "__ salq(r28);",                                                                      // IID271
-    "__ shlq(r28);",                                                                      // IID272
-    "__ shrq(r30);",                                                                      // IID273
-    "__ incrementq(r27);",                                                                // IID274
-    "__ decrementq(rdx);",                                                                // IID275
-    "__ pushp(r27);",                                                                     // IID276
-    "__ popp(r10);",                                                                      // IID277
-    "__ call(Address(r27, -0x22db8705));",                                                // IID278
-    "__ mulq(Address(r27, r21, (Address::ScaleFactor)0, -0x1f59ff9c));",                  // IID279
-    "__ negq(Address(r19, rcx, (Address::ScaleFactor)3, +0x7a47b812));",                  // IID280
-    "__ sarq(Address(r18, r21, (Address::ScaleFactor)1, -0x48857a46));",                  // IID281
-    "__ salq(Address(r24, -0x7a2bda2c));",                                                // IID282
-    "__ shrq(Address(r24, +0x1abd92f));",                                                 // IID283
-    "__ incrementq(Address(r9, r9, (Address::ScaleFactor)3, +0x31a92520));",              // IID284
-    "__ decrementq(Address(r9, r8, (Address::ScaleFactor)0, +0x7f14b4bd));",              // IID285
-    "__ imulq(r14, Address(r29, r15, (Address::ScaleFactor)1, +0x5281cf9c), 256);",       // IID286
-    "__ imulq(r16, r28, 1048576);",                                                       // IID287
-    "__ shldq(r17, r24, 2);",                                                             // IID288
-    "__ shrdq(r16, r11, 2);",                                                             // IID289
-    "__ pop2(r10, r11);",                                                                 // IID290
-    "__ pop2p(r15, r24);",                                                                // IID291
-    "__ push2(r28, r11);",                                                                // IID292
-    "__ push2p(r12, r31);",                                                               // IID293
-    "__ movzbq(r24, Address(r22, r16, (Address::ScaleFactor)0, +0x511be837));",           // IID294
-    "__ movzwq(r15, Address(r15, r26, (Address::ScaleFactor)2, -0x38794ee));",            // IID295
-    "__ movsbq(r15, Address(r25, r16, (Address::ScaleFactor)3, -0x7a092741));",           // IID296
-    "__ movswq(rdx, Address(r28, r19, (Address::ScaleFactor)2, +0x79da6a));",             // IID297
-    "__ movzbq(r27, r9);",                                                                // IID298
-    "__ movzwq(r25, r21);",                                                               // IID299
-    "__ movsbq(r14, r12);",                                                               // IID300
-    "__ movswq(r23, r11);",                                                               // IID301
-    "__ cmpxchgq(r30, Address(r12, -0x65a974df));",                                       // IID302
+    "__ eimull(r13, true);",                                                              // IID174
+    "__ emull(r23, false);",                                                              // IID175
+    "__ emull(r25, true);",                                                               // IID176
+    "__ emull(Address(r22, r10, (Address::ScaleFactor)1, -0x3d379b56), false);",          // IID177
+    "__ emull(Address(r11, -0x3249efaf), true);",                                         // IID178
+    "__ elzcntl(r9, r16, false);",                                                        // IID179
+    "__ elzcntl(r23, r28, true);",                                                        // IID180
+    "__ enegl(r8, r30, false);",                                                          // IID181
+    "__ enegl(r23, r11, true);",                                                          // IID182
+    "__ epopcntl(r13, r16, false);",                                                      // IID183
+    "__ epopcntl(r11, r11, true);",                                                       // IID184
+    "__ enotl(r26, rcx);",                                                                // IID185
+    "__ eroll(rbx, r10, false);",                                                         // IID186
+    "__ eroll(r14, r29, true);",                                                          // IID187
+    "__ erorl(r15, r20, false);",                                                         // IID188
+    "__ erorl(r17, r12, true);",                                                          // IID189
+    "__ esall(r12, rbx, false);",                                                         // IID190
+    "__ esall(r23, r27, true);",                                                          // IID191
+    "__ esarl(r29, r20, false);",                                                         // IID192
+    "__ esarl(r28, rdx, true);",                                                          // IID193
+    "__ edecl(r8, r27, false);",                                                          // IID194
+    "__ edecl(rbx, r15, true);",                                                          // IID195
+    "__ eincl(r11, r27, false);",                                                         // IID196
+    "__ eincl(r29, r25, true);",                                                          // IID197
+    "__ eshll(r12, r8, false);",                                                          // IID198
+    "__ eshll(r11, r18, true);",                                                          // IID199
+    "__ eshrl(rdx, r13, false);",                                                         // IID200
+    "__ eshrl(r23, r24, true);",                                                          // IID201
+    "__ etzcntl(r15, r15, false);",                                                       // IID202
+    "__ etzcntl(r26, r28, true);",                                                        // IID203
+    "__ elzcntl(rbx, Address(r25, r14, (Address::ScaleFactor)0, +0x1c13fdb6), false);",   // IID204
+    "__ elzcntl(r9, Address(r31, r28, (Address::ScaleFactor)3, -0x30bf8b7f), true);",     // IID205
+    "__ enegl(r8, Address(r25, -0x9c80fe2), false);",                                     // IID206
+    "__ enegl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true);",      // IID207
+    "__ epopcntl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false);",  // IID208
+    "__ epopcntl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true);",   // IID209
+    "__ esall(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false);",     // IID210
+    "__ esall(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true);",      // IID211
+    "__ esarl(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false);",     // IID212
+    "__ esarl(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true);",       // IID213
+    "__ edecl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false);",     // IID214
+    "__ edecl(r26, Address(r25, +0x3d145d48), true);",                                    // IID215
+    "__ eincl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false);",     // IID216
+    "__ eincl(r11, Address(r22, +0x765904a6), true);",                                    // IID217
+    "__ eshrl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false);",     // IID218
+    "__ eshrl(r22, Address(r12, -0x50325da9), true);",                                    // IID219
+    "__ etzcntl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false);",    // IID220
+    "__ etzcntl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true);",    // IID221
+    "__ eaddl(r22, Address(r27, r31, (Address::ScaleFactor)2, -0x7f80902f), 1048576, false);", // IID222
+    "__ eaddl(r31, Address(rdx, r21, (Address::ScaleFactor)3, -0x557cc036), 268435456, true);", // IID223
+    "__ eandl(r10, Address(r26, +0x4e6bebf9), 4096, false);",                             // IID224
+    "__ eandl(r13, Address(r30, +0x14f1a5fd), 256, true);",                               // IID225
+    "__ eimull(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false);",  // IID226
+    "__ eimull(r27, Address(r9, -0x446d2dc1), 256, true);",                               // IID227
+    "__ eorl(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false);",  // IID228
+    "__ eorl(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true);",    // IID229
+    "__ eorb(r15, Address(r9, -0x25974a1e), 64, false);",                                 // IID230
+    "__ eorb(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4, true);",    // IID231
+    "__ esall(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false);",  // IID232
+    "__ esall(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 8, true);",    // IID233
+    "__ esarl(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false);",   // IID234
+    "__ esarl(r15, Address(r25, -0x505836f3), 16, true);",                                // IID235
+    "__ eshrl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false);",   // IID236
+    "__ eshrl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true);",   // IID237
+    "__ esubl(rbx, Address(r12, r8, (Address::ScaleFactor)1, -0x3575087f), 4096, false);", // IID238
+    "__ esubl(r28, Address(rbx, r21, (Address::ScaleFactor)3, -0x55f83db8), 65536, true);", // IID239
+    "__ exorl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false);",  // IID240
+    "__ exorl(r28, Address(r18, -0x452348a1), 16777216, true);",                          // IID241
+    "__ eaddl(r18, Address(rdx, r10, (Address::ScaleFactor)2, -0x161e1d47), r16, false);", // IID242
+    "__ eaddl(r27, Address(r25, r18, (Address::ScaleFactor)3, -0x679bb823), rdx, true);", // IID243
+    "__ eorl(r27, Address(r31, r29, (Address::ScaleFactor)3, +0x19ed7934), r9, false);",  // IID244
+    "__ eorl(r22, Address(r8, r16, (Address::ScaleFactor)2, -0x1bf71f78), r17, true);",   // IID245
+    "__ eorb(rcx, Address(r15, r28, (Address::ScaleFactor)3, -0x6a4a3934), r16, false);", // IID246
+    "__ eorb(r28, Address(r23, r12, (Address::ScaleFactor)2, +0x3c2449f7), r16, true);",  // IID247
+    "__ esubl(r22, Address(r27, r10, (Address::ScaleFactor)1, -0x3c29396f), r9, false);", // IID248
+    "__ esubl(r10, Address(r16, -0x165064ff), r17, true);",                               // IID249
+    "__ exorl(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false);", // IID250
+    "__ exorl(rdx, Address(rbx, r31, (Address::ScaleFactor)3, +0x7753d0dc), r17, true);", // IID251
+    "__ exorb(r9, Address(r31, +0x72a4f58e), r30, false);",                               // IID252
+    "__ exorb(r24, Address(r25, r15, (Address::ScaleFactor)0, +0x20fc1a0a), r16, true);", // IID253
+    "__ eaddl(r12, rbx, 65536, false);",                                                  // IID254
+    "__ eaddl(r20, r24, 4096, true);",                                                    // IID255
+    "__ eandl(r18, r26, 1048576, false);",                                                // IID256
+    "__ eandl(r29, r13, 1, true);",                                                       // IID257
+    "__ eimull(rcx, r31, 65536, false);",                                                 // IID258
+    "__ eimull(r23, r29, 65536, true);",                                                  // IID259
+    "__ eorl(r23, r23, 1048576, false);",                                                 // IID260
+    "__ eorl(r21, r9, 268435456, true);",                                                 // IID261
+    "__ ercll(r13, rdx, 4);",                                                             // IID262
+    "__ eroll(r15, r31, 8, false);",                                                      // IID263
+    "__ eroll(r8, r9, 2, true);",                                                         // IID264
+    "__ erorl(r9, r15, 8, false);",                                                       // IID265
+    "__ erorl(r21, r12, 8, true);",                                                       // IID266
+    "__ esall(r19, r27, 1, false);",                                                      // IID267
+    "__ esall(r10, r11, 16, true);",                                                      // IID268
+    "__ esarl(r8, rdx, 8, false);",                                                       // IID269
+    "__ esarl(r22, r30, 4, true);",                                                       // IID270
+    "__ eshll(r25, r31, 16, false);",                                                     // IID271
+    "__ eshll(r10, r9, 8, true);",                                                        // IID272
+    "__ eshrl(r13, r8, 4, false);",                                                       // IID273
+    "__ eshrl(r16, r21, 16, true);",                                                      // IID274
+    "__ esubl(r26, r23, 16777216, false);",                                               // IID275
+    "__ esubl(r26, r14, 1048576, true);",                                                 // IID276
+    "__ exorl(r27, r26, 256, false);",                                                    // IID277
+    "__ exorl(r22, r9, 1, true);",                                                        // IID278
+    "__ esubl_imm32(r22, r30, 268435456, false);",                                        // IID279
+    "__ esubl_imm32(r8, r16, 4194304, true);",                                            // IID280
+    "__ eaddl(r20, r29, Address(r11, r12, (Address::ScaleFactor)1, +0xac0980), false);",  // IID281
+    "__ eaddl(r18, rbx, Address(r9, r18, (Address::ScaleFactor)1, +0x434a125d), true);",  // IID282
+    "__ eandl(r14, r15, Address(r14, r19, (Address::ScaleFactor)2, +0x15a5a5ee), false);", // IID283
+    "__ eandl(r28, r31, Address(r24, r12, (Address::ScaleFactor)3, -0x6d6d7e68), true);", // IID284
+    "__ eimull(r24, r13, Address(r24, r25, (Address::ScaleFactor)3, +0x784673fd), false);", // IID285
+    "__ eimull(r24, r21, Address(r8, r13, (Address::ScaleFactor)2, -0x63663889), true);", // IID286
+    "__ eorl(r12, r24, Address(r30, -0x67526556), false);",                               // IID287
+    "__ eorl(r13, r13, Address(rbx, r25, (Address::ScaleFactor)2, -0x5f394dd9), true);",  // IID288
+    "__ esubl(r26, r25, Address(r25, rdx, (Address::ScaleFactor)3, -0x2e39f79a), false);", // IID289
+    "__ esubl(r28, r8, Address(rdx, r24, (Address::ScaleFactor)3, -0xed99a54), true);",   // IID290
+    "__ exorl(r31, r22, Address(r30, r20, (Address::ScaleFactor)3, +0x3ac41cbd), false);", // IID291
+    "__ exorl(r24, r30, Address(r13, r17, (Address::ScaleFactor)1, +0x1efdc2e3), true);", // IID292
+    "__ exorb(r16, r16, Address(r9, r15, (Address::ScaleFactor)1, +0x769feb34), false);", // IID293
+    "__ exorb(r19, r25, Address(r10, +0x2239b429), true);",                               // IID294
+    "__ exorw(r25, r19, Address(r16, r24, (Address::ScaleFactor)1, +0x1c71faea), false);", // IID295
+    "__ exorw(r19, r10, Address(r28, -0x299a0cfd), true);",                               // IID296
+    "__ eaddl(rbx, r23, r24, false);",                                                    // IID297
+    "__ eaddl(r28, r14, r24, true);",                                                     // IID298
+    "__ eandl(r30, r31, r26, false);",                                                    // IID299
+    "__ eandl(r12, r31, r23, true);",                                                     // IID300
+    "__ eimull(r9, r20, r10, false);",                                                    // IID301
+    "__ eimull(r13, r30, r9, true);",                                                     // IID302
+    "__ eorw(r25, r19, r23, false);",                                                     // IID303
+    "__ eorw(r12, r16, rdx, true);",                                                      // IID304
+    "__ eorl(r31, r17, r9, false);",                                                      // IID305
+    "__ eorl(r15, r13, rbx, true);",                                                      // IID306
+    "__ eshldl(r28, rbx, r29, false);",                                                   // IID307
+    "__ eshldl(r22, rbx, r8, true);",                                                     // IID308
+    "__ eshrdl(r8, r11, r16, false);",                                                    // IID309
+    "__ eshrdl(r13, r12, r15, true);",                                                    // IID310
+    "__ esubl(r17, r23, r31, false);",                                                    // IID311
+    "__ esubl(r20, r22, r26, true);",                                                     // IID312
+    "__ exorl(r10, r25, r19, false);",                                                    // IID313
+    "__ exorl(r11, r19, r30, true);",                                                     // IID314
+    "__ eshldl(r12, r10, rdx, 1, false);",                                                // IID315
+    "__ eshldl(r20, r30, r18, 16, true);",                                                // IID316
+    "__ eshrdl(r18, r25, r18, 8, false);",                                                // IID317
+    "__ eshrdl(r19, r16, r25, 1, true);",                                                 // IID318
+    "__ ecmovl (Assembler::Condition::overflow, r11, r31, r24);",                         // IID319
+    "__ ecmovl (Assembler::Condition::noOverflow, r14, r30, r16);",                       // IID320
+    "__ ecmovl (Assembler::Condition::below, r9, r11, r26);",                             // IID321
+    "__ ecmovl (Assembler::Condition::aboveEqual, r27, rdx, r31);",                       // IID322
+    "__ ecmovl (Assembler::Condition::zero, r24, r29, r10);",                             // IID323
+    "__ ecmovl (Assembler::Condition::notZero, rcx, r21, r15);",                          // IID324
+    "__ ecmovl (Assembler::Condition::belowEqual, r23, r17, r26);",                       // IID325
+    "__ ecmovl (Assembler::Condition::above, r20, r27, r13);",                            // IID326
+    "__ ecmovl (Assembler::Condition::negative, r15, r22, r15);",                         // IID327
+    "__ ecmovl (Assembler::Condition::positive, r29, r26, r18);",                         // IID328
+    "__ ecmovl (Assembler::Condition::parity, r9, r9, r22);",                             // IID329
+    "__ ecmovl (Assembler::Condition::noParity, r30, r23, r11);",                         // IID330
+    "__ ecmovl (Assembler::Condition::less, r20, r11, rbx);",                             // IID331
+    "__ ecmovl (Assembler::Condition::greaterEqual, r28, r16, r20);",                     // IID332
+    "__ ecmovl (Assembler::Condition::lessEqual, r17, r24, r22);",                        // IID333
+    "__ ecmovl (Assembler::Condition::greater, r16, r15, r15);",                          // IID334
+    "__ ecmovl (Assembler::Condition::overflow, r28, r25, Address(r29, r16, (Address::ScaleFactor)2, -0x3c9110ad));", // IID335
+    "__ ecmovl (Assembler::Condition::noOverflow, r23, r15, Address(rbx, r30, (Address::ScaleFactor)3, +0x1cbc58bd));", // IID336
+    "__ ecmovl (Assembler::Condition::below, r26, rbx, Address(r12, rcx, (Address::ScaleFactor)3, +0x84e581a));", // IID337
+    "__ ecmovl (Assembler::Condition::aboveEqual, rcx, r24, Address(r17, +0x5cece92d));", // IID338
+    "__ ecmovl (Assembler::Condition::zero, r26, r24, Address(r24, r12, (Address::ScaleFactor)3, +0x507746a2));", // IID339
+    "__ ecmovl (Assembler::Condition::notZero, r8, r15, Address(rcx, r19, (Address::ScaleFactor)0, -0xf035c76));", // IID340
+    "__ ecmovl (Assembler::Condition::belowEqual, rdx, r23, Address(r22, r27, (Address::ScaleFactor)0, -0x12fe3534));", // IID341
+    "__ ecmovl (Assembler::Condition::above, r30, r19, Address(r13, r28, (Address::ScaleFactor)0, +0x73b8ee9d));", // IID342
+    "__ ecmovl (Assembler::Condition::negative, r22, r30, Address(r16, rcx, (Address::ScaleFactor)0, +0x22aac146));", // IID343
+    "__ ecmovl (Assembler::Condition::positive, r17, r30, Address(r17, r9, (Address::ScaleFactor)2, +0x79db2b1));", // IID344
+    "__ ecmovl (Assembler::Condition::parity, r26, rdx, Address(r14, r16, (Address::ScaleFactor)1, -0x8242011));", // IID345
+    "__ ecmovl (Assembler::Condition::noParity, r11, r19, Address(r14, r31, (Address::ScaleFactor)1, -0x4ff251cc));", // IID346
+    "__ ecmovl (Assembler::Condition::less, r20, r18, Address(r13, r16, (Address::ScaleFactor)2, -0x19efc6e2));", // IID347
+    "__ ecmovl (Assembler::Condition::greaterEqual, r19, r13, Address(r13, r23, (Address::ScaleFactor)1, +0x611b7714));", // IID348
+    "__ ecmovl (Assembler::Condition::lessEqual, r29, r13, Address(r17, r17, (Address::ScaleFactor)3, +0x3a94a93f));", // IID349
+    "__ ecmovl (Assembler::Condition::greater, r13, r29, Address(r15, r23, (Address::ScaleFactor)1, +0x76d43532));", // IID350
+    "__ adcq(r15, r13);",                                                                 // IID351
+    "__ cmpq(r9, r12);",                                                                  // IID352
+    "__ imulq(r15, r21);",                                                                // IID353
+    "__ popcntq(r12, r9);",                                                               // IID354
+    "__ sbbq(r17, r23);",                                                                 // IID355
+    "__ subq(rdx, r16);",                                                                 // IID356
+    "__ tzcntq(r29, r10);",                                                               // IID357
+    "__ lzcntq(r21, r17);",                                                               // IID358
+    "__ addq(r29, r18);",                                                                 // IID359
+    "__ andq(r28, r24);",                                                                 // IID360
+    "__ orq(r10, r20);",                                                                  // IID361
+    "__ xorq(r27, r10);",                                                                 // IID362
+    "__ movq(r14, r11);",                                                                 // IID363
+    "__ bsfq(r27, rcx);",                                                                 // IID364
+    "__ bsrq(r22, r15);",                                                                 // IID365
+    "__ btq(r31, r30);",                                                                  // IID366
+    "__ xchgq(r19, r19);",                                                                // IID367
+    "__ testq(r26, r21);",                                                                // IID368
+    "__ addq(Address(r26, r20, (Address::ScaleFactor)1, -0x4096149c), r14);",             // IID369
+    "__ andq(Address(r28, r20, (Address::ScaleFactor)2, +0x1bd8898a), r23);",             // IID370
+    "__ cmpq(Address(r15, r19, (Address::ScaleFactor)2, +0x39eee631), r10);",             // IID371
+    "__ orq(Address(r13, rdx, (Address::ScaleFactor)3, +0x1a49859), r13);",               // IID372
+    "__ xorq(Address(r21, +0x5fe8636), r24);",                                            // IID373
+    "__ subq(Address(r30, r23, (Address::ScaleFactor)2, -0x56643cc1), r25);",             // IID374
+    "__ movq(Address(r21, r26, (Address::ScaleFactor)3, +0x7e8544ab), r31);",             // IID375
+    "__ xaddq(Address(rcx, r24, (Address::ScaleFactor)3, -0x79ca4889), rbx);",            // IID376
+    "__ andq(Address(r13, r31, (Address::ScaleFactor)3, -0xd72b030), 256);",              // IID377
+    "__ addq(Address(r16, +0x534d775e), 268435456);",                                     // IID378
+    "__ cmpq(Address(r20, r15, (Address::ScaleFactor)2, -0x7cb22277), 268435456);",       // IID379
+    "__ sarq(Address(r9, r23, (Address::ScaleFactor)2, -0x72f6d86e), 4);",                // IID380
+    "__ salq(Address(r11, r24, (Address::ScaleFactor)1, -0x22826f95), 4);",               // IID381
+    "__ sbbq(Address(r14, r30, (Address::ScaleFactor)1, +0x1b43fc34), 268435456);",       // IID382
+    "__ shrq(Address(r26, r21, (Address::ScaleFactor)0, -0x3bae50c3), 8);",               // IID383
+    "__ subq(Address(r22, r10, (Address::ScaleFactor)3, +0x47e1403), 65536);",            // IID384
+    "__ xorq(Address(rdx, r19, (Address::ScaleFactor)3, -0x644a5318), 1);",               // IID385
+    "__ orq(Address(r30, r31, (Address::ScaleFactor)1, +0x2c93c783), 256);",              // IID386
+    "__ movq(Address(r26, r24, (Address::ScaleFactor)2, -0x534785f), 65536);",            // IID387
+    "__ testq(Address(r14, r30, (Address::ScaleFactor)1, +0x3932e147), -256);",           // IID388
+    "__ addq(r30, Address(r30, r24, (Address::ScaleFactor)3, -0x66e0235e));",             // IID389
+    "__ andq(r15, Address(r26, +0x36456e42));",                                           // IID390
+    "__ cmpq(r10, Address(r18, +0x5044bed));",                                            // IID391
+    "__ lzcntq(r31, Address(r12, rdx, (Address::ScaleFactor)2, -0x1707b7d4));",           // IID392
+    "__ orq(r16, Address(r20, r23, (Address::ScaleFactor)2, -0x26783729));",              // IID393
+    "__ adcq(r31, Address(r30, r31, (Address::ScaleFactor)0, +0x1ec3265d));",             // IID394
+    "__ imulq(r16, Address(rdx, r26, (Address::ScaleFactor)0, +0x3586831b));",            // IID395
+    "__ popcntq(r12, Address(r18, -0x3c3e9f7a));",                                        // IID396
+    "__ sbbq(rcx, Address(r8, r21, (Address::ScaleFactor)3, +0x6b1515ab));",              // IID397
+    "__ subq(r29, Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d));",             // IID398
+    "__ tzcntq(r26, Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189));",           // IID399
+    "__ xorq(r17, Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c));",             // IID400
+    "__ movq(r18, Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d));",             // IID401
+    "__ leaq(r12, Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560));",             // IID402
+    "__ cvttsd2siq(r29, Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657));",       // IID403
+    "__ xchgq(r22, Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f));",            // IID404
+    "__ testq(r25, Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8));",            // IID405
+    "__ addq(r18, 1);",                                                                   // IID406
+    "__ andq(r13, 16777216);",                                                            // IID407
+    "__ adcq(r13, 65536);",                                                               // IID408
+    "__ cmpq(r10, 65536);",                                                               // IID409
+    "__ rclq(r20, 2);",                                                                   // IID410
+    "__ rcrq(r9, 16);",                                                                   // IID411
+    "__ rolq(r8, 1);",                                                                    // IID412
+    "__ rorq(r25, 2);",                                                                   // IID413
+    "__ sarq(r22, 8);",                                                                   // IID414
+    "__ salq(r17, 1);",                                                                   // IID415
+    "__ sbbq(r31, 16);",                                                                  // IID416
+    "__ shlq(r27, 4);",                                                                   // IID417
+    "__ shrq(r28, 2);",                                                                   // IID418
+    "__ subq(rcx, 16777216);",                                                            // IID419
+    "__ xorq(r27, 1048576);",                                                             // IID420
+    "__ movq(r20, 268435456);",                                                           // IID421
+    "__ mov64(r27, 4503599627370496);",                                                   // IID422
+    "__ btq(r22, 4);",                                                                    // IID423
+    "__ testq(r8, -4096);",                                                               // IID424
+    "__ orq_imm32(r28, 1048576);",                                                        // IID425
+    "__ subq_imm32(r13, 65536);",                                                         // IID426
+    "__ cmovq(Assembler::Condition::overflow, r16, Address(r16, -0x1389a3eb));",          // IID427
+    "__ cmovq(Assembler::Condition::noOverflow, rbx, Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615));", // IID428
+    "__ cmovq(Assembler::Condition::below, rdx, Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2));", // IID429
+    "__ cmovq(Assembler::Condition::aboveEqual, r27, Address(r10, rcx, (Address::ScaleFactor)3, -0x1ef7abf1));", // IID430
+    "__ cmovq(Assembler::Condition::zero, r14, Address(r13, r29, (Address::ScaleFactor)2, -0x7c4c8369));", // IID431
+    "__ cmovq(Assembler::Condition::notZero, r15, Address(r23, rcx, (Address::ScaleFactor)2, -0x6bd22ccf));", // IID432
+    "__ cmovq(Assembler::Condition::belowEqual, r24, Address(r15, r10, (Address::ScaleFactor)1, -0x7ffb3d09));", // IID433
+    "__ cmovq(Assembler::Condition::above, r23, Address(r11, +0x276a863b));",             // IID434
+    "__ cmovq(Assembler::Condition::negative, r28, Address(r29, +0x3fb4396e));",          // IID435
+    "__ cmovq(Assembler::Condition::positive, r26, Address(r27, rcx, (Address::ScaleFactor)3, +0x4ddea61c));", // IID436
+    "__ cmovq(Assembler::Condition::parity, r10, Address(r22, r19, (Address::ScaleFactor)1, +0x2a126966));", // IID437
+    "__ cmovq(Assembler::Condition::noParity, r12, Address(r10, +0x3d7c59f));",           // IID438
+    "__ cmovq(Assembler::Condition::less, r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d));", // IID439
+    "__ cmovq(Assembler::Condition::greaterEqual, r23, Address(r29, -0x777ed96d));",      // IID440
+    "__ cmovq(Assembler::Condition::lessEqual, rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb));", // IID441
+    "__ cmovq(Assembler::Condition::greater, r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073));", // IID442
+    "__ call(r29);",                                                                      // IID443
+    "__ divq(r10);",                                                                      // IID444
+    "__ idivq(r19);",                                                                     // IID445
+    "__ imulq(r15);",                                                                     // IID446
+    "__ mulq(r27);",                                                                      // IID447
+    "__ negq(r20);",                                                                      // IID448
+    "__ notq(r10);",                                                                      // IID449
+    "__ rolq(r16);",                                                                      // IID450
+    "__ rorq(r27);",                                                                      // IID451
+    "__ sarq(r9);",                                                                       // IID452
+    "__ salq(r13);",                                                                      // IID453
+    "__ shlq(r14);",                                                                      // IID454
+    "__ shrq(r18);",                                                                      // IID455
+    "__ incrementq(r28);",                                                                // IID456
+    "__ decrementq(r28);",                                                                // IID457
+    "__ pushp(r22);",                                                                     // IID458
+    "__ popp(r8);",                                                                       // IID459
+    "__ call(Address(r12, +0x64cc424e));",                                                // IID460
+    "__ mulq(Address(r26, r29, (Address::ScaleFactor)0, -0x466f085f));",                  // IID461
+    "__ negq(Address(r21, r24, (Address::ScaleFactor)0, +0x2037df0b));",                  // IID462
+    "__ sarq(Address(r12, r31, (Address::ScaleFactor)3, -0x57d225aa));",                  // IID463
+    "__ salq(Address(r20, -0x1ea02f90));",                                                // IID464
+    "__ shrq(Address(r13, r20, (Address::ScaleFactor)3, +0x171081f2));",                  // IID465
+    "__ incrementq(Address(r31, +0x13a808db));",                                          // IID466
+    "__ decrementq(Address(r19, -0x180d3ea1));",                                          // IID467
+    "__ imulq(r17, Address(r16, -0x2af2fd58), 4096);",                                    // IID468
+    "__ imulq(r28, r25, 16);",                                                            // IID469
+    "__ shldq(r27, r13, 16);",                                                            // IID470
+    "__ shrdq(r8, r10, 16);",                                                             // IID471
+    "__ pop2(r14, r8);",                                                                  // IID472
+    "__ pop2p(r18, rbx);",                                                                // IID473
+    "__ push2(r23, r19);",                                                                // IID474
+    "__ push2p(r12, rbx);",                                                               // IID475
+    "__ movzbq(r9, Address(r14, r23, (Address::ScaleFactor)3, -0x428d2646));",            // IID476
+    "__ movzwq(r28, Address(r9, rcx, (Address::ScaleFactor)2, -0x72611661));",            // IID477
+    "__ movsbq(rbx, Address(r24, r21, (Address::ScaleFactor)2, +0x3a6be990));",           // IID478
+    "__ movswq(r16, Address(r22, r10, (Address::ScaleFactor)0, +0x7ef8bdd));",            // IID479
+    "__ movzbq(r28, r14);",                                                               // IID480
+    "__ movzwq(r13, r28);",                                                               // IID481
+    "__ movsbq(r11, rdx);",                                                               // IID482
+    "__ movswq(r12, r26);",                                                               // IID483
+    "__ cmpxchgq(r20, Address(r10, -0xbd2a8da));",                                        // IID484
+    "__ eidivq(r15, false);",                                                             // IID485
+    "__ eidivq(r23, true);",                                                              // IID486
+    "__ edivq(r14, false);",                                                              // IID487
+    "__ edivq(r14, true);",                                                               // IID488
+    "__ eimulq(r15, false);",                                                             // IID489
+    "__ eimulq(r20, true);",                                                              // IID490
+    "__ emulq(rcx, false);",                                                              // IID491
+    "__ emulq(r21, true);",                                                               // IID492
+    "__ emulq(Address(r16, r10, (Address::ScaleFactor)3, +0x5f66ac1e), false);",          // IID493
+    "__ emulq(Address(r21, r22, (Address::ScaleFactor)3, -0xbbc807d), true);",            // IID494
+    "__ eimulq(r22, r26, false);",                                                        // IID495
+    "__ eimulq(r25, r21, true);",                                                         // IID496
+    "__ elzcntq(r20, r13, false);",                                                       // IID497
+    "__ elzcntq(r25, r19, true);",                                                        // IID498
+    "__ enegq(r21, r30, false);",                                                         // IID499
+    "__ enegq(r29, r11, true);",                                                          // IID500
+    "__ enotq(r22, r8);",                                                                 // IID501
+    "__ epopcntq(r12, r19, false);",                                                      // IID502
+    "__ epopcntq(r29, r23, true);",                                                       // IID503
+    "__ erolq(r28, r24, false);",                                                         // IID504
+    "__ erolq(rdx, r20, true);",                                                          // IID505
+    "__ erorq(rbx, r30, false);",                                                         // IID506
+    "__ erorq(r10, r15, true);",                                                          // IID507
+    "__ esalq(r17, r13, false);",                                                         // IID508
+    "__ esalq(r21, r24, true);",                                                          // IID509
+    "__ esarq(r31, r12, false);",                                                         // IID510
+    "__ esarq(rdx, r24, true);",                                                          // IID511
+    "__ edecq(r21, r24, false);",                                                         // IID512
+    "__ edecq(r15, r31, true);",                                                          // IID513
+    "__ eincq(r10, rbx, false);",                                                         // IID514
+    "__ eincq(r18, r8, true);",                                                           // IID515
+    "__ eshlq(r10, r26, false);",                                                         // IID516
+    "__ eshlq(r28, r14, true);",                                                          // IID517
+    "__ eshrq(r10, r19, false);",                                                         // IID518
+    "__ eshrq(r28, r21, true);",                                                          // IID519
+    "__ etzcntq(r21, r22, false);",                                                       // IID520
+    "__ etzcntq(r16, r23, true);",                                                        // IID521
+    "__ eimulq(r11, Address(r18, r9, (Address::ScaleFactor)2, -0x132285a1), false);",     // IID522
+    "__ eimulq(r13, Address(r24, r15, (Address::ScaleFactor)3, +0x48f50ca0), true);",     // IID523
+    "__ elzcntq(r9, Address(r13, +0x2115cf0e), false);",                                  // IID524
+    "__ elzcntq(r27, Address(r30, +0x49cabbb), true);",                                   // IID525
+    "__ enegq(r21, Address(r13, r31, (Address::ScaleFactor)2, +0x50a8f4d2), false);",     // IID526
+    "__ enegq(r22, Address(r18, r20, (Address::ScaleFactor)1, -0x5da0584c), true);",      // IID527
+    "__ epopcntq(r14, Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1), false);",  // IID528
+    "__ epopcntq(r26, Address(r23, r22, (Address::ScaleFactor)3, -0x72c66c23), true);",   // IID529
+    "__ esalq(r26, Address(r9, +0x334aba09), false);",                                    // IID530
+    "__ esalq(r9, Address(r9, r30, (Address::ScaleFactor)3, -0x219a6102), true);",        // IID531
+    "__ esarq(r25, Address(r20, -0x2131bab1), false);",                                   // IID532
+    "__ esarq(r16, Address(r28, r16, (Address::ScaleFactor)1, +0x48c483b9), true);",      // IID533
+    "__ edecq(r30, Address(r9, r16, (Address::ScaleFactor)0, -0x88ce84f), false);",       // IID534
+    "__ edecq(r11, Address(r30, r29, (Address::ScaleFactor)2, +0x3eeb8fd0), true);",      // IID535
+    "__ eincq(r26, Address(r29, r10, (Address::ScaleFactor)3, +0x3ef4822e), false);",     // IID536
+    "__ eincq(r29, Address(r19, r20, (Address::ScaleFactor)2, -0x3f0f3db9), true);",      // IID537
+    "__ eshrq(r8, Address(r30, r20, (Address::ScaleFactor)0, +0x15b56a17), false);",      // IID538
+    "__ eshrq(r26, Address(r11, -0x2de86561), true);",                                    // IID539
+    "__ etzcntq(r11, Address(rcx, r30, (Address::ScaleFactor)1, -0x32ffb1c2), false);",   // IID540
+    "__ etzcntq(r23, Address(r9, r12, (Address::ScaleFactor)1, -0x54823e69), true);",     // IID541
+    "__ eaddq(r20, Address(r13, rcx, (Address::ScaleFactor)3, -0x46116c0d), r15, false);", // IID542
+    "__ eaddq(r13, Address(r9, r23, (Address::ScaleFactor)1, -0x286c7605), r16, true);",  // IID543
+    "__ eandq(r21, Address(r30, r17, (Address::ScaleFactor)0, +0xf4e30b2), r29, false);", // IID544
+    "__ eandq(r30, Address(r17, r31, (Address::ScaleFactor)0, +0x3ab9dec4), r17, true);", // IID545
+    "__ eorq(r10, Address(r27, r30, (Address::ScaleFactor)1, -0x197f1266), r28, false);", // IID546
+    "__ eorq(r9, Address(r29, r30, (Address::ScaleFactor)0, -0x24ea9b08), r11, true);",   // IID547
+    "__ esubq(r15, Address(r14, -0x4f44bf90), r16, false);",                              // IID548
+    "__ esubq(rcx, Address(r21, r18, (Address::ScaleFactor)1, -0x11d0ac8f), r28, true);", // IID549
+    "__ exorq(r19, Address(r19, r18, (Address::ScaleFactor)0, -0xa5e55ec), r8, false);",  // IID550
+    "__ exorq(r28, Address(r17, r28, (Address::ScaleFactor)1, -0x6eb42fe0), r16, true);", // IID551
+    "__ eaddq(r17, Address(r18, -0x60ab1105), 16777216, false);",                         // IID552
+    "__ eaddq(r25, Address(r19, r25, (Address::ScaleFactor)0, +0x122444d9), 65536, true);", // IID553
+    "__ eandq(r30, Address(r9, r28, (Address::ScaleFactor)1, -0x25b00cf3), 4096, false);", // IID554
+    "__ eandq(r9, Address(r22, rbx, (Address::ScaleFactor)1, -0x7e465026), 268435456, true);", // IID555
+    "__ eimulq(r12, Address(r25, r25, (Address::ScaleFactor)1, -0x432d68cc), 1, false);", // IID556
+    "__ eimulq(r15, Address(r17, r31, (Address::ScaleFactor)3, -0x2b97565e), 16, true);", // IID557
+    "__ eorq(r28, Address(rdx, r31, (Address::ScaleFactor)0, +0x3f1363b1), 256, false);", // IID558
+    "__ eorq(r16, Address(r12, r23, (Address::ScaleFactor)3, -0x1785863c), 16777216, true);", // IID559
+    "__ esalq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), 2, false);",   // IID560
+    "__ esalq(r8, Address(r15, r14, (Address::ScaleFactor)2, +0x21f13243), 16, true);",   // IID561
+    "__ esarq(r10, Address(r13, r29, (Address::ScaleFactor)0, +0x7d04cb72), 2, false);",  // IID562
+    "__ esarq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), 8, true);",   // IID563
+    "__ eshrq(rcx, Address(r16, r12, (Address::ScaleFactor)1, +0x260c9a38), 4, false);",  // IID564
+    "__ eshrq(r22, Address(r26, r9, (Address::ScaleFactor)0, -0x5e56bb62), 8, true);",    // IID565
+    "__ esubq(r31, Address(rbx, r28, (Address::ScaleFactor)1, +0x2b00bb10), 1, false);",  // IID566
+    "__ esubq(r21, Address(r31, -0x6c10f4ad), 4096, true);",                              // IID567
+    "__ exorq(r11, Address(r23, r30, (Address::ScaleFactor)1, +0x51a6026b), 65536, false);", // IID568
+    "__ exorq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), 16, true);",  // IID569
+    "__ eaddq(r20, r23, 16777216, false);",                                               // IID570
+    "__ eaddq(r9, r21, 4096, true);",                                                     // IID571
+    "__ eandq(r20, rdx, 16, false);",                                                     // IID572
+    "__ eandq(r14, r19, 16, true);",                                                      // IID573
+    "__ eimulq(r27, r17, 16, false);",                                                    // IID574
+    "__ eimulq(r30, r13, 256, true);",                                                    // IID575
+    "__ eorq(r19, r15, 16777216, false);",                                                // IID576
+    "__ eorq(r16, r28, 268435456, true);",                                                // IID577
+    "__ erclq(rbx, r24, 2);",                                                             // IID578
+    "__ erolq(r15, r20, 16, false);",                                                     // IID579
+    "__ erolq(r11, rcx, 16, true);",                                                      // IID580
+    "__ erorq(r13, r26, 16, false);",                                                     // IID581
+    "__ erorq(r19, r20, 4, true);",                                                       // IID582
+    "__ esalq(r19, r28, 16, false);",                                                     // IID583
+    "__ esalq(r25, r18, 4, true);",                                                       // IID584
+    "__ esarq(r10, r27, 4, false);",                                                      // IID585
+    "__ esarq(rdx, r22, 8, true);",                                                       // IID586
+    "__ eshlq(r28, r15, 1, false);",                                                      // IID587
+    "__ eshlq(rbx, r12, 4, true);",                                                       // IID588
+    "__ eshrq(r26, r11, 1, false);",                                                      // IID589
+    "__ eshrq(rdx, r31, 8, true);",                                                       // IID590
+    "__ esubq(r21, rbx, 1048576, false);",                                                // IID591
+    "__ esubq(r25, r28, 65536, true);",                                                   // IID592
+    "__ exorq(r22, r14, 1, false);",                                                      // IID593
+    "__ exorq(r11, r30, 1048576, true);",                                                 // IID594
+    "__ eorq_imm32(r20, r19, 1048576, false);",                                           // IID595
+    "__ eorq_imm32(r25, r13, 268435456, false);",                                         // IID596
+    "__ esubq_imm32(r25, r25, 268435456, false);",                                        // IID597
+    "__ esubq_imm32(r18, r11, 4194304, true);",                                           // IID598
+    "__ eaddq(r10, r18, Address(r20, +0x756f453), false);",                               // IID599
+    "__ eaddq(rbx, r27, Address(r22, r21, (Address::ScaleFactor)0, -0x25abeab7), true);", // IID600
+    "__ eandq(rdx, r31, Address(r9, r20, (Address::ScaleFactor)3, -0x4cfe39c), false);",  // IID601
+    "__ eandq(r16, r25, Address(r14, r27, (Address::ScaleFactor)0, +0x7c6654d9), true);", // IID602
+    "__ eorq(r29, rcx, Address(r15, r23, (Address::ScaleFactor)0, +0x45b7f72d), false);", // IID603
+    "__ eorq(r19, r17, Address(r13, r22, (Address::ScaleFactor)1, -0x750c1996), true);",  // IID604
+    "__ eimulq(r13, r8, Address(r31, r23, (Address::ScaleFactor)1, -0x2211b6b2), false);", // IID605
+    "__ eimulq(r11, r28, Address(r13, r11, (Address::ScaleFactor)3, +0x5c0013ab), true);", // IID606
+    "__ esubq(rdx, r18, Address(r18, rcx, (Address::ScaleFactor)0, +0x59557e71), false);", // IID607
+    "__ esubq(r27, r11, Address(r22, -0x28469649), true);",                               // IID608
+    "__ exorq(r10, r9, Address(r24, +0x49691d54), false);",                               // IID609
+    "__ exorq(r24, r12, Address(r19, +0x22d529aa), true);",                               // IID610
+    "__ eaddq(r20, r9, r10, false);",                                                     // IID611
+    "__ eaddq(r18, r17, r26, true);",                                                     // IID612
+    "__ eadcxq(r21, r16, r19);",                                                          // IID613
+    "__ eadoxq(rbx, r14, r27);",                                                          // IID614
+    "__ eandq(r9, r12, r22, false);",                                                     // IID615
+    "__ eandq(r17, r25, r10, true);",                                                     // IID616
+    "__ eimulq(r12, r15, r14, false);",                                                   // IID617
+    "__ eimulq(r29, r18, r16, true);",                                                    // IID618
+    "__ eorq(r11, r9, r10, false);",                                                      // IID619
+    "__ eorq(r25, r13, r16, true);",                                                      // IID620
+    "__ esubq(r11, r21, r25, false);",                                                    // IID621
+    "__ esubq(rdx, r20, rbx, true);",                                                     // IID622
+    "__ exorq(r25, r21, r26, false);",                                                    // IID623
+    "__ exorq(r23, r27, r21, true);",                                                     // IID624
+    "__ eshldq(r10, r12, r31, 2, false);",                                                // IID625
+    "__ eshldq(r23, r16, r29, 2, true);",                                                 // IID626
+    "__ eshrdq(r19, r24, r23, 4, false);",                                                // IID627
+    "__ eshrdq(r21, r15, r25, 4, true);",                                                 // IID628
+    "__ ecmovq (Assembler::Condition::overflow, r9, r29, rdx);",                          // IID629
+    "__ ecmovq (Assembler::Condition::noOverflow, r11, r25, r19);",                       // IID630
+    "__ ecmovq (Assembler::Condition::below, r10, r16, r17);",                            // IID631
+    "__ ecmovq (Assembler::Condition::aboveEqual, r8, r23, r31);",                        // IID632
+    "__ ecmovq (Assembler::Condition::zero, r9, r31, rbx);",                              // IID633
+    "__ ecmovq (Assembler::Condition::notZero, r16, r29, r9);",                           // IID634
+    "__ ecmovq (Assembler::Condition::belowEqual, r24, r10, r9);",                        // IID635
+    "__ ecmovq (Assembler::Condition::above, r22, r28, r26);",                            // IID636
+    "__ ecmovq (Assembler::Condition::negative, r18, r25, r20);",                         // IID637
+    "__ ecmovq (Assembler::Condition::positive, r16, r21, rbx);",                         // IID638
+    "__ ecmovq (Assembler::Condition::parity, r28, r22, r19);",                           // IID639
+    "__ ecmovq (Assembler::Condition::noParity, r13, r15, rdx);",                         // IID640
+    "__ ecmovq (Assembler::Condition::less, r8, r22, r14);",                              // IID641
+    "__ ecmovq (Assembler::Condition::greaterEqual, r12, r24, r14);",                     // IID642
+    "__ ecmovq (Assembler::Condition::lessEqual, r24, r13, r21);",                        // IID643
+    "__ ecmovq (Assembler::Condition::greater, rbx, rbx, r27);",                          // IID644
+    "__ ecmovq (Assembler::Condition::overflow, r14, r17, Address(r24, r27, (Address::ScaleFactor)3, +0x9d508f0));", // IID645
+    "__ ecmovq (Assembler::Condition::noOverflow, r13, r15, Address(r31, r21, (Address::ScaleFactor)2, +0x6ef2c74a));", // IID646
+    "__ ecmovq (Assembler::Condition::below, r13, r27, Address(r31, r25, (Address::ScaleFactor)1, +0x734fe9ab));", // IID647
+    "__ ecmovq (Assembler::Condition::aboveEqual, r15, r22, Address(r14, r29, (Address::ScaleFactor)2, -0x67d8bdfb));", // IID648
+    "__ ecmovq (Assembler::Condition::zero, r30, r23, Address(r15, r28, (Address::ScaleFactor)1, -0x2686219));", // IID649
+    "__ ecmovq (Assembler::Condition::notZero, r12, r9, Address(r9, r25, (Address::ScaleFactor)3, +0x52aab6b));", // IID650
+    "__ ecmovq (Assembler::Condition::belowEqual, r9, r25, Address(r8, r8, (Address::ScaleFactor)3, -0x1e42bd95));", // IID651
+    "__ ecmovq (Assembler::Condition::above, rcx, r20, Address(r27, rbx, (Address::ScaleFactor)2, +0x46823c58));", // IID652
+    "__ ecmovq (Assembler::Condition::negative, rbx, r12, Address(r21, -0x635b8c8));",    // IID653
+    "__ ecmovq (Assembler::Condition::positive, r23, rbx, Address(r27, r26, (Address::ScaleFactor)3, +0x922bcc0));", // IID654
+    "__ ecmovq (Assembler::Condition::parity, r25, r9, Address(r23, +0xd2a14ec));",       // IID655
+    "__ ecmovq (Assembler::Condition::noParity, r11, r19, Address(r11, -0xfb95a9d));",    // IID656
+    "__ ecmovq (Assembler::Condition::less, r13, r18, Address(r28, r19, (Address::ScaleFactor)0, +0x716b9b7e));", // IID657
+    "__ ecmovq (Assembler::Condition::greaterEqual, r21, r16, Address(rcx, r29, (Address::ScaleFactor)0, -0x5af0441e));", // IID658
+    "__ ecmovq (Assembler::Condition::lessEqual, r12, r31, Address(r20, r26, (Address::ScaleFactor)0, +0xe0b7fb1));", // IID659
+    "__ ecmovq (Assembler::Condition::greater, r15, r24, Address(r30, +0x2d3b7b4f));",    // IID660
 #endif // _LP64
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/gtest/x86/test_assemblerx86.cpp b/test/hotspot/gtest/x86/test_assemblerx86.cpp
index 30ecd87793c..85cb0d13f63 100644
--- a/test/hotspot/gtest/x86/test_assemblerx86.cpp
+++ b/test/hotspot/gtest/x86/test_assemblerx86.cpp
@@ -50,12 +50,12 @@ static void asm_check(const uint8_t *insns, const uint8_t *insns1, const unsigne
     if (std::memcmp(&insns[cur_idx], &insns1[cur_idx], insn_len) != 0) {
       stringStream ss;
       ss.print("%s\n", insn);
-      ss.print("Ours:   ");
+      ss.print("OpenJDK:       ");
       for (size_t j = 0; j < insn_len; j++) {
         ss.print("%02x ", (uint8_t)insns[cur_idx + j]);
       }
       ss.print_cr("");
-      ss.print("Theirs: ");
+      ss.print("GNU Assembler: ");
       for (size_t j = 0; j < insn_len; j++) {
         ss.print("%02x ", (uint8_t)insns1[cur_idx + j]);
       }
@@ -66,6 +66,7 @@ static void asm_check(const uint8_t *insns, const uint8_t *insns1, const unsigne
 }
 
 TEST_VM(AssemblerX86, validate) {
+  UseAVX = 3;
   FlagSetting flag_change_apx(UseAPX, true);
   VM_Version::set_bmi_cpuFeatures();
   VM_Version::set_evex_cpuFeatures();
diff --git a/test/hotspot/gtest/x86/x86-asmtest.py b/test/hotspot/gtest/x86/x86-asmtest.py
index c09fa80138d..318bc50f6ef 100644
--- a/test/hotspot/gtest/x86/x86-asmtest.py
+++ b/test/hotspot/gtest/x86/x86-asmtest.py
@@ -29,6 +29,9 @@
 OBJDUMP = "objdump"
 X86_AS = "as"
 X86_OBJCOPY = "objcopy"
+SEED = 1327
+
+random.seed(SEED)
 
 cond_to_suffix = {
     'overflow': 'o',
@@ -49,7 +52,8 @@
     'greater': 'g',
 }
 
-shift_rot_ops = {'sarl', 'sarq', 'sall', 'salq', 'shll', 'shlq', 'shrl', 'shrq', 'shrdl', 'shrdq', 'shldl', 'shldq', 'rcrq', 'rorl', 'rorq', 'roll', 'rolq', 'rcll', 'rclq'}
+shift_rot_ops = {'sarl', 'sarq', 'sall', 'salq', 'shll', 'shlq', 'shrl', 'shrq', 'shrdl', 'shrdq', 'shldl', 'shldq', 'rcrq', 'rorl', 'rorq', 'roll', 'rolq', 'rcll', 'rclq',
+                 'esarl', 'esarq', 'esall', 'esalq', 'eshll', 'eshlq', 'eshrl', 'eshrq', 'eshrdl', 'eshrdq', 'eshldl', 'eshldq', 'ercrq', 'erorl', 'erorq', 'eroll', 'erolq', 'ercll', 'erclq'}
 
 registers_mapping = {
     # skip rax, rsi, rdi, rsp, rbp as they have special encodings
@@ -161,6 +165,22 @@ def astr(self):
         cl_str = (', cl' if self._name in shift_rot_ops and len(self.operands) == 1 else '')
         return f'{self._aname} ' + ', '.join([op.astr() for op in self.operands]) + cl_str
 
+class NFInstruction(Instruction):
+    def __init__(self, name, aname, no_flag):
+        super().__init__(name, aname)
+        self.no_flag = no_flag
+    
+    def cstr(self):
+        return f'__ {self._name}(' + ', '.join([op.cstr() for op in self.operands]) + (f', {str(self.no_flag).lower()}' if self.no_flag is not None else '') + ');'
+    
+    def astr(self):
+        # JDK assembler uses 'cl' for shift instructions with one operand by default
+        cl_str = (', cl' if self._name in shift_rot_ops and len(self.operands) == 2 else '')
+        # special case for shift instructions with three operands
+        if (self._name == 'eshldl' or self._name == 'eshldq' or self._name == 'eshrdl' or self._name == 'eshrdq') and all([isinstance(op, Register) for op in self.operands]):
+            cl_str = ', cl'
+        return ('{NF}' if self.no_flag else '{EVEX}') + f'{self._aname} ' + ', '.join([op.astr() for op in self.operands]) + cl_str
+
 class RegInstruction(Instruction):
     def __init__(self, name, aname, width, reg):
         super().__init__(name, aname)
@@ -273,6 +293,36 @@ def cstr(self):
     def astr(self):
         return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + self.reg.astr()
 
+class CondRegRegRegInstruction(Instruction):
+    def __init__(self, name, aname, width, cond, reg1, reg2, reg3):
+        super().__init__(name, aname)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.reg3 = Register().generate(reg3, width)
+        self.cond = cond
+        self.generate_operands(self.reg1, self.reg2, self.reg3)
+    
+    def cstr(self):
+        return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
+    
+    def astr(self):
+        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in self.operands])
+
+class CondRegRegMemInstruction(Instruction):
+    def __init__(self, name, aname, width, cond, reg1, reg2, mem_base, mem_idx):
+        super().__init__(name, aname)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.cond = cond
+        self.generate_operands(self.reg1, self.reg2, self.mem)
+    
+    def cstr(self):
+        return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
+    
+    def astr(self):
+        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in self.operands])
+
 class MoveRegMemInstruction(Instruction):
     def __init__(self, name, aname, width, mem_width, reg, mem_base, mem_idx):
         super().__init__(name, aname)
@@ -287,6 +337,84 @@ def __init__(self, name, aname, width, reg_width, reg1, reg2):
         self.reg2 = Register().generate(reg2, reg_width)
         self.generate_operands(self.reg1, self.reg2)
 
+class RegNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg):
+        super().__init__(name, aname, no_flag)
+        self.reg = Register().generate(reg, width)
+        self.generate_operands(self.reg)
+
+class MemNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, mem_base, mem_idx):
+        super().__init__(name, aname, no_flag)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.generate_operands(self.mem)
+
+class RegRegNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, reg2):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.generate_operands(self.reg1, self.reg2)
+
+class RegMemNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg, mem_base, mem_idx):
+        super().__init__(name, aname, no_flag)
+        self.reg = Register().generate(reg, width)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.generate_operands(self.reg, self.mem)
+
+class RegMemImmNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg, imm, mem_base, mem_idx):
+        super().__init__(name, aname, no_flag)
+        self.reg = Register().generate(reg, width)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.imm = Immediate().generate(imm)
+        self.generate_operands(self.reg, self.mem, self.imm)
+
+class RegMemRegNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, mem_base, mem_idx, reg2):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.generate_operands(self.reg1, self.mem, self.reg2)
+
+class RegRegImmNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, reg2, imm):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.imm = Immediate().generate(imm)
+        self.generate_operands(self.reg1, self.reg2, self.imm)
+
+class RegRegMemNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, reg2, mem_base, mem_idx):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.mem = Address().generate(mem_base, mem_idx, width)
+        self.generate_operands(self.reg1, self.reg2, self.mem)
+
+class RegRegRegNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.reg3 = Register().generate(reg3, width)
+        self.generate_operands(self.reg1, self.reg2, self.reg3)
+
+    def astr(self):
+        return f'{{load}}' + super().astr()
+
+class RegRegRegImmNddInstruction(NFInstruction):
+    def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3, imm):
+        super().__init__(name, aname, no_flag)
+        self.reg1 = Register().generate(reg1, width)
+        self.reg2 = Register().generate(reg2, width)
+        self.reg3 = Register().generate(reg3, width)
+        self.imm = Immediate().generate(imm)
+        self.generate_operands(self.reg1, self.reg2, self.reg3, self.imm)
+
 test_regs = list(registers_mapping.keys())
 
 immediates32 = [2 ** i for i in range(0, 32, 4)]
@@ -330,7 +458,7 @@ def handle_lp64_flag(lp64_flag, print_lp64_flag, *regs):
 def get_immediate_list(op_name, width):
     # special cases
     word_imm_ops = {'addw', 'cmpw'}
-    dword_imm_ops = {'subl_imm32', 'subq_imm32', 'orq_imm32', 'cmpl_imm32', 'testl'}
+    dword_imm_ops = {'subl_imm32', 'subq_imm32', 'orq_imm32', 'cmpl_imm32', 'esubl_imm32', 'esubq_imm32', 'eorq_imm32', 'testl'}
     qword_imm_ops = {'mov64'}
     neg_imm_ops = {'testq'}
     bt_ops = {'btq'}
@@ -357,7 +485,7 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
         op_name = op[0]
         width = op[2]
 
-        if RegOp in [RegInstruction, CondRegInstruction]:
+        if RegOp in [RegInstruction, CondRegInstruction, RegNddInstruction]:
             if full_set:
                 for i in range(len(test_regs)):
                     test_reg = test_regs[i]
@@ -370,7 +498,7 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, reg=test_reg)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
-        elif RegOp in [TwoRegInstruction, MoveRegRegInstruction]:
+        elif RegOp in [TwoRegInstruction, MoveRegRegInstruction, RegRegNddInstruction]:
             if full_set:
                 for i in range(len(test_regs)):
                     test_reg1 = test_regs[i]
@@ -385,7 +513,24 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
-        elif RegOp in [MemRegInstruction, RegMemInstruction, MoveRegMemInstruction, CmpxchgInstruction, CondRegMemInstruction]:
+        elif RegOp in [RegRegRegNddInstruction, CondRegRegRegInstruction]:
+            if full_set:
+                for i in range(len(test_regs)):
+                    test_reg1 = test_regs[i]
+                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
+                    test_reg3 = test_regs[(i + 2) % len(test_regs)]
+                    lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
+                    instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3)
+                    print_instruction(instr, lp64_flag, print_lp64_flag)
+            else:
+                test_reg1 = random.choice(test_regs)
+                test_reg2 = random.choice(test_regs)
+                test_reg3 = random.choice(test_regs)
+                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
+                instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3)
+                print_instruction(instr, lp64_flag, print_lp64_flag)
+
+        elif RegOp in [MemRegInstruction, RegMemInstruction, MoveRegMemInstruction, CmpxchgInstruction, CondRegMemInstruction, RegMemNddInstruction]:
             if full_set:
                 for i in range(len(test_regs)):
                     test_reg = test_regs[i]
@@ -443,7 +588,7 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, imm=imm, mem_base=test_mem_base, mem_idx=test_mem_idx)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
-        elif RegOp in [MemInstruction]:
+        elif RegOp in [MemInstruction, MemNddInstruction]:
             if full_set:
                 for i in range(len(test_regs)):
                     test_mem_base = test_regs[i]
@@ -461,7 +606,7 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, mem_base=test_mem_base, mem_idx=test_mem_idx)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
-        elif RegOp in [RegRegImmInstruction]:
+        elif RegOp in [RegRegImmInstruction, RegRegImmNddInstruction]:
             if full_set:
                 imm_list = get_immediate_list(op_name, width)
                 for i in range(len(test_regs)):
@@ -479,7 +624,7 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, imm=imm)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
-        elif RegOp in [RegMemImmInstruction]:
+        elif RegOp in [RegMemImmInstruction, RegMemImmNddInstruction]:
             if full_set:
                 imm_list = get_immediate_list(op_name, width)
                 for i in range(len(test_regs)):
@@ -502,6 +647,48 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 instr = RegOp(*op, reg=test_reg, imm=imm, mem_base=test_mem_base, mem_idx=test_mem_idx)
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
+        elif RegOp in [RegMemRegNddInstruction, RegRegMemNddInstruction, CondRegRegMemInstruction]:
+            if full_set:
+                for i in range(len(test_regs)):
+                    test_reg1 = test_regs[i]
+                    test_mem_base = test_regs[(i + 1) % len(test_regs)]
+                    test_mem_idx = test_regs[(i + 2) % len(test_regs)]
+                    test_reg2 = test_regs[(i + 3) % len(test_regs)]
+                    if test_mem_idx == 'rsp':
+                        continue
+                    lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_mem_base, test_mem_idx, test_reg2)
+                    instr = RegOp(*op, reg1=test_reg1, mem_base=test_mem_base, mem_idx=test_mem_idx, reg2=test_reg2)
+                    print_instruction(instr, lp64_flag, print_lp64_flag)
+            else:
+                filtered_regs = [reg for reg in test_regs if reg != 'rsp']
+                test_reg1 = random.choice(test_regs)
+                test_mem_base = random.choice(test_regs)
+                test_mem_idx = random.choice(filtered_regs)
+                test_reg2 = random.choice(test_regs)
+                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_mem_base, test_mem_idx, test_reg2)
+                instr = RegOp(*op, reg1=test_reg1, mem_base=test_mem_base, mem_idx=test_mem_idx, reg2=test_reg2)
+                print_instruction(instr, lp64_flag, print_lp64_flag)
+        
+        elif RegOp in [RegRegRegImmNddInstruction]:
+            if full_set:
+                imm_list = get_immediate_list(op_name, width)
+                for i in range(len(test_regs)):
+                    test_reg1 = test_regs[i]
+                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
+                    test_reg3 = test_regs[(i + 2) % len(test_regs)]
+                    lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
+                    for imm in imm_list:
+                        instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3, imm=imm)
+                        print_instruction(instr, lp64_flag, print_lp64_flag)
+            else:
+                imm = random.choice(get_immediate_list(op_name, width))
+                test_reg1 = random.choice(test_regs)
+                test_reg2 = random.choice(test_regs)
+                test_reg3 = random.choice(test_regs)
+                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
+                instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3, imm=imm)
+                print_instruction(instr, lp64_flag, print_lp64_flag)
+
         elif RegOp in [Push2Instruction, Pop2Instruction]:
             if full_set:
                 for i in range(len(test_regs)):
@@ -707,6 +894,183 @@ def print_with_ifdef(ifdef_flags, items, item_formatter, width):
         ('cmpxchgw', 'cmpxchg', 16),
         ('cmpxchgl', 'cmpxchg', 32),
     ],
+    # --- NDD instructions ---
+    RegNddInstruction: [
+        ('eidivl', 'idiv', 32, False),
+        ('eidivl', 'idiv', 32, True),
+        ('edivl', 'div', 32, False),
+        ('edivl', 'div', 32, True),
+        ('eimull', 'imul', 32, False),
+        ('eimull', 'imul', 32, True),
+        ('emull', 'mul', 32, False),
+        ('emull', 'mul', 32, True),
+    ],
+    MemNddInstruction: [
+        ('emull', 'mul', 32, False),
+        ('emull', 'mul', 32, True),
+    ],
+    RegRegNddInstruction: [
+        ('elzcntl', 'lzcnt', 32, False),
+        ('elzcntl', 'lzcnt', 32, True),
+        ('enegl', 'neg', 32, False),
+        ('enegl', 'neg', 32, True),
+        ('epopcntl', 'popcnt', 32, False),
+        ('epopcntl', 'popcnt', 32, True),
+        ('enotl', 'not', 32, None),
+        ('eroll', 'rol', 32, False),
+        ('eroll', 'rol', 32, True),
+        ('erorl', 'ror', 32, False),
+        ('erorl', 'ror', 32, True),
+        ('esall', 'sal', 32, False),
+        ('esall', 'sal', 32, True),
+        ('esarl', 'sar', 32, False),
+        ('esarl', 'sar', 32, True),
+        ('edecl', 'dec', 32, False),
+        ('edecl', 'dec', 32, True),
+        ('eincl', 'inc', 32, False),
+        ('eincl', 'inc', 32, True), 
+        ('eshll', 'shl', 32, False),
+        ('eshll', 'shl', 32, True),
+        ('eshrl', 'shr', 32, False),
+        ('eshrl', 'shr', 32, True),
+        ('etzcntl', 'tzcnt', 32, False),
+        ('etzcntl', 'tzcnt', 32, True),
+    ],
+    RegMemNddInstruction: [
+        ('elzcntl', 'lzcnt', 32, False),
+        ('elzcntl', 'lzcnt', 32, True),
+        ('enegl', 'neg', 32, False),
+        ('enegl', 'neg', 32, True),
+        ('epopcntl', 'popcnt', 32, False),
+        ('epopcntl', 'popcnt', 32, True),
+        ('esall', 'sal', 32, False),
+        ('esall', 'sal', 32, True),
+        ('esarl', 'sar', 32, False),
+        ('esarl', 'sar', 32, True),
+        ('edecl', 'dec', 32, False),
+        ('edecl', 'dec', 32, True),
+        ('eincl', 'inc', 32, False),
+        ('eincl', 'inc', 32, True),
+        ('eshrl', 'shr', 32, False),
+        ('eshrl', 'shr', 32, True),
+        ('etzcntl', 'tzcnt', 32, False),
+        ('etzcntl', 'tzcnt', 32, True),
+    ],
+    RegMemImmNddInstruction: [
+        ('eaddl', 'add', 32, False),
+        ('eaddl', 'add', 32, True),
+        ('eandl', 'and', 32, False),
+        ('eandl', 'and', 32, True),
+        ('eimull', 'imul', 32, False),
+        ('eimull', 'imul', 32, True),
+        ('eorl', 'or', 32, False),
+        ('eorl', 'or', 32, True),
+        ('eorb', 'or', 8, False),
+        ('eorb', 'or', 8, True),
+        ('esall', 'sal', 32, False),
+        ('esall', 'sal', 32, True),
+        ('esarl', 'sar', 32, False),
+        ('esarl', 'sar', 32, True),
+        ('eshrl', 'shr', 32, False),
+        ('eshrl', 'shr', 32, True),
+        ('esubl', 'sub', 32, False),
+        ('esubl', 'sub', 32, True),
+        ('exorl', 'xor', 32, False),
+        ('exorl', 'xor', 32, True),
+    ],
+    RegMemRegNddInstruction: [
+        ('eaddl', 'add', 32, False),
+        ('eaddl', 'add', 32, True),
+        ('eorl', 'or', 32, False),
+        ('eorl', 'or', 32, True),
+        ('eorb', 'or', 8, False),
+        ('eorb', 'or', 8, True),
+        ('esubl', 'sub', 32, False),
+        ('esubl', 'sub', 32, True),
+        ('exorl', 'xor', 32, False),
+        ('exorl', 'xor', 32, True),
+        ('exorb', 'xor', 8, False),
+        ('exorb', 'xor', 8, True),
+    ],
+    RegRegImmNddInstruction: [
+        ('eaddl', 'add', 32, False),
+        ('eaddl', 'add', 32, True),
+        ('eandl', 'and', 32, False),
+        ('eandl', 'and', 32, True),
+        ('eimull', 'imul', 32, False),
+        ('eimull', 'imul', 32, True),
+        ('eorl', 'or', 32, False),
+        ('eorl', 'or', 32, True),
+        ('ercll', 'rcl', 32, None),
+        ('eroll', 'rol', 32, False),
+        ('eroll', 'rol', 32, True),
+        ('erorl', 'ror', 32, False),
+        ('erorl', 'ror', 32, True),
+        ('esall', 'sal', 32, False),
+        ('esall', 'sal', 32, True),
+        ('esarl', 'sar', 32, False),
+        ('esarl', 'sar', 32, True),
+        ('eshll', 'shl', 32, False),
+        ('eshll', 'shl', 32, True),
+        ('eshrl', 'shr', 32, False),
+        ('eshrl', 'shr', 32, True),
+        ('esubl', 'sub', 32, False),
+        ('esubl', 'sub', 32, True),
+        ('exorl', 'xor', 32, False),
+        ('exorl', 'xor', 32, True),
+        ('esubl_imm32', 'sub', 32, False),
+        ('esubl_imm32', 'sub', 32, True),
+    ],
+    RegRegMemNddInstruction: [
+        ('eaddl', 'add', 32, False),
+        ('eaddl', 'add', 32, True),
+        ('eandl', 'and', 32, False),
+        ('eandl', 'and', 32, True),
+        ('eimull', 'imul', 32, False),
+        ('eimull', 'imul', 32, True),
+        ('eorl', 'or', 32, False),
+        ('eorl', 'or', 32, True),
+        ('esubl', 'sub', 32, False),
+        ('esubl', 'sub', 32, True),
+        ('exorl', 'xor', 32, False),
+        ('exorl', 'xor', 32, True),
+        ('exorb', 'xor', 8, False),
+        ('exorb', 'xor', 8, True),
+        ('exorw', 'xor', 16, False),
+        ('exorw', 'xor', 16, True),
+    ],
+    RegRegRegNddInstruction: [
+        ('eaddl', 'add', 32, False),
+        ('eaddl', 'add', 32, True),
+        ('eandl', 'and', 32, False),
+        ('eandl', 'and', 32, True),
+        ('eimull', 'imul', 32, False),
+        ('eimull', 'imul', 32, True),
+        ('eorw', 'or', 16, False),
+        ('eorw', 'or', 16, True),
+        ('eorl', 'or', 32, False),
+        ('eorl', 'or', 32, True),
+        ('eshldl', 'shld', 32, False),
+        ('eshldl', 'shld', 32, True),
+        ('eshrdl', 'shrd', 32, False),
+        ('eshrdl', 'shrd', 32, True),
+        ('esubl', 'sub', 32, False),
+        ('esubl', 'sub', 32, True),
+        ('exorl', 'xor', 32, False),
+        ('exorl', 'xor', 32, True),
+    ],
+    RegRegRegImmNddInstruction: [
+        ('eshldl', 'shld', 32, False),
+        ('eshldl', 'shld', 32, True),
+        ('eshrdl', 'shrd', 32, False),
+        ('eshrdl', 'shrd', 32, True),
+    ],
+    CondRegRegRegInstruction: [
+        ('ecmovl', 'cmov', 32, key) for key in cond_to_suffix.keys()
+    ],
+    CondRegRegMemInstruction: [
+        ('ecmovl', 'cmov', 32, key) for key in cond_to_suffix.keys()
+    ],
 }
 
 instruction_set64 = {
@@ -859,6 +1223,177 @@ def print_with_ifdef(ifdef_flags, items, item_formatter, width):
     CmpxchgInstruction: [
         ('cmpxchgq', 'cmpxchg', 64),
     ],
+    # --- NDD instructions ---
+    RegNddInstruction: [
+        ('eidivq', 'idiv', 64, False),
+        ('eidivq', 'idiv', 64, True),
+        ('edivq', 'div', 64, False),
+        ('edivq', 'div', 64, True),
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('emulq', 'mul', 64, False),
+        ('emulq', 'mul', 64, True),
+    ],
+    MemNddInstruction: [
+        ('emulq', 'mul', 64, False),
+        ('emulq', 'mul', 64, True),
+    ],
+    RegRegNddInstruction: [
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('elzcntq', 'lzcnt', 64, False),
+        ('elzcntq', 'lzcnt', 64, True),
+        ('enegq', 'neg', 64, False),
+        ('enegq', 'neg', 64, True),
+        ('enotq', 'not', 64, None),
+        ('epopcntq', 'popcnt', 64, False),
+        ('epopcntq', 'popcnt', 64, True),
+        ('erolq', 'rol', 64, False),
+        ('erolq', 'rol', 64, True),
+        ('erorq', 'ror', 64, False),
+        ('erorq', 'ror', 64, True),
+        ('esalq', 'sal', 64, False),
+        ('esalq', 'sal', 64, True),
+        ('esarq', 'sar', 64, False),
+        ('esarq', 'sar', 64, True),
+        ('edecq', 'dec', 64, False),
+        ('edecq', 'dec', 64, True),
+        ('eincq', 'inc', 64, False),
+        ('eincq', 'inc', 64, True),
+        ('eshlq', 'shl', 64, False),
+        ('eshlq', 'shl', 64, True),
+        ('eshrq', 'shr', 64, False),
+        ('eshrq', 'shr', 64, True),
+        ('etzcntq', 'tzcnt', 64, False),
+        ('etzcntq', 'tzcnt', 64, True),
+    ],
+    RegMemNddInstruction: [
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('elzcntq', 'lzcnt', 64, False),
+        ('elzcntq', 'lzcnt', 64, True),
+        ('enegq', 'neg', 64, False),
+        ('enegq', 'neg', 64, True),
+        ('epopcntq', 'popcnt', 64, False),
+        ('epopcntq', 'popcnt', 64, True),
+        ('esalq', 'sal', 64, False),
+        ('esalq', 'sal', 64, True),
+        ('esarq', 'sar', 64, False),
+        ('esarq', 'sar', 64, True),
+        ('edecq', 'dec', 64, False),
+        ('edecq', 'dec', 64, True),
+        ('eincq', 'inc', 64, False),
+        ('eincq', 'inc', 64, True),
+        ('eshrq', 'shr', 64, False),
+        ('eshrq', 'shr', 64, True),
+        ('etzcntq', 'tzcnt', 64, False),
+        ('etzcntq', 'tzcnt', 64, True),
+    ],
+    RegMemRegNddInstruction: [
+        ('eaddq', 'add', 64, False),
+        ('eaddq', 'add', 64, True),
+        ('eandq', 'and', 64, False),
+        ('eandq', 'and', 64, True),
+        ('eorq', 'or', 64, False),
+        ('eorq', 'or', 64, True),
+        ('esubq', 'sub', 64, False),
+        ('esubq', 'sub', 64, True),
+        ('exorq', 'xor', 64, False),
+        ('exorq', 'xor', 64, True),
+    ],
+    RegMemImmNddInstruction: [
+        ('eaddq', 'add', 64, False),
+        ('eaddq', 'add', 64, True),
+        ('eandq', 'and', 64, False),
+        ('eandq', 'and', 64, True),
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('eorq', 'or', 64, False),
+        ('eorq', 'or', 64, True),
+        ('esalq', 'sal', 64, False),
+        ('esalq', 'sal', 64, True),
+        ('esarq', 'sar', 64, False),
+        ('esarq', 'sar', 64, True),
+        ('eshrq', 'shr', 64, False),
+        ('eshrq', 'shr', 64, True),
+        ('esubq', 'sub', 64, False),
+        ('esubq', 'sub', 64, True),
+        ('exorq', 'xor', 64, False),
+        ('exorq', 'xor', 64, True),
+    ],
+    RegRegImmNddInstruction: [
+        ('eaddq', 'add', 64, False),
+        ('eaddq', 'add', 64, True),
+        ('eandq', 'and', 64, False),
+        ('eandq', 'and', 64, True),
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('eorq', 'or', 64, False),
+        ('eorq', 'or', 64, True),
+        ('erclq', 'rcl', 64, None),
+        ('erolq', 'rol', 64, False),
+        ('erolq', 'rol', 64, True),
+        ('erorq', 'ror', 64, False),
+        ('erorq', 'ror', 64, True),
+        ('esalq', 'sal', 64, False),
+        ('esalq', 'sal', 64, True),
+        ('esarq', 'sar', 64, False),
+        ('esarq', 'sar', 64, True),
+        ('eshlq', 'shl', 64, False),
+        ('eshlq', 'shl', 64, True),
+        ('eshrq', 'shr', 64, False),
+        ('eshrq', 'shr', 64, True),
+        ('esubq', 'sub', 64, False),
+        ('esubq', 'sub', 64, True),
+        ('exorq', 'xor', 64, False),
+        ('exorq', 'xor', 64, True),
+        ('eorq_imm32', 'or', 64, False),
+        ('eorq_imm32', 'or', 64, False),
+        ('esubq_imm32', 'sub', 64, False), 
+        ('esubq_imm32', 'sub', 64, True), 
+    ],
+    RegRegMemNddInstruction: [
+        ('eaddq', 'add', 64, False),
+        ('eaddq', 'add', 64, True),
+        ('eandq', 'and', 64, False),
+        ('eandq', 'and', 64, True),
+        ('eorq', 'or', 64, False),
+        ('eorq', 'or', 64, True),
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('esubq', 'sub', 64, False),
+        ('esubq', 'sub', 64, True),
+        ('exorq', 'xor', 64, False),
+        ('exorq', 'xor', 64, True),
+    ],
+    RegRegRegNddInstruction: [
+        ('eaddq', 'add', 64, False),
+        ('eaddq', 'add', 64, True),
+        ('eadcxq', 'adcx', 64, None),
+        ('eadoxq', 'adox', 64, None),
+        ('eandq', 'and', 64, False),
+        ('eandq', 'and', 64, True),
+        ('eimulq', 'imul', 64, False),
+        ('eimulq', 'imul', 64, True),
+        ('eorq', 'or', 64, False),
+        ('eorq', 'or', 64, True),
+        ('esubq', 'sub', 64, False),
+        ('esubq', 'sub', 64, True),
+        ('exorq', 'xor', 64, False),
+        ('exorq', 'xor', 64, True),
+    ],
+    RegRegRegImmNddInstruction: [
+        ('eshldq', 'shld', 64, False),
+        ('eshldq', 'shld', 64, True),
+        ('eshrdq', 'shrd', 64, False),
+        ('eshrdq', 'shrd', 64, True),
+    ],
+    CondRegRegRegInstruction: [
+        ('ecmovq', 'cmov', 64, key) for key in cond_to_suffix.keys()
+    ],
+    CondRegRegMemInstruction: [
+        ('ecmovq', 'cmov', 64, key) for key in cond_to_suffix.keys()
+    ],
 }
 
 if __name__ == "__main__":
diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index 06110ddcbc1..24a1d0c7c5b 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -86,6 +86,20 @@ vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java
 
 vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java 8285417 generic-all
 
+###
+# The test first suspends a vthread and all the carriers and then it resumes the vthread expecting it
+# to run to completion. In mainline it only works because the suspension step happens while the vthread is
+# pinned to the carrier blocked on synchronized. So the carrier only actually suspends on the next unmount
+# transition which in this test happens once the vthread has finished executing the expected code.
+
+vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java 8338713 generic-all
+
+###
+# The test sends a StopThread to a vthread expecting that is currently pinned to the carrier blocked on
+# synchronized. Since the vthread is now unmounted StopThread returns JVMTI_ERROR_OPAQUE_FRAME error.
+
+vmTestbase/nsk/jdb/kill/kill001/kill001.java 8338714 generic-all
+
 ###
 # Fails on Windows because of additional memory allocation.
 
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 000f26d71c6..43f72f0be73 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -113,6 +113,13 @@ runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
 runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x64
+runtime/Dictionary/CleanProtectionDomain.java 8341916 generic-all
+runtime/Dictionary/ProtectionDomainCacheTest.java 8341916 generic-all
+runtime/logging/ProtectionDomainVerificationTest.java 8341916 generic-all
+
+# Fails with +UseCompactObjectHeaders on aarch64
+runtime/cds/appcds/SharedBaseAddress.java 8340212 linux-aarch64,macosx-aarch64
+runtime/cds/SharedBaseAddress.java 8340212 linux-aarch64,macosx-aarch64
 
 applications/jcstress/copy.java 8229852 linux-all
 
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 21c5aebaa71..af97ff465de 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -86,7 +86,9 @@ requires.properties= \
     vm.flagless \
     container.support \
     systemd.support \
-    jdk.containerized
+    jdk.containerized \
+    jlink.runtime.linkable \
+    jlink.packagedModules
 
 # Minimum jtreg version
 requiredVersion=7.4+1
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 2a08266d79f..575c0caa674 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -444,6 +444,7 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/jcmd/JCmdTestStaticDump.java \
  -runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java \
  -runtime/cds/appcds/jcmd/JCmdTestFileSafety.java \
+ -runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClass.java \
  -runtime/cds/appcds/lambdaForm/DefaultClassListLFInvokers.java \
  -runtime/cds/appcds/methodHandles \
  -runtime/cds/appcds/sharedStrings \
diff --git a/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java b/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
index 6ab45af39c5..086711085b4 100644
--- a/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
+++ b/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
@@ -62,7 +62,8 @@ public static void test1Runner() {
     }
 
     @Test
-    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 1"})
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 1"},
+        applyIfPlatformOr = {"x64", "true", "aarch64", "true"})
     public static int test2(int stop, int[] array) {
         int v = 0;
         stop = Math.min(stop, Integer.MAX_VALUE / 4);
diff --git a/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java b/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java
index 3d4584714d7..60086dba327 100644
--- a/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java
+++ b/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java
@@ -36,7 +36,6 @@
  *                   -XX:CompileCommand=inline,*String*::*
  *                   -XX:CompileCommand=dontinline,*StringBuilder*::ensureCapacityInternal
  *                   -XX:CompileCommand=dontinline,*String*::substring
- *                   -XX:CompileCommand=MemLimit,*.*,0
  *                   -XX:NodeCountInliningCutoff=220000
  *                   -XX:DesiredMethodLimit=100000
  *                   compiler.c2.TestScalarReplacementMaxLiveNodes
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
index 2d17753ba94..b511476bf52 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
@@ -153,6 +153,8 @@ static private void runAndVerify3(Runnable test, int offset) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -165,6 +167,8 @@ public static void testByteLong1a(byte[] dest, long[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -176,6 +180,8 @@ public static void testByteLong1b(byte[] dest, long[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
     public static void testByteLong1c(byte[] dest, long[] src) {
         long base = 64; // make sure it is big enough and 8 byte aligned (required for 32-bit)
@@ -186,6 +192,8 @@ public static void testByteLong1c(byte[] dest, long[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -235,6 +243,8 @@ public static void testByteLong2_runner() {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -247,6 +257,8 @@ public static void testByteLong3a(byte[] dest, long[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -298,6 +310,8 @@ public static void testByteLong4_runner() {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -310,6 +324,8 @@ public static void testByteLong5a(byte[] dest, long[] src, int start, int stop)
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -328,6 +344,8 @@ public static void testByteLong5_runner() {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -340,6 +358,8 @@ public static void testByteByte1a(byte[] dest, byte[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -357,6 +377,8 @@ public static void testByteByte1_runner() {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -369,6 +391,8 @@ public static void testByteByte2a(byte[] dest, byte[] src) {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
index 5968b7221c7..d61b8c658d6 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
@@ -51,7 +51,9 @@ public static void main(String[] args) {
     static long[] longArray = new long[size];
 
     @Test
-    @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" })
+    @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" })
     public static void test(byte[] dest, long[] src) {
         for (int i = 0; i < src.length; i++) {
             if ((i < 0) || (8 > sizeBytes - i)) {
diff --git a/test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java b/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestCombineAddPWithConstantOffsets.java
similarity index 51%
rename from test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java
rename to test/hotspot/jtreg/compiler/c2/irTests/igvn/TestCombineAddPWithConstantOffsets.java
index 26120d1f034..69963316fa9 100644
--- a/test/jdk/java/lang/Class/getEnclosingMethod/EnclosingMethodWithSecurityManager.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestCombineAddPWithConstantOffsets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,31 +20,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package compiler.c2.irTests.igvn;
+
+import compiler.lib.ir_framework.*;
 
 /*
  * @test
- * @bug 8014678
- * @run main EnclosingMethodWithSecurityManager
- * @run main/othervm -Djava.security.manager=allow EnclosingMethodWithSecurityManager "WithSecurityManager"
+ * @bug 8343067
+ * @requires os.simpleArch == "x64" | os.simpleArch == "aarch64"
+ * @requires vm.compiler2.enabled
+ * @summary Test that chains of AddP nodes with constant offsets are idealized
+ *          when their offset input changes.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.igvn.TestCombineAddPWithConstantOffsets
  */
+public class TestCombineAddPWithConstantOffsets {
 
-public class EnclosingMethodWithSecurityManager {
     public static void main(String[] args) {
-        if (args.length == 1) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        new Inner().setTheInner();
-        Inner.theInner.getEnclosingMethod();
+        TestFramework.run();
     }
 
-    public static class Inner {
-        public static Class<?> theInner;
-
-        public void setTheInner() {
-            Object o = new Object() {
-            };
-            Inner.theInner = o.getClass();
+    @Test
+    @IR(applyIfPlatform = {"x64", "true"}, failOn = {IRNode.ADD_P_OF, ".*"})
+    @IR(applyIfPlatform = {"aarch64", "true"}, failOn = {IRNode.ADD_P_OF, "reg_imm"})
+    static void testCombineAddPWithConstantOffsets(int[] arr) {
+        for (long i = 6; i < 14; i++) {
+            arr[(int)i] = 1;
         }
     }
+
+    @Run(test = {"testCombineAddPWithConstantOffsets"})
+    public void runTests() {
+        testCombineAddPWithConstantOffsets(new int[14]);
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/ccp/TestWrongMinLWiden.java b/test/hotspot/jtreg/compiler/ccp/TestWrongMinLWiden.java
new file mode 100644
index 00000000000..bb0753e3ba7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/ccp/TestWrongMinLWiden.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343944
+ * @summary Test that _widen is set correctly in MinL::add_ring() to prevent an endless widening in CCP.
+ * @run main/othervm -Xcomp -XX:CompileCommand=compileonly,compiler.ccp.TestWrongMinLWiden::*
+ *                   compiler.ccp.TestWrongMinLWiden
+ */
+
+package compiler.ccp;
+
+public class TestWrongMinLWiden {
+    static long lFld;
+    static short sFld;
+
+    public static void main(String[] strArr) {
+        Math.min(3,3); // Make sure Math class is loaded.
+        test();
+        testWithMathMin();
+    }
+
+
+    static long test() {
+        long x = 50398;
+        for (int i = 1; i < 100; i++) {
+            long xMinus1 = x - 1; // x is a phi with type #long
+            // Long comparison:
+            //     ConvI2L(sFld) <= xMinus1
+            // First converted to
+            //     CMoveL(sFld <= xMinus1, sFld, xMinus1)
+            //     CMoveL(ConvI2L(sFld) <= long_phi, ConvI2L(sFld), long_phi)
+            // with types
+            //     CMoveL(#short <= #long, #short, #long)
+            // And then converted in CMoveNode::Ideal() to
+            //     MinL(sFld, xMinus1)
+            //     MinL(ConvI2L(sFld), long_phi)
+            //
+            // We wrongly set the _widen of the new type for MinL in MinL::add_ring() to the minimum of both types which
+            // is always 0 because the _widen of sFld is 0. As a result, we will endlessly widen the involved types
+            // because the new type for MinL keeps resetting _widen to 0.
+            // Instead, we should choose the maximum of both _widen fields for the new type for MinL which will then
+            // select the _widen of xMinus1 which will grow each time we set a new type for the long_phi. Eventually,
+            // we will saturate the type of long_phi to min_long to avoid an endless widening.
+            x = sFld <= xMinus1 ? sFld : xMinus1;
+        }
+        return x;
+    }
+
+    // Same as test() but with Math.min() which internally uses x <= y ? x : y which allows the CMoveL pattern to be
+    // replaced with MinL.
+    static long testWithMathMin() {
+        long x = 50398;
+        for (int i = 1; i < 100; i++) {
+            x = Math.min(sFld, x - 1);
+        }
+        return x;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java b/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
index 0b71f892452..548a746c3af 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
  *                   -XX:CompileCommand=exclude,java.lang.Thread::sleepNanos
  *                   -XX:CompileCommand=exclude,java.lang.Thread::beforeSleep
  *                   -XX:CompileCommand=exclude,java.lang.Thread::afterSleep
+ *                   -XX:CompileCommand=exclude,java.util.concurrent.TimeUnit::toNanos
  *                   -XX:CompileCommand=exclude,java.lang.Math::min
  *                   -XX:CompileCommand=exclude,jdk.internal.event.ThreadSleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.SleepEvent::*
@@ -52,6 +53,7 @@
  *                   -XX:CompileCommand=exclude,java.lang.Thread::sleepNanos
  *                   -XX:CompileCommand=exclude,java.lang.Thread::beforeSleep
  *                   -XX:CompileCommand=exclude,java.lang.Thread::afterSleep
+ *                   -XX:CompileCommand=exclude,java.util.concurrent.TimeUnit::toNanos
  *                   -XX:CompileCommand=exclude,java.lang.Math::min
  *                   -XX:CompileCommand=exclude,jdk.internal.event.ThreadSleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.SleepEvent::*
diff --git a/test/hotspot/jtreg/compiler/exceptions/ExceptionInInit.java b/test/hotspot/jtreg/compiler/exceptions/ExceptionInInit.java
deleted file mode 100644
index a9ca2954a01..00000000000
--- a/test/hotspot/jtreg/compiler/exceptions/ExceptionInInit.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4165973
- * @summary Attempt to read inaccessible property can produce
- *          exception of the wrong type.
- * @author Tom Rodriguez
- *
- * @modules java.rmi
- * @run main/othervm -Djava.security.manager=allow compiler.exceptions.ExceptionInInit
- */
-
-package compiler.exceptions;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class ExceptionInInit {
-
-    public static void main(String[] args) {
-
-        Test test = null;
-
-        try {
-            System.setSecurityManager(new java.rmi.RMISecurityManager());
-            Test.showTest();
-        } catch (ExceptionInInitializerError e) {
-        }
-    }
-
-    public static class FooBar {
-        static String test = "test";
-        FooBar(String test) {
-            this.test = test;
-        }
-    }
-
-    public static class Test extends FooBar {
-
-        /*
-         * An AccessControlException is thrown in the static initializer of the
-         * class FooBar. This exception should produce an ExceptionInInitializer
-         * error. Instead it causes a more cryptic ClassNotFound error.
-         *
-         * The following is an excerpt from the output from java.security.debug=all
-         *
-         * access: access denied (java.util.PropertyPermission test.src read)
-         * java.lang.Exception: Stack trace
-         *         at java.lang.Thread.dumpStack(Thread.java:938)
-         *         at java.security.AccessControlContext.checkPermission(AccessControlContext.java:184)
-         *         at java.security.AccessController.checkPermission(AccessController.java:402)
-         *         at java.lang.SecurityManager.checkPermission(SecurityManager.java:516)
-         *         at java.lang.SecurityManager.checkPropertyAccess(SecurityManager.java:1035)
-         *         at java.lang.System.getProperty(System.java:441)
-         *         at sun.security.action.GetPropertyAction.run(GetPropertyAction.java:73)
-         *         at java.security.AccessController.doPrivileged(Native Method)
-         *         at ExceptionInInit$Test.&#60clinit>(ExceptionInInit.java:33)
-         *         at ExceptionInInit.main(ExceptionInInit.java:18)
-         * access: domain that failed ProtectionDomain (file:/tmp/exceptionInInit/<no certificates>)
-         *
-         * The following exception is occurring when this test program tries
-         * to access the test.src property.
-         */
-        private static String test =
-            AccessController.doPrivileged((PrivilegedAction<String>)() -> System.getProperty("test.src", "."));
-
-        Test(String test) {
-            super(test);
-        }
-        public static void showTest() {
-            System.err.println(test);
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
index 159e471e3fc..b005d767287 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,6 +122,10 @@ public static OutputAnalyzer runTest(Class<? extends Expr> expr,
         List<String> vmOpts = new LinkedList<String>();
 
         Collections.addAll(vmOpts, additionalVMOpts);
+        // Hide timestamps from warnings (e.g. due to potential CDS
+        // saved/runtime state mismatch), to avoid false positives when
+        // comparing output across runs.
+        vmOpts.add("-Xlog:all=warning:stdout:level,tags");
 
         //setup mode-specific options
         switch (testVMMode) {
diff --git a/test/hotspot/jtreg/compiler/jvmci/SecurityRestrictionsTest.java b/test/hotspot/jtreg/compiler/jvmci/SecurityRestrictionsTest.java
deleted file mode 100644
index 80c7d856836..00000000000
--- a/test/hotspot/jtreg/compiler/jvmci/SecurityRestrictionsTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8136421
- * @requires vm.jvmci
- * @library /test/lib /
- * @library common/patches
- * @modules java.base/jdk.internal.misc
- * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
- * @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *      -XX:+EnableJVMCI
- *      compiler.jvmci.SecurityRestrictionsTest
- *      NO_SEC_MAN
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *      -XX:+EnableJVMCI
- *      -Djava.security.manager=allow
- *      compiler.jvmci.SecurityRestrictionsTest
- *      NO_PERM
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *      -XX:+EnableJVMCI
- *      -Djava.security.manager=allow
- *      compiler.jvmci.SecurityRestrictionsTest
- *      ALL_PERM
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *      -XX:+EnableJVMCI -XX:-UseJVMCICompiler
- *      -Djava.security.manager=allow
- *      compiler.jvmci.SecurityRestrictionsTest
- *      NO_JVMCI_ACCESS_PERM
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *      -XX:-EnableJVMCI -XX:-UseJVMCICompiler
- *      compiler.jvmci.SecurityRestrictionsTest
- *      NO_JVMCI
- */
-
-package compiler.jvmci;
-
-import jdk.test.lib.Utils;
-
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.util.PropertyPermission;
-import java.util.function.Consumer;
-
-public class SecurityRestrictionsTest {
-
-    public static void main(String[] args) {
-        try {
-            // to init Utils before call SecurityManager
-            Class.forName(Utils.class.getName(), true,
-                    Utils.class.getClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new Error("[TEST BUG]: jdk.test.lib.Utils not found", e);
-        }
-        try {
-            TestCase mode = TestCase.valueOf(args[0]);
-            mode.run();
-        } catch (IllegalArgumentException e) {
-            throw new Error("[TEST BUG]: Unknown mode " + args[0], e);
-        }
-    }
-
-    private enum TestCase {
-        NO_SEC_MAN,
-        NO_JVMCI {
-            @Override
-            public Class<? extends Throwable> getExpectedException() {
-                return Error.class;
-            }
-        },
-        ALL_PERM {
-            @Override
-            public SecurityManager getSecurityManager() {
-                return new SecurityManager() {
-                    @Override
-                    public void checkPermission(Permission perm) {
-                    }
-                };
-            }
-        },
-        NO_PERM {
-            @Override
-            public SecurityManager getSecurityManager() {
-                return new SecurityManager();
-            }
-
-            @Override
-            public Class<? extends Throwable> getExpectedException() {
-                return AccessControlException.class;
-            }
-        },
-        NO_JVMCI_ACCESS_PERM {
-            @Override
-            public SecurityManager getSecurityManager() {
-                return new SecurityManager() {
-                    @Override
-                    public void checkPermission(Permission perm) {
-                        if (isJvmciPermission(perm)) {
-                            super.checkPermission(perm);
-                        }
-                    }
-
-                    @Override
-                    public void checkPropertyAccess(String key) {
-                        if (key.startsWith(JVMCI_PROP_START)) {
-                            super.checkPropertyAccess(key);
-                        }
-                    }
-                };
-            }
-
-            private boolean isJvmciPermission(Permission perm) {
-                String name = perm.getName();
-                boolean isJvmciRuntime = perm instanceof RuntimePermission
-                        && (JVMCI_SERVICES.equals(name)
-                            || name.startsWith(JVMCI_RT_PERM_START));
-                boolean isJvmciProperty = perm instanceof PropertyPermission
-                        && name.startsWith(JVMCI_PROP_START);
-                return isJvmciRuntime || isJvmciProperty;
-            }
-
-            @Override
-            public Class<? extends Throwable> getExpectedException() {
-                return AccessControlException.class;
-            }
-        };
-
-        public void run() {
-            System.setSecurityManager(getSecurityManager());
-            Consumer<Throwable> exceptionCheck = e -> {
-                if (e == null) {
-                    if (getExpectedException() != null) {
-                        String message = name() + ": Didn't get expected exception "
-                                + getExpectedException();
-                        throw new AssertionError(message);
-                    }
-                } else {
-                    String message = name() + ": Got unexpected exception "
-                            + e.getClass().getSimpleName();
-                    if (getExpectedException() == null){
-                        throw new AssertionError(message, e);
-                    }
-
-                    Throwable t = e;
-                    while (t.getCause() != null) {
-                        t = t.getCause();
-                    }
-                    if (!getExpectedException().isAssignableFrom(t.getClass())) {
-                        message += " instead of " + getExpectedException()
-                                .getSimpleName();
-                        throw new AssertionError(message, e);
-                    }
-                }
-            };
-            Utils.runAndCheckException(() -> {
-                // CompilerToVM::<cinit> provokes CompilerToVM::<init>
-                Class.forName("jdk.vm.ci.hotspot.CompilerToVMHelper");
-            }, exceptionCheck);
-        }
-
-        public SecurityManager getSecurityManager() {
-            return null;
-        }
-
-        public Class<? extends Throwable> getExpectedException() {
-            return null;
-        }
-
-        private static final String JVMCI_RT_PERM_START
-                = "accessClassInPackage.jdk.vm.ci";
-        private static final String JVMCI_SERVICES = "jvmciServices";
-        private static final String JVMCI_PROP_START = "jvmci.";
-
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index fc55662d801..1d586e972be 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -279,6 +279,12 @@ public class IRNode {
         superWordNodes(ADD_REDUCTION_VL, "AddReductionVL");
     }
 
+    public static final String ADD_P_OF = COMPOSITE_PREFIX + "ADD_P_OF" + POSTFIX;
+    static {
+        String regex = START + "addP_" + IS_REPLACED + MID + ".*" + END;
+        machOnly(ADD_P_OF, regex);
+    }
+
     public static final String ALLOC = PREFIX + "ALLOC" + POSTFIX;
     static {
         String optoRegex = "(.*precise .*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: C2 Runtime new_instance" + END;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index d477aa44763..caef911f73a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -142,7 +142,8 @@ public class TestFramework {
                     "UseZbb",
                     "UseRVV",
                     "Xlog",
-                    "LogCompilation"
+                    "LogCompilation",
+                    "UseCompactObjectHeaders"
             )
     );
 
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
index c77f4f6fa2e..efd328dc5cc 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
@@ -398,6 +398,7 @@ static Object[] test0(byte[] a, byte[] b, byte mask) {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
                   IRNode.AND_VB, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test1(byte[] a, byte[] b, byte mask) {
@@ -706,7 +707,7 @@ static Object[] test10c(short[] a, short[] b, short mask) {
     @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VS,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIf = {"MaxVectorSize", ">=16"},
+        applyIfAnd = {"MaxVectorSize", ">=16", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test10d(short[] a, short[] b, short mask) {
@@ -1001,6 +1002,7 @@ static Object[] test13aIL(int[] a, long[] b) {
                   IRNode.ADD_VB, "> 0",
                   IRNode.ADD_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13aIB(int[] a, byte[] b) {
@@ -1017,6 +1019,7 @@ static Object[] test13aIB(int[] a, byte[] b) {
                   IRNode.ADD_VI, "> 0",
                   IRNode.ADD_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13aIS(int[] a, short[] b) {
@@ -1037,6 +1040,7 @@ static Object[] test13aIS(int[] a, short[] b) {
                   IRNode.ADD_VI, "> 0",
                   IRNode.ADD_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13aBSIL(byte[] a, short[] b, int[] c, long[] d) {
@@ -1072,6 +1076,7 @@ static Object[] test13bIL(int[] a, long[] b) {
                   IRNode.ADD_VB, "> 0",
                   IRNode.ADD_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13bIB(int[] a, byte[] b) {
@@ -1088,6 +1093,7 @@ static Object[] test13bIB(int[] a, byte[] b) {
                   IRNode.ADD_VI, "> 0",
                   IRNode.ADD_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13bIS(int[] a, short[] b) {
@@ -1108,6 +1114,7 @@ static Object[] test13bIS(int[] a, short[] b) {
                   IRNode.ADD_VI, "> 0",
                   IRNode.ADD_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
+        applyIf = {"UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
     static Object[] test13bBSIL(byte[] a, short[] b, int[] c, long[] d) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
index fb99fc5983a..9aaa7cdd8a9 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
@@ -163,11 +163,13 @@ public static int[] testc(int[] out) {
     @Test
     @IR(applyIfCPUFeature = {"sse2", "true"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"asimd", "true"},
-        applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+        applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false"}, // AD file requires vector_length = 16
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
     public static int[] testd(int[] out) {
         for (int i = 0; i < ITER-2; i+=2) {
@@ -181,11 +183,13 @@ public static int[] testd(int[] out) {
     @Test
     @IR(applyIfCPUFeature = {"sse2", "true"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"asimd", "true"},
-        applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+        applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
     public static int[] teste(int[] out) {
         for (int i = 0; i < ITER-2; i+=2) {
@@ -199,11 +203,13 @@ public static int[] teste(int[] out) {
     @Test
     @IR(applyIfCPUFeature = {"sse2", "true"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"asimd", "true"},
-        applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+        applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
     public static int[] testf(int[] out) {
         for (int i = 0; i < ITER-2; i+=2) {
@@ -217,11 +223,13 @@ public static int[] testf(int[] out) {
     @Test
     @IR(applyIfCPUFeature = {"sse2", "true"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"asimd", "true"},
-        applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+        applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
     public static int[] testg(int[] out) {
         for (int i = 0; i < ITER-2; i+=2) {
@@ -235,11 +243,13 @@ public static int[] testg(int[] out) {
     @Test
     @IR(applyIfCPUFeature = {"sse2", "true"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"asimd", "true"},
-        applyIf = {"MaxVectorSize", "16"}, // AD file requires vector_length = 16
+        applyIfAnd = {"MaxVectorSize", "16", "UseCompactObjectHeaders", "false" }, // AD file requires vector_length = 16
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI, "> 0"})
     @IR(applyIfCPUFeature = {"avx512_vnni", "true"},
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.MUL_ADD_S2I, "> 0", IRNode.MUL_ADD_VS2VI_VNNI, "> 0"})
     public static int[] testh(int[] out) {
         for (int i = 0; i < ITER-2; i+=2) {
diff --git a/test/hotspot/jtreg/compiler/loopstripmining/TestIdenticalDominatingCLE.java b/test/hotspot/jtreg/compiler/loopstripmining/TestIdenticalDominatingCLE.java
new file mode 100644
index 00000000000..371c0fb2bc5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopstripmining/TestIdenticalDominatingCLE.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8340532
+ * @summary C2: assert(is_OuterStripMinedLoop()) failed: invalid node class: IfTrue
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -XX:CompileOnly=TestIdenticalDominatingCLE::* -XX:CompileThreshold=100 -Xcomp -XX:-TieredCompilation
+ *                   -XX:-RangeCheckElimination -XX:LoopMaxUnroll=0 TestIdenticalDominatingCLE
+ *
+ */
+
+
+public class TestIdenticalDominatingCLE {
+    boolean bFld;
+    long lFld;
+    float[][] fArr = new float[6][6];
+
+    public static void main(String[] var0) {
+        TestIdenticalDominatingCLE t = new TestIdenticalDominatingCLE();
+        t.test();
+    }
+
+    void test() {
+        int i = 0;
+        do {
+            for (int j = 0; j < 2; j++) {
+                float f = fArr[j][3] / Float.valueOf((float)1.318095814E9);
+                switch (i) {
+                    case 1:
+                        if (bFld ^ bFld) {
+                        } else {
+                            for (int k = 0; k < 600; k++) {
+                            }
+                        }
+                        break;
+                    default:
+                        if (bFld) {
+                        }
+                }
+            }
+            lFld = ++i;
+        } while (i < 6);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
index cddc5207d42..16d04102082 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -223,6 +223,8 @@ public int[] multipleOpsWith2DifferentTypesAndConstant() {
 
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] multipleOpsWith2DifferentTypesAndInvariant() {
         short[] res1 = new short[SIZE];
@@ -236,6 +238,8 @@ public int[] multipleOpsWith2DifferentTypesAndInvariant() {
 
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+        // This test fails with compact headers, but only with UseSSE<=3.
+        applyIf = { "UseCompactObjectHeaders", "false" },
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] multipleOpsWith2DifferentTypesAndComplexExpression() {
         short[] res1 = new short[SIZE];
diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
index d37bf567381..2a7886a2106 100644
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
+++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -259,7 +259,6 @@ private void testConcurrentRefinementLogs() throws Exception {
 
     LogMessageWithLevel exhFailureMessages[] = new LogMessageWithLevel[] {
         new LogMessageWithLevel("Recalculate Used Memory \\(ms\\):", Level.DEBUG),
-        new LogMessageWithLevel("Restore Preserved Marks \\(ms\\):", Level.DEBUG),
         new LogMessageWithLevel("Restore Evacuation Failed Regions \\(ms\\):", Level.DEBUG),
         new LogMessageWithLevel("Process Evacuation Failed Regions \\(ms\\):", Level.DEBUG),
         new LogMessageWithLevel("Evacuation Failed Regions:", Level.DEBUG),
diff --git a/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
index 2e7ebc2370f..88d11c10fa0 100644
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
@@ -32,7 +32,7 @@
  * @modules java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/timeout=240 gc.g1.plab.TestPLABPromotion
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.g1.plab.TestPLABPromotion
  */
 package gc.g1.plab;
 
@@ -48,12 +48,15 @@
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
 
 /**
  * Test checks PLAB promotion of different size objects.
  */
 public class TestPLABPromotion {
 
+    private static final boolean COMPACT_HEADERS = Platform.is64bit() && WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompactObjectHeaders");
+
     // GC ID with survivor PLAB statistics
     private final static long GC_ID_SURVIVOR_STATS = 1l;
     // GC ID with old PLAB statistics
@@ -74,7 +77,7 @@ public class TestPLABPromotion {
     private static final int PLAB_SIZE_HIGH = 65536;
     private static final int OBJECT_SIZE_SMALL  = 10 * HEAP_WORD_SIZE;
     private static final int OBJECT_SIZE_MEDIUM = 128 * HEAP_WORD_SIZE;
-    private static final int OBJECT_SIZE_HIGH   = 3072 * HEAP_WORD_SIZE;
+    private static final int OBJECT_SIZE_HIGH   = (COMPACT_HEADERS ? 3266 : 3250) * HEAP_WORD_SIZE;
     private static final int GC_NUM_SMALL = 1;
     private static final int GC_NUM_MEDIUM = 3;
     private static final int GC_NUM_HIGH = 7;
diff --git a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
index e6377a8570d..fce30285312 100644
--- a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
+++ b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
@@ -35,5 +35,26 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
+ */
+
+/* @test id=ccp_off
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.xml
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:-UseCompressedClassPointers -Xlog:metaspace* -Xmx6g -Xms128m
+ */
+
+/* @test id=use-zero-based-encoding-coh
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.xml
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
+ */
+
+/* @test id=use-zero-based-encoding-coh-large-class-space
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.xml
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=4g
  */
diff --git a/test/hotspot/jtreg/gtest/MetaspaceGtests.java b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
index f1f811d6a71..fac88588e31 100644
--- a/test/hotspot/jtreg/gtest/MetaspaceGtests.java
+++ b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
@@ -49,3 +49,14 @@
  * @requires vm.flagless
  * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockDiagnosticVMOptions -XX:-UseCompressedClassPointers
  */
+
+/* @test id=UseCompactObjectHeaders
+ * @summary Run metaspace-related gtests with tiny classpointers
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.xml
+ * @requires vm.bits == 64
+ * @requires vm.flagless
+ * @requires vm.debug
+ * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders
+ */
diff --git a/test/hotspot/jtreg/gtest/MetaspaceUtilsGtests.java b/test/hotspot/jtreg/gtest/MetaspaceUtilsGtests.java
index 7a9b1c8dfb3..e69de29bb2d 100644
--- a/test/hotspot/jtreg/gtest/MetaspaceUtilsGtests.java
+++ b/test/hotspot/jtreg/gtest/MetaspaceUtilsGtests.java
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * Note: This runs the metaspace utils related parts of gtest in configurations which
- *  are not tested explicitly in the standard gtests.
- *
- */
-
-/* @test
- * @bug 8264008
- * @summary Run metaspace utils related gtests with compressed class pointers off
- * @requires vm.bits == 64
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.xml
- * @requires vm.flagless
- * @run main/native GTestWrapper --gtest_filter=MetaspaceUtils* -XX:-UseCompressedClassPointers
- */
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
index f1b4c7143b4..574a680aceb 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ private static void do_test(boolean CDS) throws IOException {
                 "-Xshare:" + (CDS ? "on" : "off"),
                 "-Xmx128m",
                 "-XX:CompressedClassSpaceSize=128m",
+                "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
                 "-Xlog:metaspace*", "-Xlog:metaspace+map=trace", "-Xlog:os+map=trace",
                 "-XX:+SimulateFullAddressSpace", // So that no resevation attempt will succeed
                 "-version");
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
index 4feadfb5565..e4b6f2a0548 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@ public class CompressedClassPointers {
 
     static final String logging_option = "-Xlog:gc+metaspace=trace,metaspace=info,cds=trace";
     static final String reserveCCSAnywhere = "Reserving compressed class space anywhere";
+    static final String usesCompactObjectHeadersPat = "UseCompactObjectHeaders 1";
 
     // Returns true if we are to test the narrow klass base; we only do this on
     // platforms where we can be reasonably shure that we get reproducable placement).
@@ -57,6 +58,11 @@ static boolean testNarrowKlassBase() {
 
     }
 
+    // Returns true if the output indicates that the VM uses compact object headers
+    static boolean usesCompactObjectHeaders(OutputAnalyzer output) {
+        return output.getOutput().contains(usesCompactObjectHeadersPat);
+    }
+
     // Returns true if the output indicates that the ccs is reserved anywhere.
     static boolean isCCSReservedAnywhere(OutputAnalyzer output) {
         if (output.getOutput().contains(reserveCCSAnywhere)) {
@@ -221,7 +227,7 @@ public static void smallHeapTestNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
         output.shouldHaveExitValue(0);
@@ -239,10 +245,10 @@ public static void smallHeapTestWith1GNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
-        if (!Platform.isAArch64() && !Platform.isPPC()) {
+        if (!Platform.isAArch64()  && !usesCompactObjectHeaders(output) && !Platform.isPPC()) {
             // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }
@@ -261,10 +267,10 @@ public static void largeHeapTestNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
-        if (!Platform.isAArch64() && !Platform.isPPC()) {
+        if (!Platform.isAArch64()  && !usesCompactObjectHeaders(output) && !Platform.isPPC()) {
             // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
index 070c856a322..665c4cb8b9f 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,13 +42,16 @@
 
 public class CompressedClassPointersEncodingScheme {
 
-    private static void test(long forceAddress, long classSpaceSize, long expectedEncodingBase, int expectedEncodingShift) throws IOException {
+    private static void test(long forceAddress, boolean COH, long classSpaceSize, long expectedEncodingBase, int expectedEncodingShift) throws IOException {
         String forceAddressString = String.format("0x%016X", forceAddress).toLowerCase();
         String expectedEncodingBaseString = String.format("0x%016X", expectedEncodingBase).toLowerCase();
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
                 "-Xshare:off", // to make CompressedClassSpaceBaseAddress work
                 "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:-UseCompressedOops", // keep VM from optimizing heap location
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:" + (COH ? "+" : "-") + "UseCompactObjectHeaders",
+                "-XX:" + (COH ? "+" : "-") + "UseObjectMonitorTable",
                 "-XX:CompressedClassSpaceBaseAddress=" + forceAddress,
                 "-XX:CompressedClassSpaceSize=" + classSpaceSize,
                 "-Xmx128m",
@@ -60,7 +63,8 @@ private static void test(long forceAddress, long classSpaceSize, long expectedEn
 
         // We ignore cases where we were not able to map at the force address
         if (output.contains("reserving class space failed")) {
-            throw new SkippedException("Skipping because we cannot force ccs to " + forceAddressString);
+            System.out.println("Skipping because we cannot force ccs to " + forceAddressString);
+            return;
         }
 
         output.shouldHaveExitValue(0);
@@ -73,9 +77,51 @@ private static void test(long forceAddress, long classSpaceSize, long expectedEn
     public static void main(String[] args) throws Exception {
         // Test ccs nestling right at the end of the 4G range
         // Expecting base=0, shift=0
-        test(4 * G - 128 * M, 128 * M, 0, 0);
+        test(4 * G - 128 * M, false, 128 * M, 0, 0);
 
+        // Test ccs nestling right at the end of the 32G range
+        // Expecting:
+        // - non-aarch64: base=0, shift=3
+        // - aarch64: base to start of class range, shift 0
+        if (Platform.isAArch64()) {
+            // The best we can do on aarch64 is to be *near* the end of the 32g range, since a valid encoding base
+            // on aarch64 must be 4G aligned, and the max. class space size is 3G.
+            long forceAddress = 0x7_0000_0000L; // 28g, and also a valid EOR immediate
+            test(forceAddress, false, 3 * G, forceAddress, 0);
+        } else {
+            test(32 * G - 128 * M, false, 128 * M, 0, 3);
+        }
+
+        // Test ccs starting *below* 4G, but extending upwards beyond 4G. All platforms except aarch64 should pick
+        // zero based encoding. On aarch64, this test is excluded since the only valid mode would be XOR, but bit
+        // pattern for base and bit pattern would overlap.
+        if (!Platform.isAArch64()) {
+            test(4 * G - 128 * M, false, 2 * 128 * M, 0, 3);
+        }
         // add more...
 
+        // Compact Object Header Mode:
+        // On aarch64 and x64 we expect the VM to chose the smallest possible shift value needed to cover
+        // the encoding range. We expect the encoding Base to start at the class space start - but to enforce that,
+        // we choose a high address.
+        if (Platform.isAArch64() || Platform.isX64() || Platform.isRISCV64()) {
+            long forceAddress = 32 * G;
+
+            long ccsSize = 128 * M;
+            int expectedShift = 6;
+            test(forceAddress, true, ccsSize, forceAddress, expectedShift);
+
+            ccsSize = 512 * M;
+            expectedShift = 8;
+            test(forceAddress, true, ccsSize, forceAddress, expectedShift);
+
+            ccsSize = G;
+            expectedShift = 9;
+            test(forceAddress, true, ccsSize, forceAddress, expectedShift);
+
+            ccsSize = 3 * G;
+            expectedShift = 10;
+            test(forceAddress, true, ccsSize, forceAddress, expectedShift);
+        }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java
index b679e866ac8..e69de29bb2d 100644
--- a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java
+++ b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java
@@ -1,113 +0,0 @@
-/*
- * Copyright Amazon.com Inc. or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test id=with-coops-no-ccp
- * @library /test/lib
- * @requires vm.bits == "64"
- * @modules java.base/jdk.internal.misc
- * @run main/othervm -XX:+UseCompressedOops -XX:-UseCompressedClassPointers ArrayBaseOffsets
- */
-/*
- * @test id=with-coops-with-ccp
- * @library /test/lib
- * @requires vm.bits == "64"
- * @requires vm.opt.UseCompressedClassPointers != false
- * @modules java.base/jdk.internal.misc
- * @run main/othervm -XX:+UseCompressedOops -XX:+UseCompressedClassPointers ArrayBaseOffsets
- */
-/*
- * @test id=no-coops-no-ccp
- * @library /test/lib
- * @requires vm.bits == "64"
- * @modules java.base/jdk.internal.misc
- * @run main/othervm -XX:-UseCompressedOops -XX:-UseCompressedClassPointers ArrayBaseOffsets
- */
-/*
- * @test id=no-coops-with-ccp
- * @library /test/lib
- * @requires vm.bits == "64"
- * @requires vm.opt.UseCompressedClassPointers != false
- * @modules java.base/jdk.internal.misc
- * @run main/othervm -XX:-UseCompressedOops -XX:+UseCompressedClassPointers ArrayBaseOffsets
- */
-/*
- * @test id=32bit
- * @library /test/lib
- * @requires vm.bits == "32"
- * @modules java.base/jdk.internal.misc
- * @run main/othervm ArrayBaseOffsets
- */
-
-import jdk.internal.misc.Unsafe;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.List;
-
-import jdk.test.lib.Asserts;
-import jdk.test.lib.Platform;
-
-public class ArrayBaseOffsets {
-
-    private static final boolean COOP;
-    private static final boolean CCP;
-
-    static {
-        if (Platform.is64bit()) {
-            RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
-            List<String> vmargs = runtime.getInputArguments();
-            CCP = !vmargs.contains("-XX:-UseCompressedClassPointers");
-            COOP = System.getProperty("java.vm.compressedOopsMode") != null;
-        } else {
-            COOP = CCP = false;
-        }
-    }
-
-    static public void main(String[] args) {
-        Unsafe unsafe = Unsafe.getUnsafe();
-        int intOffset, longOffset;
-        if (Platform.is64bit()) {
-            if (CCP) {
-                intOffset = 16;
-                longOffset = 16;
-            } else {
-                intOffset = 20;
-                longOffset = 24;
-            }
-        } else {
-            intOffset = 12;
-            longOffset = 16;
-        }
-        Asserts.assertEquals(unsafe.arrayBaseOffset(boolean[].class), intOffset,  "Misplaced boolean array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(byte[].class),    intOffset,  "Misplaced byte    array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(char[].class),    intOffset,  "Misplaced char    array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(short[].class),   intOffset,  "Misplaced short   array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(int[].class),     intOffset,  "Misplaced int     array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(long[].class),    longOffset, "Misplaced long    array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(float[].class),   intOffset,  "Misplaced float   array base");
-        Asserts.assertEquals(unsafe.arrayBaseOffset(double[].class),  longOffset, "Misplaced double  array base");
-        int expectedObjArrayOffset = (COOP || !Platform.is64bit()) ? intOffset : longOffset;
-        Asserts.assertEquals(unsafe.arrayBaseOffset(Object[].class),  expectedObjArrayOffset, "Misplaced object  array base");
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java b/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java
new file mode 100644
index 00000000000..e4f88b5d8d5
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=with-coops-with-ccp
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=no-coops-with-ccp
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=with-coops-no-ccp
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=no-coops-no-ccp
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=with-coop--with-coh
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=no-coops-with-coh
+ * @library /test/lib /
+ * @requires vm.bits == "64"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
+ */
+/*
+ * @test id=32bit
+ * @library /test/lib /
+ * @requires vm.bits == "32"
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BaseOffsets
+ */
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Comparator;
+import jdk.internal.misc.Unsafe;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Platform;
+import jdk.test.whitebox.WhiteBox;
+
+public class BaseOffsets {
+
+    static class LIClass {
+        public int i;
+    }
+
+    public static final WhiteBox WB = WhiteBox.getWhiteBox();
+
+    static final long INT_OFFSET;
+    static final int  INT_ARRAY_OFFSET;
+    static final int  LONG_ARRAY_OFFSET;
+    static {
+        if (!Platform.is64bit() || WB.getBooleanVMFlag("UseCompactObjectHeaders")) {
+            INT_OFFSET = 8;
+            INT_ARRAY_OFFSET = 12;
+            LONG_ARRAY_OFFSET = 16;
+        } else if (WB.getBooleanVMFlag("UseCompressedClassPointers")) {
+            INT_OFFSET = 12;
+            INT_ARRAY_OFFSET = 16;
+            LONG_ARRAY_OFFSET = 16;
+        } else {
+            INT_OFFSET = 16;
+            INT_ARRAY_OFFSET = 20;
+            LONG_ARRAY_OFFSET = 24;
+        }
+    }
+
+    static public void main(String[] args) {
+        Unsafe unsafe = Unsafe.getUnsafe();
+        Class c = LIClass.class;
+        Field[] fields = c.getFields();
+        for (int i = 0; i < fields.length; i++) {
+            long offset = unsafe.objectFieldOffset(fields[i]);
+            if (fields[i].getType() == int.class) {
+                Asserts.assertEquals(offset, INT_OFFSET, "Misplaced int field");
+            } else {
+                Asserts.fail("Unexpected field type");
+            }
+        }
+
+        Asserts.assertEquals(unsafe.arrayBaseOffset(boolean[].class), INT_ARRAY_OFFSET,  "Misplaced boolean array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(byte[].class),    INT_ARRAY_OFFSET,  "Misplaced byte    array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(char[].class),    INT_ARRAY_OFFSET,  "Misplaced char    array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(short[].class),   INT_ARRAY_OFFSET,  "Misplaced short   array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(int[].class),     INT_ARRAY_OFFSET,  "Misplaced int     array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(long[].class),    LONG_ARRAY_OFFSET, "Misplaced long    array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(float[].class),   INT_ARRAY_OFFSET,  "Misplaced float   array base");
+        Asserts.assertEquals(unsafe.arrayBaseOffset(double[].class),  LONG_ARRAY_OFFSET, "Misplaced double  array base");
+        boolean narrowOops = System.getProperty("java.vm.compressedOopsMode") != null ||
+                             !Platform.is64bit();
+        int expected_objary_offset = narrowOops ? INT_ARRAY_OFFSET : LONG_ARRAY_OFFSET;
+        Asserts.assertEquals(unsafe.arrayBaseOffset(Object[].class),  expected_objary_offset, "Misplaced object  array base");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/Allocation.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/Allocation.java
index 41f6b6a7971..a0bc6844d56 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/Allocation.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/Allocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,11 +26,11 @@
 public class Allocation {
 
     public long p;
-    public long word_size;
+    public long size;
 
-    public Allocation(long p, long word_size) {
+    public Allocation(long p, long size) {
         this.p = p;
-        this.word_size = word_size;
+        this.size = size;
     }
 
     public boolean isNull() {
@@ -41,7 +41,7 @@ public boolean isNull() {
     public String toString() {
         return "Allocation{" +
                 "p=" + p +
-                ", word_size=" + word_size +
+                ", size=" + size +
                 '}';
     }
 }
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/AllocationProfile.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/AllocationProfile.java
index acdd589d048..8ad75e7d82d 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/AllocationProfile.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/AllocationProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -43,6 +43,9 @@ public AllocationProfile(String name, long minimumSingleAllocationSize, long max
         this.name = name;
     }
 
+    /**
+     * Returns random allocation size measured in words
+     */
     public long randomAllocationSize() {
         Random r = new Random();
         return r.nextInt((int)(maximumSingleAllocationSize - minimumSingleAllocationSize + 1)) + minimumSingleAllocationSize;
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestArena.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestArena.java
index 0be149a5a6d..0b4b9e11355 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestArena.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestArena.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2023, SAP SE. All rights reserved.
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,25 +31,25 @@ public class MetaspaceTestArena {
 
     final long allocationCeiling;
 
-    // Number and word size of allocations
-    long allocatedWords = 0;
+    // Number and byte size of allocations
+    long allocatedBytes = 0;
     long numAllocated = 0;
-    long deallocatedWords = 0;
+    long deallocatedBytes = 0;
     long numDeallocated = 0;
     volatile long numAllocationFailures = 0;
 
     private synchronized boolean reachedCeiling() {
-        return (allocatedWords - deallocatedWords) > allocationCeiling;
+        return (allocatedBytes - deallocatedBytes) > allocationCeiling;
     }
 
-    private synchronized void accountAllocation(long words) {
+    private synchronized void accountAllocation(long size) {
         numAllocated ++;
-        allocatedWords += words;
+        allocatedBytes += size;
     }
 
-    private synchronized void accountDeallocation(long words) {
+    private synchronized void accountDeallocation(long size) {
         numDeallocated ++;
-        deallocatedWords += words;
+        deallocatedBytes += size;
     }
 
     MetaspaceTestArena(long arena0, long allocationCeiling) {
@@ -57,42 +57,42 @@ private synchronized void accountDeallocation(long words) {
         this.arena = arena0;
     }
 
-    public Allocation allocate(long words) {
+    public Allocation allocate(long size) {
         if (reachedCeiling()) {
             numAllocationFailures ++;
             return null;
         }
         WhiteBox wb = WhiteBox.getWhiteBox();
-        long p = wb.allocateFromMetaspaceTestArena(arena, words);
+        long p = wb.allocateFromMetaspaceTestArena(arena, size);
         if (p == 0) {
             numAllocationFailures ++;
             return null;
         } else {
-            accountAllocation(words);
+            accountAllocation(size);
         }
-        return new Allocation(p, words);
+        return new Allocation(p, size);
     }
 
     public void deallocate(Allocation a) {
         WhiteBox wb = WhiteBox.getWhiteBox();
-        wb.deallocateToMetaspaceTestArena(arena, a.p, a.word_size);
-        accountDeallocation(a.word_size);
+        wb.deallocateToMetaspaceTestArena(arena, a.p, a.size);
+        accountDeallocation(a.size);
     }
 
     //// Convenience functions ////
 
-    public Allocation allocate_expect_success(long words) {
-        Allocation a = allocate(words);
+    public Allocation allocate_expect_success(long size) {
+        Allocation a = allocate(size);
         if (a.isNull()) {
-            throw new RuntimeException("Allocation failed (" + words + ")");
+            throw new RuntimeException("Allocation failed (" + size + ")");
         }
         return a;
     }
 
-    public void allocate_expect_failure(long words) {
-        Allocation a = allocate(words);
+    public void allocate_expect_failure(long size) {
+        Allocation a = allocate(size);
         if (!a.isNull()) {
-            throw new RuntimeException("Allocation failed (" + words + ")");
+            throw new RuntimeException("Allocation failed (" + size + ")");
         }
     }
 
@@ -104,9 +104,9 @@ boolean isLive() {
     public String toString() {
         return "arena=" + arena +
                 ", ceiling=" + allocationCeiling +
-                ", allocatedWords=" + allocatedWords +
+                ", allocatedBytes=" + allocatedBytes +
                 ", numAllocated=" + numAllocated +
-                ", deallocatedWords=" + deallocatedWords +
+                ", deallocatedBytes=" + deallocatedBytes +
                 ", numDeallocated=" + numDeallocated +
                 ", numAllocationFailures=" + numAllocationFailures +
                 '}';
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestContext.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestContext.java
index fe52317d4dd..60859ba8f70 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestContext.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestContext.java
@@ -39,9 +39,9 @@ public class MetaspaceTestContext {
 
     HashSet<MetaspaceTestArena> arenaList = new HashSet<>();
 
-    long allocatedWords;
+    long allocatedBytes;
     long numAllocated;
-    long deallocatedWords;
+    long deallocatedBytes;
     long numDeallocated;
     long allocationFailures;
 
@@ -101,20 +101,20 @@ public void destroyArena(MetaspaceTestArena a) {
         }
     }
 
-    public long committedWords() {
+    public long committedBytes() {
         long l = 0;
         if (context != 0) {
             WhiteBox wb = WhiteBox.getWhiteBox();
-            l = wb.getTotalCommittedWordsInMetaspaceTestContext(context);
+            l = wb.getTotalCommittedBytesInMetaspaceTestContext(context);
         }
         return l;
     }
 
-    public long usedWords() {
+    public long usedBytes() {
         long l = 0;
         if (context != 0) {
             WhiteBox wb = WhiteBox.getWhiteBox();
-            l = wb.getTotalUsedWordsInMetaspaceTestContext(context);
+            l = wb.getTotalUsedBytesInMetaspaceTestContext(context);
         }
         return l;
     }
@@ -124,10 +124,10 @@ public int numLiveArenas() {
     }
 
     public void updateTotals() {
-        allocatedWords = deallocatedWords = numAllocated = numDeallocated = 0;
+        allocatedBytes = deallocatedBytes = numAllocated = numDeallocated = 0;
         for (MetaspaceTestArena a : arenaList) {
-            allocatedWords += a.allocatedWords;
-            deallocatedWords += a.deallocatedWords;
+            allocatedBytes += a.allocatedBytes;
+            deallocatedBytes += a.deallocatedBytes;
             numAllocated += a.numAllocated;
             numDeallocated += a.numDeallocated;
             allocationFailures += a.numAllocationFailures;
@@ -159,17 +159,17 @@ public void checkStatistics() {
 
         updateTotals();
 
-        long usageMeasured = usedWords();
-        long committedMeasured = committedWords();
+        long usageMeasured = usedBytes();
+        long committedMeasured = committedBytes();
 
-        System.out.println("context used words " + usageMeasured + ", committed words " + committedMeasured
+        System.out.println("context used bytes " + usageMeasured + ", committed bytes " + committedMeasured
                 + ".");
 
         if (usageMeasured > committedMeasured) {
             throw new RuntimeException("Weirdness.");
         }
 
-        if (deallocatedWords > allocatedWords) {
+        if (deallocatedBytes > allocatedBytes) {
             throw new RuntimeException("Weirdness.");
         }
 
@@ -183,13 +183,13 @@ public void checkStatistics() {
             }
         }
 
-        long expectedMinUsage = allocatedWords - deallocatedWords;
+        long expectedMinUsage = allocatedBytes - deallocatedBytes;
 
         if (usageMeasured < expectedMinUsage) {
             throw new RuntimeException("Usage too low: " + usageMeasured + " expected at least " + expectedMinUsage);
         }
 
-        long expectedMaxUsage = allocatedWords;
+        long expectedMaxUsage = allocatedBytes;
 
         // This is necessary a bit fuzzy, since Metaspace usage consists of:
         // - whatever we allocated
@@ -199,12 +199,12 @@ public void checkStatistics() {
 
         // Overhead per allocation (see metaspaceArena.cpp, get_raw_allocation_word_size() )
         // Any allocation is 3 words least
-        expectedMaxUsage += (numAllocated * 3);
+        expectedMaxUsage += (numAllocated * 3 * Settings.WORD_SIZE);
 
         // Lets add a overhead per arena. Each arena carries a free block list containing
         // deallocated/retired blocks. We do not know how much. In general, the free block list should not
         // accumulate a lot of memory but be drained in the course of allocating memory from the arena.
-        long overheadPerArena = 1024 * 1024 * numLiveArenas();
+        long overheadPerArena = 1024 * 1024 * numLiveArenas() * Settings.WORD_SIZE;
         expectedMaxUsage += overheadPerArena;
 
         if (expectedMaxUsage < usageMeasured) {
@@ -229,7 +229,7 @@ public void checkStatistics() {
         // are stress tests,
         //
         long expectedMaxCommitted = usageMeasured;
-        expectedMaxCommitted += Settings.rootChunkWordSize;
+        expectedMaxCommitted += Settings.ROOT_CHUNK_WORD_SIZE * Settings.WORD_SIZE;
         expectedMaxCommitted *= 10.0;
 
         if (committedMeasured > expectedMaxCommitted) {
@@ -247,9 +247,9 @@ public java.lang.String toString() {
                 ", numArenasCreated=" + numArenasCreated +
                 ", numArenasDestroyed=" + numArenasDestroyed +
                 ", numLiveArenas=" + numLiveArenas() +
-                ", allocatedWords=" + allocatedWords +
+                ", allocatedBytes=" + allocatedBytes +
                 ", numAllocated=" + numAllocated +
-                ", deallocatedWords=" + deallocatedWords +
+                ", deallocatedBytes=" + deallocatedBytes +
                 ", numDeallocated=" + numDeallocated +
                 ", allocationFailures=" + allocationFailures +
                 '}';
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestWithThreads.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestWithThreads.java
index edf6da387ed..f49c160f887 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestWithThreads.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/MetaspaceTestWithThreads.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@ public class MetaspaceTestWithThreads {
     // The context to use.
     final MetaspaceTestContext context;
 
-    // Total *word* size we allow for the test to allocation. The test may overshoot this a bit, but should not by much.
+    // Total *byte* size we allow for the test to allocation. The test may overshoot this a bit, but should not by much.
     final long testAllocationCeiling;
 
     // Number of parallel allocators
@@ -77,8 +77,8 @@ void destroyArenasAndPurgeSpace() {
 
         context.checkStatistics();
 
-        if (context.committedWords() > 0) {
-            throw new RuntimeException("Expected no committed words after purging empty metaspace context (was: " + context.committedWords() + ")");
+        if (context.committedBytes() > 0) {
+            throw new RuntimeException("Expected no committed bytes after purging empty metaspace context (was: " + context.committedBytes() + ")");
         }
     }
 
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/RandomAllocator.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/RandomAllocator.java
index 9e2de9896dd..622fdc8166a 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/RandomAllocator.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/RandomAllocator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021 SAP SE. All rights reserved.
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.Random;
 
+import jdk.test.whitebox.WhiteBox;
+
 /**
  * RandomAllocator sits atop an arena and allocates from it.
  *
@@ -61,8 +63,8 @@ private boolean rollDice(double probability) {
 
     // Allocate a random amount from the arena. If dice hits right, add this to the deallocation list.
     void allocateRandomly() {
-        long word_size = profile.randomAllocationSize();
-        Allocation a = arena.allocate(word_size);
+        long words = profile.randomAllocationSize();
+        Allocation a = arena.allocate(words * Settings.WORD_SIZE);
         if (a != null) {
             if (to_dealloc.size() < 10000) {
                 to_dealloc.add(a);
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/Settings.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/Settings.java
index 222ce44acc6..b906232ed2e 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/Settings.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/Settings.java
@@ -27,8 +27,8 @@
 
 public final class Settings {
 
-    final static long rootChunkWordSize = 2048 * 1024;
-
+    final static long ROOT_CHUNK_WORD_SIZE = WhiteBox.getWhiteBox().rootChunkWordSize();
+    final static long WORD_SIZE = WhiteBox.getWhiteBox().wordSize();
     static Settings theSettings;
 
     static Settings settings()  {
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocation.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocation.java
index 10d05a867fc..7564bfafef8 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocation.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocation.java
@@ -45,19 +45,21 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestMetaspaceAllocation
  */
 
+import jdk.test.lib.Unit;
+
 public class TestMetaspaceAllocation {
 
     public static void main(String[] args) {
 
         MetaspaceTestContext context = new MetaspaceTestContext();
-        MetaspaceTestArena arena1 = context.createArena(false, 1024 * 1024 * 4);
-        MetaspaceTestArena arena2 = context.createArena(true,1024 * 1024 * 4);
+        MetaspaceTestArena arena1 = context.createArena(false, 32L * Unit.M.size());
+        MetaspaceTestArena arena2 = context.createArena(true, 32L * Unit.M.size());
 
-        Allocation a1 = arena1.allocate(100);
-        Allocation a2 = arena2.allocate(100);
+        Allocation a1 = arena1.allocate(800);
+        Allocation a2 = arena2.allocate(800);
 
-        long used = context.usedWords();
-        long committed = context.committedWords();
+        long used = context.usedBytes();
+        long committed = context.committedBytes();
 
         System.out.println("used " + used + " committed " + committed);
 
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT1.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT1.java
index 5676f2c4bdb..e898ee0bfc2 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT1.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT1.java
@@ -26,7 +26,7 @@
 /*
  * This is a stress test for allocating from a single MetaspaceArena from
  *  multiple threads, optionally with reserve limit (mimicking the non-expandable CompressedClassSpace)
- * or commit limit (mimimcking MaxMetaspaceSize).
+ * or commit limit (mimicking MaxMetaspaceSize).
  *
  * The test threads will start to allocate from the Arena, and occasionally deallocate.
  * The threads run with a safety allocation max; if reached (or, if the underlying arena
@@ -34,7 +34,7 @@
  * kind of float at the allocation ceiling, alternating between allocation and deallocation.
  *
  * We test with various flags, to exercise all 3 reclaim policies (none, balanced (default)
- * and aggessive) as well as one run with allocation guards enabled.
+ * and aggressive) as well as one run with allocation guards enabled.
  *
  * We also set MetaspaceVerifyInterval very low to trigger many verifications in debug vm.
  *
@@ -90,21 +90,24 @@
  *      TestMetaspaceAllocationMT1 3
  */
 
+import jdk.test.lib.Unit;
+
 public class TestMetaspaceAllocationMT1 {
 
     public static void main(String[] args) throws Exception {
 
-        final long testAllocationCeiling = 1024 * 1024 * 8; // 8m words = 64M on 64bit
+        final long testAllocationCeiling = 64L * Unit.M.size();
+
         final int numThreads = 4;
         final int seconds = Integer.parseInt(args[0]);
 
         for (int i = 0; i < 3; i ++) {
 
-            long commitLimit = (i == 1) ? 1024 * 256 : 0;
+            long commitLimit = (i == 1) ? 2 * Unit.M.size() : 0;
 
             // Note: reserve limit must be a multiple of Metaspace::reserve_alignment_words()
-            //  (512K on 64bit, 1M on 32bit)
-            long reserveLimit = (i == 2) ? Settings.rootChunkWordSize * 2 : 0;
+            //  (16 MB)
+            long reserveLimit = (i == 2) ? Settings.ROOT_CHUNK_WORD_SIZE * 16: 0;
 
             System.out.println("#### Test: ");
             System.out.println("#### testAllocationCeiling: " + testAllocationCeiling);
diff --git a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT2.java b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT2.java
index 2c6b3923d94..3f0f5c1fb2d 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT2.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT2.java
@@ -26,7 +26,7 @@
 /*
  * This is a stress test for allocating from a single MetaspaceArena from
  *  multiple threads, optionally with reserve limit (mimicking the non-expandable CompressedClassSpace)
- * or commit limit (mimimcking MaxMetaspaceSize).
+ * or commit limit (mimicking MaxMetaspaceSize).
  *
  * The test threads will start to allocate from the Arena, and occasionally deallocate.
  * The threads run with a safety allocation max; if reached (or, if the underlying arena
@@ -34,7 +34,7 @@
  * kind of float at the allocation ceiling, alternating between allocation and deallocation.
  *
  * We test with various flags, to exercise all 3 reclaim policies (none, balanced (default)
- * and aggessive) as well as one run with allocation guards enabled.
+ * and aggressive) as well as one run with allocation guards enabled.
  *
  * We also set MetaspaceVerifyInterval very low to trigger many verifications in debug vm.
  *
@@ -90,20 +90,22 @@
  *      TestMetaspaceAllocationMT2 3
  */
 
+import jdk.test.lib.Unit;
+
 public class TestMetaspaceAllocationMT2 {
 
     public static void main(String[] args) throws Exception {
 
-        final long testAllocationCeiling = 1024 * 1024 * 6; // 8m words = 64M on 64bit
+        final long testAllocationCeiling = 48L * Unit.M.size();
         final int numThreads = 4;
         final int seconds = Integer.parseInt(args[0]);
 
         for (int i = 0; i < 3; i ++) {
 
-            long commitLimit = (i == 1) ? 1024 * 256 : 0;
+            long commitLimit = (i == 1) ? 2L * Unit.M.size() : 0;
 
             // Note: reserve limit must be a multiple of Metaspace::reserve_alignment_words()
-            long reserveLimit = (i == 2) ? Settings.rootChunkWordSize * 2 : 0;
+            long reserveLimit = (i == 2) ? Settings.ROOT_CHUNK_WORD_SIZE * 16: 0;
 
             System.out.println("#### Test: ");
             System.out.println("#### testAllocationCeiling: " + testAllocationCeiling);
diff --git a/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/Host.java b/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/Host.java
deleted file mode 100644
index 9322802b652..00000000000
--- a/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/Host.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// Host and Host$Member will be loaded by a custom loader with different
-// protection domains.
-
-public class Host {
-
-    private static int forNestmatesOnly = 1;
-
-    public static class Member {
-        // We need our static initializer to ensure our CP reference
-        // to Host is resolved by the main thread.
-        static final Class<?> hostClass = Host.class;
-
-        int id;
-
-        // Executing, or JIT compiling, this method will result in
-        // a nestmate access check.
-        public Member() {
-            id = forNestmatesOnly++;
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/TestDifferentProtectionDomains.java b/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/TestDifferentProtectionDomains.java
deleted file mode 100644
index 58a9aea8dd2..00000000000
--- a/test/hotspot/jtreg/runtime/Nestmates/protectionDomain/TestDifferentProtectionDomains.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8261395
- * @summary Test the code paths when a nest-host and nest-member class are in
- *          different protection domains and the compiler thread needs to
- *          perform a nestmate access check.
- * @comment We use WB to force-compile a constructor to recreate the original
- *          failure scenario, so only run when we have "normal" compiler flags.
- * @requires vm.compMode == "Xmixed" &
- *           vm.compiler2.enabled &
- *           (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
- * @library /test/lib /
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @compile Host.java
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
- *                   -Xlog:class+nestmates=trace,protectiondomain=trace
- *                   -Djava.security.manager=allow
- *                   TestDifferentProtectionDomains
- */
-
-import java.lang.reflect.Constructor;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.Path;
-import java.security.ProtectionDomain;
-
-import compiler.whitebox.CompilerWhiteBoxTest;
-import jdk.test.whitebox.WhiteBox;
-
-public class TestDifferentProtectionDomains {
-
-    static final String TARGET = "Host";
-
-    // We need a custom classloader so that we can
-    // use a different protection domain for our target classes.
-
-    static class CustomLoader extends ClassLoader {
-
-        CustomLoader(ClassLoader parent) {
-            super(parent);
-        }
-
-        @Override
-        public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-            synchronized (getClassLoadingLock(name)) {
-                // First, check if the class has already been loaded
-                Class<?> clz = findLoadedClass(name);
-                if (clz != null) {
-                    return clz;
-                }
-
-                // Check for target class
-                if (name.startsWith(TARGET)) {
-                    try {
-                        String clzFile = name.replaceAll("\\.", "/") + ".class";
-                        byte[] buff = getResourceAsStream(clzFile).readAllBytes();
-                        ProtectionDomain differentPD = new ProtectionDomain(null, null);
-                        return defineClass(name, buff, 0, buff.length, differentPD);
-                    } catch (Throwable t) {
-                        throw new RuntimeException("Unexpected", t);
-                    }
-                }
-            }
-            return super.loadClass(name, resolve);
-        }
-    }
-
-    public static void main(String[] args) throws Throwable {
-
-        CustomLoader cl = new CustomLoader(TestDifferentProtectionDomains.class.getClassLoader());
-        Class<?> host = cl.loadClass("Host");
-        Class<?> member = cl.loadClass("Host$Member");
-
-        if (host.getProtectionDomain() == member.getProtectionDomain()) {
-            throw new Error("ProtectionDomain instances were not different!");
-        }
-
-        Constructor cons = member.getDeclaredConstructor(new Class<?>[] {});
-        WhiteBox wb = WhiteBox.getWhiteBox();
-
-        // The code path for the original failure is now only followed when
-        // there is a security manager set, so we set one. We do this here
-        // as any earlier causes security exceptions running the test and we
-        // don't want to have to set up a policy file etc.
-        System.setSecurityManager(new SecurityManager());
-
-        // Force the constructor to compile, which then triggers the nestmate
-        // access check in the compiler thread, which leads to the original bug.
-        if (!wb.enqueueMethodForCompilation(cons, CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION)) {
-            throw new RuntimeException("Failed to queue constructor for compilation");
-        }
-        while (!wb.isMethodCompiled(cons)) {
-            Thread.sleep(100);
-        }
-
-        // Just for good measure call the compiled constructor.
-        Object m = member.newInstance();
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
index 6b6431c0e5e..92643d648b7 100644
--- a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
+++ b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,32 @@
  * @summary The same JDK build should always generate the same archive file (no randomness).
  * @requires vm.cds & vm.flagless
  * @library /test/lib
- * @run driver DeterministicDump
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI DeterministicDump
  */
 
+import jdk.test.lib.cds.CDSArchiveUtils;
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.Platform;
+import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 
 public class DeterministicDump {
+
+    static long HEADER_SIZE;      // Size of header in bytes
+    static int HEADER_LEN = 106;  // Number of lines in CDS map file header
+    static int LINE_OFFSET = 22;  // Offset from address to first word of data
+    static int NUM_LINES = 5;     // Number of lines to be printed
+    static int WORD_LEN = 16 + 1; // Length of word in map file
+
     public static void main(String[] args) throws Exception {
         doTest(false);
 
@@ -62,17 +77,19 @@ public static void doTest(boolean compressed) throws Exception {
         }
 
         String baseArchive = dump(baseArgs);
+        File baseArchiveFile = new File(baseArchive + ".jsa");
+        HEADER_SIZE = CDSArchiveUtils.fileHeaderSize(baseArchiveFile);
 
         // (1) Dump with the same args. Should produce the same archive.
         String baseArchive2 = dump(baseArgs);
-        compare(baseArchive, baseArchive2);
+        compare(baseArchive, baseArchive2, baseArchiveFile);
 
         // (2) This will cause the archive to be relocated during dump time. We should
         //     still get the same bits. This simulates relocation that happens when
         //     Address Space Layout Randomization prevents the archive space to
         //     be mapped at the default location.
         String relocatedArchive = dump(baseArgs, "-XX:+UnlockDiagnosticVMOptions", "-XX:ArchiveRelocationMode=1");
-        compare(baseArchive, relocatedArchive);
+        compare(baseArchive, relocatedArchive, baseArchiveFile);
     }
 
     static int id = 0;
@@ -89,14 +106,14 @@ static String dump(ArrayList<String> args, String... more) throws Exception {
             .addSuffix(more);
         CDSTestUtils.createArchiveAndCheck(opts);
 
-        return archiveName;
+        return logName;
     }
 
-    static void compare(String file0, String file1) throws Exception {
+    static void compare(String file0, String file1, File archiveFile) throws Exception {
         byte[] buff0 = new byte[4096];
         byte[] buff1 = new byte[4096];
-        try (FileInputStream in0 = new FileInputStream(file0);
-             FileInputStream in1 = new FileInputStream(file1)) {
+        try (FileInputStream in0 = new FileInputStream(file0 + ".jsa");
+             FileInputStream in1 = new FileInputStream(file1 + ".jsa")) {
             int total = 0;
             while (true) {
                 int n0 = read(in0, buff0);
@@ -113,7 +130,12 @@ static void compare(String file0, String file1) throws Exception {
                     byte b0 = buff0[i];
                     byte b1 = buff1[i];
                     if (b0 != b1) {
-                        throw new RuntimeException("File content different at byte #" + (total + i) + ", b0 = " + b0 + ", b1 = " + b1);
+                        // The checksums are stored in the header so it should be skipped
+                        // since we want to see the first meaningful diff between the archives
+                        if (total + i > HEADER_SIZE) {
+                            print_diff(file0 + ".map", file1 + ".map", archiveFile, total + i);
+                            throw new RuntimeException("File content different at byte #" + (total + i) + ", b0 = " + b0 + ", b1 = " + b1);
+                        }
                     }
                 }
                 total += n0;
@@ -133,4 +155,115 @@ static int read(FileInputStream in, byte[] buff) throws IOException {
 
         return total;
     }
+
+    // CDS map file doesn't print the alignment bytes so they need to be considered
+    // when mapping the byte number in the archive to the word in the map file
+    static int archiveByteToMapWord(File archiveFile, int location) throws Exception {
+        int totalSize = 0;
+        int word = location;
+
+        long len = HEADER_SIZE;
+        long aligned = CDSArchiveUtils.fileHeaderSizeAligned(archiveFile);
+        for (int i = 0; i < CDSArchiveUtils.num_regions(); i++) {
+            if (i != 0) {
+                len = CDSArchiveUtils.usedRegionSize(archiveFile, i);
+                aligned = CDSArchiveUtils.usedRegionSizeAligned(archiveFile, i);
+            }
+            totalSize += len;
+            if (location > totalSize) {
+                word -= (aligned - len - 16);
+            }
+        }
+        return word/8;
+    }
+
+    // Read the mapfile and print out the lines associated with the location
+    static void print_diff(String mapName0, String mapName1, File archiveFile, int location) throws Exception {
+        FileReader f0 = new FileReader(mapName0);
+        BufferedReader b0 = new BufferedReader(f0);
+
+        FileReader f1 = new FileReader(mapName1);
+        BufferedReader b1 = new BufferedReader(f1);
+
+        int word = archiveByteToMapWord(archiveFile, location);
+        int wordOffset = word % 4; // Each line in the map file prints four words
+        String region = "";
+
+        // Skip header text and go to first line
+        for (int i = 0; i < HEADER_LEN; i++) {
+            b0.readLine();
+            b1.readLine();
+        }
+
+        int line_num = HEADER_LEN;
+        String s0 = "";
+        String s1 = "";
+        int count = 0;
+
+        // Store lines before and including the diff
+        ArrayDeque<String> prefix0 = new ArrayDeque<String>();
+        ArrayDeque<String> prefix1 = new ArrayDeque<String>();
+
+        // A line may contain 1-4 words so we iterate by word
+        do {
+            s0 = b0.readLine();
+            s1 = b1.readLine();
+            line_num++;
+
+            if (prefix0.size() >= NUM_LINES / 2 + 1) {
+                prefix0.removeFirst();
+                prefix1.removeFirst();
+            }
+            prefix0.addLast(s0);
+            prefix1.addLast(s1);
+
+            // Skip lines with headers when counting words e.g.
+            // [rw region          0x0000000800000000 - 0x00000008005a1f88   5906312 bytes]
+            // or
+            // 0x0000000800000b28: @@ TypeArrayU1       16
+            if (!s0.contains(": @@") && !s0.contains("bytes]")) {
+                int words = (s0.length() - LINE_OFFSET - 70) / 8;
+                count += words;
+            } else if (s0.contains("bytes]")) {
+                region = s0;
+            }
+        } while (count < word);
+
+        // Print the diff with the region name above it
+        System.out.println("[First diff: map file #1 (" + mapName0 + ")]");
+        System.out.println(region);
+        String diff0 = print_diff_helper(b0, wordOffset, prefix0);
+
+        System.out.println("\n[First diff: map file #2 (" + mapName1 + ")]");
+        System.out.println(region);
+        String diff1 = print_diff_helper(b1, wordOffset, prefix1);
+
+        System.out.printf("\nByte #%d at line #%d word #%d:\n", location, line_num, wordOffset);
+        System.out.printf("%s: %s\n%s: %s\n", mapName0, diff0, mapName1, diff1);
+
+        f0.close();
+        f1.close();
+    }
+
+    static String print_diff_helper(BufferedReader b, int wordOffset, ArrayDeque<String> prefix) throws Exception {
+        int start = LINE_OFFSET + WORD_LEN * wordOffset;
+        int end = start + WORD_LEN;
+        String line = prefix.getLast();
+        String diff = line.substring(start, end);
+
+        // Print previous lines
+        for (String s : prefix) {
+            if (s.equals(line)) {
+                System.out.println(">" + s);
+            } else {
+                System.out.println(" " + s);
+            }
+        }
+
+        // Print extra lines
+        for (int i = 0; i < NUM_LINES / 2; i++) {
+            System.out.println(" " + b.readLine());
+        }
+        return diff;
+    }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
new file mode 100644
index 00000000000..590f22feed7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test id=nocoops_nocoh
+ * @summary Test Loading of default archives in all configurations
+ * @requires vm.cds
+ * @requires vm.bits == 64
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestDefaultArchiveLoading nocoops_nocoh
+ */
+
+/**
+ * @test id=nocoops_coh
+ * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
+ * @requires vm.cds
+ * @requires vm.bits == 64
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestDefaultArchiveLoading nocoops_coh
+ */
+
+/**
+ * @test id=coops_nocoh
+ * @summary Test Loading of default archives in all configurations
+ * @requires vm.cds
+ * @requires vm.bits == 64
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestDefaultArchiveLoading coops_nocoh
+ */
+
+/**
+ * @test id=coops_coh
+ * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
+ * @requires vm.cds
+ * @requires vm.bits == 64
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestDefaultArchiveLoading coops_coh
+ */
+
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
+
+public class TestDefaultArchiveLoading {
+    public static void main(String[] args) throws Exception {
+
+        if (args.length != 1) {
+            throw new RuntimeException("Expected argument");
+        }
+
+        String archiveSuffix;
+        char coh, coops;
+
+        switch (args[0]) {
+            case "nocoops_nocoh":
+                coh = coops = '-';
+                archiveSuffix = "_nocoops";
+                break;
+            case "nocoops_coh":
+                coops = '-';
+                coh = '+';
+                archiveSuffix = "_nocoops_coh";
+                break;
+            case "coops_nocoh":
+                coops = '+';
+                coh = '-';
+                archiveSuffix = "";
+                break;
+            case "coops_coh":
+                coh = coops = '+';
+                archiveSuffix = "_coh";
+                break;
+            default: throw new RuntimeException("Invalid argument " + args[0]);
+        }
+
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:" + coh + "UseCompactObjectHeaders",
+                "-XX:" + coops + "UseCompressedOops",
+                "-Xlog:cds",
+                "-Xshare:on", // fail if we cannot load archive
+                "-version");
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+
+        output.shouldContain("classes" + archiveSuffix + ".jsa");
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
index 89fc346ffbb..e2e0f1bdf77 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,12 +42,15 @@ public class TestZGCWithCDS {
     public final static String UNABLE_TO_USE_ARCHIVE = "Unable to use shared archive.";
     public final static String ERR_MSG = "The saved state of UseCompressedOops and UseCompressedClassPointers is different from runtime, CDS will be disabled.";
     public static void main(String... args) throws Exception {
+         String compactHeaders = "-XX:+UseCompactObjectHeaders";
          String helloJar = JarBuilder.build("hello", "Hello");
          System.out.println("0. Dump with ZGC");
          OutputAnalyzer out = TestCommon
                                   .dump(helloJar,
                                         new String[] {"Hello"},
                                         "-XX:+UseZGC",
+                                        "-XX:+UnlockExperimentalVMOptions",
+                                        compactHeaders,
                                         "-Xlog:cds");
          out.shouldContain("Dumping shared data to file:");
          out.shouldHaveExitValue(0);
@@ -56,6 +59,8 @@ public static void main(String... args) throws Exception {
          out = TestCommon
                    .exec(helloJar,
                          "-XX:+UseZGC",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(HELLO);
@@ -67,6 +72,8 @@ public static void main(String... args) throws Exception {
                          "-XX:-UseZGC",
                          "-XX:+UseCompressedOops",           // in case turned off by vmoptions
                          "-XX:+UseCompressedClassPointers",  // by jtreg
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(UNABLE_TO_USE_ARCHIVE);
@@ -79,6 +86,8 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:-UseCompressedClassPointers",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(UNABLE_TO_USE_ARCHIVE);
@@ -91,6 +100,8 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(HELLO);
@@ -102,6 +113,8 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:+UseCompressedOops",
                          "-XX:-UseCompressedClassPointers",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(UNABLE_TO_USE_ARCHIVE);
@@ -114,6 +127,8 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:+UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(UNABLE_TO_USE_ARCHIVE);
@@ -127,6 +142,8 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds");
          out.shouldContain("Dumping shared data to file:");
          out.shouldHaveExitValue(0);
@@ -135,6 +152,8 @@ public static void main(String... args) throws Exception {
          out = TestCommon
                    .exec(helloJar,
                          "-XX:+UseZGC",
+                         "-XX:+UnlockExperimentalVMOptions",
+                         compactHeaders,
                          "-Xlog:cds",
                          "Hello");
          out.shouldContain(HELLO);
diff --git a/test/jdk/java/security/Policy/GetPermissions/JarURL.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java
similarity index 51%
rename from test/jdk/java/security/Policy/GetPermissions/JarURL.java
rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java
index 1d68225a6ec..c50d6f3fab5 100644
--- a/test/jdk/java/security/Policy/GetPermissions/JarURL.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassFromSystemModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,33 +19,35 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
+ *
  */
 
 /*
  * @test
- * @bug 7044443 7050329
- * @run main/othervm/policy=JarURL.policy JarURL
- * @summary Permissions resolved incorrectly for jar protocol
+ * @bug 8343416
+ * @summary Test dumping of class from a system module loaded by a custom loader.
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @run driver ClassFromSystemModule
  */
 
-import java.net.URL;
-import java.io.File;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.cert.Certificate;
+import java.nio.file.*;
 
-public class JarURL {
+import jdk.test.lib.process.OutputAnalyzer;
 
+public class ClassFromSystemModule {
     public static void main(String[] args) throws Exception {
-        String userDir = System.getProperty("user.dir");
-        String jarURL = "jar:file:" + userDir + File.separator + "foo.jar!/";
-        URL codeSourceURL = new URL(jarURL);
-        CodeSource cs = new CodeSource(codeSourceURL, new Certificate[0]);
-        PermissionCollection perms = Policy.getPolicy().getPermissions(cs);
-        if (!perms.implies(new AllPermission()))
-            throw new Exception("FAILED: " + codeSourceURL
-                                + " not granted AllPermission");
+        Path jrtFs = Paths.get(System.getProperty("java.home"), "lib", "jrt-fs.jar");
+        System.out.println("jrtFs: " + jrtFs.toString());
+
+        String classlist[] = new String[] {
+            "java/nio/file/spi/FileSystemProvider id: 1000",
+            "jdk/internal/jrtfs/JrtFileSystemProvider id: 1001 super:1000 source: " + jrtFs.toString(),
+        };
+
+        OutputAnalyzer out = TestCommon.testDump(null, classlist, "-Xlog:cds,cds+class=debug");
+        out.shouldContain("boot  java.nio.file.spi.FileSystemProvider")
+           .shouldContain("unreg jdk.internal.jrtfs.JrtFileSystemProvider");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
index 46e08c7b754..133f44521d5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,6 +144,7 @@ public static void main(String[] args) throws Exception {
     private static void removeDefaultArchives(String java_home_dst, String variant) {
         removeDefaultArchive(java_home_dst, variant, "");
         removeDefaultArchive(java_home_dst, variant, "_nocoops");
+        removeDefaultArchive(java_home_dst, variant, "_coh");
     }
 
     private static void removeDefaultArchive(String java_home_dst, String variant, String suffix) {
diff --git a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootChild.java
similarity index 86%
rename from test/jdk/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java
rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootChild.java
index c6693f1bafe..08e15fea1a5 100644
--- a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/internal/Foo.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,9 +19,9 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
+ *
  */
 
-package p3.internal;
-
-public class Foo {
+public class BootChild extends BootSuper {
+    // Does not override BootSuper::doit()
 }
diff --git a/test/jdk/java/lang/Class/forName/modules/src/m3/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootSuper.java
similarity index 86%
rename from test/jdk/java/lang/Class/forName/modules/src/m3/module-info.java
rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootSuper.java
index a92b756bbef..d1682ebf390 100644
--- a/test/jdk/java/lang/Class/forName/modules/src/m3/module-info.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/BootSuper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,11 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
+ *
  */
 
-module m3 {
+public class BootSuper {
+    public String doit() {
+        return "Hello";
+    }
 }
diff --git a/test/jdk/java/lang/reflect/Nestmates/testPkg/Singleton.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/NewChild.java
similarity index 86%
rename from test/jdk/java/lang/reflect/Nestmates/testPkg/Singleton.java
rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/NewChild.java
index d4732998217..b11eb9717f1 100644
--- a/test/jdk/java/lang/reflect/Nestmates/testPkg/Singleton.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/NewChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,10 +19,9 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
+ *
  */
 
-package testPkg;
-
-// Self-hosting singleton nest
-public class Singleton {
+public class NewChild extends OldSuper {
+    // Does not override BootSuper::doit()
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClass.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClass.java
new file mode 100644
index 00000000000..242a78ca024
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClass.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8342303
+ * @summary Test loading of shared old class when another class has been redefined.
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes /test/hotspot/jtreg/runtime/cds/appcds/jvmti
+ * @requires vm.cds.write.archived.java.heap
+ * @requires vm.jvmti
+ * @build jdk.test.whitebox.WhiteBox
+ *        OldClassAndRedefineClassApp
+ * @compile ../../test-classes/OldSuper.jasm
+ *          ../../test-classes/ChildOldSuper.java
+ *          ../../test-classes/Hello.java
+ * @run driver RedefineClassHelper
+ * @run driver OldClassAndRedefineClass
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class OldClassAndRedefineClass {
+    public static String appClasses[] = {
+        "OldClassAndRedefineClassApp",
+        "OldSuper",
+        "ChildOldSuper",
+        "Hello",
+    };
+    public static String sharedClasses[] = TestCommon.concat(appClasses);
+
+    public static void main(String[] args) throws Throwable {
+        runTest();
+    }
+
+    public static void runTest() throws Throwable {
+        String appJar =
+            ClassFileInstaller.writeJar("OldClassAndRedefineClassApp.jar", appClasses);
+
+        String agentCmdArg = "-javaagent:redefineagent.jar";
+
+        OutputAnalyzer out = TestCommon.testDump(appJar, sharedClasses, "-Xlog:cds,cds+class=debug");
+        out.shouldMatch("klasses.*OldSuper.[*][*].unlinked")
+           .shouldMatch("klasses.*ChildOldSuper.[*][*].unlinked");
+
+        out = TestCommon.exec(
+                appJar,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+AllowArchivingWithJavaAgent",
+                "-XX:+WhiteBoxAPI",
+                "-Xlog:cds,class+load",
+                agentCmdArg,
+               "OldClassAndRedefineClassApp");
+        out.shouldContain("[class,load] OldSuper source: shared objects file")
+           .shouldContain("[class,load] ChildOldSuper source: shared objects file")
+           .shouldContain("[class,load] Hello source: __VM_RedefineClasses__");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClassApp.java
new file mode 100644
index 00000000000..2c460ccb027
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClassApp.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+public class OldClassAndRedefineClassApp {
+
+    public static void main(String args[]) throws Throwable {
+        ClassLoader appClassLoader = ClassLoader.getSystemClassLoader();
+
+        System.out.println("Main: loading OldSuper");
+        // Load an old class (version 49), but not linking it.
+        Class.forName("OldSuper", false, appClassLoader);
+
+        // Redefine a class unrelated to the above old class.
+        System.out.println("INFO: instrumentation = " + RedefineClassHelper.instrumentation);
+        Class<?> c = Class.forName("Hello", false, appClassLoader);
+        byte[] bytes = c.getClassLoader().getResourceAsStream(c.getName().replace('.', '/') + ".class").readAllBytes();
+        RedefineClassHelper.redefineClass(c, bytes);
+
+        System.out.println("Main: loading ChildOldSuper");
+        // Load and link a subclass of the above old class.
+        // This will in turn link the old class and initializes its vtable, etc.
+        Class.forName("ChildOldSuper");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassApp.java
new file mode 100644
index 00000000000..92642c467d2
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassApp.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+import java.io.File;
+
+public class RedefineBootClassApp {
+    public static void main(String args[]) throws Throwable {
+        File bootJar = new File(args[0]);
+
+        Class<?> superCls = Class.forName("BootSuper", false, null);
+        System.out.println("BootSuper>> loader = " + superCls.getClassLoader());
+
+        {
+            BootSuper obj = (BootSuper)superCls.newInstance();
+            System.out.println("(before transform) BootSuper>> doit() = " + obj.doit());
+        }
+
+        // Redefine the class
+        byte[] bytes = Util.getClassFileFromJar(bootJar, "BootSuper");
+        Util.replace(bytes, "Hello", "HELLO");
+        RedefineClassHelper.redefineClass(superCls, bytes);
+
+        {
+            BootSuper obj = (BootSuper)superCls.newInstance();
+            String s = obj.doit();
+            System.out.println("(after transform) BootSuper>> doit() = " + s);
+            if (!s.equals("HELLO")) {
+                throw new RuntimeException("BootSuper doit() should be HELLO but got " + s);
+            }
+        }
+
+        Class<?> childCls = Class.forName("BootChild", false, null);
+        System.out.println("BootChild>> loader = " + childCls.getClassLoader());
+
+
+        {
+            BootSuper obj = (BootSuper)childCls.newInstance();
+            String s = obj.doit();
+            System.out.println("(after transform) BootChild>> doit() = " + s);
+            if (!s.equals("HELLO")) {
+                throw new RuntimeException("BootChild doit() should be HELLO but got " + s);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassTest.java
new file mode 100644
index 00000000000..bc14ec996f5
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8342303
+ * @summary Redefine a shared super class loaded by the boot loader. The vtable of its archived child class must be updated
+ * @library /test/lib
+ *          /test/hotspot/jtreg/runtime/cds/appcds
+ *          /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ *          /test/hotspot/jtreg/runtime/cds/appcds/jvmti
+ * @requires vm.jvmti
+ * @build RedefineBootClassTest
+ *        RedefineBootClassApp
+ *        BootSuper BootChild
+ * @run driver RedefineClassHelper
+ * @run driver RedefineBootClassTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class RedefineBootClassTest {
+    public static String bootClasses[] = {
+        "BootSuper",
+        "BootChild",
+    };
+    public static String appClasses[] = {
+        "RedefineBootClassApp",
+        "Util",
+    };
+    public static String sharedClasses[] = TestCommon.concat(bootClasses, appClasses);
+
+    public static void main(String[] args) throws Throwable {
+        runTest();
+    }
+
+    public static void runTest() throws Throwable {
+        String bootJar =
+            ClassFileInstaller.writeJar("RedefineClassBoot.jar", bootClasses);
+        String appJar =
+            ClassFileInstaller.writeJar("RedefineClassApp.jar", appClasses);
+
+        String bootCP = "-Xbootclasspath/a:" + bootJar;
+        String agentCmdArg = "-javaagent:redefineagent.jar";
+
+        TestCommon.testDump(appJar, sharedClasses, bootCP, "-Xlog:cds,cds+class=debug");
+
+        OutputAnalyzer out = TestCommon.execAuto("-cp", appJar,
+                bootCP,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-Xlog:cds=info,class+load",
+                agentCmdArg,
+               "RedefineBootClassApp", bootJar);
+        out.reportDiagnosticSummary();
+        TestCommon.checkExec(out);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperApp.java
new file mode 100644
index 00000000000..c60edfd2891
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperApp.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+import java.io.File;
+
+public class RedefineOldSuperApp {
+    public static void main(String args[]) throws Throwable {
+        File bootJar = new File(args[0]);
+        ClassLoader appClassLoader = ClassLoader.getSystemClassLoader();
+
+        Class<?> superCls = Class.forName("OldSuper", false, appClassLoader);
+        System.out.println("OldSuper>> loader = " + superCls.getClassLoader());
+
+        {
+            OldSuper obj = (OldSuper)superCls.newInstance();
+            System.out.println("(before transform) OldSuper>> doit() = " + obj.doit());
+        }
+
+        // Redefine the class
+        byte[] bytes = Util.getClassFileFromJar(bootJar, "OldSuper");
+        Util.replace(bytes, "Hello", "HELLO");
+        RedefineClassHelper.redefineClass(superCls, bytes);
+
+        {
+            OldSuper obj = (OldSuper)superCls.newInstance();
+            String s = obj.doit();
+            System.out.println("(after transform) OldSuper>> doit() = " + s);
+            if (!s.equals("HELLO")) {
+                throw new RuntimeException("OldSuper doit() should be HELLO but got " + s);
+            }
+        }
+
+        Class<?> childCls = Class.forName("NewChild", false, appClassLoader);
+        System.out.println("NewChild>> loader = " + childCls.getClassLoader());
+
+
+        {
+            OldSuper obj = (OldSuper)childCls.newInstance();
+            String s = obj.doit();
+            System.out.println("(after transform) NewChild>> doit() = " + s);
+            if (!s.equals("HELLO")) {
+                throw new RuntimeException("NewChild doit() should be HELLO but got " + s);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperTest.java
new file mode 100644
index 00000000000..a0c8fa7a448
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8342303
+ * @summary Redefine a shared old super class loaded by the app loader. The vtable of its archived child class must be updated
+ * @library /test/lib
+ *          /test/hotspot/jtreg/runtime/cds/appcds
+ *          /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ *          /test/hotspot/jtreg/runtime/cds/appcds/jvmti
+ * @requires vm.jvmti
+ * @compile ../../test-classes/OldSuper.jasm
+ * @build RedefineOldSuperTest
+ *        RedefineOldSuperApp
+ *        NewChild
+ * @run driver RedefineClassHelper
+ * @run driver RedefineOldSuperTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class RedefineOldSuperTest {
+    public static String appClasses[] = {
+        "OldSuper",
+        "NewChild",
+        "RedefineOldSuperApp",
+        "Util",
+    };
+    public static String sharedClasses[] = TestCommon.concat(appClasses);
+
+    public static void main(String[] args) throws Throwable {
+        runTest();
+    }
+
+    public static void runTest() throws Throwable {
+        String appJar =
+            ClassFileInstaller.writeJar("RedefineClassApp.jar", appClasses);
+
+        String agentCmdArg = "-javaagent:redefineagent.jar";
+
+        TestCommon.testDump(appJar, sharedClasses, "-Xlog:cds,cds+class=debug");
+
+        OutputAnalyzer out = TestCommon.execAuto("-cp", appJar,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-Xlog:cds=info,class+load",
+                agentCmdArg,
+               "RedefineOldSuperApp", appJar);
+        out.reportDiagnosticSummary();
+        TestCommon.checkExec(out);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java
index acbd0c948be..fbdec462e09 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java
@@ -30,7 +30,7 @@
  * @requires vm.jvmti
  * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
  * @run driver RedefineClassHelper
- * @build jdk.test.whitebox.WhiteBox RedefineBasic
+ * @build jdk.test.whitebox.WhiteBox jdk.test.lib.compiler.InMemoryJavaCompiler  RedefineBasic
  * @run driver RedefineBasicTest
  */
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
index 039aaef11cd..62bd62662a0 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
@@ -30,7 +30,7 @@
  * @requires vm.jvmti
  * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
  * @run driver RedefineClassHelper
- * @build jdk.test.whitebox.WhiteBox
+ * @build jdk.test.whitebox.WhiteBox jdk.test.lib.compiler.InMemoryJavaCompiler
  * @compile RedefineRunningMethods_SharedHelper.java
  * @run driver RedefineRunningMethods_Shared
  */
diff --git a/test/hotspot/jtreg/runtime/jni/nativeStack/libnativeStack.c b/test/hotspot/jtreg/runtime/jni/nativeStack/libnativeStack.c
index 2b75f29aa83..1087ff2ca89 100644
--- a/test/hotspot/jtreg/runtime/jni/nativeStack/libnativeStack.c
+++ b/test/hotspot/jtreg/runtime/jni/nativeStack/libnativeStack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ void generateError(JNIEnv *env) {
 }
 
 #ifdef _WIN32
-unsigned __stdcall
+unsigned
 #else
 void *
 #endif
diff --git a/test/hotspot/jtreg/runtime/logging/RedefineClasses.java b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
index 34c8900e616..714c05174eb 100644
--- a/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
+++ b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
@@ -30,6 +30,7 @@
  * @modules java.compiler
  *          java.instrument
  * @requires vm.jvmti
+ * @build jdk.test.lib.compiler.InMemoryJavaCompiler
  * @run main RedefineClassHelper
  * @run main/othervm -Xmx256m -XX:MaxMetaspaceSize=64m -javaagent:redefineagent.jar -Xlog:all=trace:file=all.log RedefineClasses
  */
diff --git a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
index 5fe5aaf286f..2004b3599c4 100644
--- a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
+++ b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
@@ -119,6 +119,11 @@ public static void main(String[] args) throws Exception {
             "-Xlog:jni=debug",
             // Enable thread termination logging as a visual cross-check
             "-Xlog:thread+os=info",
+            // We only count monitors in LM_LEGACY mode
+            "-XX:LockingMode=1",
+            // Disable compact headers since that switches locking mode to LM_LIGHTWEIGHT
+            "-XX:+UnlockExperimentalVMOptions",
+            "-XX:-UseCompactObjectHeaders",
             "JNIMonitor$" + test,
         };
         OutputAnalyzer oa = ProcessTools.executeTestJava(cmdArgs);
@@ -219,12 +224,16 @@ private static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler)
         }
 
         static void runTest(int nThreads, boolean skipUnlock, boolean throwOnExit) throws Throwable {
-            final Object monitor = new Object();
+            final Object[] monitors = new Object[nThreads];
+            for (int i = 0; i < nThreads; i++) {
+                monitors[i] = new Object();
+            }
             final AtomicReference<Throwable> exception = new AtomicReference();
             // Ensure all our VT's operate of the same carrier, sequentially.
             ExecutorService scheduler = Executors.newSingleThreadExecutor();
             ThreadFactory factory = virtualThreadBuilder(scheduler).factory();
             for (int i = 0 ; i < nThreads; i++) {
+                Object monitor = skipUnlock ? monitors[i] : monitors[0];
                 Thread th = factory.newThread(() -> {
                         try {
                             int res = monitorEnter(monitor);
diff --git a/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java b/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java
new file mode 100644
index 00000000000..62dfd6f8a79
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test dumping the heap while a virtual thread is unmounted with a native method frame at top.
+ * @requires vm.continuations
+ * @modules jdk.management
+ * @library /test/lib
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED UnmountedVThreadNativeMethodAtTop
+ */
+
+import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import com.sun.management.HotSpotDiagnosticMXBean;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import jdk.test.lib.hprof.model.Snapshot;
+import jdk.test.lib.hprof.model.ThreadObject;
+import jdk.test.lib.hprof.parser.Reader;
+
+public class UnmountedVThreadNativeMethodAtTop {
+
+    /**
+     * Test dumping the heap while a virtual thread is blocked entering a synchronized native method.
+     */
+    @Test
+    void VThreadBlockedAtSynchronizedNative() throws Exception {
+        var lock = this;
+        var started = new CountDownLatch(1);
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            runWithSynchronizedNative();
+        });
+        try {
+            synchronized (lock) {
+                vthread.start();
+
+                // wait for thread to start and block
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+
+                Path dumpFile = dumpHeap();
+                verifyHeapDump(dumpFile);
+            }
+        } finally {
+            vthread.join();
+        }
+    }
+
+    /**
+     * Run native method while holding the monitor for "this".
+     */
+    private synchronized native void runWithSynchronizedNative();
+
+    /**
+     * Called from the native method.
+     */
+    private void run() {
+    }
+
+    /**
+     * Test dumping the heap while a virtual thread is waiting in Object.wait().
+     */
+    @Test
+    void VThreadBlockedAtOjectWait() throws Exception {
+        var lock = this;
+        var started = new CountDownLatch(1);
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            try {
+                synchronized (lock) {
+                    lock.wait();
+                }
+            } catch (InterruptedException e) { }
+        });
+        try {
+            vthread.start();
+
+            // wait for thread to start and wait
+            started.await();
+            await(vthread, Thread.State.WAITING);
+
+            Path dumpFile = dumpHeap();
+            verifyHeapDump(dumpFile);
+
+            synchronized (lock) {
+                lock.notify();
+            }
+        } finally {
+            vthread.join();
+        }
+    }
+
+    private Path dumpHeap() throws Exception {
+        Path df = Files.createTempFile(Path.of("."), "dump", ".hprof");
+        Files.delete(df);
+        var bean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        bean.dumpHeap(df.toString(), false);
+        return df;
+    }
+
+    private void verifyHeapDump(Path dumpFile) throws Exception {
+        // Make sure that heap dump can be parsed
+        System.out.println("Parse " + dumpFile.toAbsolutePath() + " ...");
+        try (Snapshot snapshot = Reader.readFile(dumpFile.toString(), false, 0)) {
+            snapshot.resolve(true);
+
+            // find virtual threads
+            List<ThreadObject> vthreads = snapshot.getThreads()
+                    .stream()
+                    .filter(t -> snapshot.findThing(t.getId())
+                            .getClazz()
+                            .getName().equals("java.lang.VirtualThread"))
+                    .toList();
+
+            assertFalse(vthreads.isEmpty(), "No virtual threads found!!");
+            System.out.format("%s virtual thread(s) found%n", vthreads.size());
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+
+    static {
+        System.loadLibrary("UnmountedVThreadNativeMethodAtTop");
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/lang/Thread/virtual/libTracePinnedThreads.c b/test/hotspot/jtreg/serviceability/HeapDump/libUnmountedVThreadNativeMethodAtTop.c
similarity index 74%
rename from test/jdk/java/lang/Thread/virtual/libTracePinnedThreads.c
rename to test/hotspot/jtreg/serviceability/HeapDump/libUnmountedVThreadNativeMethodAtTop.c
index 2200b91911f..3f285d8d9df 100644
--- a/test/jdk/java/lang/Thread/virtual/libTracePinnedThreads.c
+++ b/test/hotspot/jtreg/serviceability/HeapDump/libUnmountedVThreadNativeMethodAtTop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,11 @@
 
 #include "jni.h"
 
-JNIEXPORT void JNICALL Java_TracePinnedThreads_invokePark(JNIEnv *env, jclass clazz) {
-    jmethodID mid = (*env)->GetStaticMethodID(env, clazz, "park", "()V");
+JNIEXPORT void JNICALL
+Java_UnmountedVThreadNativeMethodAtTop_runWithSynchronizedNative(JNIEnv *env, jobject obj) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jmethodID mid = (*env)->GetMethodID(env, clazz, "run", "()V");
     if (mid != NULL) {
-        (*env)->CallStaticVoidMethod(env, clazz, mid);
+        (*env)->CallVoidMethod(env, obj, mid);
     }
 }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetMethodDeclaringClass/libTestUnloadedClass.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetMethodDeclaringClass/libTestUnloadedClass.cpp
index c32b787d578..ad7708ba55d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetMethodDeclaringClass/libTestUnloadedClass.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetMethodDeclaringClass/libTestUnloadedClass.cpp
@@ -39,9 +39,9 @@ static std::atomic<jmethodID> ring_buffer[BUFFER_SIZE];
 
 void get_method_details(jmethodID method) {
   jclass method_class;
-  char *class_name = NULL;
+  char *class_name = nullptr;
   if (_jvmti->GetMethodDeclaringClass(method, &method_class) == JVMTI_ERROR_NONE) {
-    if (_jvmti->GetClassSignature(method_class, &class_name, NULL) == JVMTI_ERROR_NONE) {
+    if (_jvmti->GetClassSignature(method_class, &class_name, nullptr) == JVMTI_ERROR_NONE) {
       _jvmti->Deallocate((unsigned char *)class_name);
     }
   }
@@ -49,14 +49,14 @@ void get_method_details(jmethodID method) {
 
 void* read_ringbuffer(void* arg) {
   JNIEnv *env;
-  _jvm->AttachCurrentThreadAsDaemon((void **)&env, NULL);
+  _jvm->AttachCurrentThreadAsDaemon((void **)&env, nullptr);
   for (;;) {
     jmethodID id = ring_buffer[rand() % BUFFER_SIZE].load(std::memory_order_relaxed);
     if (id != (jmethodID)0) {
       get_method_details(id);
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,
@@ -66,8 +66,8 @@ static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,
   static bool reader_created = false;
   static int ring_buffer_idx = 0;
 
-  char *class_name = NULL;
-  if (jvmti_env->GetClassSignature(klass, &class_name, NULL) != JVMTI_ERROR_NONE) {
+  char *class_name = nullptr;
+  if (jvmti_env->GetClassSignature(klass, &class_name, nullptr) != JVMTI_ERROR_NONE) {
     return;
   }
   // We only care MyClass and only one thread loads it
@@ -79,7 +79,7 @@ static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,
 
   if (!reader_created) {
     pthread_t tid;
-    pthread_create(&tid, NULL, read_ringbuffer, NULL);
+    pthread_create(&tid, nullptr, read_ringbuffer, nullptr);
     reader_created = true;
   }
 
@@ -119,7 +119,7 @@ JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved)
   }
 
   // Enable the ClassPrepare event
-  error = _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL);
+  error = _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, nullptr);
   if (error != JVMTI_ERROR_NONE) {
     fprintf(stderr, "Error enabling ClassPrepare event: %d\n", error);
     return JNI_ERR;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
index 4dbb9f71969..1cfd7dfd57d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
@@ -35,7 +35,6 @@ extern "C" {
 /* ========================================================================== */
 
 /* scaffold objects */
-static JNIEnv *jni = nullptr;
 static jvmtiEnv *jvmti = nullptr;
 static jlong timeout = 0;
 
@@ -71,7 +70,7 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv *jni, jthread thr, jobject obj) {
 
 /* ========================================================================== */
 
-static int prepare() {
+static int prepare(JNIEnv* jni) {
   jvmtiError err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, nullptr);
   if (err != JVMTI_ERROR_NONE) {
     jni->FatalError("Error enabling JVMTI_EVENT_MONITOR_CONTENDED_ENTER.");
@@ -92,15 +91,14 @@ static int clean() {
 /* agent algorithm
  */
 static void JNICALL
-agentProc(jvmtiEnv *jvmti, JNIEnv *agentJNI, void *arg) {
-  jni = agentJNI;
+agentProc(jvmtiEnv *jvmti, JNIEnv *jni, void *arg) {
 
   /* wait for initial sync */
   if (!agent_wait_for_sync(timeout)) {
     return;
   }
 
-  if (!prepare()) {
+  if (!prepare(jni)) {
     set_agent_fail_status();
     return;
   }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
index 207ceeb6ac3..f2121380f63 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
@@ -32,7 +32,6 @@ extern "C" {
 /* ========================================================================== */
 
 /* scaffold objects */
-static JNIEnv *jni = nullptr;
 static jvmtiEnv *jvmti = nullptr;
 static jlong timeout = 0;
 
@@ -127,7 +126,6 @@ static int clean() {
  */
 static void JNICALL
 agentProc(jvmtiEnv *jvmti, JNIEnv *agentJNI, void *arg) {
-  jni = agentJNI;
 
 /* wait for initial sync */
   if (!agent_wait_for_sync(timeout))
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
index 8f66851a084..8c9f2e17483 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
@@ -30,8 +30,9 @@
 
 extern "C" {
 
+const int MAX_COUNT = 50;
+
 /* scaffold objects */
-static JNIEnv *jni = nullptr;
 static jvmtiEnv *jvmti = nullptr;
 static jlong timeout = 0;
 
@@ -40,6 +41,8 @@ static jthread expected_thread = nullptr;
 static jobject expected_object = nullptr;
 static volatile int eventsCount = 0;
 
+static void check_stack_trace(JNIEnv* env, jthread thr);
+
 void JNICALL
 MonitorWaited(jvmtiEnv *jvmti, JNIEnv *jni, jthread thr, jobject obj, jboolean timed_out) {
 
@@ -65,10 +68,49 @@ MonitorWaited(jvmtiEnv *jvmti, JNIEnv *jni, jthread thr, jobject obj, jboolean t
       set_agent_fail_status();
     }
   }
+
+  if (jni->IsVirtualThread(thr)) {
+    check_stack_trace(jni, thr);
+  }
 }
 
 /* ========================================================================== */
 
+static void check_stack_trace(JNIEnv* jni, jthread thr) {
+  jvmtiError err;
+  jint count = 0;
+  jint skipped = 0;
+
+  print_stack_trace(jvmti, jni, nullptr);
+
+  jvmtiFrameInfo frameInfo[MAX_COUNT];
+
+  err = jvmti->GetStackTrace(thr, 0, MAX_COUNT, frameInfo, &count);
+  check_jvmti_status(jni, err, "event handler: error in JVMTI GetStackTrace call");
+
+  const int expected_count = 8;
+  const char* expected_methods[expected_count] = {"wait0", "wait", "run", "runWith", "run", "run", "enter0", "enter"};
+
+  if (count != expected_count) {
+    LOG("Expected 8 methods in the stack but found %d", count);
+    jni->FatalError("Unexpected method count");
+  }
+
+  for (int idx = 0; idx < count; idx++) {
+    jclass declaringClass = nullptr;
+    char *clasSignature = nullptr;
+    char *methodName = nullptr;
+
+    err = jvmti->GetMethodName(frameInfo[idx].method, &methodName, nullptr, nullptr);
+    check_jvmti_status(jni, err, "event handler: error in JVMTI GetMethodName call");
+
+    if (strcmp(methodName, expected_methods[idx]) != 0) {
+      LOG("Expected method %s but found %s", expected_methods[idx], methodName);
+      jni->FatalError("Unexpected method found");
+    }
+  }
+}
+
 static int prepare() {
   /* enable MonitorWait event */
   jvmtiError err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, nullptr);
@@ -90,7 +132,6 @@ static int clean() {
 
 static void JNICALL
 agentProc(jvmtiEnv *jvmti, JNIEnv *agentJNI, void *arg) {
-  jni = agentJNI;
 
   /* wait for initial sync */
   if (!agent_wait_for_sync(timeout))
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
index 2bdf36df950..db246c17d8f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
  *     - change signature of agentProc function
  *       and save JNIEnv pointer now passed as argument.
  *
+ * @requires vm.continuations
  * @library /test/lib
  * @compile monitorwaited01.java
  * @run main/othervm/native -agentlib:monitorwaited01 monitorwaited01 platform
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
index 3a3b28fdcfa..631c893df62 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -251,13 +251,14 @@ public static void main(String[] args) throws Exception {
         }
     }
 
+    private static native void runFromNative(Runnable runnable);
+
     private static Thread createPinnedVThread(Runnable runnable) {
-        final Object syncObj = new Object();
-        return Thread.ofVirtual().unstarted(() -> {
-            synchronized (syncObj) {
-                runnable.run();
-            }
-        });
+        return Thread.ofVirtual().unstarted(() -> runFromNative(runnable));
+    }
+
+    private static void runUpcall(Runnable runnable) {
+        runnable.run();
     }
 
     // Native implementation of suspendWaiting.
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
index e6ee99eb23f..eb554d3550f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
@@ -191,6 +191,16 @@ Java_GetThreadStateMountedTest_getErrorCount(JNIEnv* jni, jclass clazz) {
 
 static std::atomic<bool> time_to_exit(false);
 
+extern "C" JNIEXPORT void JNICALL
+Java_GetThreadStateMountedTest_runFromNative(JNIEnv* jni, jclass clazz, jobject runnable) {
+  jmethodID mid = jni->GetStaticMethodID(clazz, "runUpcall", "(Ljava/lang/Runnable;)V");
+  if (mid == nullptr) {
+    jni->FatalError("failed to get runUpcall method");
+    return;
+  }
+  jni->CallStaticVoidMethod(clazz, mid, runnable);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_GetThreadStateMountedTest_waitInNative(JNIEnv* jni, jclass clazz) {
   // Notify main thread that we are ready
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java
index d0a2eb65c63..d455a16c998 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,30 @@
  * @test id=default
  * @summary Verifies JVMTI StopThread support for virtual threads.
  * @requires vm.continuations
+ * @library /test/lib
  * @run main/othervm/native -agentlib:StopThreadTest StopThreadTest
  */
 
 /*
  * @test id=no-vmcontinuations
  * @summary Verifies JVMTI StopThread support for bound virtual threads.
- * @run main/othervm/native -agentlib:StopThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations StopThreadTest
+ * @library /test/lib
+ * @run main/othervm/native -agentlib:StopThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations -DboundVThread=true StopThreadTest
  */
 
 /*
  * @test id=platform
  * @summary Verifies JVMTI StopThread support for platform threads.
+ * @library /test/lib
  * @run main/othervm/native -agentlib:StopThreadTest StopThreadTest platform
  */
 
+import jdk.test.lib.Platform;
 import java.lang.AssertionError;
 
+import com.sun.management.HotSpotDiagnosticMXBean;
+import java.lang.management.ManagementFactory;
+
 /*
  *     The test exercises the JVMTI function: StopThread(jthread).
  *     The test creates a new virtual or platform thread.
@@ -53,7 +60,9 @@
  */
 public class StopThreadTest {
     private static final String agentLib = "StopThreadTest";
+    static final boolean isBoundVThread = Boolean.getBoolean("boundVThread");
     static final int JVMTI_ERROR_NONE = 0;
+    static final int JVMTI_ERROR_OPAQUE_FRAME = 32;
     static final int THREAD_NOT_SUSPENDED = 13;
     static final int PASSED = 0;
     static final int FAILED = 2;
@@ -104,7 +113,7 @@ public static void run() {
             } else {
                 testTaskThread = Thread.ofPlatform().name("TestTaskThread").start(testTask);
             }
-            TestTask.ensureAtPointA();
+            TestTask.ensureBlockedAfterPointA(testTaskThread);
 
             if (is_virtual) { // this check is for virtual target thread only
                 log("\nMain #A.1: unsuspended");
@@ -119,10 +128,12 @@ public static void run() {
             log("\nMain #A.2: suspended");
             suspendThread(testTaskThread);
             retCode = stopThread(testTaskThread);
-            if (retCode != JVMTI_ERROR_NONE) {
-                throwFailed("Main #A.2: expected JVMTI_ERROR_NONE instead of: " + retCode);
+            int expectedRetCode = preemptableVirtualThread() ? JVMTI_ERROR_OPAQUE_FRAME : JVMTI_ERROR_NONE;
+            String expectedRetCodeName = preemptableVirtualThread() ? "JVMTI_ERROR_OPAQUE_FRAME" : "JVMTI_ERROR_NONE";
+            if (retCode != expectedRetCode) {
+                throwFailed("Main #A.2: expected " + expectedRetCodeName + " instead of: " + retCode);
             } else {
-                log("Main #A.2: got expected JVMTI_ERROR_NONE");
+                log("Main #A.2: got expected " + expectedRetCodeName);
             }
             resumeThread(testTaskThread);
         }
@@ -168,7 +179,7 @@ static class TestTask implements Runnable {
         static Object lock = new Object();
         static void log(String str) { System.out.println(str); }
 
-        static volatile boolean atPointA = false;
+        static volatile boolean reachedPointA = false;
         static volatile boolean finished = false;
 
         static void sleep(long millis) {
@@ -179,8 +190,9 @@ static void sleep(long millis) {
             }
         }
 
-        static void ensureAtPointA() {
-            while (!atPointA) {
+        static void ensureBlockedAfterPointA(Thread vt) {
+            // wait while the thread state is not the expected one
+            while (!reachedPointA || vt.getState() != Thread.State.BLOCKED) {
                 sleep(1);
             }
         }
@@ -203,7 +215,7 @@ public void run() {
                 seenExceptionFromA = true;
             }
             Thread.interrupted();
-            if (!seenExceptionFromA) {
+            if (!seenExceptionFromA && !preemptableVirtualThread()) {
                 StopThreadTest.setFailed("TestTask.run: expected AssertionError from method A()");
             }
             sleep(1); // to cause yield
@@ -241,7 +253,7 @@ public void run() {
         //  - when suspended: JVMTI_ERROR_NONE is expected
         static void A() {
             log("TestTask.A: started");
-            atPointA = true;
+            reachedPointA = true;
             synchronized (lock) {
             }
             log("TestTask.A: finished");
@@ -263,4 +275,10 @@ static void C() {
             log("TestTask.C: finished");
         }
     }
+
+    static boolean preemptableVirtualThread() {
+        boolean legacyLockingMode = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                                        .getVMOption("LockingMode").getValue().equals("1");
+        return is_virtual && !isBoundVThread && !legacyLockingMode;
+    }
 }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
index 96926a389e1..e4673c3d017 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
@@ -25,6 +25,7 @@
  * @test id=default
  * @summary Test SuspendThread/ResumeThread, SuspendThreadList/ResumeThreadList
  *          for virtual threads.
+ * @requires vm.debug != true
  * @library /test/lib
  * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -34,6 +35,19 @@
  *      SuspendResume1
  */
 
+/*
+ * @test id=debug
+ * @requires vm.debug == true
+ * @library /test/lib
+ * @compile SuspendResume1.java
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm/native/timeout=600
+ *      -Djdk.virtualThreadScheduler.maxPoolSize=1
+ *      -agentlib:SuspendResume1
+ *      -XX:-VerifyContinuations
+ *      SuspendResume1
+ */
+
  /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
@@ -168,7 +182,7 @@ public void run() {
     public void ensureReady() {
         try {
             while (!threadReady) {
-                sleep(1000);
+                sleep(100);
             }
         } catch (InterruptedException e) {
             throw new RuntimeException("Interruption while preparing tested thread: \n\t" + e);
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
index 65381468ba9..7c7d21160ae 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
@@ -24,6 +24,7 @@
 /*
  * @test id=default
  * @summary Test SuspendAllVirtualThreads/ResumeAllVirtualThreads
+ * @requires vm.debug != true
  * @library /test/lib
  * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -33,6 +34,19 @@
  *      SuspendResume2
  */
 
+/*
+ * @test id=debug
+ * @requires vm.debug == true
+ * @library /test/lib
+ * @compile SuspendResume2.java
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @run main/othervm/native
+ *      -Djdk.virtualThreadScheduler.maxPoolSize=1
+ *      -agentlib:SuspendResume2
+ *      -XX:-VerifyContinuations
+ *      SuspendResume2
+ */
+
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
@@ -148,7 +162,7 @@ public void run() {
         while (!shouldFinish) {
             if (n <= 0) {
                 n = 1000;
-                SuspendResume2.sleep(1);
+                SuspendResume2.sleep(10);
             }
             if (i > n) {
                 i = 0;
@@ -162,7 +176,7 @@ public void run() {
     public void ensureReady() {
         try {
             while (!threadReady) {
-                sleep(1);
+                sleep(100);
             }
         } catch (InterruptedException e) {
             throw new RuntimeException("Interruption while preparing tested thread: \n\t" + e);
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java
index d679f382d93..107c843226e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,13 +32,20 @@
 
 /**
  * @test id=xint
- * @summary Do not suspend virtual threads in a critical section.
- * @bug 8311218
+ * @requires vm.debug != true
  * @requires vm.continuations
  * @library /testlibrary
  * @run main/othervm -Xint SuspendWithInterruptLock
  */
 
+/**
+ * @test id=xint-debug
+ * @requires vm.debug == true
+ * @requires vm.continuations
+ * @library /testlibrary
+ * @run main/othervm -Xint -XX:-VerifyContinuations SuspendWithInterruptLock
+ */
+
 import jvmti.JVMTIUtils;
 
 public class SuspendWithInterruptLock {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
index c97a8ef3471..7d898bcab25 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
@@ -28,6 +28,7 @@
 
 extern "C" {
 
+const int MAX_COUNT = 50;
 static jvmtiEnv *jvmti = nullptr;
 static std::atomic<int> thread_end_cnt(0);
 static std::atomic<int> thread_unmount_cnt(0);
@@ -38,10 +39,70 @@ void JNICALL VirtualThreadEnd(jvmtiEnv *jvmti, JNIEnv* jni, jthread vthread) {
 }
 
 void JNICALL VirtualThreadMount(jvmtiEnv* jvmti, ...) {
+  jvmtiError err;
+  jint count = 0;
+  jvmtiFrameInfo frameInfo[MAX_COUNT];
+
+  va_list ap;
+  JNIEnv* jni = nullptr;
+  jthread thread = nullptr;
+
+  va_start(ap, jvmti);
+  jni = va_arg(ap, JNIEnv*);
+  thread = va_arg(ap, jthread);
+  va_end(ap);
+
+  err = jvmti->GetStackTrace(thread, 0, MAX_COUNT, frameInfo, &count);
+  check_jvmti_status(jni, err, "event handler: error in JVMTI GetStackTrace call");
+
+  // Verify top 3 methods to filter events from Continuation::try_preempt().
+  const int verification_count = 3;
+  const char* expected_methods[verification_count] = {"yieldContinuation", "park", "parkVirtualThread"};
+
+  if (count < verification_count) return;
+
+  for (int idx = 0; idx < verification_count; idx++) {
+    char* methodName = get_method_name(jvmti, jni, frameInfo[idx].method);
+    if (strcmp(methodName, expected_methods[idx]) != 0) {
+      deallocate(jvmti, jni, methodName);
+      return;
+    }
+    deallocate(jvmti, jni, methodName);
+  }
   thread_mount_cnt++;
 }
 
 void JNICALL VirtualThreadUnmount(jvmtiEnv* jvmti, ...) {
+  jvmtiError err;
+  jint count = 0;
+  jvmtiFrameInfo frameInfo[MAX_COUNT];
+
+  va_list ap;
+  JNIEnv* jni = nullptr;
+  jthread thread = nullptr;
+
+  va_start(ap, jvmti);
+  jni = va_arg(ap, JNIEnv*);
+  thread = va_arg(ap, jthread);
+  va_end(ap);
+
+  err = jvmti->GetStackTrace(thread, 0, MAX_COUNT, frameInfo, &count);
+  check_jvmti_status(jni, err, "event handler: error in JVMTI GetStackTrace call");
+
+  // Verify top 3 methods to filter events from Continuation::try_preempt().
+  const int verification_count = 3;
+  const char* expected_methods[verification_count] = {"run", "enter0", "enter"};
+
+  if (count < verification_count) return;
+
+  for (int idx = 0; idx < verification_count; idx++) {
+    char* methodName = get_method_name(jvmti, jni, frameInfo[idx].method);
+    if (strcmp(methodName, expected_methods[idx]) != 0) {
+      deallocate(jvmti, jni, methodName);
+      return;
+    }
+    deallocate(jvmti, jni, methodName);
+  }
   thread_unmount_cnt++;
 }
 
@@ -118,13 +179,13 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
   }
 
   clazz = env->FindClass("VThreadEventTest");
-  if (clazz == NULL) {
+  if (clazz == nullptr) {
       LOG("FindClass failed\n");
       return JNI_ERR;
   }
 
   mid = env->GetStaticMethodID(clazz, "agentStarted", "()V");
-  if (mid == NULL) {
+  if (mid == nullptr) {
       LOG("GetStaticMethodID failed\n");
       return JNI_ERR;
   }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
index 77f53f051d6..9a339f8202b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
@@ -49,6 +49,7 @@ public class VThreadMonitorTest {
     }
     private static native boolean hasEventPosted();
     private static native void checkContendedMonitor(Thread thread, Object mon1, Object mon2);
+    private static native void checkOwnedMonitor(Thread thread, int expectedCount);
     private static native int check();
 
     private static void log(String str) { System.out.println(str); }
@@ -57,6 +58,7 @@ public class VThreadMonitorTest {
     private static final Object lock0 = new MonitorClass0();
     private static final Object lock1 = new Object();
     private static final Object lock2 = new MonitorClass2();
+    private static volatile Thread waiter;
 
     static void sleep(long millis) {
         try {
@@ -73,6 +75,12 @@ static void m0() {
     static void m1() {
         synchronized (lock1) {
             // log(thrName() +" entered sync section with lock1");
+            if (waiter == null) {
+                try {
+                    waiter = Thread.currentThread();
+                    lock1.wait();
+                } catch (InterruptedException e) {}
+            }
             m0();
         }
     }
@@ -121,6 +129,13 @@ public static void main(String[] args) throws Exception {
             for (int i = 0; i < VT_TOTAL; i++) {
                 vthreads[i].start();
             }
+            // Wait for waiter to enter lock1.
+            while (waiter == null) {}
+            synchronized (lock1) {
+                checkOwnedMonitor(waiter, 1);
+                lock1.notify();
+            }
+
             // Wait for the MonitorContendedEnter event.
             while (!hasEventPosted()) {
                 log("Main thread is waiting for event\n");
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
index af0861ee031..13df3356ba4 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
@@ -119,7 +119,7 @@ check_contended_monitor(jvmtiEnv *jvmti, JNIEnv *jni, const char* func,
 
 static void
 check_owned_monitor(jvmtiEnv *jvmti, JNIEnv *jni, const char* func,
-                    jthread thread, char* tname, jboolean is_vt, jobject monitor) {
+                    jthread thread, char* tname, jboolean is_vt, jint expected_count) {
   jvmtiError err;
   jint state = 0;
   jint mcount = -1;
@@ -135,8 +135,8 @@ check_owned_monitor(jvmtiEnv *jvmti, JNIEnv *jni, const char* func,
   LOG("\n%s: GetOwnedMonitorInfo: %s owns %d monitor(s)\n", func, tname, mcount);
   jvmti->Deallocate((unsigned char *)owned_monitors);
 
-  if (is_vt == JNI_TRUE && mcount < 2) {
-    LOG("%s: FAIL: monitorCount for %s expected to be >= 2\n", func, tname);
+  if (is_vt == JNI_TRUE && mcount != expected_count) {
+    LOG("%s: FAIL: monitorCount for %s expected to be %d\n", func, tname, expected_count);
     status = STATUS_FAILED;
     return;
   }
@@ -186,9 +186,9 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv *jni, jthread vthread, jobject mon
   check_contended_monitor(jvmti, jni, "MonitorContendedEnter",
                           cthread,  ctname, JNI_FALSE, nullptr, nullptr);
   check_owned_monitor(jvmti, jni, "MonitorContendedEnter",
-                      vthread, vtname, JNI_TRUE, monitor);
+                      vthread, vtname, JNI_TRUE, 2);
   check_owned_monitor(jvmti, jni, "MonitorContendedEnter",
-                      cthread, ctname, JNI_FALSE, monitor);
+                      cthread, ctname, JNI_FALSE, 2);
   deallocate(jvmti, jni, (void*)vtname);
   deallocate(jvmti, jni, (void*)ctname);
 }
@@ -352,6 +352,15 @@ Java_VThreadMonitorTest_checkContendedMonitor(JNIEnv *jni, jclass cls, jthread v
   deallocate(jvmti, jni, (void*)tname);
 }
 
+JNIEXPORT void JNICALL
+Java_VThreadMonitorTest_checkOwnedMonitor(JNIEnv *jni, jclass cls, jthread vthread, jint expected_count) {
+  char* tname = get_thread_name(jvmti, jni, vthread);
+
+  check_owned_monitor(jvmti, jni, "checkOwnedMonitor", vthread, tname, JNI_TRUE, expected_count);
+
+  deallocate(jvmti, jni, (void*)tname);
+}
+
 JNIEXPORT jint JNICALL
 Java_VThreadMonitorTest_check(JNIEnv *jni, jclass cls) {
   return status;
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
index 067a992d444..d39779c4e4d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,8 @@ public static void main(String[] args) throws Exception {
             tokensMap.put("(a java.lang.Class for LingeredAppWithLock)",
                           "instance of Oop for java/lang/Class");
             tokensMap.put("Method*=", "Type is Method");
-            tokensMap.put("(a java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject)",
-                          "instance of Oop for java/util/concurrent/locks/AbstractQueuedSynchronizer\\$ConditionObject");
+            tokensMap.put("(a java.lang.ref.ReferenceQueue$Lock)",
+                          "instance of Oop for java/lang/ref/ReferenceQueue\\$Lock");
 
             String[] lines = jstackOutput.split("\\R");
 
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
index bcf93498574..1f039eb73b5 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,12 +93,12 @@ private static void checkForTruncation(String longConstantOutput) throws Excepti
         // ...
         // longConstant VM_Version::CPU_SHA 17179869184
         // longConstant markWord::age_shift 3
-        // longConstant markWord::hash_mask_in_place 549755813632
+        // longConstant markWord::hash_mask_in_place 4398046509056
         // ...
 
         checkLongValue("markWord::hash_mask_in_place",
                        longConstantOutput,
-                       Platform.is64bit() ? 549755813632L: 4294967168L);
+                       Platform.is64bit() ? 4398046509056L: 4294967168L);
 
         String arch = System.getProperty("os.arch");
         if (arch.equals("amd64") || arch.equals("i386") || arch.equals("x86")) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/TestDescription.java
deleted file mode 100644
index 663c38add05..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/TestDescription.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- *
- * @summary converted from VM Testbase nsk/jvmti/AttachOnDemand/attach004.
- * VM Testbase keywords: [jpda, jvmti, noras, feature_282, vm6, jdk]
- * VM Testbase readme:
- * Description :
- *     Test tries to load java agent to the VM after the VM has started using
- *     Attach API (com.sun.tools.attach).
- *     Test is based on the nsk.share.aod framework. In this framework each java
- *     agent starts new thread from the 'agentmain' method, and all test checks are executed
- *     in this thread. Also in the terms of this framework java application running in the
- *     VM where agent is loaded to is called 'target application'.
- *     In this test target application is running with enabled security manager and with restricted
- *     permissions. Test checks that loaded agent is also run with restricted permissions (attempt
- *     to create ClassLoader should fail with SecurityException).
- *
- * @library /vmTestbase
- *          /test/lib
- * @build nsk.share.aod.AODTestRunner
- *        nsk.share.aod.TargetApplicationWaitingAgents
- *
- * @comment create attach004Agent00.jar in current directory
- * @build nsk.jvmti.AttachOnDemand.attach004.attach004Agent00
- * @run driver jdk.test.lib.helpers.ClassFileInstaller nsk.jvmti.AttachOnDemand.attach004.attach004Agent00
- * @run driver ExecDriver --cmd
- *      ${compile.jdk}/bin/jar
- *      -cfm attach004Agent00.jar ${test.src}/attach004Agent00.mf
- *      nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.class
- *
- * @run main/othervm
- *      nsk.share.aod.AODTestRunner
- *      -jdk ${test.jdk}
- *      -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts} -Djava.security.manager -Djava.security.policy==${test.src}/attach004.policy"
- *      -target nsk.share.aod.TargetApplicationWaitingAgents
- *      -ja attach004Agent00.jar
- */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004.policy b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004.policy
deleted file mode 100644
index 68023babf5c..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-grant {
-        permission java.net.SocketPermission   "*:0-", "listen,connect,resolve";
-        permission java.lang.RuntimePermission "modifyThreadGroup";
-        permission java.lang.RuntimePermission "modifyThread";
-        permission java.lang.RuntimePermission "shutdownHooks";
-        permission java.util.PropertyPermission "vmsqe.aod.AppId", "read";
-        permission java.io.FilePermission "${vmsqe.aod.AppId}", "read";
-        permission java.io.FilePermission "${vmsqe.aod.AppId}", "delete";
-};
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.java
deleted file mode 100644
index b78701a6c51..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package nsk.jvmti.AttachOnDemand.attach004;
-
-import nsk.share.aod.AbstractJarAgent;
-import java.lang.instrument.Instrumentation;
-
-public class attach004Agent00 extends AbstractJarAgent {
-
-    static class TestClassLoader extends ClassLoader {
-    }
-
-    protected void agentActions() throws Throwable {
-        if (System.getSecurityManager() == null) {
-            setStatusFailed("System.getSecurityManager() returns null");
-            return;
-        }
-        try {
-            /*
-             * Target application should be run with restricted permissions
-             * and attempt to create ClassLoader from the agent should fail
-             * with SecurityException
-             */
-
-            TestClassLoader classLoader = new TestClassLoader();
-            display("ClassLoader created: " + classLoader);
-
-            setStatusFailed("Expected SecurityException wasn't thrown");
-        } catch (SecurityException e) {
-            display("Expected SecurityException: " + e);
-            logThrowable(e);
-        }
-    }
-
-    public static void agentmain(String options, Instrumentation inst) {
-        new attach004Agent00().runJarAgent(options, inst);
-    }
-}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.mf b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.mf
deleted file mode 100644
index 0108a54eb9b..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach004/attach004Agent00.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Agent-Class: nsk.jvmti.AttachOnDemand.attach004.attach004Agent00
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
index 7593b460c2e..47e030945ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
@@ -23,116 +23,147 @@
 
 package java.lang;
 
-import jdk.internal.misc.Blocker;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 import nsk.jvmti.scenarios.bcinstr.BI04.bi04t002a;
 
 /**
- * Class <code>Object</code> is the root of the class hierarchy.
- * Every class has <code>Object</code> as a superclass. All objects,
+ * Class {@code Object} is the root of the class hierarchy.
+ * Every class has {@code Object} as a superclass. All objects,
  * including arrays, implement the methods of this class.
  *
- * @author  unascribed
- * @version 1.67, 02/03/04
  * @see     java.lang.Class
- * @since   JDK1.0
+ * @since   1.0
  */
 public class Object {
 
     /**
-     * Returns the runtime class of an object. That <tt>Class</tt>
-     * object is the object that is locked by <tt>static synchronized</tt>
-     * methods of the represented class.
+     * Constructs a new object.
+     */
+    @IntrinsicCandidate
+    public Object() {}
+
+    /**
+     * Returns the runtime class of this {@code Object}. The returned
+     * {@code Class} object is the object that is locked by {@code
+     * static synchronized} methods of the represented class.
+     *
+     * <p><b>The actual result type is {@code Class<? extends |X|>}
+     * where {@code |X|} is the erasure of the static type of the
+     * expression on which {@code getClass} is called.</b> For
+     * example, no cast is required in this code fragment:</p>
      *
-     * @return The <code>java.lang.Class</code> object that represents
-     *         the runtime class of the object.  The result is of type
-     *         {@code Class<? extends X>} where X is the
-     *         static type of the expression on which
-     *         <code>getClass</code> is called.
+     * <p>
+     * {@code Number n = 0;                             }<br>
+     * {@code Class<? extends Number> c = n.getClass(); }
+     * </p>
+     *
+     * @return The {@code Class} object that represents the runtime
+     *         class of this object.
+     * @jls 15.8.2 Class Literals
      */
-    public final native Class<? extends Object> getClass();
+    @IntrinsicCandidate
+    public final native Class<?> getClass();
 
     /**
-     * Returns a hash code value for the object. This method is
-     * supported for the benefit of hashtables such as those provided by
-     * <code>java.util.Hashtable</code>.
+     * {@return a hash code value for this object} This method is
+     * supported for the benefit of hash tables such as those provided by
+     * {@link java.util.HashMap}.
      * <p>
-     * The general contract of <code>hashCode</code> is:
+     * The general contract of {@code hashCode} is:
      * <ul>
      * <li>Whenever it is invoked on the same object more than once during
-     *     an execution of a Java application, the <tt>hashCode</tt> method
+     *     an execution of a Java application, the {@code hashCode} method
      *     must consistently return the same integer, provided no information
-     *     used in <tt>equals</tt> comparisons on the object is modified.
+     *     used in {@code equals} comparisons on the object is modified.
      *     This integer need not remain consistent from one execution of an
      *     application to another execution of the same application.
-     * <li>If two objects are equal according to the <tt>equals(Object)</tt>
-     *     method, then calling the <code>hashCode</code> method on each of
-     *     the two objects must produce the same integer result.
+     * <li>If two objects are equal according to the {@link
+     *     #equals(Object) equals} method, then calling the {@code
+     *     hashCode} method on each of the two objects must produce the
+     *     same integer result.
      * <li>It is <em>not</em> required that if two objects are unequal
-     *     according to the {@link java.lang.Object#equals(java.lang.Object)}
-     *     method, then calling the <tt>hashCode</tt> method on each of the
-     *     two objects must produce distinct integer results.  However, the
-     *     programmer should be aware that producing distinct integer results
-     *     for unequal objects may improve the performance of hashtables.
+     *     according to the {@link #equals(Object) equals} method, then
+     *     calling the {@code hashCode} method on each of the two objects
+     *     must produce distinct integer results.  However, the programmer
+     *     should be aware that producing distinct integer results for
+     *     unequal objects may improve the performance of hash tables.
      * </ul>
-     * <p>
-     * As much as is reasonably practical, the hashCode method defined by
-     * class <tt>Object</tt> does return distinct integers for distinct
-     * objects. (This is typically implemented by converting the internal
-     * address of the object into an integer, but this implementation
-     * technique is not required by the
-     * Java<font size="-2"><sup>TM</sup></font> programming language.)
      *
-     * @return  a hash code value for this object.
+     * @implSpec
+     * As far as is reasonably practical, the {@code hashCode} method defined
+     * by class {@code Object} returns distinct integers for distinct objects.
+     *
+     * @apiNote
+     * The {@link java.util.Objects#hash(Object...) hash} and {@link
+     * java.util.Objects#hashCode(Object) hashCode} methods of {@link
+     * java.util.Objects} can be used to help construct simple hash codes.
+     *
      * @see     java.lang.Object#equals(java.lang.Object)
-     * @see     java.util.Hashtable
+     * @see     java.lang.System#identityHashCode
      */
+    @IntrinsicCandidate
     public native int hashCode();
 
     /**
      * Indicates whether some other object is "equal to" this one.
      * <p>
-     * The <code>equals</code> method implements an equivalence relation
+     * The {@code equals} method implements an equivalence relation
      * on non-null object references:
      * <ul>
      * <li>It is <i>reflexive</i>: for any non-null reference value
-     *     <code>x</code>, <code>x.equals(x)</code> should return
-     *     <code>true</code>.
+     *     {@code x}, {@code x.equals(x)} should return
+     *     {@code true}.
      * <li>It is <i>symmetric</i>: for any non-null reference values
-     *     <code>x</code> and <code>y</code>, <code>x.equals(y)</code>
-     *     should return <code>true</code> if and only if
-     *     <code>y.equals(x)</code> returns <code>true</code>.
+     *     {@code x} and {@code y}, {@code x.equals(y)}
+     *     should return {@code true} if and only if
+     *     {@code y.equals(x)} returns {@code true}.
      * <li>It is <i>transitive</i>: for any non-null reference values
-     *     <code>x</code>, <code>y</code>, and <code>z</code>, if
-     *     <code>x.equals(y)</code> returns <code>true</code> and
-     *     <code>y.equals(z)</code> returns <code>true</code>, then
-     *     <code>x.equals(z)</code> should return <code>true</code>.
+     *     {@code x}, {@code y}, and {@code z}, if
+     *     {@code x.equals(y)} returns {@code true} and
+     *     {@code y.equals(z)} returns {@code true}, then
+     *     {@code x.equals(z)} should return {@code true}.
      * <li>It is <i>consistent</i>: for any non-null reference values
-     *     <code>x</code> and <code>y</code>, multiple invocations of
-     *     <tt>x.equals(y)</tt> consistently return <code>true</code>
-     *     or consistently return <code>false</code>, provided no
-     *     information used in <code>equals</code> comparisons on the
+     *     {@code x} and {@code y}, multiple invocations of
+     *     {@code x.equals(y)} consistently return {@code true}
+     *     or consistently return {@code false}, provided no
+     *     information used in {@code equals} comparisons on the
      *     objects is modified.
-     * <li>For any non-null reference value <code>x</code>,
-     *     <code>x.equals(null)</code> should return <code>false</code>.
+     * <li>For any non-null reference value {@code x},
+     *     {@code x.equals(null)} should return {@code false}.
      * </ul>
+     *
      * <p>
-     * The <tt>equals</tt> method for class <code>Object</code> implements
+     * An equivalence relation partitions the elements it operates on
+     * into <i>equivalence classes</i>; all the members of an
+     * equivalence class are equal to each other. Members of an
+     * equivalence class are substitutable for each other, at least
+     * for some purposes.
+     *
+     * @implSpec
+     * The {@code equals} method for class {@code Object} implements
      * the most discriminating possible equivalence relation on objects;
-     * that is, for any non-null reference values <code>x</code> and
-     * <code>y</code>, this method returns <code>true</code> if and only
-     * if <code>x</code> and <code>y</code> refer to the same object
-     * (<code>x == y</code> has the value <code>true</code>).
-     * <p>
-     * Note that it is generally necessary to override the <tt>hashCode</tt>
+     * that is, for any non-null reference values {@code x} and
+     * {@code y}, this method returns {@code true} if and only
+     * if {@code x} and {@code y} refer to the same object
+     * ({@code x == y} has the value {@code true}).
+     *
+     * In other words, under the reference equality equivalence
+     * relation, each equivalence class only has a single element.
+     *
+     * @apiNote
+     * It is generally necessary to override the {@link #hashCode() hashCode}
      * method whenever this method is overridden, so as to maintain the
-     * general contract for the <tt>hashCode</tt> method, which states
+     * general contract for the {@code hashCode} method, which states
      * that equal objects must have equal hash codes.
+     * <p>The two-argument {@link java.util.Objects#equals(Object,
+     * Object) Objects.equals} method implements an equivalence relation
+     * on two possibly-null object references.
      *
      * @param   obj   the reference object with which to compare.
-     * @return  <code>true</code> if this object is the same as the obj
-     *          argument; <code>false</code> otherwise.
+     * @return  {@code true} if this object is the same as the obj
+     *          argument; {@code false} otherwise.
      * @see     #hashCode()
-     * @see     java.util.Hashtable
+     * @see     java.util.HashMap
      */
     public boolean equals(Object obj) {
         bi04t002a.instrInvoke(bi04t002a.INSTR_EQUALS);
@@ -142,7 +173,7 @@ public boolean equals(Object obj) {
     /**
      * Creates and returns a copy of this object.  The precise meaning
      * of "copy" may depend on the class of the object. The general
-     * intent is that, for any object <tt>x</tt>, the expression:
+     * intent is that, for any object {@code x}, the expression:
      * <blockquote>
      * <pre>
      * x.clone() != x</pre></blockquote>
@@ -150,75 +181,89 @@ public boolean equals(Object obj) {
      * <blockquote>
      * <pre>
      * x.clone().getClass() == x.getClass()</pre></blockquote>
-     * will be <tt>true</tt>, but these are not absolute requirements.
+     * will be {@code true}, but these are not absolute requirements.
      * While it is typically the case that:
      * <blockquote>
      * <pre>
      * x.clone().equals(x)</pre></blockquote>
-     * will be <tt>true</tt>, this is not an absolute requirement.
+     * will be {@code true}, this is not an absolute requirement.
      * <p>
      * By convention, the returned object should be obtained by calling
-     * <tt>super.clone</tt>.  If a class and all of its superclasses (except
-     * <tt>Object</tt>) obey this convention, it will be the case that
-     * <tt>x.clone().getClass() == x.getClass()</tt>.
+     * {@code super.clone}.  If a class and all of its superclasses (except
+     * {@code Object}) obey this convention, it will be the case that
+     * {@code x.clone().getClass() == x.getClass()}.
      * <p>
      * By convention, the object returned by this method should be independent
      * of this object (which is being cloned).  To achieve this independence,
      * it may be necessary to modify one or more fields of the object returned
-     * by <tt>super.clone</tt> before returning it.  Typically, this means
+     * by {@code super.clone} before returning it.  Typically, this means
      * copying any mutable objects that comprise the internal "deep structure"
      * of the object being cloned and replacing the references to these
      * objects with references to the copies.  If a class contains only
      * primitive fields or references to immutable objects, then it is usually
-     * the case that no fields in the object returned by <tt>super.clone</tt>
+     * the case that no fields in the object returned by {@code super.clone}
      * need to be modified.
-     * <p>
-     * The method <tt>clone</tt> for class <tt>Object</tt> performs a
+     *
+     * @implSpec
+     * The method {@code clone} for class {@code Object} performs a
      * specific cloning operation. First, if the class of this object does
-     * not implement the interface <tt>Cloneable</tt>, then a
-     * <tt>CloneNotSupportedException</tt> is thrown. Note that all arrays
-     * are considered to implement the interface <tt>Cloneable</tt>.
+     * not implement the interface {@code Cloneable}, then a
+     * {@code CloneNotSupportedException} is thrown. Note that all arrays
+     * are considered to implement the interface {@code Cloneable} and that
+     * the return type of the {@code clone} method of an array type {@code T[]}
+     * is {@code T[]} where T is any reference or primitive type.
      * Otherwise, this method creates a new instance of the class of this
      * object and initializes all its fields with exactly the contents of
      * the corresponding fields of this object, as if by assignment; the
      * contents of the fields are not themselves cloned. Thus, this method
      * performs a "shallow copy" of this object, not a "deep copy" operation.
      * <p>
-     * The class <tt>Object</tt> does not itself implement the interface
-     * <tt>Cloneable</tt>, so calling the <tt>clone</tt> method on an object
-     * whose class is <tt>Object</tt> will result in throwing an
+     * The class {@code Object} does not itself implement the interface
+     * {@code Cloneable}, so calling the {@code clone} method on an object
+     * whose class is {@code Object} will result in throwing an
      * exception at run time.
      *
      * @return     a clone of this instance.
-     * @exception  CloneNotSupportedException  if the object's class does not
-     *               support the <code>Cloneable</code> interface. Subclasses
-     *               that override the <code>clone</code> method can also
+     * @throws  CloneNotSupportedException  if the object's class does not
+     *               support the {@code Cloneable} interface. Subclasses
+     *               that override the {@code clone} method can also
      *               throw this exception to indicate that an instance cannot
      *               be cloned.
      * @see java.lang.Cloneable
      */
+    @IntrinsicCandidate
     protected native Object clone() throws CloneNotSupportedException;
 
     /**
-     * Returns a string representation of the object. In general, the
-     * <code>toString</code> method returns a string that
+     * {@return a string representation of the object}
+     *
+     * Satisfying this method's contract implies a non-{@code null}
+     * result must be returned.
+     *
+     * @apiNote
+     * In general, the
+     * {@code toString} method returns a string that
      * "textually represents" this object. The result should
      * be a concise but informative representation that is easy for a
      * person to read.
      * It is recommended that all subclasses override this method.
-     * <p>
-     * The <code>toString</code> method for class <code>Object</code>
+     * The string output is not necessarily stable over time or across
+     * JVM invocations.
+     * @implSpec
+     * The {@code toString} method for class {@code Object}
      * returns a string consisting of the name of the class of which the
-     * object is an instance, the at-sign character `<code>@</code>', and
+     * object is an instance, the at-sign character `{@code @}', and
      * the unsigned hexadecimal representation of the hash code of the
      * object. In other words, this method returns a string equal to the
      * value of:
-     * <blockquote>
-     * <pre>
+     * {@snippet lang=java :
      * getClass().getName() + '@' + Integer.toHexString(hashCode())
-     * </pre></blockquote>
-     *
-     * @return  a string representation of the object.
+     * }
+     * The {@link java.util.Objects#toIdentityString(Object)
+     * Objects.toIdentityString} method returns the string for an
+     * object equal to the string that would be returned if neither
+     * the {@code toString} nor {@code hashCode} methods were
+     * overridden by the object's class.
      */
     public String toString() {
         bi04t002a.instrInvoke(bi04t002a.INSTR_TOSTRING);
@@ -230,7 +275,7 @@ public String toString() {
      * monitor. If any threads are waiting on this object, one of them
      * is chosen to be awakened. The choice is arbitrary and occurs at
      * the discretion of the implementation. A thread waits on an object's
-     * monitor by calling one of the <code>wait</code> methods.
+     * monitor by calling one of the {@code wait} methods.
      * <p>
      * The awakened thread will not be able to proceed until the current
      * thread relinquishes the lock on this object. The awakened thread will
@@ -244,25 +289,26 @@ public String toString() {
      * object's monitor in one of three ways:
      * <ul>
      * <li>By executing a synchronized instance method of that object.
-     * <li>By executing the body of a <code>synchronized</code> statement
+     * <li>By executing the body of a {@code synchronized} statement
      *     that synchronizes on the object.
-     * <li>For objects of type <code>Class,</code> by executing a
-     *     synchronized static method of that class.
+     * <li>For objects of type {@code Class,} by executing a
+     *     static synchronized method of that class.
      * </ul>
      * <p>
      * Only one thread at a time can own an object's monitor.
      *
-     * @exception  IllegalMonitorStateException  if the current thread is not
+     * @throws  IllegalMonitorStateException  if the current thread is not
      *               the owner of this object's monitor.
      * @see        java.lang.Object#notifyAll()
      * @see        java.lang.Object#wait()
      */
+    @IntrinsicCandidate
     public final native void notify();
 
     /**
      * Wakes up all threads that are waiting on this object's monitor. A
      * thread waits on an object's monitor by calling one of the
-     * <code>wait</code> methods.
+     * {@code wait} methods.
      * <p>
      * The awakened threads will not be able to proceed until the current
      * thread relinquishes the lock on this object. The awakened threads
@@ -272,188 +318,183 @@ public String toString() {
      * being the next thread to lock this object.
      * <p>
      * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the <code>notify</code> method for a
+     * of this object's monitor. See the {@code notify} method for a
      * description of the ways in which a thread can become the owner of
      * a monitor.
      *
-     * @exception  IllegalMonitorStateException  if the current thread is not
+     * @throws  IllegalMonitorStateException  if the current thread is not
      *               the owner of this object's monitor.
      * @see        java.lang.Object#notify()
      * @see        java.lang.Object#wait()
      */
+    @IntrinsicCandidate
     public final native void notifyAll();
 
     /**
-     * Causes current thread to wait until either another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object, or a
-     * specified amount of time has elapsed.
-     * <p>
-     * The current thread must own this object's monitor.
-     * <p>
-     * This method causes the current thread (call it <var>T</var>) to
-     * place itself in the wait set for this object and then to relinquish
-     * any and all synchronization claims on this object. Thread <var>T</var>
-     * becomes disabled for thread scheduling purposes and lies dormant
-     * until one of four things happens:
-     * <ul>
-     * <li>Some other thread invokes the <tt>notify</tt> method for this
-     * object and thread <var>T</var> happens to be arbitrarily chosen as
-     * the thread to be awakened.
-     * <li>Some other thread invokes the <tt>notifyAll</tt> method for this
-     * object.
-     * <li>Some other thread {@link java.lang.Thread#interrupt() interrupts}
-     * thread <var>T</var>.
-     * <li>The specified amount of real time has elapsed, more or less.  If
-     * <tt>timeout</tt> is zero, however, then real time is not taken into
-     * consideration and the thread simply waits until notified.
-     * </ul>
-     * The thread <var>T</var> is then removed from the wait set for this
-     * object and re-enabled for thread scheduling. It then competes in the
-     * usual manner with other threads for the right to synchronize on the
-     * object; once it has gained control of the object, all its
-     * synchronization claims on the object are restored to the status quo
-     * ante - that is, to the situation as of the time that the <tt>wait</tt>
-     * method was invoked. Thread <var>T</var> then returns from the
-     * invocation of the <tt>wait</tt> method. Thus, on return from the
-     * <tt>wait</tt> method, the synchronization state of the object and of
-     * thread <tt>T</tt> is exactly as it was when the <tt>wait</tt> method
-     * was invoked.
+     * Causes the current thread to wait until it is awakened, typically
+     * by being <em>notified</em> or <em>interrupted</em>.
      * <p>
-     * A thread can also wake up without being notified, interrupted, or
-     * timing out, a so-called <i>spurious wakeup</i>.  While this will rarely
-     * occur in practice, applications must guard against it by testing for
-     * the condition that should have caused the thread to be awakened, and
-     * continuing to wait if the condition is not satisfied.  In other words,
-     * waits should always occur in loops, like this one:
-     * <pre>
-     *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait(timeout);
-     *         ... // Perform action appropriate to condition
-     *     }
-     * </pre>
-     * (For more information on this topic, see Section 3.2.3 in Doug Lea's
-     * "Concurrent Programming in Java (Second Edition)" (Addison-Wesley,
-     * 2000), or Item 50 in Joshua Bloch's "Effective Java Programming
-     * Language Guide" (Addison-Wesley, 2001).
-     * <p>
-     * If the current thread is
-     * {@link java.lang.Thread#interrupt() interrupted} by another thread
-     * while it is waiting, then an <tt>InterruptedException</tt> is thrown.
-     * This exception is not thrown until the lock status of this object has
-     * been restored as described above.
-     * <p>
-     * Note that the <tt>wait</tt> method, as it places the current thread
-     * into the wait set for this object, unlocks only this object; any
-     * other objects on which the current thread may be synchronized remain
-     * locked while the thread waits.
+     * In all respects, this method behaves as if {@code wait(0L, 0)}
+     * had been called. See the specification of the {@link #wait(long, int)} method
+     * for details.
+     *
+     * @throws IllegalMonitorStateException if the current thread is not
+     *         the owner of the object's monitor
+     * @throws InterruptedException if any thread interrupted the current thread before or
+     *         while the current thread was waiting. The <em>interrupted status</em> of the
+     *         current thread is cleared when this exception is thrown.
+     * @see    #notify()
+     * @see    #notifyAll()
+     * @see    #wait(long)
+     * @see    #wait(long, int)
+     */
+    public final void wait() throws InterruptedException {
+        bi04t002a.instrInvoke(bi04t002a.INSTR_WAIT);
+        wait(0L);
+    }
+
+    /**
+     * Causes the current thread to wait until it is awakened, typically
+     * by being <em>notified</em> or <em>interrupted</em>, or until a
+     * certain amount of real time has elapsed.
      * <p>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the <code>notify</code> method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
+     * In all respects, this method behaves as if {@code wait(timeoutMillis, 0)}
+     * had been called. See the specification of the {@link #wait(long, int)} method
+     * for details.
      *
-     * @param      timeout   the maximum time to wait in milliseconds.
-     * @exception  IllegalArgumentException      if the value of timeout is
-     *               negative.
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of the object's monitor.
-     * @exception  InterruptedException if another thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
-     * @see        java.lang.Object#notify()
-     * @see        java.lang.Object#notifyAll()
+     * @param  timeoutMillis the maximum time to wait, in milliseconds
+     * @throws IllegalArgumentException if {@code timeoutMillis} is negative
+     * @throws IllegalMonitorStateException if the current thread is not
+     *         the owner of the object's monitor
+     * @throws InterruptedException if any thread interrupted the current thread before or
+     *         while the current thread was waiting. The <em>interrupted status</em> of the
+     *         current thread is cleared when this exception is thrown.
+     * @see    #notify()
+     * @see    #notifyAll()
+     * @see    #wait()
+     * @see    #wait(long, int)
      */
     public final void wait(long timeoutMillis) throws InterruptedException {
-        if (!Thread.currentThread().isVirtual()) {
-            wait0(timeoutMillis);
-            return;
+        if (timeoutMillis < 0) {
+            throw new IllegalArgumentException("timeout value is negative");
         }
 
-        // virtual thread waiting
-        boolean attempted = Blocker.begin();
-        try {
+        if (Thread.currentThread() instanceof VirtualThread vthread) {
+            try {
+                wait0(timeoutMillis);
+            } catch (InterruptedException e) {
+                // virtual thread's interrupt status needs to be cleared
+                vthread.getAndClearInterrupt();
+                throw e;
+            }
+        } else {
             wait0(timeoutMillis);
-        } catch (InterruptedException e) {
-            // virtual thread's interrupt status needs to be cleared
-            Thread.currentThread().getAndClearInterrupt();
-            throw e;
-        } finally {
-            Blocker.end(attempted);
         }
     }
 
+    // final modifier so method not in vtable
+    private final native void wait0(long timeoutMillis) throws InterruptedException;
+
     /**
-     * Causes current thread to wait until another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object, or
-     * some other thread interrupts the current thread, or a certain
-     * amount of real time has elapsed.
-     * <p>
-     * This method is similar to the <code>wait</code> method of one
-     * argument, but it allows finer control over the amount of time to
-     * wait for a notification before giving up. The amount of real time,
-     * measured in nanoseconds, is given by:
-     * <blockquote>
-     * <pre>
-     * 1000000*timeout+nanos</pre></blockquote>
-     * <p>
-     * In all other respects, this method does the same thing as the
-     * method {@link #wait(long)} of one argument. In particular,
-     * <tt>wait(0, 0)</tt> means the same thing as <tt>wait(0)</tt>.
-     * <p>
-     * The current thread must own this object's monitor. The thread
-     * releases ownership of this monitor and waits until either of the
-     * following two conditions has occurred:
+     * Causes the current thread to wait until it is awakened, typically
+     * by being <em>notified</em> or <em>interrupted</em>, or until a
+     * certain amount of real time has elapsed.
+     * <p>
+     * The current thread must own this object's monitor lock. See the
+     * {@link #notify notify} method for a description of the ways in which
+     * a thread can become the owner of a monitor lock.
+     * <p>
+     * This method causes the current thread (referred to here as <var>T</var>) to
+     * place itself in the wait set for this object and then to relinquish any
+     * and all synchronization claims on this object. Note that only the locks
+     * on this object are relinquished; any other objects on which the current
+     * thread may be synchronized remain locked while the thread waits.
+     * <p>
+     * Thread <var>T</var> then becomes disabled for thread scheduling purposes
+     * and lies dormant until one of the following occurs:
      * <ul>
-     * <li>Another thread notifies threads waiting on this object's monitor
-     *     to wake up either through a call to the <code>notify</code> method
-     *     or the <code>notifyAll</code> method.
-     * <li>The timeout period, specified by <code>timeout</code>
-     *     milliseconds plus <code>nanos</code> nanoseconds arguments, has
-     *     elapsed.
+     * <li>Some other thread invokes the {@code notify} method for this
+     * object and thread <var>T</var> happens to be arbitrarily chosen as
+     * the thread to be awakened.
+     * <li>Some other thread invokes the {@code notifyAll} method for this
+     * object.
+     * <li>Some other thread {@linkplain Thread#interrupt() interrupts}
+     * thread <var>T</var>.
+     * <li>The specified amount of real time has elapsed, more or less.
+     * The amount of real time, in nanoseconds, is given by the expression
+     * {@code 1000000 * timeoutMillis + nanos}. If {@code timeoutMillis} and {@code nanos}
+     * are both zero, then real time is not taken into consideration and the
+     * thread waits until awakened by one of the other causes.
+     * <li>Thread <var>T</var> is awakened spuriously. (See below.)
      * </ul>
      * <p>
-     * The thread then waits until it can re-obtain ownership of the
-     * monitor and resumes execution.
+     * The thread <var>T</var> is then removed from the wait set for this
+     * object and re-enabled for thread scheduling. It competes in the
+     * usual manner with other threads for the right to synchronize on the
+     * object; once it has regained control of the object, all its
+     * synchronization claims on the object are restored to the status quo
+     * ante - that is, to the situation as of the time that the {@code wait}
+     * method was invoked. Thread <var>T</var> then returns from the
+     * invocation of the {@code wait} method. Thus, on return from the
+     * {@code wait} method, the synchronization state of the object and of
+     * thread {@code T} is exactly as it was when the {@code wait} method
+     * was invoked.
      * <p>
-     * As in the one argument version, interrupts and spurious wakeups are
-     * possible, and this method should always be used in a loop:
-     * <pre>
+     * A thread can wake up without being notified, interrupted, or timing out, a
+     * so-called <em>spurious wakeup</em>.  While this will rarely occur in practice,
+     * applications must guard against it by testing for the condition that should
+     * have caused the thread to be awakened, and continuing to wait if the condition
+     * is not satisfied. See the example below.
+     * <p>
+     * For more information on this topic, see section 14.2,
+     * "Condition Queues," in Brian Goetz and others' <cite>Java Concurrency
+     * in Practice</cite> (Addison-Wesley, 2006) or Item 81 in Joshua
+     * Bloch's <cite>Effective Java, Third Edition</cite> (Addison-Wesley,
+     * 2018).
+     * <p>
+     * If the current thread is {@linkplain java.lang.Thread#interrupt() interrupted}
+     * by any thread before or while it is waiting, then an {@code InterruptedException}
+     * is thrown.  The <em>interrupted status</em> of the current thread is cleared when
+     * this exception is thrown. This exception is not thrown until the lock status of
+     * this object has been restored as described above.
+     *
+     * @apiNote
+     * The recommended approach to waiting is to check the condition being awaited in
+     * a {@code while} loop around the call to {@code wait}, as shown in the example
+     * below. Among other things, this approach avoids problems that can be caused
+     * by spurious wakeups.
+     *
+     * {@snippet lang=java :
      *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait(timeout, nanos);
-     *         ... // Perform action appropriate to condition
+     *         while ( <condition does not hold and timeout not exceeded> ) {
+     *             long timeoutMillis = ... ; // recompute timeout values
+     *             int nanos = ... ;
+     *             obj.wait(timeoutMillis, nanos);
+     *         }
+     *         ... // Perform action appropriate to condition or timeout
      *     }
-     * </pre>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the <code>notify</code> method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
+     * }
      *
-     * @param      timeout   the maximum time to wait in milliseconds.
-     * @param      nanos      additional time, in nanoseconds range
-     *                       0-999999.
-     * @exception  IllegalArgumentException      if the value of timeout is
-     *                      negative or the value of nanos is
-     *                      not in the range 0-999999.
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of this object's monitor.
-     * @exception  InterruptedException if another thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
+     * @param  timeoutMillis the maximum time to wait, in milliseconds
+     * @param  nanos   additional time, in nanoseconds, in the range 0-999999 inclusive
+     * @throws IllegalArgumentException if {@code timeoutMillis} is negative,
+     *         or if the value of {@code nanos} is out of range
+     * @throws IllegalMonitorStateException if the current thread is not
+     *         the owner of the object's monitor
+     * @throws InterruptedException if any thread interrupted the current thread before or
+     *         while the current thread was waiting. The <em>interrupted status</em> of the
+     *         current thread is cleared when this exception is thrown.
+     * @see    #notify()
+     * @see    #notifyAll()
+     * @see    #wait()
+     * @see    #wait(long)
      */
-    public final void wait(long timeout, int nanos) throws InterruptedException {
+    public final void wait(long timeoutMillis, int nanos) throws InterruptedException {
 
         bi04t002a.instrInvoke(bi04t002a.INSTR_WAIT_JI);
 
-        if (timeout < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
+        if (timeoutMillis < 0) {
+            throw new IllegalArgumentException("timeoutMillis value is negative");
         }
 
         if (nanos < 0 || nanos > 999999) {
@@ -461,106 +502,114 @@ public final void wait(long timeout, int nanos) throws InterruptedException {
                                 "nanosecond timeout value out of range");
         }
 
-            if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
-                timeout++;
-            }
-
-            wait(timeout);
-    }
-
-    // final modifier so method not in vtable
-    private final native void wait0(long timeoutMillis) throws InterruptedException;
+        if (nanos > 0 && timeoutMillis < Long.MAX_VALUE) {
+            timeoutMillis++;
+        }
 
-    /**
-     * Causes current thread to wait until another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object.
-     * In other words, this method behaves exactly as if it simply
-     * performs the call <tt>wait(0)</tt>.
-     * <p>
-     * The current thread must own this object's monitor. The thread
-     * releases ownership of this monitor and waits until another thread
-     * notifies threads waiting on this object's monitor to wake up
-     * either through a call to the <code>notify</code> method or the
-     * <code>notifyAll</code> method. The thread then waits until it can
-     * re-obtain ownership of the monitor and resumes execution.
-     * <p>
-     * As in the one argument version, interrupts and spurious wakeups are
-     * possible, and this method should always be used in a loop:
-     * <pre>
-     *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait();
-     *         ... // Perform action appropriate to condition
-     *     }
-     * </pre>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the <code>notify</code> method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
-     *
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of the object's monitor.
-     * @exception  InterruptedException if another thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
-     * @see        java.lang.Object#notify()
-     * @see        java.lang.Object#notifyAll()
-     */
-    public final void wait() throws InterruptedException {
-        bi04t002a.instrInvoke(bi04t002a.INSTR_WAIT);
-        wait(0);
+        wait(timeoutMillis);
     }
 
     /**
      * Called by the garbage collector on an object when garbage collection
      * determines that there are no more references to the object.
-     * A subclass overrides the <code>finalize</code> method to dispose of
+     * A subclass overrides the {@code finalize} method to dispose of
      * system resources or to perform other cleanup.
      * <p>
-     * The general contract of <tt>finalize</tt> is that it is invoked
-     * if and when the Java<font size="-2"><sup>TM</sup></font> virtual
+     * <b>When running in a Java virtual machine in which finalization has been
+     * disabled or removed, the garbage collector will never call
+     * {@code finalize()}. In a Java virtual machine in which finalization is
+     * enabled, the garbage collector might call {@code finalize} only after an
+     * indefinite delay.</b>
+     * <p>
+     * The general contract of {@code finalize} is that it is invoked
+     * if and when the Java virtual
      * machine has determined that there is no longer any
      * means by which this object can be accessed by any thread that has
      * not yet died, except as a result of an action taken by the
      * finalization of some other object or class which is ready to be
-     * finalized. The <tt>finalize</tt> method may take any action, including
+     * finalized. The {@code finalize} method may take any action, including
      * making this object available again to other threads; the usual purpose
-     * of <tt>finalize</tt>, however, is to perform cleanup actions before
+     * of {@code finalize}, however, is to perform cleanup actions before
      * the object is irrevocably discarded. For example, the finalize method
      * for an object that represents an input/output connection might perform
      * explicit I/O transactions to break the connection before the object is
      * permanently discarded.
      * <p>
-     * The <tt>finalize</tt> method of class <tt>Object</tt> performs no
+     * The {@code finalize} method of class {@code Object} performs no
      * special action; it simply returns normally. Subclasses of
-     * <tt>Object</tt> may override this definition.
+     * {@code Object} may override this definition.
      * <p>
      * The Java programming language does not guarantee which thread will
-     * invoke the <tt>finalize</tt> method for any given object. It is
+     * invoke the {@code finalize} method for any given object. It is
      * guaranteed, however, that the thread that invokes finalize will not
      * be holding any user-visible synchronization locks when finalize is
      * invoked. If an uncaught exception is thrown by the finalize method,
      * the exception is ignored and finalization of that object terminates.
      * <p>
-     * After the <tt>finalize</tt> method has been invoked for an object, no
+     * After the {@code finalize} method has been invoked for an object, no
      * further action is taken until the Java virtual machine has again
      * determined that there is no longer any means by which this object can
      * be accessed by any thread that has not yet died, including possible
      * actions by other objects or classes which are ready to be finalized,
      * at which point the object may be discarded.
      * <p>
-     * The <tt>finalize</tt> method is never invoked more than once by a Java
+     * The {@code finalize} method is never invoked more than once by a Java
      * virtual machine for any given object.
      * <p>
-     * Any exception thrown by the <code>finalize</code> method causes
+     * Any exception thrown by the {@code finalize} method causes
      * the finalization of this object to be halted, but is otherwise
      * ignored.
      *
-     * @throws Throwable the <code>Exception</code> raised by this method
+     * @apiNote
+     * Classes that embed non-heap resources have many options
+     * for cleanup of those resources. The class must ensure that the
+     * lifetime of each instance is longer than that of any resource it embeds.
+     * {@link java.lang.ref.Reference#reachabilityFence} can be used to ensure that
+     * objects remain reachable while resources embedded in the object are in use.
+     * <p>
+     * A subclass should avoid overriding the {@code finalize} method
+     * unless the subclass embeds non-heap resources that must be cleaned up
+     * before the instance is collected.
+     * Finalizer invocations are not automatically chained, unlike constructors.
+     * If a subclass overrides {@code finalize} it must invoke the superclass
+     * finalizer explicitly.
+     * To guard against exceptions prematurely terminating the finalize chain,
+     * the subclass should use a {@code try-finally} block to ensure
+     * {@code super.finalize()} is always invoked. For example,
+     * {@snippet lang="java":
+     *     @Override
+     *     protected void finalize() throws Throwable {
+     *         try {
+     *             ... // cleanup subclass state
+     *         } finally {
+     *             super.finalize();
+     *         }
+     *     }
+     * }
+     *
+     * @deprecated Finalization is deprecated and subject to removal in a future
+     * release. The use of finalization can lead to problems with security,
+     * performance, and reliability.
+     * See <a href="https://openjdk.org/jeps/421">JEP 421</a> for
+     * discussion and alternatives.
+     * <p>
+     * Subclasses that override {@code finalize} to perform cleanup should use
+     * alternative cleanup mechanisms and remove the {@code finalize} method.
+     * Use {@link java.lang.ref.Cleaner} and
+     * {@link java.lang.ref.PhantomReference} as safer ways to release resources
+     * when an object becomes unreachable. Alternatively, add a {@code close}
+     * method to explicitly release resources, and implement
+     * {@code AutoCloseable} to enable use of the {@code try}-with-resources
+     * statement.
+     * <p>
+     * This method will remain in place until finalizers have been removed from
+     * most existing code.
+     *
+     * @throws Throwable the {@code Exception} raised by this method
+     * @see java.lang.ref.WeakReference
+     * @see java.lang.ref.PhantomReference
+     * @jls 12.6 Finalization of Class Instances
      */
+    @Deprecated(since="9", forRemoval=true)
     protected void finalize() throws Throwable { }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp
index 4e8bf729cff..089aab78bb5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp
@@ -90,7 +90,7 @@ void* THREAD_new(PROCEDURE procedure, void* context) {
 /***************************************************************/
 
 #ifdef windows
-unsigned __stdcall procedure(void* t) {
+unsigned procedure(void* t) {
 #else // !windows
 void* procedure(void* t) {
 #endif
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp
index 6b262617c5c..ad5e33c90ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp
@@ -160,7 +160,7 @@ void nsk_printHexBytes(const char indent[], int columns,
 /*************************************************************/
 
 /**
- * Returns str or "<NULL>" if str is null; useful for printing strings.
+ * Returns str or "<null>" if str is null; useful for printing strings.
  */
 const char* nsk_null_string(const char* str);
 
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java
index 0414d28502c..0447270d99a 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,21 +28,18 @@
 import javax.xml.catalog.CatalogException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogReferCircularityTest
  * @run testng/othervm catalog.CatalogReferCircularityTest
  * @summary Via nextCatalog entry, the catalog reference chain may be
  *          a (partial) closed circuit. For instance, a catalog may use itself
  *          as an additional catalog specified in its own nextCatalog entry.
  *          This case tests if the implementation handles this issue.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CatalogReferCircularityTest {
 
     @Test(dataProvider = "catalogName",
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java
index 4f59f77a58f..d76b56d7510 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.DefaultFeaturesTest
  * @run testng/othervm catalog.DefaultFeaturesTest
  * @summary This case tests if the default feature values are expected.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DefaultFeaturesTest {
 
     private CatalogFeatures defaultFeature;
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java
index 666bb91c786..2d5771557ad 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@
 import static catalog.CatalogTestUtils.DEFER_TRUE;
 import static catalog.CatalogTestUtils.getCatalogPath;
 import static javax.xml.catalog.CatalogFeatures.Feature.DEFER;
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-import static jaxp.library.JAXPTestUtilities.tryRunWithAllPerm;
 
 import java.lang.reflect.Method;
 
@@ -40,7 +38,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
@@ -48,13 +45,11 @@
  * @bug 8077931 8176405
  * @library /javax/xml/jaxp/libs
  * @modules java.xml/javax.xml.catalog:open
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.DeferFeatureTest
  * @run testng/othervm catalog.DeferFeatureTest
  * @summary This case tests whether the catalogs specified in delegateSystem,
  *          delegatePublic, delegateURI and nextCatalog entries are used lazily
  *          in resolution via defer feature.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DeferFeatureTest {
 
     @Test(dataProvider = "catalog-countOfLoadedCatalogFile")
@@ -107,8 +102,8 @@ private CatalogResolver createResolver(Catalog catalog) {
     }
 
     private int loadedCatalogCount(Catalog catalog) throws Exception {
-        Method method = tryRunWithAllPerm(() -> catalog.getClass().getDeclaredMethod("loadedCatalogCount"));
-        runWithAllPerm(() -> method.setAccessible(true));
+        Method method = catalog.getClass().getDeclaredMethod("loadedCatalogCount");
+        method.setAccessible(true);
         return (int) method.invoke(catalog);
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java
index 62aa2fbec17..43c6bf42f44 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.DelegatePublicTest
  * @run testng/othervm catalog.DelegatePublicTest
  * @summary Get matched URIs from DelegatePublic entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DelegatePublicTest {
 
     @Test(dataProvider = "publicId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java
index 47cad5616c7..554d23776f9 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.DelegateSystemTest
  * @run testng/othervm catalog.DelegateSystemTest
  * @summary Get matched URIs from delegateSystem entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DelegateSystemTest {
 
     @Test(dataProvider = "systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java
index e576559dcc1..2a92149a730 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/DelegateUriTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.DelegateUriTest
  * @run testng/othervm catalog.DelegateUriTest
  * @summary Get matched URIs from delegateURI entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DelegateUriTest {
 
     @Test(dataProvider = "uri-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java
index 355fa68f0bd..7516be7d560 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/GroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,19 +32,16 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.GroupTest
  * @run testng/othervm catalog.GroupTest
  * @summary Get matched URIs from system, public and uri entries respectively,
  *          and some of the entries are enclosed by group entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class GroupTest {
 
     private static final String CATALOG_GROUP = "group.xml";
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java
index d12720c2391..6a5248b8f9f 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,20 +35,17 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.LoadCatalogTest
  * @run testng/othervm catalog.LoadCatalogTest
  * @summary When catalog resolver loads catalog files, the current catalog file
  *          and the catalog files specified by the nextCatalog entries may not
  *          accessible. This case tests how does the resolver handle this issue.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class LoadCatalogTest {
 
     private static final String CATALOG_LOADCATALOGFILES = "loadCatalogFiles.xml";
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java
index f134f0d4391..d7e0711636d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/NextCatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,19 +32,16 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.NextCatalogTest
  * @run testng/othervm catalog.NextCatalogTest
  * @summary Get matched URIs from system, public and uri entries respectively,
  *          but some of the entries are defined in none-current catalog files.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NextCatalogTest {
 
     private static final String CATALOG_NEXTCATALOGLEFT
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java
index 33e91f6494e..74fc25e90c1 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/NormalizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,21 +32,18 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.NormalizationTest
  * @run testng/othervm catalog.NormalizationTest
  * @summary Before matching identifiers and URI references, it has to normalize
  *          the passed identifiers and URI references. And then the catalog
  *          resolver uses the normalized stuff to search the counterparts in
  *          catalog files.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NormalizationTest {
 
     private static final String CATALOG_NORMALIZATION = "normalization.xml";
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java
index 61235a72579..85cb2505244 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,20 +33,17 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.PreferFeatureTest
  * @run testng/othervm catalog.PreferFeatureTest
  * @summary This case tests how does the feature affect the catalog resolution,
  *          and tests the priority between this feature and attribute prefer
  *          in catalog file.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PreferFeatureTest {
 
     @Test(dataProvider = "prefer-publicId-systemId",
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java
index 59a85622753..6bcbd140466 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/PreferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,21 +29,18 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.PreferTest
  * @run testng/othervm catalog.PreferTest
  * @summary Get matched URIs from system and public family entries, which
  *          specify the prefer attribute. It tests how does the prefer attribute
  *          affect the resolution procedure. The test rule is based on OASIS
  *          Standard V1.1 section 4.1.1. "The prefer attribute".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PreferTest {
 
     @Test(dataProvider = "publicId-systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java
index 9c1894e14ce..42dc6bbe215 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,21 +30,18 @@
 import javax.xml.catalog.CatalogException;
 import javax.xml.catalog.CatalogResolver;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.PublicFamilyTest
  * @run testng/othervm catalog.PublicFamilyTest
  * @summary Get matched URIs from public and delegatePublic entries.
  *          It tests the resolution priorities among the public family entries.
  *          The test rule is based on OASIS Standard V1.1 section 7.1.2.
  *          "Resolution of External Identifiers".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PublicFamilyTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java
index b99fe0be99c..d44dca87732 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/PublicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.PublicTest
  * @run testng/othervm catalog.PublicTest
  * @summary Get matched URIs from public entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PublicTest {
 
     @Test(dataProvider = "publicId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java
index 128d0982db7..0626e83bed9 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,19 +39,16 @@
 import javax.xml.catalog.CatalogFeatures.Feature;
 import javax.xml.catalog.CatalogResolver;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.ResolveFeatureTest
  * @run testng/othervm catalog.ResolveFeatureTest
  * @summary This case tests how does resolve feature affect the catalog
  *          resolution.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ResolveFeatureTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java
index 748a1577424..647fccd49fb 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.RewriteSystemTest
  * @run testng/othervm catalog.RewriteSystemTest
  * @summary Get matched URIs from rewriteSystem entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class RewriteSystemTest {
 
     @Test(dataProvider = "systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java
index 60b4c950a62..d7b98b96f11 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/RewriteUriTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.RewriteUriTest
  * @run testng/othervm catalog.RewriteUriTest
  * @summary Get matched URIs from rewriteURI entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class RewriteUriTest {
 
     @Test(dataProvider = "uri-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java
index 82bdc8022f4..61c59d4049c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,18 +37,15 @@
 import javax.xml.catalog.CatalogFeatures;
 import javax.xml.catalog.CatalogResolver;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.SpecifyCatalogTest
  * @run testng/othervm catalog.SpecifyCatalogTest
  * @summary This case tests how to specify the catalog files.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SpecifyCatalogTest {
 
     private static final String ID_URI = "http://remote/dtd/uri/doc.dtd";
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java
index c9480dd2db3..ec614332207 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,21 +31,18 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.SystemFamilyTest
  * @run testng/othervm catalog.SystemFamilyTest
  * @summary Get matched URIs from system, rewriteSystem, systemSuffix and
  *          delegateSystem entries. It tests the resolution priorities among
  *          the system family entries. The test rule is based on OASIS
  *          Standard V1.1 section 7.1.2. "Resolution of External Identifiers".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SystemFamilyTest {
 
     @Test(dataProvider = "systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java
index 902b5237b86..2a40b581654 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.SystemSuffixTest
  * @run testng/othervm catalog.SystemSuffixTest
  * @summary Get matched URIs from systemSuffix entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SystemSuffixTest {
 
     @Test(dataProvider = "systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java
index f0b6d4d26ad..73c11340b29 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/SystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.SystemTest
  * @run testng/othervm catalog.SystemTest
  * @summary Get matched URIs from system entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SystemTest {
 
     @Test(dataProvider = "systemId-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java
index f96bc094780..44c9afcfa13 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/UriFamilyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,21 +31,18 @@
 import javax.xml.catalog.CatalogException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.UriFamilyTest
  * @run testng/othervm catalog.UriFamilyTest
  * @summary Get matched URIs from uri, rewriteURI, uriSuffix and delegateURI
  *          entries. It tests the resolution priorities among the uri family
  *          entries. The test rule is based on OASIS Standard V1.1 section
  *          7.2.2. "Resolution of External Identifiers".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class UriFamilyTest {
 
     @Test(dataProvider = "uri-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java
index 42bcb95e109..8feadb03fa2 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/UriSuffixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.catalog.CatalogException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.UriSuffixTest
  * @run testng/othervm catalog.UriSuffixTest
  * @summary Get matched URIs from rewriteURI entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class UriSuffixTest {
 
     @Test(dataProvider = "uri-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java
index 360539eda43..cf76eada5e7 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/UriTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,18 +34,15 @@
 import javax.xml.catalog.CatalogFeatures;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.UriTest
  * @run testng/othervm catalog.UriTest
  * @summary Get matched URIs from uri entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class UriTest {
 
     @Test(dataProvider = "uri-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java
index dd9ad54e8a1..f3b99074e98 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,20 +29,17 @@
 import javax.xml.catalog.CatalogResolver;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.UrnUnwrappingTest
  * @run testng/othervm catalog.UrnUnwrappingTest
  * @summary If the passed public identifier is started with "urn:publicid:",
  *          it has to be regarded as URN and normalized. And then the catalog
  *          resolver uses the normalized stuff to do matching.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class UrnUnwrappingTest {
 
     @Test(dataProvider = "urn-matchedUri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java b/test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java
index 0ec655f5aa8..04676557ea4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,20 +32,17 @@
 
 import javax.xml.catalog.CatalogException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8077931
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.ValidateCatalogTest
  * @run testng/othervm catalog.ValidateCatalogTest
  * @summary A legal catalog file must be well-formed XML, the root element
  *          must be catalog, and the naming space of the root element must be
  *          urn:oasis:names:tc:entity:xmlns:xml:catalog.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ValidateCatalogTest {
 
     private static final String CATALOG_WRONGROOT = "validateCatalog-wrongRoot.xml";
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java
index bdd6a4e78bf..cb8f5c56048 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,17 +47,14 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.datatype.ptests.DurationTest
  * @run testng/othervm javax.xml.datatype.ptests.DurationTest
  * @summary Class containing the test cases for Duration.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DurationTest {
 
     private DatatypeFactory datatypeFactory;
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java
index 06c1a847d53..7b75562bd87 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,15 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.datatype.ptests.FactoryNewInstanceTest
  * @run testng/othervm javax.xml.datatype.ptests.FactoryNewInstanceTest
  * @summary Tests for DatatypeFactory.newInstance(factoryClassName , classLoader)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class FactoryNewInstanceTest {
 
     private static final String DEFAULT_IMPL_CLASS =
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java
index a626c1ad02c..d9df1a2cddd 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,18 +42,15 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 5049592 5041845 5048932 5064587 5040542 5049531 5049528
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.datatype.ptests.XMLGregorianCalendarTest
  * @run testng/othervm javax.xml.datatype.ptests.XMLGregorianCalendarTest
  * @summary Class containing the test cases for XMLGregorianCalendar
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLGregorianCalendarTest {
 
     private DatatypeFactory datatypeFactory;
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java
index 65d42c83dc3..8bf88ff09fc 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.transform.sax.SAXResult;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -48,10 +47,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.DBFNamespaceTest
  * @run testng/othervm javax.xml.parsers.ptests.DBFNamespaceTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DBFNamespaceTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java
index 2743b4bac53..f21af74330d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -74,10 +73,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.DocumentBuilderFactoryTest
  * @run testng/othervm javax.xml.parsers.ptests.DocumentBuilderFactoryTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DocumentBuilderFactoryTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java
index dfc7e2df9ec..4e9006f9f5b 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -48,10 +47,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.DocumentBuilderImpl01
  * @run testng/othervm javax.xml.parsers.ptests.DocumentBuilderImpl01
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DocumentBuilderImpl01 implements EntityResolver {
     /**
      * Provide DocumentBuilder.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java
index ea50b10364c..3bcc49d58b2 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -42,10 +41,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.FactoryConfErrorTest
  * @run testng/othervm javax.xml.parsers.ptests.FactoryConfErrorTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class FactoryConfErrorTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java
index 49264402764..2b47bd6a3da 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,18 +33,15 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.SAXFactoryNewInstanceTest
  * @run testng/othervm javax.xml.parsers.ptests.SAXFactoryNewInstanceTest
  * @summary Tests for SAXParserFactory.newInstance(factoryClassName , classLoader)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SAXFactoryNewInstanceTest {
 
     private static final String SAXPARSER_FACTORY_CLASSNAME = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl";
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java
index 5bf37b24a14..77134c58ac1 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -40,10 +39,8 @@
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.SAXParserFactTest
  * @run testng/othervm javax.xml.parsers.ptests.SAXParserFactTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SAXParserFactTest {
 
     private static final String NAMESPACES = "http://xml.org/sax/features/namespaces";
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java
index 659af20492a..f828dbeea18 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,14 @@
 
 package javax.xml.parsers.ptests;
 
-import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.PropertyPermission;
-
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.HandlerBase;
 import org.xml.sax.InputSource;
@@ -48,10 +43,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.SAXParserTest
  * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAXParserTest {
     /**
      * Provide SAXParser.
@@ -129,7 +122,7 @@ public void testParse04(SAXParser saxparser) throws Exception {
      */
     @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
     public void testParse05(SAXParser saxparser) throws Exception {
-        tryRunWithTmpPermission(() -> saxparser.parse(new File(""), new HandlerBase()), new PropertyPermission("user.dir", "read"));
+        saxparser.parse(new File(""), new HandlerBase());
     }
 
     /**
@@ -198,7 +191,7 @@ public void testParse09(SAXParser saxparser) throws Exception {
     @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
     public void testParse10(SAXParser saxparser) throws Exception {
         File file = new File("");
-        tryRunWithTmpPermission(() -> saxparser.parse(file, new DefaultHandler()), new PropertyPermission("user.dir", "read"));
+        saxparser.parse(file, new DefaultHandler());
     }
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java
index 3e7fc2ff5f6..db02034e22c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotSupportedException;
@@ -45,10 +44,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.SAXParserTest02
  * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest02
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SAXParserTest02 {
     private static final String DOM_NODE = "http://xml.org/sax/properties/dom-node";
     private static final String XML_STRING = "http://xml.org/sax/properties/xml-string";
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java
index 33dc530e72e..47d202da7b8 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -44,10 +43,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.parsers.ptests.SAXParserTest03
  * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest03
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAXParserTest03 {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java
index 59f3cdc40f2..b846524e0bf 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,15 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.stream.ptests.XMLEventFactoryNewInstanceTest
  * @run testng/othervm javax.xml.stream.ptests.XMLEventFactoryNewInstanceTest
  * @summary Tests for XMLEventFactory.newFactory(factoryId , classLoader)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLEventFactoryNewInstanceTest {
 
     private static final String DEFAULT_IMPL_CLASS =
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java
index 310ba0b6c20..ac6b009410c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,15 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.stream.ptests.XMLInputFactoryNewInstanceTest
  * @run testng/othervm javax.xml.stream.ptests.XMLInputFactoryNewInstanceTest
  * @summary Tests for XMLInputFactory.newFactory(factoryId , classLoader)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLInputFactoryNewInstanceTest {
 
     private static final String DEFAULT_IMPL_CLASS =
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java
index f7fdaa30714..fa406024834 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLOutputFactoryNewInstanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,15 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.stream.ptests.XMLOutputFactoryNewInstanceTest
  * @run testng/othervm javax.xml.stream.ptests.XMLOutputFactoryNewInstanceTest
  * @summary Tests for XMLOutputFactory.newFactory(factoryId , classLoader)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLOutputFactoryNewInstanceTest {
 
     private static final String DEFAULT_IMPL_CLASS =
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java
index 85b39d288fb..cbe4cc59209 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -44,11 +43,9 @@
  * @test
  * @bug 6384418
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.Bug6384418Test
  * @run testng/othervm javax.xml.transform.ptests.Bug6384418Test
  * @summary verify the transforming won't throw any exception
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6384418Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java
index 897e6183f75..b26537d22bf 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
@@ -56,10 +55,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.DOMResultTest
  * @run testng/othervm javax.xml.transform.ptests.DOMResultTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DOMResultTest {
     /**
      * Unit test for simple DOM parsing.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java
index d274355f06d..c591c18fb45 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -44,10 +43,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.ErrorListenerTest
  * @run testng/othervm javax.xml.transform.ptests.ErrorListenerTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ErrorListenerTest implements ErrorListener {
     /**
      * Define ErrorListener's status.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java
index 8ca1ae14c0c..3e50e8bb79e 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -48,10 +47,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.SAXSourceTest
  * @run testng/othervm javax.xml.transform.ptests.SAXSourceTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAXSourceTest {
     /**
      * Test style-sheet file name
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java
index e772e4e8892..0e1eabfa8fe 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -62,10 +61,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.SAXTFactoryTest
  * @run testng/othervm javax.xml.transform.ptests.SAXTFactoryTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAXTFactoryTest {
     /**
      * Test style-sheet file.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java
index 224e6528ed3..6002e371523 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -54,10 +53,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.StreamResultTest
  * @run testng/othervm javax.xml.transform.ptests.StreamResultTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class StreamResultTest {
     /**
      * Unit test for StreamResult.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java
index 2cd828c7837..f647d4c0bf1 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -50,10 +49,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TfClearParamTest
  * @run testng/othervm javax.xml.transform.ptests.TfClearParamTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TfClearParamTest {
     /**
      * Test style-sheet file name.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java
index 73cf9093506..8666306669d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,6 @@
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.Attributes;
@@ -71,12 +70,10 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformTest
  * @run testng/othervm javax.xml.transform.ptests.TransformTest
  * @summary Tests for variable combination of Transformer.transform(Source, Result)
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java
index 027da107aff..8907b7afd55 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -45,10 +44,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformerExcpTest
  * @run testng/othervm javax.xml.transform.ptests.TransformerExcpTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerExcpTest {
     /**
      * Transform an unformatted style-sheet file. TransformerException is thrown.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java
index 9c6ea1ed7b5..8223319aa0a 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -60,10 +59,8 @@
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformerFactoryTest
  * @run testng/othervm javax.xml.transform.ptests.TransformerFactoryTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerFactoryTest {
     /**
      * TransformerFactory builtin system-default implementation class name.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java
index f4644546307..f940f268ff4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -53,10 +52,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformerTest
  * @run testng/othervm javax.xml.transform.ptests.TransformerTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerTest {
     /**
      * XSLT file serves every test method.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java
index b658e13660e..a9391b02866 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 
@@ -50,10 +49,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformerTest02
  * @run testng/othervm javax.xml.transform.ptests.TransformerTest02
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerTest02 {
     /**
      * Unit test for transform(StreamSource, StreamResult).
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java
index ff898fc5c62..4cdd2e606f1 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -52,10 +51,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.TransformerTest03
  * @run testng/othervm javax.xml.transform.ptests.TransformerTest03
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerTest03 {
     /**
      * Test for Transformer.setOutputProperties method.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java
index db092c003e9..0d642b67129 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -51,10 +50,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.URIResolverTest
  * @run testng/othervm javax.xml.transform.ptests.URIResolverTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class URIResolverTest implements URIResolver {
     /**
      * System ID constant.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java
index db07644d989..41a528ce1d2 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -38,10 +37,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.transform.ptests.othervm.TFCErrorTest
  * @run testng/othervm javax.xml.transform.ptests.othervm.TFCErrorTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class TFCErrorTest {
     @Test(expectedExceptions = ClassNotFoundException.class)
     public void tfce01() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java
index 11bc3dc1bab..d9721883870 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,6 @@
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
@@ -71,12 +70,10 @@
  * @test
  * @bug 8080907 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.validation.ptests.SchemaFactoryTest
  * @run testng/othervm javax.xml.validation.ptests.SchemaFactoryTest
  * @summary Class containing the test cases for SchemaFactory
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.FilePolicy.class})
 public class SchemaFactoryTest {
 
     @BeforeClass
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java
index c3bfb0354cf..b8c7a2d54e7 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.validation.TypeInfoProvider;
 import javax.xml.validation.ValidatorHandler;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -50,11 +49,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.validation.ptests.TypeInfoProviderTest
  * @run testng/othervm javax.xml.validation.ptests.TypeInfoProviderTest
  * @summary test ValidatorHandler.getTypeInfoProvider()
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TypeInfoProviderTest {
 
     private ValidatorHandler validatorHandler;
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java
index db3280f2ff7..2bbed60ba37 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
@@ -49,11 +48,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.validation.ptests.ValidatorHandlerTest
  * @run testng/othervm javax.xml.validation.ptests.ValidatorHandlerTest
  * @summary Class containing the test cases for ValidatorHandler API
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ValidatorHandlerTest {
     @BeforeClass
     public void setup() throws SAXException {
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java
index 56cc6fee57b..6dbd38a7fa1 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
@@ -60,11 +59,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.validation.ptests.ValidatorTest
  * @run testng/othervm javax.xml.validation.ptests.ValidatorTest
  * @summary Class containing the test cases for Validator API
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ValidatorTest {
 
     @BeforeClass
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathEvaluationResultTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathEvaluationResultTest.java
index 8c387182865..5daf8adcfa6 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathEvaluationResultTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathEvaluationResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package javax.xml.xpath.ptests;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
 
@@ -44,10 +43,8 @@
  * @bug 8183266
  * @summary verifies the specification of the XPathEvaluationResult API
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.xpath.ptests.XPathEvaluationResultTest
  * @run testng/othervm javax.xml.xpath.ptests.XPathEvaluationResultTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XPathEvaluationResultTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java
index aa95e147e0d..c63b161aae9 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -57,10 +56,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.xpath.ptests.XPathExpressionTest
  * @run testng/othervm javax.xml.xpath.ptests.XPathExpressionTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XPathExpressionTest {
     /**
      * Document object for testing XML file.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java
index 67f3f03c0d4..561c6923eda 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import jaxp.library.JAXPDataProvider;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -49,10 +48,8 @@
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.xpath.ptests.XPathFactoryTest
  * @run testng/othervm javax.xml.xpath.ptests.XPathFactoryTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XPathFactoryTest {
     /**
      * Valid URL for creating a XPath factory.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java
index 20db15e01c9..07d439e5aa8 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -39,10 +38,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.xpath.ptests.XPathFunctionResolverTest
  * @run testng/othervm javax.xml.xpath.ptests.XPathFunctionResolverTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XPathFunctionResolverTest {
     /**
      * A XPath for evaluation environment and expressions.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java
index d98653c82c7..e2eb0d6a03a 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -61,10 +60,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow javax.xml.xpath.ptests.XPathTest
  * @run testng/othervm javax.xml.xpath.ptests.XPathTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XPathTest {
     /**
      * Document object for testing XML file.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java
index 32538102567..bd7dfb10eab 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import static org.testng.Assert.assertTrue;
 import static org.w3c.dom.ptests.DOMTestUtil.createDOM;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -40,11 +39,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.AttrTest
  * @run testng/othervm org.w3c.dom.ptests.AttrTest
  * @summary Test for the Attr Interface
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AttrTest {
     /*
      * Verify getName method against both existing Attr and new Attr.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java
index 600b4654549..c3cff46c714 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -36,11 +35,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/functional
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.CommentTest
  * @run testng/othervm org.w3c.dom.ptests.CommentTest
  * @summary Test for Comment implementation returned by Document.createComment(String)
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CommentTest extends AbstractCharacterDataTest {
     @Override
     protected CharacterData createCharacterData(String text) throws IOException, SAXException, ParserConfigurationException {
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java
index 56e5932bcba..3ebf28afaa7 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import static org.w3c.dom.ptests.DOMTestUtil.createNewDocument;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
@@ -44,11 +43,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.DocumentTest
  * @run testng/othervm org.w3c.dom.ptests.DocumentTest
  * @summary Test createAttributeNS, getElementsByTagNameNS and createElementNS method of Document
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DocumentTest {
 
     @DataProvider(name = "invalid-nsuri")
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java
index cc2c100042f..b5265b825b0 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import static org.w3c.dom.ptests.DOMTestUtil.createDOM;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.NamedNodeMap;
@@ -35,11 +34,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.DocumentTypeTest
  * @run testng/othervm org.w3c.dom.ptests.DocumentTypeTest
  * @summary Test DocumentType
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DocumentTypeTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java
index cc9e3d09763..8e8191aa2a3 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
@@ -37,11 +36,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.DomImplementationTest
  * @run testng/othervm org.w3c.dom.ptests.DomImplementationTest
  * @summary Test DomImplementation API
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DomImplementationTest {
     /*
      * Test createDocument method with a namespace uri, qualified name and null
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java
index f9fd96dce6a..b538f7d1738 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
@@ -51,11 +50,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.ElementTest
  * @run testng/othervm org.w3c.dom.ptests.ElementTest
  * @summary Test for the methods of Element Interface
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ElementTest {
     @Test
     public void testGetAttributeNS() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java
index 2e6723f6fc7..65fe0e046ab 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -39,11 +38,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.EntityChildTest
  * @run testng/othervm org.w3c.dom.ptests.EntityChildTest
  * @summary Test DOM Parser: parsing an xml file that contains external entities.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class EntityChildTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java
index 4e495fba159..86cd3aa7bbb 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import static org.testng.Assert.assertNull;
 import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -37,11 +36,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.NamedNodeMapTest
  * @run testng/othervm org.w3c.dom.ptests.NamedNodeMapTest
  * @summary Test for the methods of NamedNodeMap Interface
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NamedNodeMapTest {
     /*
      * Test setNamedItemNS method with a node having the same namespaceURI and
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java
index 3b6c5e12640..740c28279f6 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import static org.w3c.dom.ptests.DOMTestUtil.createDOM;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -35,13 +34,11 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.NodeListTest
  * @run testng/othervm org.w3c.dom.ptests.NodeListTest
  * @summary Verifies a bug found in jaxp1.0.1 and 1.1FCS. After going out of
  * bound, the last element of a NodeList returns null. The bug has been fixed
  * in jaxp 1.1.1 build.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NodeListTest {
 
     @DataProvider(name = "xml")
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java
index c1ec36e320a..8df0808f9d4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 
 import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
@@ -45,7 +44,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -57,11 +55,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.NodeTest
  * @run testng/othervm org.w3c.dom.ptests.NodeTest
  * @summary Test Node interface
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NodeTest {
     @DataProvider(name = "feature-supported")
     public Object[][] getFeatureSupportedList() throws Exception {
@@ -160,7 +156,7 @@ public void testInsertBefore() throws Exception {
 
         String outputfile = USER_DIR + "InsertBefore.out";
         String goldfile = GOLDEN_DIR + "InsertBeforeGF.out";
-        tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read"));
+        outputXml(document, outputfile);
         assertTrue(compareWithGold(goldfile, outputfile));
     }
 
@@ -178,7 +174,7 @@ public void testReplaceChild() throws Exception {
 
         String outputfile = USER_DIR + "ReplaceChild3.out";
         String goldfile = GOLDEN_DIR + "ReplaceChild3GF.out";
-        tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read"));
+        outputXml(document, outputfile);
         assertTrue(compareWithGold(goldfile, outputfile));
     }
 
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java
index dca0dcea354..301df8e51c3 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -39,11 +38,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.NotationTest
  * @run testng/othervm org.w3c.dom.ptests.NotationTest
  * @summary Test for Notation interface
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class NotationTest {
     /*
      * Test getSystemId method.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java
index cf9e5a6e01f..ea6a9072002 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.ProcessingInstruction;
@@ -33,11 +32,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.PITest
  * @run testng/othervm org.w3c.dom.ptests.PITest
  * @summary Test for the methods of Processing Instruction
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PITest {
     /*
      * Test getData, setData and getTarget methods
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java
index 87bdfdd0dcc..e763eda5c35 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;
@@ -42,11 +41,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/functional
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.TextTest
  * @run testng/othervm org.w3c.dom.ptests.TextTest
  * @summary Test for Text implementation returned by Document.createTextNode(String)
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TextTest extends AbstractCharacterDataTest {
     /*
      * Verify splitText method works as the spec.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java
index 58241072b7c..1013d5f4baf 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -40,11 +39,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.w3c.dom.ptests.TypeInfoTest
  * @run testng/othervm org.w3c.dom.ptests.TypeInfoTest
  * @summary Test getTypeName and getTypeNamespace methods of TypeInfo interface
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class TypeInfoTest {
     /*
      * Get the TypeInfo of the root element, and verify it.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java
index 6712f3a9ca6..b43012a6197 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.AttributesImpl;
 
@@ -35,10 +34,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.AttrImplTest
  * @run testng/othervm org.xml.sax.ptests.AttrImplTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class AttrImplTest {
     private static final String CAR_URI = "http://www.cars.com/xml";
 
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java
index 60344d29609..5e7db17c746 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -46,10 +45,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.AttributesNSTest
  * @run testng/othervm org.xml.sax.ptests.AttributesNSTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AttributesNSTest {
     /**
      * Test for Attribute Interface's setter/getter.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java
index 5fe50e39447..6ebdf070060 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -47,10 +46,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.AttributesTest
  * @run testng/othervm org.xml.sax.ptests.AttributesTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AttributesTest {
     /**
      * Unit test for Attributes interface. Prints all attributes into output
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java
index 5da3045fcd7..b450caba7aa 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -52,10 +51,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.ContentHandlerTest
  * @run testng/othervm org.xml.sax.ptests.ContentHandlerTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ContentHandlerTest {
     /**
      * Content event handler visit all nodes to print to output file.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java
index 173cfb9677e..f65a290cb2c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
@@ -51,10 +50,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.DefaultHandlerTest
  * @run testng/othervm org.xml.sax.ptests.DefaultHandlerTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DefaultHandlerTest {
     /**
      * Test default handler that transverses XML and  print all visited node.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java
index 0bd15eb507a..507e9d28384 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -52,10 +51,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.EHFatalTest
  * @run testng/othervm org.xml.sax.ptests.EHFatalTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class EHFatalTest {
     /**
      * Error Handler to capture all error events to output file. Verifies the
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java
index d0f56627e53..4ee4bf510a8 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 import java.util.Enumeration;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.NamespaceSupport;
 
@@ -37,10 +36,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.NSSupportTest
  * @run testng/othervm org.xml.sax.ptests.NSSupportTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NSSupportTest {
     /**
      * Empty prefix name.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java
index e137c427165..81da8f25b88 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.XMLReader;
 
@@ -39,10 +38,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.NSTableTest
  * @run testng/othervm org.xml.sax.ptests.NSTableTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NSTableTest {
     private static final String NAMESPACES =
                         "http://xml.org/sax/features/namespaces";
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java
index 225265bbb20..b4a59180bac 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -50,10 +49,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.ParserAdapterTest
  * @run testng/othervm org.xml.sax.ptests.ParserAdapterTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ParserAdapterTest {
     /**
      * namespaces feature name.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java
index 6dbc3d92e2f..a7463edb53c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -55,11 +54,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.ResolverTest
  * @run testng/othervm org.xml.sax.ptests.ResolverTest
  */
 @Test
-@Listeners({jaxp.library.FilePolicy.class})
 public class ResolverTest {
     /**
      * Unit test for entityResolver setter.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java
index f4c5354ef0e..319b58a446f 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /**
@@ -42,10 +41,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.SAXParserNSTableTest
  * @run testng/othervm org.xml.sax.ptests.SAXParserNSTableTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAXParserNSTableTest {
     /**
      * namespace processing is enabled. namespace-prefix is also is enabled.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java
index 6ca9abf190d..4090b6b0733 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -52,11 +51,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLFilterCBTest
  * @run testng/othervm org.xml.sax.ptests.XMLFilterCBTest
  */
 @Test
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLFilterCBTest {
     /**
      * Test XMLFilter working with XML reader.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java
index a8d9adcf3ab..7ba882a9d1d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXNotRecognizedException;
@@ -44,10 +43,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLFilterTest
  * @run testng/othervm org.xml.sax.ptests.XMLFilterTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLFilterTest {
     /**
      * name spaces constant.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java
index bd526b4e105..40462fcf076 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.HandlerBase;
 import org.xml.sax.InputSource;
@@ -44,10 +43,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLReaderAdapterTest
  * @run testng/othervm org.xml.sax.ptests.XMLReaderAdapterTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLReaderAdapterTest {
     /**
      * http://xml.org/sax/features/namespace-prefixes property name.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java
index ad6951d7e2e..a109a27bce4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 import static org.testng.Assert.assertNotNull;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -37,10 +36,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLReaderFactoryTest
  * @run testng/othervm org.xml.sax.ptests.XMLReaderFactoryTest
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLReaderFactoryTest {
     /**
      * No exception expected when create XMLReader by default.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java
index 02f4baee9b2..9874866c7ec 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
@@ -45,11 +44,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLReaderNSTableTest
  * @run testng/othervm org.xml.sax.ptests.XMLReaderNSTableTest
  */
 @Test
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLReaderNSTableTest {
     /**
      * XML file that used to be parsed.
diff --git a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java
index a7e1bc7a2b9..497df48f7e4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -50,10 +49,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow org.xml.sax.ptests.XMLReaderTest
  * @run testng/othervm org.xml.sax.ptests.XMLReaderTest
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLReaderTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java
index 5f8f8d3be86..a42fcd9d3d7 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/AstroTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,11 @@
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.AstroTest
  * @run testng/othervm test.astro.AstroTest
  * @summary run astro application, test xslt
  *
@@ -69,7 +67,6 @@
  * AstroProcessor to test different JAXP classes and features.
  *
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AstroTest {
     private FiltersAndGolden[] data;
 
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java
index a17f5caae38..d337ee1bbad 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -54,11 +53,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.DocumentLSTest
  * @run testng/othervm test.astro.DocumentLSTest
  * @summary org.w3c.dom.ls tests
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DocumentLSTest {
     /*
      * Test creating an empty Document
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java
index fb8d3935fbf..75b7880a1ca 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,14 @@
 
 import javax.xml.namespace.QName;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.NamespaceContextTest
  * @run testng/othervm test.astro.NamespaceContextTest
  * @summary javax.xml.namespace.QName tests
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NamespaceContextTest {
     private static final String PREFIX = "astro";
     private static final String LOCAL_PART = "stardb";
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java
index 79245b28d7d..6cdbd93ce82 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/SAX201Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,15 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.XMLReader;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.SAX201Test
  * @run testng/othervm test.astro.SAX201Test
  * @summary verify SAX 2.0.1 allows to use null in setters
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SAX201Test {
     @Test
     public void test() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java
index 6e69fc10d34..782831e60b8 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.SchemaValidationTest
  * @run testng/othervm test.astro.SchemaValidationTest
  * @summary test parser sets schema related properties to do validation
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SchemaValidationTest {
     /*
      * Only set the schemaLanguage, without setting schemaSource. It should
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java b/test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java
index aad6d0f2ce4..04bab01fa75 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/astro/XPathAPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
@@ -56,12 +55,10 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.astro.XPathAPITest
  * @run testng/othervm test.astro.XPathAPITest
  * @summary test XPath API
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.FilePolicy.class})
 public class XPathAPITest {
     private static final String STARDB_STAR_3_CONSTELLATION = "//astro:stardb/astro:star[3]/astro:constellation";
     private static final String STARDB_STAR = "//astro:stardb/astro:star";
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java
index a8230b4a891..b2a66629e39 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMConfiguration;
@@ -70,10 +69,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.auctionportal.AuctionController
  * @run testng/othervm test.auctionportal.AuctionController
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AuctionController {
     /**
      * Check for DOMErrorHandler handling DOMError. Before fix of bug 4890927
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java
index 9c4a6b0d4ea..854cb7d1ad4 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXParseException;
@@ -61,10 +60,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.auctionportal.AuctionItemRepository
  * @run testng/othervm test.auctionportal.AuctionItemRepository
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class AuctionItemRepository {
     /**
      * XML file for parsing.
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java
index 9147f317b8d..92fc6bfa4c2 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/auctionportal/UserController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -59,10 +58,8 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.auctionportal.UserController
  * @run testng/othervm test.auctionportal.UserController
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class UserController {
     /**
      * Checking when creating an XML document using DOM Level 2 validating
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java
index ca03c241d91..a8bac488b8e 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4511326
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4511326
  * @run testng/othervm test.gaptest.Bug4511326
  * @summary In forwards-compatible mode the attribute isn't ignored
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4511326 {
 
     private static final String XSL = "<xsl:stylesheet version='2.0' "
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java
index 44c691c9336..d27186bcf6d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,18 +34,15 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4512806
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4512806
  * @run testng/othervm test.gaptest.Bug4512806
  * @summary test transformer.setOutputProperties(null)
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4512806 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java
index 6c786ee796a..5fc68a28a6b 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4515047
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4515047
  * @run testng/othervm test.gaptest.Bug4515047
  * @summary test transform an empty dom source
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4515047 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java
index 0c512db8259..014765f89d8 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -54,12 +53,10 @@
  * @test
  * @bug 4515660
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4515660
  * @run testng/othervm test.gaptest.Bug4515660
  * @summary verify property org.xml.sax.driver is used by SAXTransformerFactory
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4515660 {
 
     @BeforeClass
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java
index 0e14ebc4355..de333ae19f6 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -50,12 +49,10 @@
  * @test
  * @bug 4693341
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4693341
  * @run testng/othervm test.gaptest.Bug4693341
  * @summary test transforming to stream with external dtd
  */
 
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4693341 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java
index ad805c7ff5f..b8fe9e06814 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
@@ -44,11 +43,9 @@
  * @test
  * @bug 4848653
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4848653
  * @run testng/othervm test.gaptest.Bug4848653
  * @summary Verify JAXP schemaLanguage property is ignored if setValidating(false)
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4848653 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java
index 0da5ad75cfb..6ebcae5940d 100644
--- a/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java
+++ b/test/jaxp/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -47,11 +46,9 @@
  * @test
  * @bug 4858685 4894410
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow test.gaptest.Bug4858685
  * @run testng/othervm test.gaptest.Bug4858685
  * @summary test transforming text node
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4858685 {
     @Test
     public void test() throws TransformerException, IOException {
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java
deleted file mode 100644
index 8305f54af74..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jaxp.library;
-
-import org.testng.ITestContext;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-
-/**
- * This policy includes default permissions.
- * It should be used as one listener: either TestListener or MethodListener.
- */
-public class BasePolicy implements ITestListener {
-
-    @Override
-    public void onFinish(ITestContext arg0) {
-        try {
-            JAXPPolicyManager.teardownPolicyManager();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to teardown the policy manager", e);
-        }
-    }
-
-    @Override
-    public void onStart(ITestContext arg0) {
-        // suppose to only run othervm mode
-        if (isRunWithSecurityManager())
-            JAXPPolicyManager.getJAXPPolicyManager(true);
-    }
-
-    @Override
-    public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) {
-    }
-
-    @Override
-    public void onTestFailure(ITestResult arg0) {
-    }
-
-    @Override
-    public void onTestSkipped(ITestResult arg0) {
-    }
-
-    @Override
-    public void onTestStart(ITestResult arg0) {
-    }
-
-    @Override
-    public void onTestSuccess(ITestResult arg0) {
-    }
-
-    protected boolean isRunWithSecurityManager() {
-        final String runSecMngr = JAXPTestUtilities.getSystemProperty("runSecMngr");
-        return runSecMngr != null && runSecMngr.equals("true");
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java
deleted file mode 100644
index d40c0c58b2e..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jaxp.library;
-
-import static jaxp.library.JAXPTestUtilities.getSystemProperty;
-
-import java.io.FilePermission;
-
-import org.testng.ITestContext;
-
-/**
- * This policy can access local XML files.
- */
-public class FilePolicy extends BasePolicy {
-
-    @Override
-    public void onStart(ITestContext arg0) {
-        // suppose to only run othervm mode
-        if (isRunWithSecurityManager()) {
-            JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true);
-            String userdir = getSystemProperty("user.dir");
-            policyManager.addPermission(new FilePermission(userdir + "/-", "read,write,delete"));
-            String testSrc = System.getProperty("test.src");
-            // to handle the directory structure of some functional test suite
-            if (testSrc.endsWith("ptests"))
-                testSrc = testSrc.substring(0, testSrc.length() - 7);
-            policyManager.addPermission(new FilePermission(testSrc + "/-", "read"));
-            policyManager.addPermission(new FilePermission(userdir, "read"));
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java
deleted file mode 100644
index b9431443b88..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jaxp.library;
-
-import org.testng.ITestContext;
-
-/**
- * This policy can access internal jaxp packages.
- */
-public class InternalAPIPolicy extends BasePolicy {
-
-    @Override
-    public void onStart(ITestContext arg0) {
-        // suppose to only run othervm mode
-        if (isRunWithSecurityManager()) {
-            JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true);
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xerces.internal.jaxp"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.generic"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"));
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java
deleted file mode 100644
index 2940045352c..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jaxp.library;
-
-
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Path;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.SecurityPermission;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.PropertyPermission;
-import java.util.Set;
-import java.util.StringJoiner;
-
-
-/*
- * This is a base class that every test class must extend if it needs to be run
- * with security mode.
- */
-@SuppressWarnings("removal")
-public class JAXPPolicyManager {
-    /*
-     * Backing up policy.
-     */
-    private Policy policyBackup;
-
-    /*
-     * Backing up security manager.
-     */
-    private SecurityManager smBackup;
-
-    /*
-     * Current policy.
-     */
-    private TestPolicy policy = new TestPolicy();
-
-    /*
-     * JAXPPolicyManager singleton.
-     */
-    private static JAXPPolicyManager policyManager = null;
-
-    /*
-     * Install a SecurityManager along with a default Policy to allow testNG to
-     * run when there is a security manager.
-     */
-    private JAXPPolicyManager() {
-        // Backing up policy and security manager for restore
-        policyBackup = Policy.getPolicy();
-        smBackup = System.getSecurityManager();
-
-        // Set customized policy
-        setDefaultPermissions();
-        Policy.setPolicy(policy);
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    static synchronized JAXPPolicyManager getJAXPPolicyManager(boolean createIfNone) {
-        if (policyManager == null & createIfNone)
-            policyManager = new JAXPPolicyManager();
-        return policyManager;
-    }
-
-    private void teardown() throws Exception {
-        System.setSecurityManager(smBackup);
-        Policy.setPolicy(policyBackup);
-    }
-
-    /*
-     * Restore the original Policy and SecurityManager.
-     */
-    static synchronized void teardownPolicyManager() throws Exception {
-        if (policyManager != null) {
-            policyManager.teardown();
-            policyManager = null;
-        }
-    }
-
-    /*
-     * Set default permissions, sub-class of JAXPBaseTest should override this
-     * method.
-     */
-    private void setDefaultPermissions() {
-        //Permissions to set security manager and policy
-        addPermission(new SecurityPermission("getPolicy"));
-        addPermission(new SecurityPermission("setPolicy"));
-        addPermission(new RuntimePermission("setSecurityManager"));
-        addPermission(new PropertyPermission("test.src", "read"));
-    }
-
-    /*
-     * Add permission to the TestPolicy.
-     *
-     * @param permission to be added.
-     */
-    void addPermission(Permission p) {
-        policy.addPermission(p);
-    }
-
-    /*
-     * Add a temporary permission in current thread context. This won't impact
-     * global policy and doesn't support permission combination.
-     *
-     * @param permission
-     *            to add.
-     * @return index of the added permission.
-     */
-    int addTmpPermission(Permission p) {
-        return policy.addTmpPermission(p);
-    }
-
-    /*
-     * set allowAll in current thread context.
-     */
-    void setAllowAll(boolean allow) {
-        policy.setAllowAll(allow);
-    }
-
-    /*
-     * Remove a temporary permission from current thread context.
-     *
-     * @param index to remove.
-     *
-     * @throws RuntimeException if no temporary permission list in current
-     *             thread context or no permission correlated to the index.
-     */
-    void removeTmpPermission(int index) {
-        policy.removeTmpPermission(index);
-    }
-
-
-}
-
-/*
- * Simple Policy class that supports the required Permissions to validate the
- * JAXP concrete classes.
- */
-@SuppressWarnings("removal")
-class TestPolicy extends Policy {
-    private final static Set<String> TEST_JARS =
-         Set.of("jtreg.*jar", "javatest.*jar", "testng.*jar", "jcommander.*jar");
-    private final PermissionCollection permissions = new Permissions();
-
-    private ThreadLocal<Map<Integer, Permission>> transientPermissions = new ThreadLocal<>();
-    private ThreadLocal<Boolean> allowAll = new ThreadLocal<>();
-
-    private static Policy defaultPolicy = Policy.getPolicy();
-
-    /*
-     * Add permission to this policy.
-     *
-     * @param permission to be added.
-     */
-    void addPermission(Permission p) {
-        permissions.add(p);
-    }
-
-    /*
-     * Set all permissions. Caution: this should not called carefully unless
-     * it's really needed.
-     *
-     * private void setAllPermissions() { permissions.add(new AllPermission());
-     * }
-     */
-
-    /*
-     * Overloaded methods from the Policy class.
-     */
-    @Override
-    public String toString() {
-        StringJoiner sj = new StringJoiner("\n", "policy: ", "");
-        Enumeration<Permission> perms = permissions.elements();
-        while (perms.hasMoreElements()) {
-            sj.add(perms.nextElement().toString());
-        }
-        return sj.toString();
-
-    }
-
-    @Override
-    public PermissionCollection getPermissions(ProtectionDomain domain) {
-        return permissions;
-    }
-
-    @Override
-    public PermissionCollection getPermissions(CodeSource codesource) {
-        return permissions;
-    }
-
-    private boolean isTestMachineryDomain(ProtectionDomain domain) {
-        CodeSource cs = (domain == null) ? null : domain.getCodeSource();
-        URL loc = (cs == null) ? null : cs.getLocation();
-        URI uri = (loc == null) ? null : URI.create(loc.toString());
-        String name = (uri == null) ? null : Path.of(uri).getFileName().toString();
-        return name != null && TEST_JARS.stream()
-                                .filter(name::matches)
-                                .findAny()
-                                .isPresent();
-    }
-
-    @Override
-    public boolean implies(ProtectionDomain domain, Permission perm) {
-        if (allowAll())
-            return true;
-
-        if (defaultPolicy.implies(domain, perm))
-            return true;
-
-        if (permissions.implies(perm))
-            return true;
-
-        if (isTestMachineryDomain(domain))
-            return true;
-
-        return tmpImplies(perm);
-    }
-
-    /*
-     * Add a temporary permission in current thread context. This won't impact
-     * global policy and doesn't support permission combination.
-     *
-     * @param permission to add.
-     * @return index of the added permission.
-     */
-    int addTmpPermission(Permission p) {
-        Map<Integer, Permission> tmpPermissions = transientPermissions.get();
-        if (tmpPermissions == null)
-            tmpPermissions = new HashMap<>();
-
-        int id = tmpPermissions.size();
-        tmpPermissions.put(id, p);
-        transientPermissions.set(tmpPermissions);
-        return id;
-    }
-
-    /*
-     * Remove a temporary permission from current thread context.
-     *
-     * @param index to remove.
-     *
-     * @throws RuntimeException if no temporary permission list in current
-     *             thread context or no permission correlated to the index.
-     */
-    void removeTmpPermission(int index) {
-        try {
-            Map<Integer, Permission> tmpPermissions = transientPermissions.get();
-            tmpPermissions.remove(index);
-        } catch (NullPointerException | IndexOutOfBoundsException e) {
-            throw new RuntimeException("Tried to delete a non-existent temporary permission", e);
-        }
-    }
-
-    /*
-     * Checks to see if the specified permission is implied by temporary
-     * permission list in current thread context.
-     *
-     * @param permission the Permission object to compare.
-     *
-     * @return true if "permission" is implied by any permission in the
-     *         temporary permission list, false if not.
-     */
-    private boolean tmpImplies(Permission perm) {
-        Map<Integer, Permission> tmpPermissions = transientPermissions.get();
-        if (tmpPermissions != null) {
-            for (Permission p : tmpPermissions.values()) {
-                if (p.implies(perm))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /*
-     * Checks to see if allow all permission requests in current thread context.
-     */
-    private boolean allowAll() {
-        Boolean allow = allowAll.get();
-        if (allow != null) {
-            return allow;
-        }
-        return false;
-    }
-
-    /*
-     * set allowAll in current thread context.
-     */
-    void setAllowAll(boolean allow) {
-        allowAll.set(allow);
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestPolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestPolicy.java
deleted file mode 100644
index 200405bc596..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestPolicy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jaxp.library;
-
-import static jaxp.library.JAXPTestUtilities.getSystemProperty;
-import java.io.FilePermission;
-import java.net.SocketPermission;
-import org.testng.ITestContext;
-
-/**
- * Covers all policies currently required for running JAXP tests
- */
-public class JAXPTestPolicy extends BasePolicy {
-    @Override
-    public void onStart(ITestContext arg0) {
-        if (isRunWithSecurityManager()) {
-            JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true);
-            String userdir = getSystemProperty("user.dir");
-            policyManager.addPermission(new FilePermission(userdir + "/-", "read,write,delete"));
-            String testSrc = System.getProperty("test.src");
-            // to handle the directory structure of some functional test suite
-            if (testSrc.endsWith("ptests"))
-                testSrc = testSrc.substring(0, testSrc.length() - 7);
-            policyManager.addPermission(new FilePermission(testSrc + "/-", "read"));
-            policyManager.addPermission(new FilePermission(userdir, "read"));
-
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xerces.internal.jaxp"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xerces.internal.impl"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xerces.internal.xni.parser"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.generic"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"));
-            policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.xml.internal.stream"));
-
-            policyManager.addPermission(new SocketPermission("openjdk.org:80", "connect,resolve"));
-            policyManager.addPermission(new SocketPermission("www.w3.org:80", "connect,resolve"));
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
index c39ba8e8e2c..8f72543db8e 100644
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
+++ b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,15 +36,10 @@
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.Permission;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -340,57 +335,6 @@ public static String getPathByClassName(Class<?> clazz, String relativeDir) {
     }
 
 
-    /**
-     * Run the supplier with all permissions. This won't impact global policy.
-     *
-     * @param s
-     *            Supplier to run
-     */
-    public static <T> T runWithAllPerm(Supplier<T> s) {
-        Optional<JAXPPolicyManager> policyManager = Optional.ofNullable(JAXPPolicyManager
-                .getJAXPPolicyManager(false));
-        policyManager.ifPresent(manager -> manager.setAllowAll(true));
-        try {
-            return s.get();
-        } finally {
-            policyManager.ifPresent(manager -> manager.setAllowAll(false));
-        }
-    }
-
-    /**
-     * Run the supplier with all permissions. This won't impact global policy.
-     *
-     * @param s
-     *            Supplier to run
-     */
-    public static <T> T tryRunWithAllPerm(Callable<T> c) throws Exception {
-        Optional<JAXPPolicyManager> policyManager = Optional.ofNullable(JAXPPolicyManager
-                .getJAXPPolicyManager(false));
-        policyManager.ifPresent(manager -> manager.setAllowAll(true));
-        try {
-            return c.call();
-        } finally {
-            policyManager.ifPresent(manager -> manager.setAllowAll(false));
-        }
-    }
-
-    /**
-     * Run the Runnable with all permissions. This won't impact global policy.
-     *
-     * @param s
-     *            Supplier to run
-     */
-    public static void runWithAllPerm(Runnable r) {
-        Optional<JAXPPolicyManager> policyManager = Optional.ofNullable(JAXPPolicyManager
-                .getJAXPPolicyManager(false));
-        policyManager.ifPresent(manager -> manager.setAllowAll(true));
-        try {
-            r.run();
-        } finally {
-            policyManager.ifPresent(manager -> manager.setAllowAll(false));
-        }
-    }
-
     /**
      * Acquire a system property.
      *
@@ -399,7 +343,7 @@ public static void runWithAllPerm(Runnable r) {
      * @return property value
      */
     public static String getSystemProperty(String name) {
-        return runWithAllPerm(() -> System.getProperty(name));
+        return System.getProperty(name);
     }
 
     /**
@@ -411,7 +355,7 @@ public static String getSystemProperty(String name) {
      *            System property value to be set.
      */
     public static void setSystemProperty(String name, String value) {
-        runWithAllPerm(() -> System.setProperty(name, value));
+        System.setProperty(name, value);
     }
 
     /**
@@ -421,79 +365,7 @@ public static void setSystemProperty(String name, String value) {
      *            System property name to be cleared.
      */
     public static void clearSystemProperty(String name) {
-        runWithAllPerm(() -> System.clearProperty(name));
-    }
-
-    /**
-     * Run the runnable with assigning temporary permissions. This won't impact
-     * global policy.
-     *
-     * @param r
-     *            Runnable to run
-     * @param ps
-     *            assigning permissions to add.
-     */
-    public static void runWithTmpPermission(Runnable r, Permission... ps) {
-        JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false);
-        List<Integer> tmpPermissionIndexes = new ArrayList<>();
-        if (policyManager != null) {
-            for (Permission p : ps)
-                tmpPermissionIndexes.add(policyManager.addTmpPermission(p));
-        }
-        try {
-            r.run();
-        } finally {
-            for (int index: tmpPermissionIndexes)
-                policyManager.removeTmpPermission(index);
-        }
-    }
-
-    /**
-     * Run the supplier with assigning temporary permissions. This won't impact
-     * global policy.
-     *
-     * @param s
-     *            Supplier to run
-     * @param ps
-     *            assigning permissions to add.
-     */
-    public static <T> T runWithTmpPermission(Supplier<T> s, Permission... ps) {
-        JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false);
-        List<Integer> tmpPermissionIndexes = new ArrayList<>();
-        if (policyManager != null) {
-            for (Permission p : ps)
-                tmpPermissionIndexes.add(policyManager.addTmpPermission(p));
-        }
-        try {
-            return s.get();
-        } finally {
-            for (int index: tmpPermissionIndexes)
-                policyManager.removeTmpPermission(index);
-        }
-    }
-
-    /**
-     * Run the RunnableWithException with assigning temporary permissions. This
-     * won't impact global policy.
-     *
-     * @param r
-     *            RunnableWithException to execute
-     * @param ps
-     *            assigning permissions to add.
-     */
-    public static void tryRunWithTmpPermission(RunnableWithException r, Permission... ps) throws Exception {
-        JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false);
-        List<Integer> tmpPermissionIndexes = new ArrayList<>();
-        if (policyManager != null) {
-            for (Permission p : ps)
-                tmpPermissionIndexes.add(policyManager.addTmpPermission(p));
-        }
-        try {
-            r.run();
-        } finally {
-            for (int index: tmpPermissionIndexes)
-                policyManager.removeTmpPermission(index);
-        }
+        System.clearProperty(name);
     }
 
     @FunctionalInterface
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java
deleted file mode 100644
index 928003a2ece..00000000000
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jaxp.library;
-
-import java.net.SocketPermission;
-
-import org.testng.ITestContext;
-
-/**
- * This policy can access network.
- */
-public class NetAccessPolicy extends BasePolicy {
-
-    @Override
-    public void onStart(ITestContext arg0) {
-        // suppose to only run othervm mode
-        if (isRunWithSecurityManager()) {
-            JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true);
-            policyManager.addPermission(new SocketPermission("openjdk.org:80", "connect,resolve"));
-            policyManager.addPermission(new SocketPermission("www.w3.org:80", "connect,resolve"));
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java
deleted file mode 100644
index 9b138f12708..00000000000
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogAccessTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package catalog;
-
-import java.net.URI;
-import javax.xml.catalog.CatalogFeatures;
-import javax.xml.catalog.CatalogManager;
-import javax.xml.catalog.CatalogResolver;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import static jaxp.library.JAXPTestUtilities.tryRunWithAllPerm;
-
-/*
- * @test
- * @bug 8171243
- * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogAccessTest
- * @summary the Catalog API grants no privilege to external resources. This test
- * verifies that SecurityException will be thrown if access to resources is denied
- * by the security manager.
- */
-@Listeners({jaxp.library.BasePolicy.class})
-public class CatalogAccessTest {
-    static final CatalogFeatures FEATURES = CatalogFeatures.builder().
-            with(CatalogFeatures.Feature.PREFER, "system").build();
-
-    /*
-     * Verifies that the SecurityException is thrown if access to the resource is
-     * denied by the security manager.
-     */
-    @Test(dataProvider = "accessTest", expectedExceptions = SecurityException.class)
-    public void testSecurity(String cfile, String sysId, String pubId) throws Exception {
-        CatalogResolver cr = CatalogManager.catalogResolver(FEATURES, URI.create(cfile));
-        InputSource is = cr.resolveEntity(pubId, sysId);
-        Assert.fail("Failed to throw SecurityException");
-    }
-
-    /*
-        DataProvider: used for SecurityException testing
-        Data columns:
-        catalog uri, systemId, publicId
-     */
-    @DataProvider(name = "accessTest")
-    Object[][] getDataForAccessTest() throws Exception {
-        String systemId = "http://www.sys00test.com/rewrite.dtd";
-        String publicId = "PUB-404";
-        String urlFile = tryRunWithAllPerm(() ->
-                getClass().getResource("rewriteSystem_id.xml").toExternalForm());
-        return new Object[][]{
-            {urlFile, systemId, publicId}
-        };
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java
index 1cb1016ac36..66ddad86785 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogFileInputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import jdk.test.lib.net.SimpleHttpServer;
@@ -72,7 +71,6 @@
  *          JDK-8168968, it has to only run without SecurityManager
  *          because an ACE will be thrown for invalid path.
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogFileInputTest extends CatalogSupportBase {
 
     static final CatalogFeatures FEATURES = CatalogFeatures.builder().
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogResolverTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogResolverTest.java
index 2eba917506e..6ad23785b64 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogResolverTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -45,7 +44,6 @@
  * @summary Tests CatalogResolver functions. See CatalogTest for existing basic
  * functional tests.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CatalogResolverTest extends CatalogSupportBase {
     static final String KEY_FILES = "javax.xml.catalog.files";
     static final String SYSTEM_ID = "http://openjdk_java_net/xml/catalog/dtd/system.dtd";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java
index 428dc67419d..4344bc1c623 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.transform.stream.StreamSource;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -43,7 +42,6 @@
  * @test
  * @bug 8158084 8162438 8162442 8166220 8166398 8290740
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport
  * @run testng/othervm catalog.CatalogSupport
  * @summary verifies the use of Catalog in SAX/DOM/StAX/Validation/Transform.
  * The two main scenarios for all processors are:
@@ -66,7 +64,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogSupport extends CatalogSupportBase {
     /*
      * Initializing fields
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java
index 3daf3b6365d..2025e2d14d3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -50,7 +49,6 @@
  * @test
  * @bug 8158084 8162438 8162442 8166220
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport1
  * @run testng/othervm catalog.CatalogSupport1
  * @summary extends CatalogSupport, verifies that the catalog file can be set
  * using the System property.
@@ -62,7 +60,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CatalogSupport1 extends CatalogSupportBase {
     /*
      * Initializing fields
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java
index bef1339adf7..5bd748c3d87 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -54,7 +53,6 @@
  * @test
  * @bug 8158084 8162438 8162442 8163535 8166220
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport2
  * @run testng/othervm catalog.CatalogSupport2
  * @summary extends CatalogSupport tests, verifies that the use of the Catalog may
  * be disabled through the System property.
@@ -67,7 +65,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogSupport2 extends CatalogSupportBase {
     static final String TTIMEOUTREAD = "sun.net.client.defaultReadTimeout";
     static final String TIMEOUTCONNECT = "sun.net.client.defaultConnectTimeout";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java
index 35582749fbd..0b2c0198699 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -54,7 +53,6 @@
  * @test
  * @bug 8158084 8162438 8162442 8163535 8166220
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport3
  * @run testng/othervm catalog.CatalogSupport3
  * @summary extends CatalogSupport tests, verifies that the use of the Catalog may
  * be disabled through the API property.
@@ -67,7 +65,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogSupport3 extends CatalogSupportBase {
     static final String TTIMEOUTREAD = "sun.net.client.defaultReadTimeout";
     static final String TIMEOUTCONNECT = "sun.net.client.defaultConnectTimeout";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java
index 49e424f3845..8d06cc61355 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -48,7 +47,6 @@
  * @test
  * @bug 8158084 8162438 8162442 8166220
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport4
  * @run testng/othervm catalog.CatalogSupport4
  * @summary verifies the overriding over of the USE_CATALOG feature. Extending
  * CatalogSupport tests, the USE_CATALOG is turned off system-wide, however,
@@ -64,7 +62,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogSupport4 extends CatalogSupportBase {
     /*
      * Initializing fields
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java
index e6506b22e2b..564848e2e1a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.InputSource;
@@ -47,7 +46,6 @@
  * @test
  * @bug 8158084 8163232 8166220
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogSupport5
  * @run testng/othervm catalog.CatalogSupport5
  * @summary extends CatalogSupport tests, verifies that when errors occur,
  * relevant checked Exceptions are returned.
@@ -60,7 +58,6 @@
  *
  * @author huizhe.wang@oracle.com
  */
-@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class})
 public class CatalogSupport5 extends CatalogSupportBase {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java
index dbbc9d88e7b..0c0e77bb952 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,6 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
@@ -70,11 +69,9 @@
  * @test
  * @bug 8081248 8144966 8146606 8146237 8150969 8151162 8152527 8154220 8163232
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow catalog.CatalogTest
  * @run testng/othervm catalog.CatalogTest
  * @summary Tests basic Catalog functions.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CatalogTest extends CatalogSupportBase {
     static final String KEY_FILES = "javax.xml.catalog.files";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/GroupTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/GroupTest.java
index 87210e2f97f..46aa46ee29f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/catalog/GroupTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/GroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
@@ -41,7 +40,6 @@
  * @run testng catalog.GroupTest
  * @summary Tests catalog with Group entries.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class GroupTest extends CatalogSupportBase {
 
     String catalogGroup;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java
index 5ae453dbde8..577ba680ddb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6350682.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,22 @@
 
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.TransformerFactory;
-
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6350682
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.Bug6350682
  * @run testng/othervm common.Bug6350682
  * @summary Test SAXParserFactory and TransformerFactory can newInstance when setContextClassLoader(null).
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6350682 {
 
     @Test
     public void testSAXParserFactory() {
         // This test run in othervm so change in environment need not to be recovered at the end of test.
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+        Thread.currentThread().setContextClassLoader(null);
         if (Bug6350682.class.getClassLoader() == null) {
             System.out.println("this class loader is NULL");
         } else {
@@ -58,7 +53,7 @@ public void testSAXParserFactory() {
     @Test
     public void testTransformerFactory() {
         // This test run in othervm so change in environment need not to be recovered at the end of test.
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+        Thread.currentThread().setContextClassLoader(null);
         TransformerFactory factory = TransformerFactory.newInstance();
         Assert.assertNotNull(factory, "Failed to get an instance of a TransformerFactory");
     }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java
index a34b268d793..d94a84a243b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/Bug6723276Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6723276
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.Bug6723276Test
  * @run testng/othervm common.Bug6723276Test
  * @summary Test JAXP class can be loaded by bootstrap classloader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6723276Test {
     private static final String ERR_MSG = "org.apache.xerces.jaxp.SAXParserFactoryImpl not found";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/Bug7143711Test.java b/test/jaxp/javax/xml/jaxp/unittest/common/Bug7143711Test.java
deleted file mode 100644
index 8472a3bf5d3..00000000000
--- a/test/jaxp/javax/xml/jaxp/unittest/common/Bug7143711Test.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package common;
-
-import javax.xml.XMLConstants;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.xpath.XPathFactory;
-
-import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
-import static jaxp.library.JAXPTestUtilities.setSystemProperty;
-import org.testng.Assert;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @bug 7143711
- * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.Bug7143711Test
- * @summary Test set use-service-mechanism shall not override what's set by the constructor in secure mode.
- */
-@Listeners({ jaxp.library.BasePolicy.class })
-@Test(singleThreaded = true)
-public class Bug7143711Test {
-    private static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
-    private static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-
-    private static final String DOM_FACTORY_ID = "javax.xml.parsers.DocumentBuilderFactory";
-    private static final String SAX_FACTORY_ID = "javax.xml.parsers.SAXParserFactory";
-
-    // impl specific feature
-    private static final String ORACLE_FEATURE_SERVICE_MECHANISM = "http://www.oracle.com/feature/use-service-mechanism";
-
-    @Test
-    public void testValidation_SAX_withSM() {
-        System.out.println("Validation using SAX Source with security manager:");
-        setSystemProperty(SAX_FACTORY_ID, "MySAXFactoryImpl");
-
-        try {
-            SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            // should not allow
-            factory.setFeature(ORACLE_FEATURE_SERVICE_MECHANISM, true);
-            if ((boolean) factory.getFeature(ORACLE_FEATURE_SERVICE_MECHANISM)) {
-                Assert.fail("should not override in secure mode");
-            }
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-
-        } finally {
-            clearSystemProperty(SAX_FACTORY_ID);
-        }
-    }
-
-    @Test(enabled=false) //skipped due to bug JDK-8080097
-    public void testTransform_DOM_withSM() {
-        System.out.println("Transform using DOM Source;  Security Manager is set:");
-        setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl");
-
-        try {
-            TransformerFactory factory = TransformerFactory.newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl",
-                    TransformerFactory.class.getClassLoader());
-            factory.setFeature(ORACLE_FEATURE_SERVICE_MECHANISM, true);
-            if ((boolean) factory.getFeature(ORACLE_FEATURE_SERVICE_MECHANISM)) {
-                Assert.fail("should not override in secure mode");
-            }
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally {
-            clearSystemProperty(DOM_FACTORY_ID);
-        }
-    }
-
-    @Test
-    public void testXPath_DOM_withSM() {
-        System.out.println("Evaluate DOM Source;  Security Manager is set:");
-        setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl");
-
-        try {
-            XPathFactory xPathFactory = XPathFactory.newInstance("http://java.sun.com/jaxp/xpath/dom",
-                    "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl", null);
-            xPathFactory.setFeature(ORACLE_FEATURE_SERVICE_MECHANISM, true);
-            if ((boolean) xPathFactory.getFeature(ORACLE_FEATURE_SERVICE_MECHANISM)) {
-                Assert.fail("should not override in secure mode");
-            }
-
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        } finally {
-            clearSystemProperty(DOM_FACTORY_ID);
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java
index 41584223322..64041622814 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/CDataChunkSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.stream.events.XMLEvent;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -43,11 +42,9 @@
  * @test
  * @bug 8158619
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.CDataChunkSizeTest
  * @run testng/othervm common.CDataChunkSizeTest
  * @summary Verifies the support of property jdk.xml.cdataChunkSize
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class CDataChunkSizeTest {
 
     final static String CDATA_CHUNK_SIZE = "jdk.xml.cdataChunkSize";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/EncodingErrorsReportingTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/EncodingErrorsReportingTest.java
index 6559aef6146..2b780a42a17 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/EncodingErrorsReportingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/EncodingErrorsReportingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @bug 8038043
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @run testng/othervm common.EncodingErrorsReportingTest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.EncodingErrorsReportingTest
  * @summary Verifies that parsers reports location of wrong UTF-8 symbols in
  *          XML files parsed and included via xi:include element
  */
@@ -49,11 +48,9 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
-@Listeners({jaxp.library.BasePolicy.class})
 public class EncodingErrorsReportingTest implements EntityResolver {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/Sources.java b/test/jaxp/javax/xml/jaxp/unittest/common/Sources.java
index 9d902f66ebf..2e88f5ce633 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/Sources.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/Sources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package common;
 
-import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -46,7 +45,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -57,12 +55,10 @@
  * @test
  * @bug 8144967
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.Sources
  * @run testng/othervm common.Sources
  * @summary Tests related to the javax.xml.transform.Source
  * and org.xml.sax.InputSource
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Sources {
 
     /**
@@ -129,7 +125,7 @@ public Object[][] getSourcesEx() {
         return new Object[][] {
             // This will set a non-null systemId on the resulting
             // StreamSource
-            { runWithTmpPermission(() -> new StreamSource(new File("")), new PropertyPermission("user.dir", "read")) },
+            { new StreamSource(new File("")) },
             // Can't tell because XMLStreamReader is a pull parser, cursor
             // advancement
             // would have been required in order to examine the reader.
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java
index 474a892aeef..fec537fda02 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
@@ -43,12 +42,10 @@
  * @bug 8144593
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @compile -XDignore.symbol.file TestSAXDriver.java
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.TransformationWarningsTest
  * @run testng/othervm common.TransformationWarningsTest
  * @summary Check that warnings about unsupported properties from parsers
  * are suppressed during the transformation process.
  */
-@Listeners({jaxp.library.BasePolicy.class, jaxp.library.InternalAPIPolicy.class})
 public class TransformationWarningsTest extends WarningsTestBase {
 
     @BeforeClass
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java
index 65d9a2806a8..8a733e4f133 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -47,12 +46,10 @@
  * @key intermittent
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @compile -XDignore.symbol.file TestSAXDriver.java
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.ValidationWarningsTest
  * @run testng/othervm common.ValidationWarningsTest
  * @summary Check that warnings about unsupported properties from SAX
  *  parsers are suppressed during the xml validation process.
  */
-@Listeners({jaxp.library.InternalAPIPolicy.class})
 public class ValidationWarningsTest extends WarningsTestBase {
 
     @BeforeClass
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java b/test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java
index 3fde8d1f725..208fdbd316b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/WarningsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
 
 package common;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.lang.Thread.UncaughtExceptionHandler;
@@ -62,20 +60,20 @@ void startTest() throws Exception {
         PrintStream defStdErr = System.err;
         //Set new byte array stream as standard error stream
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream(5000);
-        runWithAllPerm(() -> System.setErr(new PrintStream(byteStream)));
+        System.setErr(new PrintStream(byteStream));
         //Execute multiple TestWorker tasks
         for (int id = 0; id < THREADS_COUNT; id++) {
             EXECUTOR.execute(new TestWorker(id));
         }
         //Initiate shutdown of previously submitted task
-        runWithAllPerm(EXECUTOR::shutdown);
+        EXECUTOR.shutdown();
         //Wait for termination of submitted tasks
         if (!EXECUTOR.awaitTermination(THREADS_COUNT, TimeUnit.SECONDS)) {
             //If not all tasks terminates during the time out force them to shutdown
-            runWithAllPerm(EXECUTOR::shutdownNow);
+            EXECUTOR.shutdown();
         }
         //Restore default standard error stream
-        runWithAllPerm(() -> System.setErr(defStdErr));
+        System.setErr(defStdErr);
         //Print tasks stderr output
         String errContent = byteStream.toString();
         System.out.println("Standard error output content:");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java
index 6d10d783779..1205a1d1c5e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementation;
@@ -66,11 +65,9 @@
  * @test
  * @bug 6439439 8087303 8174025 8223291 8249867 8261209 8260858 8265073
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow common.prettyprint.PrettyPrintTest
  * @run testng/othervm common.prettyprint.PrettyPrintTest
  * @summary Test serializing xml and html with indentation.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class PrettyPrintTest {
 
     private static final String DOM_FORMAT_PRETTY_PRINT = "format-pretty-print";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java
index d1540dddf63..f22e95837bd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6320118.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6320118
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.Bug6320118
  * @run testng/othervm datatype.Bug6320118
  * @summary Test xml datatype XMLGregorianCalendar.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6320118 {
 
     DatatypeFactory df;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
index 4bbb5500c64..d1e5aea93da 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6937951
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.Bug6937951Test
  * @run testng/othervm datatype.Bug6937951Test
  * @summary Test midnight is same as the start of the next day in XMLGregorianCalendar.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6937951Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
index f104029a968..8aa5d6369a3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,18 +34,15 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6937964
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.Bug6937964Test
  * @run testng/othervm datatype.Bug6937964Test
  * @summary Test Duration is normalized.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6937964Test {
     /**
      * Print debugging to System.err.
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
index ed553ee7ce2..c6b143c1d5a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 7042647
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.Bug7042647Test
  * @run testng/othervm datatype.Bug7042647Test
  * @summary Test getFirstDayOfWeek is correct after converting XMLGregorianCalendar to a GregorianCalendar.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug7042647Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
index d4050c8bff2..3866ae6a70c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,14 @@
 import javax.xml.namespace.QName;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.DatatypeFactoryTest
  * @run testng/othervm datatype.DatatypeFactoryTest
  * @summary Test DatatypeFactory.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DatatypeFactoryTest {
 
     private static final boolean DEBUG = false;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java
index 044b6588c44..d4d96449f82 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/DurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,18 +40,15 @@
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8190835
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.DurationTest
  * @run testng/othervm datatype.DurationTest
  * @summary Test Duration.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DurationTest {
 
     private final static boolean DEBUG = true;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
index 1c8c0821a54..47a965e8665 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,25 +23,18 @@
 
 package datatype;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.net.URL;
 import java.net.URLClassLoader;
-
 import javax.xml.datatype.DatatypeFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.FactoryFindTest
  * @run testng/othervm datatype.FactoryFindTest
  * @summary Test Classloader for DatatypeFactory.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class FactoryFindTest {
 
     boolean myClassLoaderUsed = false;
@@ -51,12 +44,12 @@ public void testFactoryFind() throws Exception {
         DatatypeFactory factory = DatatypeFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+        Thread.currentThread().setContextClassLoader(null);
 
         factory = DatatypeFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader()));
+        Thread.currentThread().setContextClassLoader(new MyClassLoader());
         factory = DatatypeFactory.newInstance();
         if (System.getSecurityManager() == null)
             Assert.assertTrue(myClassLoaderUsed);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java
index b66af1d778b..7fe96d741ee 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.datatype.Duration;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8068839
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.JDK8068839Test
  * @run testng/othervm datatype.JDK8068839Test
  * @summary Verifies that Duration's edge cases
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class JDK8068839Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
index b7fcae1dadd..df97f5c7a2b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow datatype.XMLGregorianCalendarTest
  * @run testng/othervm datatype.XMLGregorianCalendarTest
  * @summary Test XMLGregorianCalendar.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLGregorianCalendarTest {
 
     private static final boolean DEBUG = false;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java
index 664393a687e..4d5fec2670c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915524.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -39,12 +38,10 @@
  * @test
  * @bug 4915524
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4915524
  * @run testng/othervm dom.Bug4915524
  * @summary Test Document.adoptNode() shall not throw Exception when the source document object is created from different implementation.
  */
 
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4915524 {
 
     String data = "<?xml version=\"1.0\" ?>" + "<!DOCTYPE root [" + "<!ELEMENT root ANY>" + "<!ATTLIST root attr1 ID #FIXED 'xxx'"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java
index fcabd144b76..25396f674e2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4915748.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.DOMConfiguration;
@@ -39,11 +38,9 @@
  * @test
  * @bug 4915748
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4915748
  * @run testng/othervm dom.Bug4915748
  * @summary Test DOMErrorHandler is called in case CDATA section is split by termination marker ']]>'.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4915748 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java
index 237d416a51b..14fd3910c6b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966082.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -34,11 +33,9 @@
  * @test
  * @bug 4966082
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4966082
  * @run testng/othervm dom.Bug4966082
  * @summary Test Element.getSchemaTypeInfo() returns an instance of TypeInfo instead of null when the document's schema is an XML DTD.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966082 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java
index a105ceb4f78..beb5af821b5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966138.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.TypeInfo;
@@ -36,11 +35,9 @@
  * @test
  * @bug 4966138
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4966138
  * @run testng/othervm dom.Bug4966138
  * @summary Test Element's TypeInfo.getTypeName() returns a name instead of null in case the element is declared using anonymous simple type.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966138 {
 
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java
index 248f70e4b98..c101f5bb334 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966142.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.TypeInfo;
@@ -36,11 +35,9 @@
  * @test
  * @bug 4966142
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4966142
  * @run testng/othervm dom.Bug4966142
  * @summary Test TypeInfo.isDerivedFrom(...) works instead of throws UnsupportedOperationException when the TypeInfo instance refers to a simple type.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966142 {
 
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java
index 99fa5490046..e2a45212b1d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug4966143.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.TypeInfo;
@@ -36,12 +35,10 @@
  * @test
  * @bug 4966143
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug4966143
  * @run testng/othervm dom.Bug4966143
  * @summary Test isDerivedFrom(...) returns true only if the parameter is DERIVATION_EXTENSION,
  * in case TypeInfo instance refers to a complex type derived from another complex type by extension.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966143 {
 
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java
index f303bf1c707..7b87c2f7fc3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6339023.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementation;
@@ -40,11 +39,9 @@
  * @test
  * @bug 6339023
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6339023
  * @run testng/othervm dom.Bug6339023
  * @summary Test normalize-characters.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6339023 {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java
index 74321c52fde..8db7201d732 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6355326.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
@@ -47,11 +46,9 @@
  * @test
  * @bug 6355326
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6355326
  * @run testng/othervm dom.Bug6355326
  * @summary Test DOM implementation encoding.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6355326 {
 
     DOMImplementationLS implLS = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java
index bcad42bdfaa..b6d051e4f14 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6367542.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package dom;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.bootstrap.DOMImplementationRegistry;
@@ -33,11 +32,9 @@
  * @test
  * @bug 6367542
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6367542
  * @run testng/othervm dom.Bug6367542
  * @summary Test DOMImplementationRegistry.getDOMImplementation("XML") returns a DOMImplementation instance.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6367542 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java
index 181d83b5559..a016057734f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6520131.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMError;
@@ -41,11 +40,9 @@
  * @test
  * @bug 6520131
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6520131
  * @run testng/othervm dom.Bug6520131
  * @summary Test DOMErrorHandler reports an error for invalid character.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6520131 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java
index d3784f0a6be..51e18be5741 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6521260.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -41,11 +40,9 @@
  * @test
  * @bug 6521260
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6521260
  * @run testng/othervm dom.Bug6521260
  * @summary Test setAttributeNS doesn't result in an unsorted internal list of attributes.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6521260 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
index 38735c414f2..5ee23f17dc5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import jaxp.library.JAXPTestUtilities;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -46,11 +45,9 @@
  * @test
  * @bug 6582545
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6582545Test
  * @run testng/othervm dom.Bug6582545Test
  * @summary Test the value is correct when iterating attributes.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6582545Test {
     private DocumentBuilder xmlParser = null;
     private Document document = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
index 08f6530e7b4..e34b4dfb764 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6879614
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.Bug6879614Test
  * @run testng/othervm dom.Bug6879614Test
  * @summary Test DocumentBuilder can parse the certain xml.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6879614Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java
index b32d8b1d904..aa4fc54de9a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6333993Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
@@ -42,11 +41,9 @@
  * @test
  * @bug 6333993
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.CR6333993Test
  * @run testng/othervm dom.CR6333993Test
  * @summary Test NodeList.item(valid index) returns value after NodeList.item(NodeList.getLength()).
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class CR6333993Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java
index 58c4019bffa..757c2d798bc 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517707Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -44,11 +43,9 @@
  * @test
  * @bug 6517707
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.CR6517707Test
  * @run testng/othervm dom.CR6517707Test
  * @summary Test Node.setNodeValue(value) shall throw DOMException.NO_MODIFICATION_ALLOWED_ERR if the node is read-only.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class CR6517707Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java
index 70f1cb68e1b..20c19187777 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6517717Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -43,11 +42,9 @@
  * @test
  * @bug 6517717
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.CR6517717Test
  * @run testng/othervm dom.CR6517717Test
  * @summary Test Node.setPrefix(prefix) shall throw DOMException.NO_MODIFICATION_ALLOWED_ERR if the node is read-only.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class CR6517717Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java
index ccae3a55e06..0cf4b03f54c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/CR6909336Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.transform.dom.DOMResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.bootstrap.DOMImplementationRegistry;
@@ -38,11 +37,9 @@
  * @test
  * @bug 6909336
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.CR6909336Test
  * @run testng/othervm dom.CR6909336Test
  * @summary Test DOM writer can write more that 20 nested elements.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class CR6909336Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
index b3aa2d812f5..2f16e4ffcfb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
@@ -59,11 +58,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.DOMConfigurationTest
  * @run testng/othervm dom.DOMConfigurationTest
  * @summary Test DOMConfiguration for supported properties.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DOMConfigurationTest {
 
     static class TestHandler implements DOMErrorHandler {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMFeatureTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMFeatureTest.java
index 471773077d1..febd9e70d5d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMFeatureTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMFeatureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -46,7 +45,6 @@
  * @run testng dom.DOMFeatureTest
  * @summary Tests DOM features.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DOMFeatureTest {
 
     private static final String XML1 = "<?xml version=\"1.0\"?>\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
index 94a2dcdeb78..965b15aa5cd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMImplementation;
 
@@ -34,11 +33,9 @@
  * @test
  * @bug 8042244
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.DOMXPathTest
  * @run testng/othervm dom.DOMXPathTest
  * @summary Verifies that the experimental DOM L3 XPath implementation is no longer available.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DOMXPathTest {
     /*
        Verifies that DOMImplementation::hasFeature returns false and getFeature
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java
index e2254f66262..ff1c9f33b3c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -56,7 +55,6 @@
  * @run testng dom.DocumentTest
  * @summary Tests functionalities for Document.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DocumentTest {
     static final int DOC1 = 1;
     static final int DOC2 = 2;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java
index f72c9739c75..1d2bc5ab194 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ElementTraversal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMImplementation;
@@ -40,12 +39,10 @@
  * @test
  * @bug 8135283 8138721
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ElementTraversal
  * @run testng/othervm dom.ElementTraversal
  * @summary Tests for the Element Traversal interface.
  */
 
-@Listeners({jaxp.library.FilePolicy.class})
 public class ElementTraversal {
     /*
        Verifies that ElementTraversal is supported.
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
index 80e67d416f1..40539e7dfc3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,27 +22,22 @@
  */
 package dom;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8078139
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.JdkXmlDomTest
  * @run testng/othervm dom.JdkXmlDomTest
  * @summary Verifies that jdk.xml.dom classes are loaded by the ext class loader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class JdkXmlDomTest {
     @Test
     public void test() throws ClassNotFoundException {
-        ClassLoader cl = runWithAllPerm(() -> ClassLoader.getSystemClassLoader().getParent());
+        ClassLoader cl = ClassLoader.getSystemClassLoader().getParent();
         Class<?> cls = Class.forName("org.w3c.dom.xpath.XPathEvaluator", false, cl);
 
-        Assert.assertTrue(runWithAllPerm(() -> cls.getClassLoader()) != null);
+        Assert.assertTrue(cls.getClassLoader() != null);
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
index 24ec0476b8f..91be15b7dd1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -40,11 +39,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.TCKEncodingTest
  * @run testng/othervm dom.TCKEncodingTest
  * @summary Test Document.getInputEncoding().
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class TCKEncodingTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
index d360a27f042..6495a2bc87c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
@@ -53,11 +52,9 @@
  * @test
  * @bug 4973153
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.Bug4973153
  * @run testng/othervm dom.ls.Bug4973153
  * @summary Test LSSerialiser.setEncoding() raises 'unsupported-encoding' error if encoding is invalid.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4973153 {
 
     DOMImplementationLS implLS = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
index 2a362a9f4a5..fb45b67ba25 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementation;
@@ -47,12 +46,10 @@
  * @test
  * @bug 6290947
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.Bug6290947
  * @run testng/othervm dom.ls.Bug6290947
  * @summary Test LSSerializer writes the XML declaration when LSSerializerFilter is set that rejects all nodes and
  * LSSerializer's configuration set parameter "xml-declaration" to "true".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6290947 {
 
     private static String XML_STRING = "<?xml version=\"1.0\"?><ROOT><ELEMENT1><CHILD1/><CHILD1><COC1/></CHILD1></ELEMENT1><ELEMENT2>test1<CHILD2/></ELEMENT2></ROOT>";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
index 76c013f4d7c..5f494d2a524 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -44,11 +43,9 @@
  * @test
  * @bug 6354955
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.Bug6354955
  * @run testng/othervm dom.ls.Bug6354955
  * @summary Test LSSerializer can writeToString on DOM Text node with white space.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6354955 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
index 429949ad7f2..78b449b0d7c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementation;
@@ -47,11 +46,9 @@
  * @test
  * @bug 6376823
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.Bug6376823
  * @run testng/othervm dom.ls.Bug6376823
  * @summary Test LSSerializer works.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6376823 {
 
     private static String XML_STRING = "<?xml version=\"1.0\"?><ROOT><ELEMENT1><CHILD1/><CHILD1><COC1/></CHILD1></ELEMENT1><ELEMENT2>test1<CHILD2/></ELEMENT2></ROOT>";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
index c0eafb0f014..b01c410382f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -38,11 +37,9 @@
  * @test
  * @bug 6710741
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.Bug6710741Test
  * @run testng/othervm dom.ls.Bug6710741Test
  * @summary Test there should be stack trace information if LSSerializer().writeToString reports an exception.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6710741Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
index 825d3f56596..eb8564ce837 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMImplementation;
@@ -50,11 +49,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.LSParserTCKTest
  * @run testng/othervm dom.ls.LSParserTCKTest
  * @summary Test Specifications and Descriptions for LSParser.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class LSParserTCKTest {
 
     DOMImplementationLS implLS = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
index 4a999b5cb14..acf1b59d8d5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMError;
@@ -42,11 +41,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.LSParserTest
  * @run testng/othervm dom.ls.LSParserTest
  * @summary Test LSParser's DOMConfiguration for supported properties.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class LSParserTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
index 3cf602c82a4..1052120dc53 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
@@ -55,11 +54,9 @@
  * @test
  * @bug 8080906 8114834 8206132
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow dom.ls.LSSerializerTest
  * @run testng/othervm dom.ls.LSSerializerTest
  * @summary Test LSSerializer.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class LSSerializerTest {
 
     class DOMErrorHandlerImpl implements DOMErrorHandler {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java
index dda14b2b36c..7260a2d13da 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import org.testng.Assert;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.ls.DOMImplementationLS;
@@ -48,11 +47,9 @@
  * @test
  * @bug 8169450 8222415 8219692
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.BaseParsingTest
  * @run testng/othervm parsers.BaseParsingTest
  * @summary Tests that verify base parsing
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class BaseParsingTest {
     private static final String DOM_IMPL =
             "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
index 93d6782c358..fdc882181d6 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 4674384
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4674384_MAX_OCCURS_Test
  * @run testng/othervm parsers.Bug4674384_MAX_OCCURS_Test
  * @summary Test large maxOccurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4674384_MAX_OCCURS_Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java
index f885a244cc2..567ea86e96c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4934208.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -39,11 +38,9 @@
  * @test
  * @bug 4934208
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4934208
  * @run testng/othervm parsers.Bug4934208
  * @summary Test SAXParser can parse keyref constraint with a selector that is a union xpath expression selecting a node and its child.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4934208 {
     @Test
     public void test1() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java
index 79dd7d326ef..9538f1f18f5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4967002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -41,14 +40,12 @@
  * @test
  * @bug 4967002
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4967002
  * @run testng/othervm parsers.Bug4967002
  * @summary Test DocumentBuilderFactory.newDocumentBuilder() throws ParserConfigurationException
  * when it uses the "http://java.sun.com/xml/jaxp/properties/schemaSource" property
  * and/or the "http://java.sun.com/xml/jaxp/properties/schemaLanguage" property
  * in conjunction with setting a Schema object.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4967002 {
     String schemaSource = "<?xml version='1.0'?>\n" + "<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>\n" + "  <xsd:element name='test101'>\n"
             + "    <xsd:complexType>\n" + "      <xsd:attribute name='attr'/>\n" + "      <xsd:attribute name='attr2' default='DEF'/>\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java
index fb1c722be19..dfad62f77af 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4985486.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -35,11 +34,9 @@
  * @test
  * @bug 4985486
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4985486
  * @run testng/othervm parsers.Bug4985486
  * @summary Test SAXParser can parse large characters(more than 10000).
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4985486 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java
index 59ae3bb4f06..e16b7a08131 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991020.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4991020
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4991020
  * @run testng/othervm parsers.Bug4991020
  * @summary Test XPath like "node_name/." can be parsed.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4991020 {
 
     protected static SAXParser createParser() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java
index e9e658d5064..310a6277315 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug4991946.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4991946
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug4991946
  * @run testng/othervm parsers.Bug4991946
  * @summary Can parse the element type is anyType in the schema and is substituted by the simple type via the 'xsi:type' attribute in xml document.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4991946 {
 
     protected static SAXParser createParser() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java
index 872ba1b3e4f..e05fe6df7ec 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5010072.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -36,11 +35,9 @@
  * @test
  * @bug 5010072
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug5010072
  * @run testng/othervm parsers.Bug5010072
  * @summary Test SchemaFactory throws SAXException if xpath is "@".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug5010072 {
 
     protected static class ErrorHandler extends DefaultHandler {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java
index 340bd12d867..64bdd5fa689 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug5025825.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -42,12 +41,10 @@
  * @test
  * @bug 5025825
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug5025825
  * @run testng/othervm parsers.Bug5025825
  * @summary Test if SAXParserFactory set a Schema object, when SAXParser sets "http://java.sun.com/xml/jaxp/properties/schemaSource" property
  * and/or "http://java.sun.com/xml/jaxp/properties/schemaLanguage" property, it shall throw SAXException.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug5025825 {
 
     String schemaSource = "<?xml version='1.0'?>\n" + "<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>\n" + "  <xsd:element name='test101'>\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java
index 83a66f3ce06..6ad407f9555 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6309988.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXParseException;
@@ -45,12 +44,10 @@
  * @test
  * @bug 6309988
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6309988
  * @run testng/othervm parsers.Bug6309988
  * @summary Test elementAttributeLimit, maxOccurLimit, entityExpansionLimit.
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6309988 {
 
     DocumentBuilderFactory dbf = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java
index 3c0998b57a8..14bd6cf3fdf 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6341770.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,33 +23,25 @@
 
 package parsers;
 
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.nio.file.Paths;
-import java.util.PropertyPermission;
-
 import javax.xml.parsers.SAXParserFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 
 /*
  * @test
  * @bug 6341770
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6341770
  * @run testng/othervm parsers.Bug6341770
  * @summary Test external entity linked to non-ASCII base URL.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6341770 {
 
     // naming a file "aux" would fail on windows.
@@ -77,13 +69,12 @@ public void testNonAsciiURI() {
             w.flush();
             w.close();
             System.out.println("Parsing: " + main);
-            tryRunWithTmpPermission(
-                    () -> SAXParserFactory.newInstance().newSAXParser().parse(main, new DefaultHandler() {
-                        public void startElement(String uri, String localname, String qname, Attributes attr)
-                                throws SAXException {
-                            System.out.println("encountered <" + qname + ">");
-                        }
-                    }), new PropertyPermission("user.dir", "read"));
+            SAXParserFactory.newInstance().newSAXParser().parse(main, new DefaultHandler() {
+                public void startElement(String uri, String localname, String qname, Attributes attr)
+                        throws SAXException {
+                    System.out.println("encountered <" + qname + ">");
+                }
+            });
         } catch (Exception e) {
             e.printStackTrace();
             Assert.fail("Exception: " + e.getMessage());
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java
index 38fd631114b..30e1ffc94e5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6361283.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6361283
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6361283
  * @run testng/othervm parsers.Bug6361283
  * @summary Test SAXParser returns version as 1.1 for XML 1.1 document.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6361283 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
index fab882af2ee..287ca463ed1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.XMLReader;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 6506304
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6506304Test
  * @run testng/othervm parsers.Bug6506304Test
  * @summary Test MalformedURLException: unknown protocol won't be thrown when there is a space within the full path file name.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6506304Test {
     public static boolean isWindows = false;
     static {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java
index 459aa086e4d..eb619931314 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6518733.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6518733
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6518733
  * @run testng/othervm parsers.Bug6518733
  * @summary Test SAX parser handles several attributes that each contain a newline within the attribute value.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6518733 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java
index 930151d0f4d..326b0bd8252 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6564400.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -50,11 +49,9 @@
  * @test
  * @bug 6564400
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6564400
  * @run testng/othervm parsers.Bug6564400
  * @summary Test ignorable whitespace handling with schema validation.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6564400 {
     private boolean sawIgnorable = false;
     Schema schema = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java
index 41cc1c29a36..47ccf360c87 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6573786.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6573786
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6573786
  * @run testng/othervm parsers.Bug6573786
  * @summary Test parser error messages are formatted.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6573786 {
     String _cache = "";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java
index 2c9ba167249..f5d9f531d21 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6594813.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
@@ -43,11 +42,9 @@
  * @test
  * @bug 6594813
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6594813
  * @run testng/othervm parsers.Bug6594813
  * @summary Test SAXParser output is wellformed with name space.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6594813 {
 
     public Bug6594813(String name) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java
index c18f144a3f4..e29bef31baa 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6608841.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6608841
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6608841
  * @run testng/othervm parsers.Bug6608841
  * @summary Test SAX parses external parameter entity.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6608841 {
     public Bug6608841(String name) {
     }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java
index 6149805a0f6..c042dcdf676 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6690015.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -41,11 +40,9 @@
  * @test
  * @bug 6518733
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6690015
  * @run testng/othervm parsers.Bug6690015
  * @summary Test SAX parser handles several attributes with newlines.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6690015 {
 
     public Bug6690015() {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java
index b6d3de02d98..2c52983ec9f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6760982.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -43,11 +42,9 @@
  * @test
  * @bug 6518733
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6760982
  * @run testng/othervm parsers.Bug6760982
  * @summary Test SAX parser handles several attributes with containing "&gt;".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6760982 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
index 2e4f8d936e4..158136d00fc 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.ProcessingInstruction;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6849942
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug6849942Test
  * @run testng/othervm parsers.Bug6849942Test
  * @summary Test parsing an XML that starts with a processing instruction and no prolog.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6849942Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
index 28e9072b209..dd33d85b2b3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -45,11 +44,9 @@
  * @test
  * @bug 7157608
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug7157608Test
  * @run testng/othervm parsers.Bug7157608Test
  * @summary Test feature standard-uri-conformant works.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug7157608Test {
     public static boolean isWindows = false;
     static {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
index 9de25e9aa1f..8758a0b1b8d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -39,11 +38,9 @@
  * @test
  * @bug 7166896
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug7166896Test
  * @run testng/othervm parsers.Bug7166896Test
  * @summary Test DocumentBuilder.parse(String uri) supports IPv6 format.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug7166896Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java
index ddabbcd998d..263a42bf866 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8003147
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @compile -g Bug8003147TestClass.java
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug8003147Test
  * @run testng/othervm parsers.Bug8003147Test
  * @summary Test port fix for BCEL bug 39695.
  */
@@ -34,16 +33,11 @@
 package parsers;
 
 import static jaxp.library.JAXPTestUtilities.getSystemProperty;
-
 import java.io.FileOutputStream;
 import java.io.FilePermission;
-
 import jaxp.library.JAXPTestUtilities;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
-
 import com.sun.org.apache.bcel.internal.classfile.ClassParser;
 import com.sun.org.apache.bcel.internal.classfile.ConstantClass;
 import com.sun.org.apache.bcel.internal.classfile.ConstantPool;
@@ -55,7 +49,6 @@
 import com.sun.org.apache.bcel.internal.generic.InstructionFactory;
 import com.sun.org.apache.bcel.internal.generic.InstructionList;
 
-@Listeners({ jaxp.library.FilePolicy.class, jaxp.library.InternalAPIPolicy.class })
 public class Bug8003147Test {
 
     @Test
@@ -63,44 +56,42 @@ public void test() throws Exception {
         // Note: Because BCEL library is always behind java version, to make sure
         // JavaClass can parse the class file, create a separate
         // Bug8003147TestClass.java, which only uses basic features.
-        JAXPTestUtilities.tryRunWithTmpPermission(() -> {
-            String classfile = getSystemProperty("test.classes") + "/parsers/Bug8003147TestClass.class";
-            JavaClass jc = new ClassParser(classfile).parse();
+        String classfile = getSystemProperty("test.classes") + "/parsers/Bug8003147TestClass.class";
+        JavaClass jc = new ClassParser(classfile).parse();
 
-            // rename class
-            ConstantPool cp = jc.getConstantPool();
-            int cpIndex = ((ConstantClass) cp.getConstant(jc.getClassNameIndex())).getNameIndex();
-            cp.setConstant(cpIndex, new ConstantUtf8("parsers/Bug8003147TestClassPrime"));
-            ClassGen gen = new ClassGen(jc);
-            Method[] methods = jc.getMethods();
-            int index;
-            for (index = 0; index < methods.length; index++) {
-                if (methods[index].getName().equals("doSomething")) {
-                    break;
-                }
+        // rename class
+        ConstantPool cp = jc.getConstantPool();
+        int cpIndex = ((ConstantClass) cp.getConstant(jc.getClassNameIndex())).getNameIndex();
+        cp.setConstant(cpIndex, new ConstantUtf8("parsers/Bug8003147TestClassPrime"));
+        ClassGen gen = new ClassGen(jc);
+        Method[] methods = jc.getMethods();
+        int index;
+        for (index = 0; index < methods.length; index++) {
+            if (methods[index].getName().equals("doSomething")) {
+                break;
             }
-            Method m = methods[index];
-            MethodGen mg = new MethodGen(m, gen.getClassName(), gen.getConstantPool());
+        }
+        Method m = methods[index];
+        MethodGen mg = new MethodGen(m, gen.getClassName(), gen.getConstantPool());
 
-            // @bug 8064516, not currently used directly by JAXP, but we may need
-            // to modify preexisting methods in the future.
-            InstructionFactory f = new InstructionFactory(gen);
-            InstructionList il = mg.getInstructionList();
-            InstructionList newInst = new InstructionList();
-            newInst.append(f.createPrintln("Hello Sekai!"));
-            il.insert(newInst);
-            mg.setMaxStack();
+        // @bug 8064516, not currently used directly by JAXP, but we may need
+        // to modify preexisting methods in the future.
+        InstructionFactory f = new InstructionFactory(gen);
+        InstructionList il = mg.getInstructionList();
+        InstructionList newInst = new InstructionList();
+        newInst.append(f.createPrintln("Hello Sekai!"));
+        il.insert(newInst);
+        mg.setMaxStack();
 
-            gen.replaceMethod(m, mg.getMethod());
-            String path = classfile.replace("Bug8003147TestClass", "Bug8003147TestClassPrime");
-            gen.getJavaClass().dump(new FileOutputStream(path));
+        gen.replaceMethod(m, mg.getMethod());
+        String path = classfile.replace("Bug8003147TestClass", "Bug8003147TestClassPrime");
+        gen.getJavaClass().dump(new FileOutputStream(path));
 
-            try {
-                Class.forName("parsers.Bug8003147TestClassPrime");
-            } catch (ClassFormatError cfe) {
-                cfe.printStackTrace();
-                Assert.fail("modified version of class does not pass verification");
-            }
-        }, new FilePermission(getSystemProperty("test.classes") + "/-", "read,write"));
+        try {
+            Class.forName("parsers.Bug8003147TestClassPrime");
+        } catch (ClassFormatError cfe) {
+            cfe.printStackTrace();
+            Assert.fail("modified version of class does not pass verification");
+        }
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java
index 4349a8cbdcc..dc865b7fdd2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/Bug8073385.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,14 @@
 
 package parsers;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
 import static org.testng.Assert.assertTrue;
-
 import java.io.StringReader;
 import java.util.Locale;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -44,12 +39,10 @@
  * @test
  * @bug 8073385
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.Bug8073385
  * @run testng/othervm parsers.Bug8073385
  * @summary test that invalid XML character exception string contains
  *     information about character value, element and attribute names
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug8073385 {
 
     private Locale defLoc;
@@ -57,12 +50,12 @@ public class Bug8073385 {
     @BeforeClass
     public void setup() {
         defLoc = Locale.getDefault();
-        runWithAllPerm(() -> Locale.setDefault(Locale.ENGLISH));
+        Locale.setDefault(Locale.ENGLISH);
     }
 
     @AfterClass
     public void cleanup() {
-        runWithAllPerm(() -> Locale.setDefault(defLoc));
+        Locale.setDefault(defLoc);
     }
 
     @DataProvider(name = "illegalCharactersData")
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
index b6a2a394769..7494d3850ad 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,25 +23,18 @@
 
 package parsers;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.net.URL;
 import java.net.URLClassLoader;
-
 import javax.xml.parsers.SAXParserFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.FactoryFindTest
  * @run testng/othervm parsers.FactoryFindTest
  * @summary Test Classloader for SAXParserFactory.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class FactoryFindTest {
 
     boolean myClassLoaderUsed = false;
@@ -51,11 +44,11 @@ public void testFactoryFind() {
         SAXParserFactory factory = SAXParserFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+        Thread.currentThread().setContextClassLoader(null);
         factory = SAXParserFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader()));
+        Thread.currentThread().setContextClassLoader(new MyClassLoader());
         factory = SAXParserFactory.newInstance();
         if (System.getSecurityManager() == null)
             Assert.assertTrue(myClassLoaderUsed);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java
index 9a842561ab0..e65977126fe 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/HandleError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8157797
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.HandleError
  * @run testng/othervm parsers.HandleError
  * @summary Tests that the parser handles errors properly.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class HandleError {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
index dc554f259df..7be3fb053a5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
@@ -37,11 +36,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.ParseEmptyStream
  * @run testng/othervm parsers.ParseEmptyStream
  * @summary Test SAXParser doesn't accept empty stream.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class ParseEmptyStream {
 
     SAXParserFactory factory = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java
index 60f95005760..80de838435b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java
@@ -5,7 +5,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -14,7 +13,6 @@
  * @test
  * @bug 8072081
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.SupplementaryChars
  * @run testng/othervm parsers.SupplementaryChars
  * @summary verifies that supplementary characters are supported as character
  * data in xml 1.0, and also names in xml 1.1.
@@ -22,7 +20,6 @@
  * Joe Wang (huizhe.wang@oracle.com)
  */
 
-@Listeners({jaxp.library.BasePolicy.class})
 public class SupplementaryChars {
 
     @Test(dataProvider = "supported")
diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
index 421e4109cda..0b8b0ea823c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
@@ -46,12 +45,10 @@
  * @test
  * @bug 6794483 8080908
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow parsers.xinclude.Bug6794483Test
  * @run testng/othervm parsers.xinclude.Bug6794483Test
  * @summary Test JAXP parser can resolve the included content properly if the
  * included xml contains an empty tag that ends with "/>", refer to XERCESJ-1134.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6794483Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
index 22c7f5b048b..8de2d8b1b22 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,15 @@
 package sax;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ext.Attributes2Impl;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Attributes2ImplTest
  * @run testng/othervm sax.Attributes2ImplTest
  * @summary Test Attributes2Impl.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Attributes2ImplTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
index 3a82f58dca8..89f0ceebe61 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -40,11 +39,9 @@
  * @test
  * @bug 6889654
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Bug6889654Test
  * @run testng/othervm sax.Bug6889654Test
  * @summary Test SAXException includes whole information.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6889654Test {
 
     final String MSG = "Failed to parse XML";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
index f735b8c869f..d0a41dc0cf1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 import javax.xml.datatype.DatatypeConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -34,11 +33,9 @@
  * @test
  * @bug 6925410
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Bug6925410Test
  * @run testng/othervm sax.Bug6925410Test
  * @summary Test XMLReaderFactory can createXMLReader repeatedly.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6925410Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
index ba2c3656563..4aeb8ed603d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6949607
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Bug6949607Test
  * @run testng/othervm sax.Bug6949607Test
  * @summary Test Attributes.getValue returns null when parameter uri is empty.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6949607Test {
 
     final String MSG = "Failed to parse XML";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
index 49ea6ea06f3..58bdee54aca 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -44,11 +43,9 @@
  * @test
  * @bug 6992561
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Bug6992561Test
  * @run testng/othervm sax.Bug6992561Test
  * @summary Test encoding of SystemId in Locator.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6992561Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
index fac75946702..c2d377f7d7b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.getSystemProperty;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -37,14 +35,10 @@
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
-import java.util.PropertyPermission;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
@@ -57,11 +51,9 @@
  * @test
  * @bug 7057778
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.Bug7057778Test
  * @run testng/othervm sax.Bug7057778Test
  * @summary Test the file can be deleted after SAXParser.parse(File, DefaultHandler).
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug7057778Test {
 
     static final String xml = "Bug7057778.xml";
@@ -77,8 +69,7 @@ public void testParse() {
             SAXParser parser = spf.newSAXParser();
             XMLReader xmlReader = parser.getXMLReader();
             xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", new MyHandler1());
-            tryRunWithTmpPermission(() -> parser.parse(dst, new MyHandler1()),
-                    new PropertyPermission("user.dir", "read"));
+            parser.parse(dst, new MyHandler1());
         } catch (SAXException ex) {
             ex.printStackTrace();
         } catch (IOException ex) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
index 440999d8dbe..85e447783ca 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 
 import org.testng.Assert;
 import org.testng.AssertJUnit;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
@@ -45,11 +44,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.DefaultHandler2Test
  * @run testng/othervm sax.DefaultHandler2Test
  * @summary Test DefaultHandler2.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DefaultHandler2Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java b/test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
index 102ef7d0900..bbec3104208 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
@@ -43,11 +42,9 @@
  * @test
  * @bug 6809409
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.IssueTracker56Test
  * @run testng/othervm sax.IssueTracker56Test
  * @summary Test SAXException has Cause.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class IssueTracker56Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java
index 5d16af21b86..7630d96a023 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/NSSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 
 import org.testng.Assert;
 import org.testng.AssertJUnit;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.NamespaceSupport;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.NSSupportTest
  * @run testng/othervm sax.NSSupportTest
  * @summary Test NamespaceSupport.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NSSupportTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/SAXParserTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/SAXParserTest.java
index 319f17a9010..708ae2178b0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/SAXParserTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/SAXParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.nio.file.Path;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -43,7 +42,6 @@
  * @run testng sax.SAXParserTest
  * @summary Tests functionalities for SAXParser.
  */
-@Listeners({ jaxp.library.BasePolicy.class })
 public class SAXParserTest {
 
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java
index 19a2c4d9a6b..ff961e8e9e2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,10 @@
 
 package sax;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.io.StringReader;
-
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
@@ -42,12 +37,9 @@
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @run testng/othervm -Djdk.xml.resetSymbolTable=false sax.SymbolTableResetTest
  * @run testng/othervm -Djdk.xml.resetSymbolTable=true sax.SymbolTableResetTest
- * @run testng/othervm -Djdk.xml.resetSymbolTable=false -DrunSecMngr=true -Djava.security.manager=allow sax.SymbolTableResetTest
- * @run testng/othervm -Djdk.xml.resetSymbolTable=true -DrunSecMngr=true -Djava.security.manager=allow sax.SymbolTableResetTest
  * @summary Test that SAXParser reallocates symbol table during
  *          subsequent parse operations
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SymbolTableResetTest {
 
     /*
@@ -91,14 +83,14 @@ private void parseAndCheckReset(boolean setFeature, boolean value) throws Except
         // Expected result based on system property and feature
         boolean resetExpected = setFeature && value;
         // Indicates if system property is set
-        boolean spSet = runWithAllPerm(() -> System.getProperty(RESET_FEATURE)) != null;
+        boolean spSet = System.getProperty(RESET_FEATURE) != null;
         // Dummy xml input for parser
         String input = "<dummy>Test</dummy>";
 
         // Check if system property is set only when feature setting is not requested
         // and estimate if reset of symbol table is expected
         if (!setFeature && spSet) {
-            resetExpected = runWithAllPerm(() -> Boolean.getBoolean(RESET_FEATURE));
+            resetExpected = Boolean.getBoolean(RESET_FEATURE);
         }
 
         // Create SAXParser and set feature if it is requested
diff --git a/test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java
index a7e508d69ef..ae235f32549 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/sax/XMLReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.testng.annotations.AfterClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -41,11 +40,9 @@
  * @test
  * @bug 8158246 8316383
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow sax.XMLReaderTest
  * @run testng/othervm sax.XMLReaderTest
  * @summary This class contains tests that cover the creation of XMLReader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLReaderTest {
     private final String SAX_PROPNAME = "org.xml.sax.driver";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
index b949340123e..d4773e8ddd1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.AttributeLocalNameTest.AttributeLocalNameTest
  * @run testng/othervm stream.AttributeLocalNameTest.AttributeLocalNameTest
  * @summary Test XMLStreamReader.getAttributeLocalName().
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class AttributeLocalNameTest {
 
     static final String XML = "<?xml version=\"1.0\"?>" + "<S:Envelope foo=\"bar\" xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"></S:Envelope>";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java
index 83413811fba..5b5e0f1b82f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6370703.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6370703
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6370703
  * @run testng/othervm stream.Bug6370703
  * @summary Test StAX parser can parse attribute default value when START_ELEMENT.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6370703 {
 
     private static String INPUT_FILE = "sgml.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java
index 250721a4744..50d96ff5fa7 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6378422.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 import javax.xml.stream.XMLInputFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6378422
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6378422
  * @run testng/othervm stream.Bug6378422
  * @summary Test setting reuse-instance property on StAX factory.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6378422 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java
index 74223c6826c..4aac76e4044 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6380870.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6380870
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6380870
  * @run testng/othervm stream.Bug6380870
  * @summary Test StAX parser can parse VoiceXML DTD.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6380870 {
 
     private static String INPUT_FILE = "basic-form.vxml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java
index debb318d470..5386160af79 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6489502
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6489502
  * @run testng/othervm stream.Bug6489502
  * @summary Test XMLInputFactory works correctly in case it repeats to create reader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6489502 {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java
index 1f347385057..e524685bbc4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6509774
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6509774
  * @run testng/othervm stream.Bug6509774
  * @summary Test Property javax.xml.stream.supportDTD, DTD events are now returned even if supportDTD=false.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6509774 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
index 4dfe360ac13..c56232781b1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,15 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6688002
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6688002Test
  * @run testng/othervm stream.Bug6688002Test
  * @summary Test single instance of XMLOutputFactory/XMLInputFactory create multiple Writer/Readers in parallel.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6688002Test {
 
     private static final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
index bef1b02e238..4327738ff92 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6976938
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.Bug6976938Test
  * @run testng/othervm stream.Bug6976938Test
  * @summary Test StAX parser won't throw StackOverflowError while reading valid XML file, in case the text content of an XML element contains many lines like "&lt; ... &gt;".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6976938Test {
 
     private static final String INPUT_FILE = "Bug6976938.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
index c6c4af176c7..ccddb6548e4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.CoalesceTest.CoalesceTest
  * @run testng/othervm stream.CoalesceTest.CoalesceTest
  * @summary Test Coalesce property works.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CoalesceTest {
 
     String countryElementContent = "START India  CS}}}}}} India END";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
index 806be8572db..5c8d774382a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,17 +37,14 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EntitiesTest.EntityTest
  * @run testng/othervm stream.EntitiesTest.EntityTest
  * @summary Test StAX parses entity.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class EntityTest {
 
     XMLInputFactory factory = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
index 51da18e69c5..13bd8a52100 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package stream;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
@@ -42,11 +41,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EventReaderDelegateTest
  * @run testng/othervm stream.EventReaderDelegateTest
  * @summary Test EventReaderDelegate.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class EventReaderDelegateTest {
 
     public EventReaderDelegateTest(String name) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
index d69808989e3..9260f1a491f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,18 +48,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6631268
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EventsTest.Issue41Test
  * @run testng/othervm stream.EventsTest.Issue41Test
  * @summary Test XMLEvent.writeAsEncodedUnicode can output the event content.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Issue41Test {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
index 870b3297be8..9308f5499f0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,18 +37,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6620632
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EventsTest.Issue48Test
  * @run testng/othervm stream.EventsTest.Issue48Test
  * @summary Test XMLEventReader can parse notation and entity information from DTD Event.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Issue48Test {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
index 260a8c47316..0ffbb787d77 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,14 @@
 import javax.xml.stream.events.StartDocument;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EventsTest.Issue53Test
  * @run testng/othervm stream.EventsTest.Issue53Test
  * @summary Test encodingSet/standaloneSet returns correct result in case encoding/standalone is set when constructing StartDocument.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Issue53Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
index 61bba35daeb..7a4bafad3e1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.EventsTest.Issue58Test
  * @run testng/othervm stream.EventsTest.Issue58Test
  * @summary Test XMLEvent.getLocation() returns a non-volatile Location.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Issue58Test {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
index 6650315ef16..59a5dd4ff63 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
 package stream;
 
 import static jaxp.library.JAXPTestUtilities.getSystemProperty;
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -34,22 +32,17 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Properties;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.FactoryFindTest
  * @run testng/othervm stream.FactoryFindTest
  * @summary Test SaTX factory using factory property and using ContextClassLoader.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class FactoryFindTest {
 
     boolean myClassLoaderUsed = false;
@@ -109,11 +102,11 @@ public void testFactoryFind() {
             XMLInputFactory factory = XMLInputFactory.newInstance();
             Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-            runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+            Thread.currentThread().setContextClassLoader(null);
             factory = XMLInputFactory.newInstance();
             Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-            runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader()));
+            Thread.currentThread().setContextClassLoader(new MyClassLoader());
             factory = XMLInputFactory.newInstance();
             // because it's decided by having sm or not in FactoryFind code
             if (System.getSecurityManager() == null)
@@ -124,11 +117,11 @@ public void testFactoryFind() {
             XMLOutputFactory ofactory = XMLOutputFactory.newInstance();
             Assert.assertTrue(ofactory.getClass().getClassLoader() == null);
 
-            runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+            Thread.currentThread().setContextClassLoader(null);
             ofactory = XMLOutputFactory.newInstance();
             Assert.assertTrue(ofactory.getClass().getClassLoader() == null);
 
-            runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader()));
+            Thread.currentThread().setContextClassLoader(new MyClassLoader());
             ofactory = XMLOutputFactory.newInstance();
             if (System.getSecurityManager() == null)
                 Assert.assertTrue(myClassLoaderUsed);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
index fd9034eeb44..23875941137 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.IgnoreExternalDTDTest
  * @run testng/othervm stream.IgnoreExternalDTDTest
  * @summary Test feature ignore-external-dtd.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class IgnoreExternalDTDTest {
 
     final static String FACTORY_KEY = "javax.xml.stream.XMLInputFactory";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
index ed79ce0cf60..115b167dc7c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.ProcessingInstructionTest.ProcessingInstructionTest
  * @run testng/othervm stream.ProcessingInstructionTest.ProcessingInstructionTest
  * @summary Test XMLStreamReader parses Processing Instruction.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class ProcessingInstructionTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
index 03a8863a180..b94842ad666 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,17 +38,14 @@
 import javax.xml.stream.util.StreamReaderDelegate;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.StreamReaderDelegateTest
  * @run testng/othervm stream.StreamReaderDelegateTest
  * @summary Test StreamReaderDelegate.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class StreamReaderDelegateTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
index aeaed26dafe..bd057a5bb7d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventLocationTest
  * @run testng/othervm stream.XMLEventLocationTest
  * @summary Test XMLEvent Location.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLEventLocationTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
index 687db31a91d..10032cdf89a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6489890
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6489890
  * @run testng/othervm stream.XMLEventReaderTest.Bug6489890
  * @summary Test XMLEventReader's initial state is an undefined state, and nextEvent() is START_DOCUMENT.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6489890 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
index 8d193d18188..96707482cf9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,29 +22,21 @@
  */
 package stream.XMLEventReaderTest;
 
-import java.io.FilePermission;
 import java.io.StringReader;
-
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.events.EntityReference;
 import javax.xml.stream.events.XMLEvent;
-
-import jaxp.library.JAXPTestUtilities;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6555001
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6555001
  * @run testng/othervm stream.XMLEventReaderTest.Bug6555001
  * @summary Test StAX parser replaces the entity reference as setting.
  */
-@Listeners({ jaxp.library.BasePolicy.class })
 public class Bug6555001 {
     private static final String XML = ""
             + "<!DOCTYPE doc SYSTEM 'file:///tmp/this/does/not/exist/but/that/is/ok' ["
@@ -52,67 +44,63 @@ public class Bug6555001 {
 
     @Test
     public void testReplacing() throws Exception {
-        JAXPTestUtilities.tryRunWithTmpPermission(() -> {
-            XMLInputFactory factory = XMLInputFactory.newInstance();
-            factory.setProperty("javax.xml.stream.isReplacingEntityReferences", true);
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        factory.setProperty("javax.xml.stream.isReplacingEntityReferences", true);
 
-            StringReader sr = new StringReader(XML);
-            XMLEventReader reader = factory.createXMLEventReader(sr);
+        StringReader sr = new StringReader(XML);
+        XMLEventReader reader = factory.createXMLEventReader(sr);
 
-            boolean sawUndef = false;
-            boolean sawDef = false;
+        boolean sawUndef = false;
+        boolean sawDef = false;
 
-            while (reader.hasNext()) {
-                XMLEvent event = reader.nextEvent();
-                // System.out.println("Event: " + event);
-                if (event.isEntityReference()) {
-                    EntityReference ref = (EntityReference) event;
-                    if ("def".equals(ref.getName())) {
-                        sawDef = true;
-                    } else if ("undef".equals(ref.getName())) {
-                        sawUndef = true;
-                    } else {
-                        throw new IllegalArgumentException("Unexpected entity name");
-                    }
+        while (reader.hasNext()) {
+            XMLEvent event = reader.nextEvent();
+            // System.out.println("Event: " + event);
+            if (event.isEntityReference()) {
+                EntityReference ref = (EntityReference) event;
+                if ("def".equals(ref.getName())) {
+                    sawDef = true;
+                } else if ("undef".equals(ref.getName())) {
+                    sawUndef = true;
+                } else {
+                    throw new IllegalArgumentException("Unexpected entity name");
                 }
             }
+        }
 
-            Assert.assertEquals(false, sawDef);
-            Assert.assertEquals(true, sawUndef);
-            reader.close();
-        }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read"));
+        Assert.assertEquals(false, sawDef);
+        Assert.assertEquals(true, sawUndef);
+        reader.close();
     }
 
     @Test
     public void testNotReplacing() throws Exception {
-        JAXPTestUtilities.tryRunWithTmpPermission(() -> {
-            XMLInputFactory factory = XMLInputFactory.newInstance();
-            factory.setProperty("javax.xml.stream.isReplacingEntityReferences", false);
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        factory.setProperty("javax.xml.stream.isReplacingEntityReferences", false);
 
-            StringReader sr = new StringReader(XML);
-            XMLEventReader reader = factory.createXMLEventReader(sr);
+        StringReader sr = new StringReader(XML);
+        XMLEventReader reader = factory.createXMLEventReader(sr);
 
-            boolean sawUndef = false;
-            boolean sawDef = false;
+        boolean sawUndef = false;
+        boolean sawDef = false;
 
-            while (reader.hasNext()) {
-                XMLEvent event = reader.nextEvent();
-                // System.out.println("Event: " + event);
-                if (event.isEntityReference()) {
-                    EntityReference ref = (EntityReference) event;
-                    if ("def".equals(ref.getName())) {
-                        sawDef = true;
-                    } else if ("undef".equals(ref.getName())) {
-                        sawUndef = true;
-                    } else {
-                        throw new IllegalArgumentException("Unexpected entity name");
-                    }
+        while (reader.hasNext()) {
+            XMLEvent event = reader.nextEvent();
+            // System.out.println("Event: " + event);
+            if (event.isEntityReference()) {
+                EntityReference ref = (EntityReference) event;
+                if ("def".equals(ref.getName())) {
+                    sawDef = true;
+                } else if ("undef".equals(ref.getName())) {
+                    sawUndef = true;
+                } else {
+                    throw new IllegalArgumentException("Unexpected entity name");
                 }
             }
+        }
 
-            Assert.assertEquals(true, sawDef);
-            Assert.assertEquals(true, sawUndef);
-            reader.close();
-        }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read"));
+        Assert.assertEquals(true, sawDef);
+        Assert.assertEquals(true, sawUndef);
+        reader.close();
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
index 2da4cd7e88f..bea6ad7ff44 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package stream.XMLEventReaderTest;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import java.io.ByteArrayInputStream;
@@ -37,11 +36,9 @@
  * @test
  * @bug 6586466
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6586466Test
  * @run testng/othervm stream.XMLEventReaderTest.Bug6586466Test
  * @summary Test XMLEventReader.nextTag() shall update internal event state.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6586466Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
index ddc9e44f1f8..3a6be371d99 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package stream.XMLEventReaderTest;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import javax.xml.namespace.QName;
@@ -37,11 +36,9 @@
  * @test
  * @bug 6613059
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6613059Test
  * @run testng/othervm stream.XMLEventReaderTest.Bug6613059Test
  * @summary Test XMLEventReader.nextTag() shall update internal event state, same as 6586466.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6613059Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
index 1a52f698290..c9692f5bcff 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.stream.XMLOutputFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6668115
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6668115Test
  * @run testng/othervm stream.XMLEventReaderTest.Bug6668115Test
  * @summary Test XMLEventReader.getElementText() shall update last event even if no peek.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6668115Test {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
index 2f8c8871b8e..d71ad595088 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6846133
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug6846133Test
  * @run testng/othervm stream.XMLEventReaderTest.Bug6846133Test
  * @summary Test method getDocumentTypeDeclaration() of DTD Event returns a valid value.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6846133Test {
     private static final String xml = "<!DOCTYPE html PUBLIC \"-//W3C//DTDXHTML 1.0 Transitional//EN\" "
             + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">" + "<html><body><p>I am some simple html</p></body> </html>";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java
index b81d14e2477..b6f221162a1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 import com.sun.org.apache.xerces.internal.impl.XMLEntityManager;
@@ -40,12 +39,10 @@
  * @test
  * @bug 8153781
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Bug8153781
  * @run testng/othervm stream.XMLEventReaderTest.Bug8153781
  * @summary Test if method skipDTD of class XMLDTDScannerImpl will correctly skip the DTD section,
  *          even if a call to XMLEntityScanner.scanData for skipping to the closing ']' returns true.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug8153781 {
     public static int DOCTYPE_SECTION_LENGTH = XMLEntityManager.DEFAULT_BUFFER_SIZE * 2;
     public static int DOCUMENT_LENGTH = DOCTYPE_SECTION_LENGTH + 4096;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/EventReaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/EventReaderTest.java
index af1ac977085..5ceb3b96c88 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/EventReaderTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/EventReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,11 @@
 import java.io.StringReader;
 import java.util.NoSuchElementException;
 import javax.xml.stream.XMLEventReader;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.StartDocument;
-
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
-
 import static org.testng.Assert.assertEquals;
 
 /*
@@ -44,7 +40,6 @@
  * @run testng stream.XMLEventReaderTest.EventReaderTest
  * @summary Tests XMLEventReader
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class EventReaderTest {
     @Test(expectedExceptions = NoSuchElementException.class)
     public void testNextEvent() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
index 95f664dfee0..81c79999368 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.Issue40Test
  * @run testng/othervm stream.XMLEventReaderTest.Issue40Test
  * @summary Test XMLEventReader.getElementText() works after calling peek().
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Issue40Test {
 
     public java.io.File input;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8201138.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8201138.java
index 0ed6b58895c..189f712eac0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8201138.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8201138.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,15 @@
 import javax.xml.stream.events.StartElement;
 
 import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8201138
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.JDK8201138
  * @run testng/othervm stream.XMLEventReaderTest.JDK8201138
  * @summary Verifies a fix that set the type and data properly in the loop
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class JDK8201138 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8209615.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8209615.java
index 281f385c732..f6ac5c3c9c9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8209615.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/JDK8209615.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package stream.XMLEventReaderTest;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import javax.xml.stream.*;
 import java.io.ByteArrayInputStream;
@@ -35,11 +34,9 @@
  * @test
  * @bug 8209615
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventReaderTest.JDK8209615
  * @run testng/othervm stream.XMLEventReaderTest.JDK8209615
  * @summary Verifies that the parser continues parsing the character data
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class JDK8209615 {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
index 59a2bd313ab..0a94a0c5138 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,17 +42,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventWriterTest.ReaderToWriterTest
  * @run testng/othervm stream.XMLEventWriterTest.ReaderToWriterTest
  * @summary Test XMLEventWriter.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ReaderToWriterTest {
 
     private static final XMLEventFactory XML_EVENT_FACTORY = XMLEventFactory.newInstance();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
index afc23e959a4..98e170e7a56 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,17 +36,14 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLEventWriterTest.XMLEventWriterTest
  * @run testng/othervm stream.XMLEventWriterTest.XMLEventWriterTest
  * @summary Test XMLEventWriter.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLEventWriterTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
index 90187dd0cd6..a4ef6015236 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,10 @@
 
 package stream.XMLInputFactoryTest;
 
-import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
-import static jaxp.library.JAXPTestUtilities.setSystemProperty;
-
 import java.util.PropertyPermission;
-
 import javax.xml.stream.XMLInputFactory;
-
+import static jaxp.library.JAXPTestUtilities.setSystemProperty;
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
@@ -39,11 +34,9 @@
  * @bug 6756677
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @compile MyInputFactory.java
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLInputFactoryTest.Bug6756677Test
  * @run testng/othervm stream.XMLInputFactoryTest.Bug6756677Test
  * @summary Test XMLInputFactory.newFactory(String factoryId, ClassLoader classLoader).
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6756677Test {
 
     @Test
@@ -51,8 +44,7 @@ public void testNewInstance() {
         String myFactory = "stream.XMLInputFactoryTest.MyInputFactory";
         try {
             setSystemProperty("MyInputFactory", myFactory);
-            XMLInputFactory xif = runWithTmpPermission(() -> XMLInputFactory.newInstance("MyInputFactory", null),
-                    new PropertyPermission("MyInputFactory", "read"));
+            XMLInputFactory xif = XMLInputFactory.newInstance("MyInputFactory", null);
             System.out.println(xif.getClass().getName());
             Assert.assertTrue(xif.getClass().getName().equals(myFactory));
 
@@ -68,8 +60,7 @@ public void testNewFactory() {
         ClassLoader cl = null;
         try {
             setSystemProperty("MyInputFactory", myFactory);
-            XMLInputFactory xif = runWithTmpPermission(() -> XMLInputFactory.newFactory("MyInputFactory", cl),
-                    new PropertyPermission("MyInputFactory", "read"));
+            XMLInputFactory xif = XMLInputFactory.newFactory("MyInputFactory", cl);
             System.out.println(xif.getClass().getName());
             Assert.assertTrue(xif.getClass().getName().equals(myFactory));
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
index 707518e0112..e03bc4e26a0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6909759
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLInputFactoryTest.Bug6909759Test
  * @run testng/othervm stream.XMLInputFactoryTest.Bug6909759Test
  * @summary Test createXMLStreamReader with StreamSource.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6909759Test {
 
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
index ab932b857dc..086e72074b3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,14 @@
 import javax.xml.transform.sax.SAXSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLInputFactoryTest.IssueTracker38
  * @run testng/othervm stream.XMLInputFactoryTest.IssueTracker38
  * @summary Test createXMLEventReader from DOM or SAX source is unsupported.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class IssueTracker38 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
index 1129e4d522e..a10d43c9b7c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.transform.sax.SAXResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 6846132
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLOutputFactoryTest.Bug6846132Test
  * @run testng/othervm stream.XMLOutputFactoryTest.Bug6846132Test
  * @summary Test createXMLStreamWriter with SAXResult won't throw a NullPointerException.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6846132Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
index d202dadecab..0b53da86f0e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,14 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLOutputFactoryTest.DuplicateNSDeclarationTest
  * @run testng/othervm stream.XMLOutputFactoryTest.DuplicateNSDeclarationTest
  * @summary Test the writing of duplicate namespace declarations when IS_REPAIRING_NAMESPACES is ture.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DuplicateNSDeclarationTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
index 2ba4177d0a3..a0bf13670f1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,17 +35,14 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLOutputFactoryTest.StreamResultTest
  * @run testng/othervm stream.XMLOutputFactoryTest.StreamResultTest
  * @summary Test create XMLWriter with variant Result.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class StreamResultTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
index e0e84869a2f..e59c56bfc92 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLResolverTest.XMLResolverTest
  * @run testng/othervm stream.XMLResolverTest.XMLResolverTest
  * @summary Test XMLResolver.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XMLResolverTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionCauseTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionCauseTest.java
index e32527621f8..bcd5a0936d4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionCauseTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionCauseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamExceptionTest.ExceptionCauseTest
  * @run testng/othervm stream.XMLStreamExceptionTest.ExceptionCauseTest
  * @summary Test XMLStreamException constructor initializes chained exception
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class ExceptionCauseTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
index 445fd457629..0fd7c30bbae 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,14 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamExceptionTest.ExceptionTest
  * @run testng/othervm stream.XMLStreamExceptionTest.ExceptionTest
  * @summary Test XMLStreamException contains the message of the wrapped exception.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class ExceptionTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
index a73129a4ee7..d455cf629fb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6481615
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamFilterTest.Bug6481615
  * @run testng/othervm stream.XMLStreamFilterTest.Bug6481615
  * @summary Test Filtered XMLStreamReader can return the event type if current state is START_ELEMENT.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6481615 {
 
     static final String XML = "<?xml version=\"1.0\"?>" + "<S:Envelope foo=\"bar\" xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"></S:Envelope>";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
index 7a83b01a0d9..ed5adfc7c00 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6481678
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamFilterTest.Bug6481678
  * @run testng/othervm stream.XMLStreamFilterTest.Bug6481678
  * @summary Test Filtered XMLStreamReader parses namespace correctly.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6481678 {
 
     String rootElement = "fruits";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
index 918e4ff77a9..810b1483066 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamFilterTest.HasNextTest
  * @run testng/othervm stream.XMLStreamFilterTest.HasNextTest
  * @summary Test Filtered XMLStreamReader hasNext() always return the correct value if repeat to call it.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class HasNextTest {
 
     private static String INPUT_FILE = "HasNextTest.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
index 9981b8cdc8d..154099c2a2c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6218794
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.BOMTest
  * @run testng/othervm stream.XMLStreamReaderTest.BOMTest
  * @summary Test XMLStreamReader parses BOM UTF-8 and BOM UTF-16 big endian stream.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class BOMTest {
     // UTF-8 BOM test file
     private static final String INPUT_FILE1 = "UTF8-BOM.xml.data";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
index 782cef14452..a5833a25660 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -43,11 +42,9 @@
  * @test
  * @bug 6388460
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Bug6388460
  * @run testng/othervm stream.XMLStreamReaderTest.Bug6388460
  * @summary Test StAX parser can parse UTF-16 wsdl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6388460 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
index b67b39cd096..57089903293 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6472982
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Bug6472982Test
  * @run testng/othervm stream.XMLStreamReaderTest.Bug6472982Test
  * @summary Test XMLStreamReader.getNamespaceContext().getPrefix("") won't throw IllegalArgumentException.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6472982Test {
     String namespaceURI = "foobar.com";
     String rootElement = "foo";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
index 8b13cba975a..0d809c4ca0d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6767322
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Bug6767322Test
  * @run testng/othervm stream.XMLStreamReaderTest.Bug6767322Test
  * @summary Test XMLStreamReader.getVersion() returns null if a version isn't declared.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6767322Test {
     private static final String INPUT_FILE = "Bug6767322.xml";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
index bfec69af143..b48a3c3ce08 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package stream.XMLStreamReaderTest;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import java.io.StringReader;
@@ -35,11 +34,9 @@
  * @test
  * @bug 6847819
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Bug6847819Test
  * @run testng/othervm stream.XMLStreamReaderTest.Bug6847819Test
  * @summary Test StAX parser shall throw XMLStreamException for illegal xml declaration.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6847819Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
index 073d782a8b3..4580310403d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8069098
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.BugTest
  * @run testng/othervm stream.XMLStreamReaderTest.BugTest
  * @summary Test StAX parser can parse xml without declaration.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class BugTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
index 3dbd217976d..15855dc1191 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,14 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.DefaultAttributeTest
  * @run testng/othervm stream.XMLStreamReaderTest.DefaultAttributeTest
  * @summary Test StAX parses namespace and attribute.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DefaultAttributeTest {
 
     private static final String INPUT_FILE = "ExternalDTD.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
index 0ba48680086..b3959817bff 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.DoubleXmlnsTest
  * @run testng/othervm stream.XMLStreamReaderTest.DoubleXmlnsTest
  * @summary Test double namespaces and nested namespaces.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class DoubleXmlnsTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
index 9f1ce91e55d..a736db1f0bd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6440324
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.IsValidatingTest
  * @run testng/othervm stream.XMLStreamReaderTest.IsValidatingTest
  * @summary Test StAX can accept non-existent DTD if IS_VALIDATING if false.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class IsValidatingTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
index 497c5b13162..5885150e712 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6631262
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Issue44Test
  * @run testng/othervm stream.XMLStreamReaderTest.Issue44Test
  * @summary Test XMLStreamReader.getName() shall throw IllegalStateException if current event is not start/end element.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Issue44Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
index c74569dd49c..8b12a3f4943 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 
 import org.testng.Assert;
 import org.testng.AssertJUnit;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6631265
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Issue47Test
  * @run testng/othervm stream.XMLStreamReaderTest.Issue47Test
  * @summary Test XMLStreamReader.standaloneSet() presents if input document has a value for "standalone" attribute in xml declaration.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Issue47Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
index 9faa9028a68..080e3c584f4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.IssueTracker24
  * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker24
  * @summary Test no prefix is represented by "", not null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class IssueTracker24 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
index 197ffbd9cf7..72d92716fd8 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.IssueTracker35
  * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker35
  * @summary Test StAX parse xsd document including external DTD.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class IssueTracker35 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
index 277eed57037..4cbd2777bad 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.IssueTracker70
  * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker70
  * @summary Test it can retrieve attribute with null or empty name space.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class IssueTracker70 {
 
     static private final File testFile = new File(IssueTracker70.class.getResource("IssueTracker70.xml").getFile());
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
index 5898049acbb..a48ee90ad1d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Jsr173MR1Req5Test
  * @run testng/othervm stream.XMLStreamReaderTest.Jsr173MR1Req5Test
  * @summary Test XMLStreamReader parses namespace declaration within element when NamespaceAware turns off and on.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Jsr173MR1Req5Test {
 
     private static final String INPUT_FILE1 = "Jsr173MR1Req5.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
index 6d2755480c0..eef8b78a15d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.Jsr173MR1Req8Test
  * @run testng/othervm stream.XMLStreamReaderTest.Jsr173MR1Req8Test
  * @summary Test XMLStreamReader parses attribute with namespace aware.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Jsr173MR1Req8Test {
 
     private static final String INPUT_FILE1 = "Jsr173MR1Req8.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
index a90e465b922..6b3f05324d9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.NamespaceTest
  * @run testng/othervm stream.XMLStreamReaderTest.NamespaceTest
  * @summary Test StAX parser processes namespace.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NamespaceTest {
 
     String namespaceURI = "foobar.com";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
index 3d83e2342f6..e6a5847de95 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8167340 8204329
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.StreamReaderTest
  * @run testng/othervm stream.XMLStreamReaderTest.StreamReaderTest
  * @summary Verifies patches for StreamReader bugs
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class StreamReaderTest {
     @Test(expectedExceptions = NoSuchElementException.class)
     public void testNext() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
index 0fa1183302b..dbb210f2d1e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,13 +38,11 @@
 import javax.xml.stream.events.XMLEvent;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.SupportDTDTest
  * @run testng/othervm stream.XMLStreamReaderTest.SupportDTDTest
  * @summary Test SUPPORT_DTD and IS_REPLACING_ENTITY_REFERENCES.
  */
@@ -77,7 +75,6 @@
 *       The current jaxp implementation actually throws a nullpointexception. A better error message could be used.
 *
 */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SupportDTDTest {
     final boolean DEBUG = false;
     final String _file = "ExternalDTD.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
index 6e771ad4ceb..95f48407387 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,14 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.VoiceXMLDTDTest
  * @run testng/othervm stream.XMLStreamReaderTest.VoiceXMLDTDTest
  * @summary Test parsing Voice XML DTD.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class VoiceXMLDTDTest {
 
     private static final String INPUT_FILE1 = "voicexml.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
index be495f03af7..e5fc573abf4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,14 @@
 import javax.xml.stream.XMLInputFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamReaderTest.XML11Test
  * @run testng/othervm stream.XMLStreamReaderTest.XML11Test
  * @summary Test parsing xml 1.1.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class XML11Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
index 971a89535a2..5a47a849185 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -42,11 +41,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.AttributeEscapeTest
  * @run testng/othervm stream.XMLStreamWriterTest.AttributeEscapeTest
  * @summary Test XMLStreamWriter shall escape the illegal characters.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class AttributeEscapeTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
index 82205353cab..55a05247137 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6452107
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.Bug6452107
  * @run testng/othervm stream.XMLStreamWriterTest.Bug6452107
  * @summary Test StAX can write ISO-8859-1 encoding XML.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6452107 {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
index 11e0c2d1319..4e809a2ce9b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6600882
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.Bug6600882Test
  * @run testng/othervm stream.XMLStreamWriterTest.Bug6600882Test
  * @summary Test toString(), hashCode() of XMLStreamWriter .
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6600882Test {
 
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
index b89cda5758c..7ae492e0445 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 import util.BaseStAXUT;
@@ -39,11 +38,9 @@
  * @test
  * @bug 6675332
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.Bug6675332Test
  * @run testng/othervm stream.XMLStreamWriterTest.Bug6675332Test
  * @summary Test XMLStreamWriter writeAttribute when IS_REPAIRING_NAMESPACES is true.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6675332Test extends BaseStAXUT {
 
     private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
index 2d683464430..018f2dc077e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 7037352
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.Bug7037352Test
  * @run testng/othervm stream.XMLStreamWriterTest.Bug7037352Test
  * @summary Test XMLStreamWriter.getNamespaceContext().getPrefix with XML_NS_URI and XMLNS_ATTRIBUTE_NS_URI.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug7037352Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
index c33092534e0..589067d473b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -50,11 +49,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.DomUtilTest
  * @run testng/othervm stream.XMLStreamWriterTest.DomUtilTest
  * @summary Test XMLStreamWriter writes a soap message.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DomUtilTest {
 
     private XMLOutputFactory staxOut;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
index bb91e14c720..195de9ac12f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.EmptyElementTest
  * @run testng/othervm stream.XMLStreamWriterTest.EmptyElementTest
  * @summary Test XMLStreamWriter writes namespace and attribute after writeEmptyElement.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class EmptyElementTest {
 
     // expected output
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
index ad1e9e2c4be..48b4012a3eb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.EncodingTest
  * @run testng/othervm stream.XMLStreamWriterTest.EncodingTest
  * @summary Test XMLStreamWriter writes a document with encoding setting.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class EncodingTest {
 
     private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
index ae268155e0c..5cffbf7a249 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,14 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.NamespaceTest
  * @run testng/othervm stream.XMLStreamWriterTest.NamespaceTest
  * @summary Test the writing of Namespaces.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NamespaceTest {
 
     /** debug output? */
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
index 1170fb0ffb9..9290e63de9c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6391922
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.NullUriDetectionTest
  * @run testng/othervm stream.XMLStreamWriterTest.NullUriDetectionTest
  * @summary Test XMLStreamWriter can writeDefaultNamespace(null).
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class NullUriDetectionTest {
     @Test
     public void test1() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
index f6234bc4412..7850e89a8be 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.SqeLinuxTest
  * @run testng/othervm stream.XMLStreamWriterTest.SqeLinuxTest
  * @summary Test XMLStreamWriter can output multiple declarations if IS_REPAIRING_NAMESPACES is false.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class SqeLinuxTest {
 
     // note that expected output will have multiple declarations,
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java
index cadc7fbc40e..ad18ffdd003 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.annotations.DataProvider;
 
@@ -44,13 +43,11 @@
  * @test
  * @bug 8145974
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.SurrogatesTest
  * @run testng/othervm stream.XMLStreamWriterTest.SurrogatesTest
  * @summary Check that XMLStreamWriter generates valid xml with surrogate pair
  *  used within element text
  */
 
-@Listeners({jaxp.library.BasePolicy.class})
 public class SurrogatesTest {
 
     // Test that valid surrogate characters can be written/readen by xml stream
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
index 4fc07a4894f..da9db5d072e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6394074
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.UnprefixedNameTest
  * @run testng/othervm stream.XMLStreamWriterTest.UnprefixedNameTest
  * @summary Test XMLStreamWriter namespace prefix with writeDefaultNamespace.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class UnprefixedNameTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
index f0ba0306e10..059730d7449 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,17 +42,14 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.WriterTest
  * @run testng/othervm stream.XMLStreamWriterTest.WriterTest
  * @summary Test XMLStreamWriter functionality.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class WriterTest {
 
     final String ENCODING = "UTF-8";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
index 894a9c96c88..3a6a4c958d3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.transform.dom.DOMResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -44,11 +43,9 @@
  * @test
  * @bug 6347190 8139584 8216408
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow stream.XMLStreamWriterTest.XMLStreamWriterTest
  * @run testng/othervm stream.XMLStreamWriterTest.XMLStreamWriterTest
  * @summary Tests XMLStreamWriter.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XMLStreamWriterTest {
     /**
      * @bug 8139584
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
index 12b30b07d7c..476a0fb2868 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
@@ -48,11 +47,9 @@
  * @test
  * @bug 4693341
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug4693341Test
  * @run testng/othervm transform.Bug4693341Test
  * @summary Test transform with external dtd.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4693341Test {
     // save dtd file to current working directory to avoid writing into source repository
     public void copyDTDtoWorkDir() throws IOException {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java
index a69d21e4899..e4c6cab3883 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug4892774.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 import transform.util.DOMUtil;
@@ -50,12 +49,10 @@
  * @test
  * @bug 4892774
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug4892774
  * @run testng/othervm transform.Bug4892774
  * @summary Test identity transformer with all possible types of Source and Result combinations for doucment version and encoding information.
  */
 
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4892774 {
 
     private final String XML_FILE = "catalog.xml";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java
index f4163861734..744c1f3f67c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug5073477.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.dom.DOMResult;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -35,11 +34,9 @@
  * @test
  * @bug 5073477
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug5073477
  * @run testng/othervm transform.Bug5073477
  * @summary Test DOMResult.setNextSibling works correctly.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug5073477 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java
index b6ca27670a2..ce75c63b525 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6175602.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6175602
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6175602
  * @run testng/othervm transform.Bug6175602
  * @summary Test compilation of MsWordXMLImport.xsl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6175602 {
 
     public Bug6175602() {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java
index a90da9e0917..c9f445d30db 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6206491.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -49,11 +48,9 @@
  * @test
  * @bug 6206491
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6206491
  * @run testng/othervm transform.Bug6206491
  * @summary Test key searches over more than one document.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6206491 {
 
     private String getResource(String s) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
index 1936e1bb05e..406f93a3ec2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,31 +23,24 @@
 
 package transform;
 
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
-import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
-
 import java.io.File;
 import java.io.StringReader;
 import java.util.PropertyPermission;
-
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 
 /*
  * @test
  * @bug 6216226
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6216226Test
  * @run testng/othervm transform.Bug6216226Test
  * @summary Test StreamResult(File) is closed after transform().
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6216226Test {
 
     @Test
@@ -58,7 +51,7 @@ public final void test() {
             Transformer xformer = tf.newTransformer();
             StringReader st = new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\"?><doc></doc>");
             StreamSource s = new StreamSource(st);
-            StreamResult r = runWithTmpPermission(() -> new StreamResult(test), new PropertyPermission("user.dir", "read"));
+            StreamResult r = new StreamResult(test);
             xformer.transform(s, r);
             if (!test.delete()) {
                 Assert.fail("cannot delete file: " + test.getPath());
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java
index c3eaca59f1e..a5f2afa3ce2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6311448.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -42,11 +41,9 @@
  * @test
  * @bug 6311448
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6311448
  * @run testng/othervm transform.Bug6311448
  * @summary Test XML transformer can output Unicode surrorate pair.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6311448 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java
index e4069b33256..0cb13c410a9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6384805.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,15 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6384805
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6384805
  * @run testng/othervm transform.Bug6384805
  * @summary Test XSLTC can parse XML namespace when nodeset is created within a template.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6384805 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java
index 1efacc7ce35..36ff25533b2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6465722.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -42,11 +41,9 @@
  * @test
  * @bug 6465722
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6465722
  * @run testng/othervm transform.Bug6465722
  * @summary Test Transformer can transform the node attribute prefixed with a namespace.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6465722 {
 
     public Bug6465722(String name) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java
index fa6a287bc1a..149537dd0dc 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6467808.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,18 +33,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6467808
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6467808
  * @run testng/othervm transform.Bug6467808
  * @summary Test Transformer can parse re-declare prefixed namespace mappings.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6467808 {
 
     private static final String TESTXML = "<?xml version='1.0' ?>\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java
index 851fac70837..7c1a8bcb72a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490380.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6490380
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6490380
  * @run testng/othervm transform.Bug6490380
  * @summary Test only a single DOCTYPE declaration is generated through transforming.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6490380 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java
index e2d2b179218..f4e627cf4c6 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6490921.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -49,11 +48,9 @@
  * @test
  * @bug 6490921
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6490921
  * @run testng/othervm transform.Bug6490921
  * @summary Test property org.xml.sax.driver is always applied in transformer API.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6490921 {
 
     public static class ReaderStub extends XMLFilterImpl {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java
index 145de8eecf0..349e137d664 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6513892.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -42,11 +41,9 @@
  * @test
  * @bug 6513892
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6513892
  * @run testng/othervm transform.Bug6513892
  * @summary Test the output encoding of the transform is the same as that of the redirect extension.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6513892 {
     @BeforeClass
     public void setup(){
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java
index 97cbbbd1b1d..974751c4bbd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6537167.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6537167
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6537167
  * @run testng/othervm transform.Bug6537167
  * @summary Test transforming for particular xsl files.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6537167 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java
index 1323cdff886..6c4877f6d4d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6540545.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6540545
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6540545
  * @run testng/othervm transform.Bug6540545
  * @summary Test XSLT as expected.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6540545 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java
index dddbbea396b..4dd8522a816 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6551616.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 6551616
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6551616
  * @run testng/othervm transform.Bug6551616
  * @summary Test SAX2StAXEventWriter.
  */
@@ -38,12 +37,10 @@
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLOutputFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 import com.sun.org.apache.xalan.internal.xsltc.trax.SAX2StAXEventWriter;
 
-@Listeners({jaxp.library.InternalAPIPolicy.class})
 public class Bug6551616 {
     String _cache = "";
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java
index 6f3481a463e..9d73a097b3b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6559595.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6559595
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6559595
  * @run testng/othervm transform.Bug6559595
  * @summary Test ampersand in href attribute is not handled specially even if output is set to HTML.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6559595 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java
index d8c3218ae37..7262ca65e98 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6565260.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6565260
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6565260
  * @run testng/othervm transform.Bug6565260
  * @summary Test use-attribute-sets attribute is not used for the root node.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6565260 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java
index 7a621141bc7..c14e9b08c07 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Bug6940416.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,18 +39,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6940416
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Bug6940416
  * @run testng/othervm transform.Bug6940416
  * @summary Test transforming correctly.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6940416 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
index a68f805521f..03588032bf5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,18 +43,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6935697
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.BugDB12665704Test
  * @run testng/othervm transform.BugDB12665704Test
  * @summary Test Transformer can compile large xsl file.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class BugDB12665704Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java
index 883e5ace08a..9f258d49777 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CLITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,32 +21,22 @@
  * questions.
  */
 
+package transform;
+
+import org.testng.annotations.Test;
+
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CLITest
  * @run testng/othervm transform.CLITest
  * @summary Test internal transform CLI.
  */
-
-package transform;
-
-import java.util.PropertyPermission;
-
-import jaxp.library.JAXPTestUtilities;
-
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-
-@Listeners({ jaxp.library.FilePolicy.class })
 public class CLITest {
 
     @Test
     public void testCLI() throws Exception {
-        JAXPTestUtilities.tryRunWithTmpPermission(() -> {
-            String[] args = new String[] { "-XSLTC", "-XSL", getClass().getResource("tigertest.xsl").toString(),
-                "-IN", getClass().getResource("tigertest-in.xml").toString(), };
-            ProcessXSLT.main(args);
-        }, new PropertyPermission("*", "read,write"));
+        String[] args = new String[] { "-XSLTC", "-XSL", getClass().getResource("tigertest.xsl").toString(),
+            "-IN", getClass().getResource("tigertest-in.xml").toString(), };
+        ProcessXSLT.main(args);
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java
index 62220163c0d..fca3931cf59 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,18 +37,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6401137
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6401137Test
  * @run testng/othervm transform.CR6401137Test
  * @summary Test transform certain xsl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6401137Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java
index 2c1764d39f3..5a27ede2cc1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6551600Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,36 +24,28 @@
 package transform;
 
 import java.io.File;
-import java.io.FilePermission;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import jaxp.library.JAXPTestUtilities;
-
 /*
  * @test
  * @bug 6551600
  * @requires os.family == "windows"
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6551600Test
  * @run testng/othervm transform.CR6551600Test
  * @summary Test using UNC path as StreamResult.
  */
-@Listeners({ jaxp.library.BasePolicy.class })
 public class CR6551600Test {
 
     @Test
@@ -73,44 +65,40 @@ public final void testUNCPath() {
         }
 
         var uncFilePath = uncPath + "xslt_unc_test.xml";
-        JAXPTestUtilities.runWithTmpPermission(() -> {
-            try {
-                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-                DocumentBuilder builder = factory.newDocumentBuilder();
-                Document doc = builder.newDocument();
-                Element root = doc.createElement("test");
-                doc.appendChild(root);
-                // create an identity transform
-                Transformer t = TransformerFactory.newInstance().newTransformer();
-                File f = new File(uncFilePath);
-                StreamResult result = new StreamResult(f);
-                DOMSource source = new DOMSource(doc);
-                System.out.println("Writing to " + f);
-                t.transform(source, result);
-            } catch (Exception e) {
-                // unexpected failure
-                e.printStackTrace();
-                Assert.fail(e.toString());
-            }
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.newDocument();
+            Element root = doc.createElement("test");
+            doc.appendChild(root);
+            // create an identity transform
+            Transformer t = TransformerFactory.newInstance().newTransformer();
+            File f = new File(uncFilePath);
+            StreamResult result = new StreamResult(f);
+            DOMSource source = new DOMSource(doc);
+            System.out.println("Writing to " + f);
+            t.transform(source, result);
+        } catch (Exception e) {
+            // unexpected failure
+            e.printStackTrace();
+            Assert.fail(e.toString());
+        }
 
-            File file = new File(uncFilePath);
-            if (file.exists()) {
-                file.deleteOnExit();
-            }
-        }, new FilePermission(uncFilePath, "read,write,delete"));
+        File file = new File(uncFilePath);
+        if (file.exists()) {
+            file.deleteOnExit();
+        }
     }
 
     private boolean checkAccess(String path) {
-        return JAXPTestUtilities.runWithTmpPermission(() -> {
-            try {
-                Path tmepFile = Files.createTempFile(Paths.get(path), "test", "6551600");
-                Files.deleteIfExists(tmepFile);
-                return true;
-            } catch (Exception e) {
-                System.out.println("Access check failed.");
-                e.printStackTrace();
-                return false;
-            }
-        }, new FilePermission(path + "*", "read,write,delete"));
+        try {
+            Path tmepFile = Files.createTempFile(Paths.get(path), "test", "6551600");
+            Files.deleteIfExists(tmepFile);
+            return true;
+        } catch (Exception e) {
+            System.out.println("Access check failed.");
+            e.printStackTrace();
+            return false;
+        }
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java
index cac380f1a50..46cd162abbf 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6577667Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6577667
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6577667Test
  * @run testng/othervm transform.CR6577667Test
  * @summary Test XSLT can parse statement "not(preceding-sibling::* or following-sibling::*)" in stylesheet file.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6577667Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java
index 505d5930b45..f9eb4eebbf6 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6652519Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -41,11 +40,9 @@
  * @test
  * @bug 6652519
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6652519Test
  * @run testng/othervm transform.CR6652519Test
  * @summary Test transfoming from StreamSource to DOMResult.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6652519Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java
index 97f0f82e9da..22fc8c2d4e7 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6689809Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6689809
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6689809Test
  * @run testng/othervm transform.CR6689809Test
  * @summary Test Transformer can handle XPath predicates in xsl:key elements.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6689809Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java
index 9b9aa76ae45..d5bb9238deb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6905829Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6905829
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6905829Test
  * @run testng/othervm transform.CR6905829Test
  * @summary Test XSLT can parse certain xsl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6905829Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java
index 744dfdee274..86972e693f0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6935697Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6935697
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6935697Test
  * @run testng/othervm transform.CR6935697Test
  * @summary Test XSLT can parse the certain xsl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6935697Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java
index f6a3dd2275b..20bab62ab01 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6941869Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6941869
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6941869Test
  * @run testng/othervm transform.CR6941869Test
  * @summary Test XSLT evaluate "count(.|key('props', d/e)[1])" correctly.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6941869Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java
index 1e18d7c7478..906758327f3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6957215Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,18 +39,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6957215
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR6957215Test
  * @run testng/othervm transform.CR6957215Test
  * @summary Test XSLT generates the element content using xsl:attribute instructions.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6957215Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java
index b39593295a8..689c489871d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR7098746Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,18 +34,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 7098746
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.CR7098746Test
  * @run testng/othervm transform.CR7098746Test
  * @summary Test transforming as expected.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR7098746Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java
index d69cf7af210..ea94a7a0a7c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/DOMResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package transform;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
@@ -49,11 +48,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.DOMResultTest
  * @run testng/othervm transform.DOMResultTest
  * @summary Test DOMResult.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class DOMResultTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
index 3486215c490..650d6d6ce1b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,25 +23,18 @@
 
 package transform;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.net.URL;
 import java.net.URLClassLoader;
-
 import javax.xml.transform.TransformerFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.FactoryFindTest
  * @run testng/othervm transform.FactoryFindTest
  * @summary Test creating TransformerFactory with ContextClassLoader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class FactoryFindTest {
 
     boolean myClassLoaderUsed = false;
@@ -51,11 +44,11 @@ public void testFactoryFind() throws Exception {
         TransformerFactory factory = TransformerFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null));
+        Thread.currentThread().setContextClassLoader(null);
         factory = TransformerFactory.newInstance();
         Assert.assertTrue(factory.getClass().getClassLoader() == null);
 
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader()));
+        Thread.currentThread().setContextClassLoader(new MyClassLoader());
         factory = TransformerFactory.newInstance();
         if (System.getSecurityManager() == null)
             Assert.assertTrue(myClassLoaderUsed);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java
index 398f935a648..1cba32eec0c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2204Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,15 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6905829
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Issue2204Test
  * @run testng/othervm transform.Issue2204Test
  * @summary Test XSLT can work against the certain xsl.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Issue2204Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java
index 35f7aa6fc40..bc504a38852 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/Issue2290Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,17 +41,14 @@
 import org.w3c.dom.DocumentFragment;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.Issue2290Test
  * @run testng/othervm transform.Issue2290Test
  * @summary Test XSL extension for RTF works, for https://issues.apache.org/jira/i#browse/XALANJ-2290.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Issue2290Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java b/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java
index 1726aacdfb5..00c1b8a8e25 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,7 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import java.util.Random;
 import javax.xml.transform.OutputKeys;
@@ -48,7 +46,6 @@
  * @summary Verifies that a surrogate pair at the edge of a buffer is properly handled
  * @bug 8207760
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class JDK8207760 {
     final String xsl8207760 =
         "<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\n" +
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java
index 44a7822479e..836f3b65b30 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/NamespacePrefixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,23 +30,19 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
-import org.testng.annotations.Test;
 import static org.testng.Assert.assertTrue;
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
+import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8167179
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.NamespacePrefixTest
  * @run testng/othervm transform.NamespacePrefixTest
  * @summary This class tests the generation of namespace prefixes
  */
@@ -84,11 +80,11 @@ public void testConcurrentTransformations() throws Exception {
             EXECUTOR.execute(new TransformerThread(tmpl.newTransformer(), id));
         }
         // Initiate shutdown of previously submitted task
-        runWithAllPerm(EXECUTOR::shutdown);
+        EXECUTOR.shutdown();
         // Wait for termination of submitted tasks
         if (!EXECUTOR.awaitTermination(THREADS_COUNT, TimeUnit.SECONDS)) {
             // If not all tasks terminates during the time out force them to shutdown
-            runWithAllPerm(EXECUTOR::shutdownNow);
+            EXECUTOR.shutdown();
         }
         // Check if all transformation threads generated the correct namespace prefix
         assertTrue(concurrentTestPassed.get());
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
index 673c4b212f8..d12a1fef8d6 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -48,11 +47,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.SAX2DOMTest
  * @run testng/othervm transform.SAX2DOMTest
  * @summary Test Transforming from SAX to DOM.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SAX2DOMTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
index b46e6d7e480..1d5fa236279 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,17 +35,14 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.SecureProcessingTest
  * @run testng/othervm transform.SecureProcessingTest
  * @summary Test XSLT shall report TransformerException for unsafe xsl when FEATURE_SECURE_PROCESSING is true.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SecureProcessingTest {
     @Test
     public void testSecureProcessing() {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java
index a8589c1ece3..0a14f47a37a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,17 +35,14 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.SourceTest
  * @run testng/othervm transform.SourceTest
  * @summary Test Sources.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SourceTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
index 78a397969d7..6796a1324c2 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
@@ -61,11 +60,9 @@
  * @modules java.xml/com.sun.xml.internal.stream
  * @clean MyXMLInputFactoryImpl MyXMLStreamReader
  * @build MyXMLInputFactoryImpl MyXMLStreamReader
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.StAXSourceTest
  * @run testng/othervm transform.StAXSourceTest
  * @summary Test parsing from StAXSource.
  */
-@Listeners({jaxp.library.JAXPTestPolicy.class})
 public class StAXSourceTest {
     @DataProvider(name = "xml")
     public Object[][] getData() throws Exception {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java
index 29d211db788..81708c319bd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/StylesheetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
 
 import java.io.StringReader;
 import org.xml.sax.InputSource;
-
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.TransformerConfigurationException;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -38,11 +36,9 @@
  * @test
  * @bug 8058152
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.StylesheetTest
  * @run testng/othervm transform.StylesheetTest
  * @summary this test contains test cases for verifying stylesheet
  */
-@Listeners(jaxp.library.FilePolicy.class)
 public class StylesheetTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java
index 2c740471eed..d3bdee2413a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Result;
@@ -38,16 +37,13 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
 import static jaxp.library.JAXPTestUtilities.compareLinesWithGold;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 /*
  * @test
@@ -56,7 +52,6 @@
  * @run testng transform.SurrogateTest
  * @summary XML Transformer outputs Unicode supplementary character incorrectly to HTML
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SurrogateTest {
 
     final static String TEST_SRC = System.getProperty("test.src", ".");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java
index 270507a8c2d..00a0a411987 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/TemplatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,14 @@
 import javax.xml.transform.*;
 import javax.xml.transform.stream.StreamSource;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.TemplatesTest
  * @run testng/othervm transform.TemplatesTest
  * @summary This class contains tests for Templates.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class TemplatesTest {
 
     /**
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
index 064461a56dc..3e4a1c222f9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -50,11 +49,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.TransformerFactoryTest
  * @run testng/othervm transform.TransformerFactoryTest
  * @summary Test TransformerFactory.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerFactoryTest {
 
     private static URIResolver resolver = new URIResolver() {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java
index e25f2bf3c2c..6a982caa10d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/TransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@
 import org.testng.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -72,12 +71,10 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.TransformerTest
  * @run testng/othervm transform.TransformerTest
  * @summary Transformer Tests
  * @bug 6272879 6305029 6505031 8150704 8162598 8169112 8169631 8169772
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TransformerTest {
 
     // some global constants
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
index a358978557b..24570c20bad 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package transform;
 
 import java.io.FilePermission;
-import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.nio.file.Files;
@@ -37,29 +36,22 @@
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
-
 import static org.testng.Assert.assertEquals;
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
 import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
 import static jaxp.library.JAXPTestUtilities.setSystemProperty;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
 import static jaxp.library.JAXPTestUtilities.getSystemProperty;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @compile DocumentExtFunc.java
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.XSLTFunctionsTest
  * @run testng/othervm transform.XSLTFunctionsTest
  * @summary This class contains tests for XSLT functions.
  */
 
-@Listeners({jaxp.library.FilePolicy.class})
 public class XSLTFunctionsTest {
     /**
      * @bug 8165116
@@ -79,9 +71,7 @@ public void testRedirect(String xml, String xsl, String output, String redirect)
         Transformer t = tf.newTransformer(new StreamSource(new StringReader(xsl)));
 
         //Transform the xml
-        tryRunWithTmpPermission(
-                () -> t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter())),
-                new FilePermission(output, "write"), new FilePermission(redirect, "write"));
+        t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter()));
 
         // Verifies that the output is redirected successfully
         String userDir = getSystemProperty("user.dir");
@@ -173,7 +163,7 @@ public void testDocument(final String xml, final String xsl,
         TransformerFactory tf = TransformerFactory.newInstance();
         tf.setFeature(ORACLE_ENABLE_EXTENSION_FUNCTION, true);
         tf.setAttribute(EXTENSION_CLASS_LOADER,
-                runWithAllPerm(() -> Thread.currentThread().getContextClassLoader()));
+                Thread.currentThread().getContextClassLoader());
         Transformer t = tf.newTransformer( xslsrc );
         t.setErrorListener(tf.getErrorListener());
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java b/test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
index c6c1ae2433d..61aeba98442 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.transform.sax.TransformerHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.helpers.AttributesImpl;
@@ -38,11 +37,9 @@
  * @test
  * @bug 6451633
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.sax.Bug6451633
  * @run testng/othervm transform.sax.Bug6451633
  * @summary Test TransformerHandler ignores empty text node.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6451633 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/sort/SortTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/sort/SortTest.java
index 4e83f88dff1..0f37cb7f5b4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/sort/SortTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/sort/SortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,18 +40,15 @@
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 8193830
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.sort.SortTest
  * @run testng/othervm transform.sort.SortTest
  * @summary verify xsl:sort lang attribute
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class SortTest {
 
     static final String LAND_EN = "en";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java b/test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
index 8a1630088b6..c250d200b6d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,12 @@
 
 package transform.util;
 
-import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
-import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.PropertyPermission;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -39,10 +36,8 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 import org.testng.Assert;
 import org.w3c.dom.Document;
-
 import transform.VersionDefaultHandler;
 
 public class StreamUtil extends TransformerUtil {
@@ -69,7 +64,7 @@ public Source prepareSource(InputStream is) throws Exception {
 
     public Result prepareResult() throws Exception {
         FileOutputStream fos = new FileOutputStream(TEMP_FILE);
-        return runWithTmpPermission(() -> new StreamResult(fos), new PropertyPermission("user.dir", "read"));
+        return new StreamResult(fos);
     }
 
     public void checkResult(Result result, String inputVersion) throws Exception {
@@ -89,7 +84,7 @@ public void checkResult(Result result, String version, String encoding) throws E
         // use sax parser, as encoding info cannot be set on DOM document
         SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
         VersionDefaultHandler dh = new VersionDefaultHandler();
-        tryRunWithTmpPermission(() -> parser.parse(new File(TEMP_FILE), dh), new PropertyPermission("user.dir", "read"));
+        parser.parse(new File(TEMP_FILE), dh);
         Assert.assertTrue(dh.getVersion().equals(version), "Expected version is " + version + " actual version " + dh.getVersion());
         Assert.assertTrue(dh.getEncoding().equals(encoding), "Expected version is " + encoding + " actual version " + dh.getEncoding());
     }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java
index ff006e9129a..ca4700c9eda 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/AnyElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @test
  * @bug 8080907
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.AnyElementTest
  * @run testng/othervm validation.AnyElementTest
  * @summary Test processContents attribute of any element
  */
@@ -39,12 +38,10 @@
 import javax.xml.validation.Validator;
 
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-@Listeners({jaxp.library.FilePolicy.class})
 public class AnyElementTest {
     @BeforeClass
     public void setup() throws URISyntaxException, SAXException {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java
index 88dcd0a1159..d426191deea 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966232.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -39,11 +38,9 @@
  * @test
  * @bug 4966232
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4966232
  * @run testng/othervm validation.Bug4966232
  * @summary Test SchemaFactory.newSchema(Source) returns a Schema instance for DOMSource & SAXSource.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966232 {
 
     // test for W3C XML Schema 1.0 - newSchema(Source schema)
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java
index 6eb978c6670..c0d648e6348 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4966254.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -39,11 +38,9 @@
  * @test
  * @bug 4966254
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4966254
  * @run testng/othervm validation.Bug4966254
  * @summary Test validate(StreamSource) & validate(StreamSource,null) works instead of throws IOException.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4966254 {
 
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java
index 3229af656ce..8c432b35896 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969042.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -45,12 +44,10 @@
  * @test
  * @bug 4969042
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969042
  * @run testng/othervm validation.Bug4969042
  * @summary Test ValidationHandler shall invoke ignorableWhitespace() of the
  * user-defined ContentHandler once the validator detects any ignorable whitespaces.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969042 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java
index 0c014d7503b..7871dcde135 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969089.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -40,12 +39,10 @@
  * @test
  * @bug 4969089
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969089
  * @run testng/othervm validation.Bug4969089
  * @summary Test when an ErrorHandler is set for a SchemaFactory, SchemaFactory.newSchema(Source[])
  * method throws an exception that is not equal to the exception thrown from the ErrorHandler.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969089 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java
index f4d3f4b1a26..96c9bdac65b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969110.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
@@ -36,12 +35,10 @@
  * @test
  * @bug 4969110
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969110
  * @run testng/othervm validation.Bug4969110
  * @summary Test ValidationHandler.set/getProperty() throws a correct exception
  * instead of a sun internal exception in case the "property name" parameter is invalid.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969110 {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java
index 1ed208aabb3..f0cf65571af 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969689.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
@@ -36,12 +35,10 @@
  * @test
  * @bug 4969689
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969689
  * @run testng/othervm validation.Bug4969689
  * @summary Test SchemaFactory.get/setFeature() throw NullPointerException
  * instead of SAXNotRecognizedException in case the "feature name" parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969689 {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java
index d0538969786..7a03ba1ac74 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969692.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -35,12 +34,10 @@
  * @test
  * @bug 4969692
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969692
  * @run testng/othervm validation.Bug4969692
  * @summary Test Validator.get/setFeature() throw NullPointerException
  * instead of SAXNotRecognizedException in case the "feature name" parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969692 {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java
index 8eca589566d..859255c606f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969693.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -35,12 +34,10 @@
  * @test
  * @bug 4969693
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969693
  * @run testng/othervm validation.Bug4969693
  * @summary Test Validator.get/setProperty() throw NullPointerException
  * instead of SAXNotRecognizedException in case the "property name" parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969693 {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java
index ef04b737408..053e23d49d4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969695.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
@@ -35,12 +34,10 @@
  * @test
  * @bug 4969695
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969695
  * @run testng/othervm validation.Bug4969695
  * @summary Test SchemaFactory.get/setProperty() throw NullPointerException
  * instead of SAXNotRecognizedException in case the "property name" parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969695 {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java
index 990e2f6a4be..9e54de05a1a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4969732.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -44,12 +43,10 @@
  * @test
  * @bug 4969732
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4969732
  * @run testng/othervm validation.Bug4969732
  * @summary Test TypeInfoProvider.getElementTypeInfo() throws IllegalStateException
  * in case the method is not called from method startElement() or endElement().
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4969732 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java
index 30c094cd83b..ce3f8c1fdcd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970380.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXNotRecognizedException;
 
@@ -35,11 +34,9 @@
  * @test
  * @bug 4970380
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4970380
  * @run testng/othervm validation.Bug4970380
  * @summary Test validatorHandler.getFeature(...) with unknown name and "http://xml.org/sax/features/namespace-prefixes".
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4970380 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java
index 67b9751c1dc..a299a7ea948 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970383.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4970383
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4970383
  * @run testng/othervm validation.Bug4970383
  * @summary Test validatorHandler.setFeature throws NullPointerException if name parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4970383 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java
index a20705a718d..1c2dae0227f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970400.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4970400
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4970400
  * @run testng/othervm validation.Bug4970400
  * @summary Test ValidatorHandler recognizes namespace-prefixes feature.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4970400 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java
index 9b801d76d62..3d9b456afdf 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970402.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -47,11 +46,9 @@
  * @test
  * @bug 4970402
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4970402
  * @run testng/othervm validation.Bug4970402
  * @summary Test TypeInfoProvider's attribute accessing methods throw IndexOutOfBoundsException when index parameter is invalid.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4970402 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java
index 210bd2ce932..b03fc76cf2f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4970951.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -47,11 +46,9 @@
  * @test
  * @bug 4970951
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4970951
  * @run testng/othervm validation.Bug4970951
  * @summary Test TypeInfoProvider.isSpecified(...) return true if the attribute was originally present.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4970951 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java
index a8d10802541..28dcff65c44 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971605.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
@@ -42,11 +41,9 @@
  * @test
  * @bug 4971605
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4971605
  * @run testng/othervm validation.Bug4971605
  * @summary Test SchemaFactory.newSchema(Source) returns a Schema instance for DOMSource.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4971605 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java
index 496f63a7bd4..acd39910784 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4971607.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4971607
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4971607
  * @run testng/othervm validation.Bug4971607
  * @summary Test ValidatorHandler.getFeature(...) throws NullPointerException when name parameter is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4971607 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java
index 663056025f9..c4bb741f5e9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4972882.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -38,11 +37,9 @@
  * @test
  * @bug 4972882
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4972882
  * @run testng/othervm validation.Bug4972882
  * @summary Test Validator throws Exception when two identity-constraints are defined with the same {name} and {target namespace}.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4972882 {
 
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java
index 4796cff2a51..72db9e721a1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4986844.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -34,11 +33,9 @@
  * @test
  * @bug 4986844
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4986844
  * @run testng/othervm validation.Bug4986844
  * @summary Test SchemaFactory can detect particle restriction.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4986844 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
index 9f360c38cec..a24c426b9b1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,15 @@
 
 import javax.xml.validation.SchemaFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4987574
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4987574
  * @run testng/othervm validation.Bug4987574
  * @summary Test schemaFactory.newSchema doesn't throw NullPointerException for empty schema.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4987574 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java
index 0f5205cbfe8..8ed6d9b1626 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988267.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -34,11 +33,9 @@
  * @test
  * @bug 4988267
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4988267
  * @run testng/othervm validation.Bug4988267
  * @summary Test SchemaFactory can detect particle restriction.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4988267 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java
index 8450d3e4a49..cb59146f816 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988268.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,15 @@
 
 import javax.xml.validation.SchemaFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4988268
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4988268
  * @run testng/othervm validation.Bug4988268
  * @summary Test the schema is valid.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4988268 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java
index feaa8b02250..d766cd0b652 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4988387.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -34,11 +33,9 @@
  * @test
  * @bug 4988387
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4988387
  * @run testng/othervm validation.Bug4988387
  * @summary Test SchemaFactory can detect invalid XPath expressions.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4988387 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java
index dee3d838f29..2f7a0e7eab7 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4996446.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -40,11 +39,9 @@
  * @test
  * @bug 4996446
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4996446
  * @run testng/othervm validation.Bug4996446
  * @summary Test SchemaFactory can detect violations of the "Schema Component Constraint: Element Declarations Consistent".
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug4996446 {
 
     SchemaFactory schemaFactory = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java
index 223137c9751..b1265ba1583 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4997818.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
@@ -39,12 +38,10 @@
  * @test
  * @bug 4997818
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4997818
  * @run testng/othervm validation.Bug4997818
  * @summary Test SchemaFactory.newSchema(...) throws an exception, which is thrown from LSResourceResolver.
  */
 
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4997818 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java
index 189822e1fdf..e7bac5f7d1d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5011500.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
@@ -44,11 +43,9 @@
  * @test
  * @bug 5011500
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug5011500
  * @run testng/othervm validation.Bug5011500
  * @summary Test ValidatorHanlder and Validator can work for the xml document.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug5011500 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java
index e314e09b96d..b56fc8ad495 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug5072946.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -49,11 +48,9 @@
  * @test
  * @bug 5072946
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug5072946
  * @run testng/othervm validation.Bug5072946
  * @summary Test Validator.validate(DOMSource,DOMResult) outputs to the result.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug5072946 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java
index 9f728350462..5d2dac022cb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6378043.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,15 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6378043
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6378043
  * @run testng/othervm validation.Bug6378043
  * @summary Test XPath expression "child::" can be parsed.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6378043 {
 
     static String SCHEMA_LANG = "http://www.w3.org/2001/XMLSchema";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java
index 99de8bedc52..93d76104acf 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6449797.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import javax.xml.XMLConstants;
 import javax.xml.validation.SchemaFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -33,11 +32,9 @@
  * @test
  * @bug 6449797
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6449797
  * @run testng/othervm validation.Bug6449797
  * @summary Test SchemaFactory can parse the specified attribute value with a specified namespace.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6449797 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java
index 0cabf01b20f..8200a231bcb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6457662.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,18 +39,15 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6457662
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6457662
  * @run testng/othervm validation.Bug6457662
  * @summary Test a Validator checks sequence maxOccurs correctly when it validates document repeatedly.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6457662 {
 
     public static final String xml = "<ACL xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + "<Tokens access=\"full\">" + "<Token>CheetahTech</Token>"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
index 0c7419d01da..4899e6422c5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -52,11 +51,9 @@
  * @test
  * @bug 6467424
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6467424Test
  * @run testng/othervm validation.Bug6467424Test
  * @summary Test Validator augments the default delement value if feature element-default is on.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6467424Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java
index 616598bee80..c55b43b8417 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6483188.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXParseException;
 
@@ -39,12 +38,10 @@
  * @test
  * @bug 6483188
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6483188
  * @run testng/othervm validation.Bug6483188
  * @summary Test Schema Validator can handle element with having large maxOccurs, but doesn't accept sequence with having large maxOccurs in FEATURE_SECURE_PROCESSING mode.
  */
 @Test(singleThreaded = true)
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6483188 {
     SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java
index 3d1054fac30..4aa1dd7627e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6493687.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package validation;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -31,11 +30,9 @@
  * @test
  * @bug 6493687
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6493687
  * @run testng/othervm validation.Bug6493687
  * @summary Test validator.validate(new DOMSource(node)) without any exception.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6493687 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java
index d671aa9c02b..ed310e75998 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6509668.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.validation.ValidatorHandler;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.TypeInfo;
 import org.xml.sax.Attributes;
@@ -49,11 +48,9 @@
  * @test
  * @bug 6509668
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6509668
  * @run testng/othervm validation.Bug6509668
  * @summary Test TypeInfoProvider.getElementTypeInfo() for union type when startElement and endElement.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6509668 {
 
     public static final String XSD = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java
index f1b7bd215e6..688dd41c68f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6526547.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -43,11 +42,9 @@
  * @test
  * @bug 6526547
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6526547
  * @run testng/othervm validation.Bug6526547
  * @summary Test document parsed without setting NamespaceAware can be validated with a Schema.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6526547 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java
index f47400bfb6d..3c69056c516 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6531160.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXParseException;
@@ -42,11 +41,9 @@
  * @test
  * @bug 6531160
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6531160
  * @run testng/othervm validation.Bug6531160
  * @summary Test document generated by newDocument() can be validated with a Schema.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6531160 {
 
     private static final String XSD = "<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>\n" + "  <xs:element name='root' type='xs:string'/>\n"
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
index 5a8d0c3cbe3..845653b4b32 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -44,11 +43,9 @@
  * @test
  * @bug 6695843
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6695843Test
  * @run testng/othervm validation.Bug6695843Test
  * @summary Test Validator should report accurate element type if there is a violation on a complexType with simpleContent that extends a base complexType.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6695843Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
index 4a4556efac3..5ddf8a73854 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
 
 package validation;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -33,7 +31,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
@@ -42,9 +39,7 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
@@ -55,11 +50,9 @@
  * @test
  * @bug 6773084
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6773084Test
  * @run testng/othervm validation.Bug6773084Test
  * @summary Test Schema object is thread safe.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6773084Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
@@ -99,7 +92,7 @@ public boolean accept(File file) {
         for (int i = 0; i < files.length; i++) {
             EXEC.execute(new XMLValiddator(dbf.newDocumentBuilder().parse(files[i]), i));
         }
-        runWithAllPerm(() -> EXEC.shutdown());
+        EXEC.shutdown();
         EXEC.awaitTermination(TIMEOUT, TimeUnit.SECONDS);
     }
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java
index d7232a0f6ee..ce45a685478 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6859210.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -42,11 +41,9 @@
  * @test
  * @bug 6859210
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6859210
  * @run testng/othervm validation.Bug6859210
  * @summary Test Schema Validator can parse xml when maxOccurs is large.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6859210 {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
index 6f6d2ecf733..c3604a42698 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,46 +24,38 @@
 package validation;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.AllPermission;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-
 import javax.xml.XMLConstants;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
-import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 
 /*
  * @test
  * @bug 6925531
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6925531Test
- * @run testng/othervm -Djava.security.manager=allow validation.Bug6925531Test
- * @summary Test Validator can validate SAXSource when SecurityManager is set or FEATURE_SECURE_PROCESSING is on.
+ * @run testng/othervm validation.Bug6925531Test
+ * @summary Test Validator can validate SAXSource when FEATURE_SECURE_PROCESSING is on.
+ * Note that the run with the Java Security Manager was removed.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug6925531Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-    String xsd = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" + "        xmlns:test='jaxp13_test'\n"
-            + "        targetNamespace='jaxp13_test'\n" + "        elementFormDefault='qualified'>\n" + "    <element name='test' type='string'/>\n"
+    String xsd = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n"
+            + "        xmlns:test='jaxp13_test'\n"
+            + "        targetNamespace='jaxp13_test'\n"
+            + "        elementFormDefault='qualified'>\n"
+            + "    <element name='test' type='string'/>\n"
             + "</schema>\n";
 
-    String xml = "<?xml version='1.0'?>\n" + "<ns:test xmlns:ns='jaxp13_test'>\n" + "    abc\n" + "</ns:test>\n";
+    String xml = "<?xml version='1.0'?>\n"
+            + "<ns:test xmlns:ns='jaxp13_test'>\n"
+            + "    abc\n"
+            + "</ns:test>\n";
 
     StreamSource xsdSource;
     SAXSource xmlSource;
@@ -77,136 +69,34 @@ public void init() {
     }
 
     /**
-     * when security manager is present, secure feature is on automatically
+     * Verifies validation with FEATURE_SECURE_PROCESSING (FSP) turned on explicitly
+     * on SchemaFactory.
+     * Note: the test with Java Security Manager was removed.
+     * @throws Exception if the test fails
      */
     @Test
-    public void test_SM() {
+    public void test_SF() throws Exception {
         init();
-        Permissions granted = new java.security.Permissions();
-        granted.add(new AllPermission());
-
-        System.setSecurityManager(new MySM(granted));
 
         SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
-
-        Schema schema = null;
-        try {
-            schema = schemaFactory.newSchema(xsdSource);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        }
-
+        schemaFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        Schema schema = schemaFactory.newSchema(xsdSource);
         Validator validator = schema.newValidator();
-
-        try {
-            validator.validate(xmlSource, null);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        } catch (IOException e) {
-            Assert.fail(e.toString());
-        } finally {
-            System.setSecurityManager(null);
-        }
-
-        System.out.println("OK");
+        validator.validate(xmlSource, null);
     }
 
     /**
-     * set secure feature on SchemaFactory
+     * Verifies validation with FEATURE_SECURE_PROCESSING (FSP) turned on explicitly
+     * on the Validator.
+     * @throws Exception if the test fails
      */
     @Test
-    public void test_SF() {
+    public void test_Val() throws Exception {
         init();
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                System.setSecurityManager(null);
-                return null; // nothing to return
-            }
-        });
-
         SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
-        try {
-            schemaFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        } catch (SAXNotRecognizedException ex) {
-            System.out.println(ex.getMessage());
-        } catch (SAXNotSupportedException ex) {
-            System.out.println(ex.getMessage());
-        }
-
-        Schema schema = null;
-        try {
-            schema = schemaFactory.newSchema(xsdSource);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        }
-
+        Schema schema = schemaFactory.newSchema(xsdSource);
         Validator validator = schema.newValidator();
-
-        try {
-            validator.validate(xmlSource, null);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        } catch (IOException e) {
-            Assert.fail(e.toString());
-        }
-        System.out.println("OK");
-    }
-
-    /**
-     * set secure feature on the Validator
-     */
-    @Test
-    public void test_Val() {
-        init();
-        System.setSecurityManager(null);
-        SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
-
-        Schema schema = null;
-        try {
-            schema = schemaFactory.newSchema(xsdSource);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        }
-
-        Validator validator = schema.newValidator();
-        try {
-            validator.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        } catch (SAXNotRecognizedException ex) {
-            System.out.println(ex.getMessage());
-        } catch (SAXNotSupportedException ex) {
-            System.out.println(ex.getMessage());
-        }
-
-        try {
-            validator.validate(xmlSource, null);
-        } catch (SAXException e) {
-            Assert.fail(e.toString());
-        } catch (IOException e) {
-            Assert.fail(e.toString());
-        }
-        System.out.println("OK");
-    }
-
-    class MySM extends SecurityManager {
-        Permissions granted;
-
-        public MySM(Permissions perms) {
-            granted = perms;
-        }
-
-        /**
-         * The central point in checking permissions. Overridden from
-         * java.lang.SecurityManager
-         *
-         * @param perm The permission requested.
-         */
-        @Override
-        public void checkPermission(Permission perm) {
-            if (granted.implies(perm)) {
-                return;
-            }
-            super.checkPermission(perm);
-        }
-
+        validator.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        validator.validate(xmlSource, null);
     }
 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
index 6b77db907a5..c8a7cf80423 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -48,11 +47,9 @@
  * @test
  * @bug 6946312
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6946312Test
  * @run testng/othervm validation.Bug6946312Test
  * @summary Test XML parser shall callback to ContentHandler when receiving characters data.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6946312Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
index 0d3b9219916..900209b2657 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
  * @test
  * @bug 6954738
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug6954738_Test
  * @run testng/othervm validation.Bug6954738_Test
  * @summary Test Validator can process a XML document containing an element with 8000 characters.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6954738_Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java
index 5334e10aea0..500ee00630e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6708840Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,18 +40,15 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6708840
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.CR6708840Test
  * @run testng/othervm validation.CR6708840Test
  * @summary Test Validator can process StAXSource.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6708840Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java
index 6ecbba3014d..6fcff45fc05 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import org.w3c.dom.Document;
@@ -42,11 +41,9 @@
  * @test
  * @bug 6740048
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.CR6740048
  * @run testng/othervm validation.CR6740048
  * @summary Test DocumentBuilder can be reused when the DocumentBuilderFactory sets schema.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class CR6740048 {
     private static final String TAG_INFO = "containerInfo";
     private static final String SCHEMA_LANGUAGE_URL = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java
index 2608ea2ff0c..be74b3278fa 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Issue682Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import org.xml.sax.InputSource;
@@ -42,11 +41,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Issue682Test
  * @run testng/othervm validation.Issue682Test
  * @summary Test comination of fields in <xsd:unique>, for https://issues.apache.org/jira/browse/XERCESJ-682.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Issue682Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java
index 83840d1c6cc..fe4abae1a9c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.IssueTracker30
  * @run testng/othervm validation.IssueTracker30
  * @summary Test maxOccurs validation.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class IssueTracker30 {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
index 5fbe6d30dac..738de63fbeb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -48,11 +47,9 @@
  * @test
  * @bug 6631318
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.JaxpIssue43Test
  * @run testng/othervm validation.JaxpIssue43Test
  * @summary Test creating schema from a DOM fragment with namespace.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class JaxpIssue43Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
index 832f5f577d5..61b185bf2a7 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
 
@@ -46,11 +45,9 @@
  * @test
  * @bug 6684227
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.JaxpIssue49
  * @run testng/othervm validation.JaxpIssue49
  * @summary Test property current-element-node works.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class JaxpIssue49 {
 
     private Schema schema;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
index e07e172764e..77701ae5723 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,14 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.LargeMaxOccursTest
  * @run testng/othervm validation.LargeMaxOccursTest
  * @summary Test Validator shall report error for maxOccurs > 5000 when FEATURE_SECURE_PROCESSING is on, except the schema can be applied for constant-space algorithm.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class LargeMaxOccursTest {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
index ad8a18a321e..58a5f4fc9ae 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.MultiOccursTest
  * @run testng/othervm validation.MultiOccursTest
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class MultiOccursTest {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
index 0fb2fb22487..907ff73bad0 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.MultiOccursUnboundedTest
  * @run testng/othervm validation.MultiOccursUnboundedTest
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class MultiOccursUnboundedTest {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java
index 660d3919717..6b385c836cb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.OccursTest
  * @run testng/othervm validation.OccursTest
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class OccursTest {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
index 8e9e7dd1a5e..8c3211db36f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.OccursUnboundedTest
  * @run testng/othervm validation.OccursUnboundedTest
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class OccursUnboundedTest {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
index 5a53b6ca7a6..0e16f83c067 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.OccursWildcardTest
  * @run testng/othervm validation.OccursWildcardTest
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class OccursWildcardTest {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
index 3b4c1f6a18d..9734f4dfe24 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.OccursWildcardUnbounded
  * @run testng/othervm validation.OccursWildcardUnbounded
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class OccursWildcardUnbounded {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
index 03ecf71aa42..fbfd9932aac 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.ParticlesId005Test
  * @run testng/othervm validation.ParticlesId005Test
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ParticlesId005Test {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
index 86a84095d63..982a66dfbfd 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,14 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.ParticlesIg004Test
  * @run testng/othervm validation.ParticlesIg004Test
  * @summary Test particlesIg004.xsd.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ParticlesIg004Test {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
index 54a381c394d..1844a3c69c5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -41,11 +40,9 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.ParticlesQ013Test
  * @run testng/othervm validation.ParticlesQ013Test
  * @summary Test Schema Validator can parse multiple or unbounded occurs.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ParticlesQ013Test {
 
     boolean errorFound;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
index 4d9fea992c4..e10ee209f07 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.TCKGroupA008Test
  * @run testng/othervm validation.TCKGroupA008Test
  * @summary Test groupA008.xsd.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class TCKGroupA008Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
index eda21f05c44..a4538bcf5b5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 import org.testng.annotations.DataProvider;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -54,7 +53,6 @@
  * @run testng/othervm validation.ValidationTest
  * @summary Runs validations with schemas and sources
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ValidationTest {
     static final String FILE_PATH = "files/";
     /*
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java
index e9797a6fde3..0c2f48a6675 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,10 @@
 
 package validation;
 
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
-import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.util.PropertyPermission;
-
 import javax.xml.XMLConstants;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
@@ -41,20 +37,17 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.ValidatorTest
  * @run testng/othervm validation.ValidatorTest
  * @summary Test Validator.validate(Source, Result).
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ValidatorTest {
 
     @Test
@@ -96,8 +89,7 @@ public void testValidateStream() {
             // Validate this instance document against the
             // Instance document supplied
             File resultAlias = resultFile;
-            Result xmlResult = runWithTmpPermission(() -> new javax.xml.transform.stream.StreamResult(
-                    resultAlias), new PropertyPermission("user.dir", "read"));
+            Result xmlResult = new javax.xml.transform.stream.StreamResult(resultAlias);
             Source xmlSource = new javax.xml.transform.stream.StreamSource(new File(ValidatorTest.class.getResource("toys.xml").toURI()));
 
             validate("toys.xsd", xmlSource, xmlResult);
@@ -126,8 +118,7 @@ public void testValidateGMonth() {
             // Validate this instance document against the
             // Instance document supplied
             File resultAlias = resultFile;
-            Result xmlResult = runWithTmpPermission(() -> new javax.xml.transform.stream.StreamResult(
-                    resultAlias), new PropertyPermission("user.dir", "read"));
+            Result xmlResult = new javax.xml.transform.stream.StreamResult(resultAlias);
             Source xmlSource = new javax.xml.transform.stream.StreamSource(new File(ValidatorTest.class.getResource("gMonths.xml").toURI()));
 
             validate("gMonths.xsd", xmlSource, xmlResult);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
index 774466dee37..4424d3748f8 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -39,11 +38,9 @@
  * @test
  * @bug 6943252
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6943252Test
  * @run testng/othervm validation.tck.Bug6943252Test
  * @summary Test Schema doesn't allow to use value more than allowed by base type.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6943252Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
index 321d33eca6b..e0e8be80051 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 6963124
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6963124Test
  * @run testng/othervm validation.tck.Bug6963124Test
  * @summary Test Schema doesn't allow maxOccurs > 1 for reference to all model group.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6963124Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
index 6e687c4300a..f01985d195c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -49,11 +48,9 @@
  * @test
  * @bug 6963468
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6963468Test
  * @run testng/othervm validation.tck.Bug6963468Test
  * @summary Test Validation allows element a is a union type and element b specifies a as its substitution group and b type is or is derived from one of the member types of the union.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6963468Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
index a061cabecb4..564ad0bb844 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 6964720
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6964720Test
  * @run testng/othervm validation.tck.Bug6964720Test
  * @summary Test Schema doesn't allow the inexpressible union of two attribute wildcards.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6964720Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
index 863f9833540..6aa27f6be9c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -39,11 +38,9 @@
  * @test
  * @bug 6967214
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6967214Test
  * @run testng/othervm validation.tck.Bug6967214Test
  * @summary Test Schema doesn't allow unpaired parenthesises in regex.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6967214Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
index a8f908a752d..8295581128d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 6970890
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6970890Test
  * @run testng/othervm validation.tck.Bug6970890Test
  * @summary Test Schema allows [-] in regex.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6970890Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
index 25f57033052..bd22ec0e1b3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -40,11 +39,9 @@
  * @test
  * @bug 6971190
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6971190Test
  * @run testng/othervm validation.tck.Bug6971190Test
  * @summary Test Validation accepts UTF lexical presentation.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6971190Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
index 0c72202bd84..5a90b6953b4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -44,11 +43,9 @@
  * @test
  * @bug 6974551
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6974551Test
  * @run testng/othervm validation.tck.Bug6974551Test
  * @summary Test Validation for SAXParser can expose whitespace facet for xs:anySimpleType.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6974551Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
index 27ee0b4e3e1..f4cb42d399d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -39,11 +38,9 @@
  * @test
  * @bug 6975265
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6975265Test
  * @run testng/othervm validation.tck.Bug6975265Test
  * @summary Test Schema doesn't allow some Element Information Items contain other element information item.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6975265Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
index 435dd3d3b3b..58d51a4e874 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,15 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6977201
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6977201Test
  * @run testng/othervm validation.tck.Bug6977201Test
  * @summary Test Validator interprets regex "" correctly.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6977201Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
index 34cd44649d4..905f7f5bbf4 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import javax.xml.validation.Validator;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -49,11 +48,9 @@
  * @test
  * @bug 6989956
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug6989956Test
  * @run testng/othervm validation.tck.Bug6989956Test
  * @summary Test Validation can process correctly that maxOccurs in Choice less than maxOccurs in Elements contained in the Choice.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6989956Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
index 319eacb8b54..75f1ef54692 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -37,11 +36,9 @@
  * @test
  * @bug 7014246
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.Bug7014246Test
  * @run testng/othervm validation.tck.Bug7014246Test
  * @summary Test Schema doesn't allow maxInclusive of derived time type greater than the base.
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class Bug7014246Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java
index 2c83da1c49b..e1eb7d688e8 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -37,13 +36,11 @@
  * @test
  * @bug 8142463
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.ParticleTest
  * @run testng/othervm validation.tck.ParticleTest
  * @summary Tests that verify bug fixes for Particles (http://www.w3.org/TR/xmlschema11-1/#cParticles)
 
  * @author Joe Wang (huizhe.wang@oracle.com)
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class ParticleTest {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java
index 25ece2a97ab..e9080331595 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/tck/RegexWord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
@@ -36,13 +35,11 @@
  * @test
  * @bug 8142900
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.tck.RegexWord
  * @run testng/othervm validation.tck.RegexWord
  * @summary Verifies that all characters except the set of "punctuation",
  * "separator" and "other" characters are accepted by \w [#x0000-#x10FFFF]-[\p{P}\p{Z}\p{C}]
  * @author Joe Wang
  */
-@Listeners({jaxp.library.FilePolicy.class})
 public class RegexWord {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java
index 64a21d999cd..db1c86dc626 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991857.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
@@ -38,11 +37,9 @@
  * @test
  * @bug 4991857
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.Bug4991857
  * @run testng/othervm xpath.Bug4991857
  * @summary XPath.evaluate(...) throws XPathExpressionException when context is null and expression refers to the context.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4991857 {
 
     Document d = null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java
index e7aa367eace..84f88546bfe 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4991939.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 4991939
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.Bug4991939
  * @run testng/othervm xpath.Bug4991939
  * @summary XPath.evaluate(...) throws IllegalArgumentException if returnType is not one of the types defined in XPathConstants.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4991939 {
 
     @Test
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java
index a0024230fce..86d1c924afb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992788.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import javax.xml.xpath.XPathFactoryConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -39,11 +38,9 @@
  * @test
  * @bug 4992788
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.Bug4992788
  * @run testng/othervm xpath.Bug4992788
  * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if source is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4992788 {
 
     private static String expression = "/widgets/widget[@name='a']/@quantity";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java
index aca7fe3c248..f46000034a9 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992793.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import javax.xml.xpath.XPathFactoryConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -41,11 +40,9 @@
  * @test
  * @bug 4992793
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.Bug4992793
  * @run testng/othervm xpath.Bug4992793
  * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if expression is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4992793 {
 
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java
index a7295986f71..30a16b6498d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/Bug4992805.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import javax.xml.xpath.XPathFactoryConfigurationException;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
@@ -40,11 +39,9 @@
  * @test
  * @bug 4992805
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.Bug4992805
  * @run testng/othervm xpath.Bug4992805
  * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if returnType is null.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class Bug4992805 {
 
     private static String expression = "/widgets/widget[@name='a']/@quantity";
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
index e49fd141e60..bf57ce1b211 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,29 +23,23 @@
 
 package xpath;
 
-import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
-
 import javax.xml.xpath.XPathFactory;
-
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @test
  * @bug 6354969
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.ClassLoaderTest
  * @run testng/othervm xpath.ClassLoaderTest
  * @summary Test XPathFactory newInstance() with ContextClassLoader.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class ClassLoaderTest {
 
     @Test
     public void testClassLoader() {
-        MyClassLoader cl = runWithAllPerm(() -> new MyClassLoader());
-        runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(cl));
+        MyClassLoader cl = new MyClassLoader();
+        Thread.currentThread().setContextClassLoader(cl);
         XPathFactory xPathFactory = XPathFactory.newInstance();
 
         if (!cl.isCalled()) {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
index d9a8878093e..21fc436226b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
 import javax.xml.xpath.XPathFunctionResolver;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -51,12 +50,10 @@
 /*
  * @test
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.SecureProcessingTest
  * @run testng/othervm xpath.SecureProcessingTest
  * @summary Test when FEATURE_SECURE_PROCESSING is true, calling an external function will cause XPathFunctionException.
  */
 @Test
-@Listeners({jaxp.library.FilePolicy.class})
 public class SecureProcessingTest {
     public final void testSecureProcessing() {
         boolean _isSecureMode = System.getSecurityManager() != null;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
index 27badf40864..0db3a40a40c 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -41,12 +40,10 @@
  * @test
  * @bug 8054196
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.XPathAnyTypeTest
  * @run testng/othervm xpath.XPathAnyTypeTest
  * @summary Test for the project XPath: support any type. This test covers the new
  * evaluateExpression methods of XPath, as well as XPathNodes and XPathEvaluationResult.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XPathAnyTypeTest extends XPathTestBase {
     /*
      Test for resolveFunction(QName functionName,int arity); evaluate throws
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
index 964d83d34f0..79fe2885204 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -43,12 +42,10 @@
  * @test
  * @bug 8054196
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow xpath.XPathExpAnyTypeTest
  * @run testng/othervm xpath.XPathExpAnyTypeTest
  * @summary Test for the project XPath: support any type. This test covers the new
  * evaluateExpression methods of XPathExpression.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class XPathExpAnyTypeTest extends XPathTestBase {
 
     /*
diff --git a/test/jdk/ProblemList-Xcomp.txt b/test/jdk/ProblemList-Xcomp.txt
index 02f81b13bad..680806e6e31 100644
--- a/test/jdk/ProblemList-Xcomp.txt
+++ b/test/jdk/ProblemList-Xcomp.txt
@@ -28,4 +28,5 @@
 #############################################################################
 
 java/lang/invoke/MethodHandles/CatchExceptionTest.java          8146623 generic-all
+java/lang/reflect/callerCache/ReflectionCallerCacheTest.java    8332028 generic-all
 com/sun/jdi/InterruptHangTest.java                              8043571 generic-all
diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt
index e81ac813747..cab33229a5b 100644
--- a/test/jdk/ProblemList-zgc.txt
+++ b/test/jdk/ProblemList-zgc.txt
@@ -38,3 +38,5 @@ sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8307393   generic-all
 sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8307393   generic-all
 
 com/sun/jdi/ThreadMemoryLeakTest.java          8307402 generic-all
+
+jdk/jfr/event/runtime/TestNativeMemoryUsageEvents.java   8343893 generic-all
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index ea74cd40fb8..a87ab372da2 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -467,6 +467,7 @@ java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsol
 java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java 8265985 macosx-all
 java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java 8266059 macosx-all
 java/awt/Robot/Delay/InterruptOfDelay.java 8265986 macosx-all
+java/awt/Robot/InfiniteLoopException.java 8342638 windows-all
 java/awt/MenuBar/TestNoScreenMenuBar.java 8265987 macosx-all
 
 java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8266283 generic-all
@@ -557,8 +558,6 @@ sun/management/jdp/JdpOffTest.java                              8308807 aix-ppc6
 
 javax/management/MBeanServer/OldMBeanServerTest.java            8030957 aix-all
 
-javax/management/monitor/DerivedGaugeMonitorTest.java           8042211 generic-all
-
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8262312 linux-all
 
 ############################################################################
@@ -771,6 +770,7 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 # jdk_jfr
 
 jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-all
+jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
 
@@ -804,6 +804,7 @@ java/awt/image/VolatileImage/VolatileImageConfigurationTest.java 8171069 macosx-
 java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all
 java/awt/Frame/FrameStateTest/FrameStateTest.java 8203920 macosx-all,linux-all
 java/awt/print/PrinterJob/ScaledText/ScaledText.java 8231226 macosx-all
+java/awt/print/PrinterJob/PrintTextTest.java 8148334 generic-all
 java/awt/font/TextLayout/TestJustification.java 8250791 macosx-all
 java/awt/TrayIcon/DragEventSource/DragEventSource.java 8252242 macosx-all
 java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java 7187728 macosx-all,linux-all
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 6276932afbd..7b6276c7aa0 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -102,7 +102,9 @@ requires.properties= \
     systemd.support \
     release.implementor \
     jdk.containerized \
-    jdk.foreign.linker
+    jdk.foreign.linker \
+    jlink.runtime.linkable \
+    jlink.packagedModules
 
 # Minimum jtreg version
 requiredVersion=7.4+1
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index e7ee8990f94..b1d1c8be273 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -423,8 +423,7 @@ jdk_imageio = \
     javax/imageio
 
 jdk_accessibility = \
-    javax/accessibility \
-    com/sun/java/accessibility
+    javax/accessibility
 
 jfc_demo = \
      demo/jfc
@@ -630,8 +629,6 @@ jdk_security_manual_no_input = \
     com/sun/security/sasl/gsskerb/AuthOnly.java \
     com/sun/security/sasl/gsskerb/ConfSecurityLayer.java \
     com/sun/security/sasl/gsskerb/NoSecurityLayer.java \
-    sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java \
-    sun/security/provider/PolicyParser/PrincipalExpansionError.java \
     sun/security/smartcardio/TestChannel.java \
     sun/security/smartcardio/TestConnect.java \
     sun/security/smartcardio/TestConnectAgain.java \
@@ -654,7 +651,6 @@ jdk_core_manual_interactive = \
 
 jdk_security_manual_interactive = \
     sun/security/tools/keytool/i18n.java \
-    java/security/Policy/Root/Root.java \
     com/sun/security/auth/callback/TextCallbackHandler/Password.java \
     sun/security/krb5/config/native/TestDynamicStore.java
 
@@ -670,4 +666,4 @@ jdk_core_no_security = \
 
 # Set of tests for `@since` checks in source code documentation
 jdk_since_checks = \
-   tools/sincechecker/modules/java_base/CheckSince_javaBase.java
+   tools/sincechecker/
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java
index bb9538c70a1..10fb456bd75 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Test AES ciphers with different modes and padding schemes after
  *  remove then add provider.
  * @modules java.base/com.sun.crypto.provider
- * @run main/othervm/policy=testAES.policy TestAESWithProviderChange
  */
 
 public class TestAESWithProviderChange extends Dynamic {
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java
index 677f9aa913a..cd3ef77d20f 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @bug 8044193
  * @summary Test AES ciphers with different modes and padding schemes after
  *  remove default provider then add it back.
- * @run main/othervm/policy=testAES.policy TestAESWithRemoveAddProvider
  */
 
 public class TestAESWithRemoveAddProvider extends Dynamic {
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy
deleted file mode 100644
index 5c6a06beb02..00000000000
--- a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant codeBase "file:${test.classes}/*" {
-    permission java.security.SecurityPermission "removeProvider.*";
-    permission java.security.SecurityPermission "insertProvider.*";
-    permission java.lang.RuntimePermission
-               "accessClassInPackage.com.sun.crypto.provider";
-    permission java.util.PropertyPermission "test.provider.name", "read";
-};
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java
index 2a82f2214d4..3bacff7617d 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/RSA/TestOAEPPadding.java
@@ -57,7 +57,7 @@ public static void main(String args[]) throws Exception {
                         System.getProperty("test.provider.name", "SunJCE"));
         System.out.println("Testing provider " + cp.getName() + "...");
         Provider kfp = Security.getProvider(
-                        System.getProperty("test.providername", "SunRsaSign"));
+                        System.getProperty("test.provider.name", "SunRsaSign"));
         String kpgAlgorithm = "RSA";
         KeyPairGenerator kpg = KeyPairGenerator.getInstance(kpgAlgorithm, kfp);
         kpg.initialize(SecurityUtils.getTestKeySize(kpgAlgorithm));
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java
index 0088fe54a80..fd33337a3c0 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java
@@ -69,6 +69,8 @@ public class HKDFExhaustiveTest {
   private static final int LARGE_LENGTH = 1000;
   private static final int NEGATIVE_LENGTH = -1;
 
+  static class TestKDFParams implements KDFParameters {}
+
   private static final KdfVerifier<String, String, AlgorithmParameterSpec> KdfGetInstanceVerifier =
       (a, p, s) -> {
 
@@ -304,6 +306,12 @@ private static void testGetInstanceNegative() {
     Utils.runAndCheckException(
         () -> KDF.getInstance(KDF_ALGORITHMS[0], null, INVALID_STRING),
         NoSuchProviderException.class);
+    Utils.runAndCheckException(
+        () -> KDF.getInstance(KDF_ALGORITHMS[0], new TestKDFParams(), SUNJCE),
+        InvalidAlgorithmParameterException.class);
+    Utils.runAndCheckException(
+        () -> KDF.getInstance(KDF_ALGORITHMS[0], new TestKDFParams(), SUNJCE_PROVIDER),
+        InvalidAlgorithmParameterException.class);
 
     // getInstance(String algorithm, KDFParameters kdfParameters, Provider provider)
     Utils.runAndCheckException(
diff --git a/test/jdk/com/sun/java/accessibility/util/8051626/Bug8051626.java b/test/jdk/com/sun/java/accessibility/util/8051626/Bug8051626.java
deleted file mode 100644
index 96f301d5ce5..00000000000
--- a/test/jdk/com/sun/java/accessibility/util/8051626/Bug8051626.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 8051626
- * @summary Ensure no failure when using Java Accessibility Utility with security manager
- * @modules java.desktop jdk.accessibility
- *
- * @run main/othervm -Djava.security.manager=allow Bug8051626
- */
-
-import com.sun.java.accessibility.util.AWTEventMonitor;
-import java.awt.Dimension;
-import java.lang.reflect.InvocationTargetException;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-public class Bug8051626 {
-
-    public static void main(final String[] args) throws InterruptedException,
-                                                        InvocationTargetException {
-            final Bug8051626 app = new Bug8051626();
-            app.test();
-        }
-
-    private void test() throws InterruptedException, InvocationTargetException {
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                final JFrame frame = new JFrame("Bug 8051626");
-                try {
-                    final JPanel panel = new JPanel();
-                    final JButton okButton = new JButton("OK");
-                    panel.add(okButton);
-                    frame.getContentPane().add(panel);
-                    frame.setMinimumSize(new Dimension(300, 180));
-                    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                    frame.pack();
-                    frame.setLocation(400, 300);
-                    frame.setVisible(true);
-                    // If the security manager is on this should not cause an exception.
-                    // Prior to the 8051626 fix it would as follows:
-                    // java.security.AccessControlException:
-                    //   access denied ("java.lang.RuntimePermission" "accessClassInPackage.com.sun.java.accessibility.util")
-                    AWTEventMonitor.getComponentWithFocus();
-                } finally {
-                    frame.dispose();
-                }
-            }
-        });
-    }
-
-}
diff --git a/test/jdk/com/sun/jndi/ldap/LdapDnsProviderTest.java b/test/jdk/com/sun/jndi/ldap/LdapDnsProviderTest.java
index f00ac2ecb47..cca8fa45c62 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapDnsProviderTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapDnsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,27 +58,10 @@
  * @build jdk.test.lib.RandomFactory
  * @compile dnsprovider/TestDnsProvider.java
  * @run main/othervm LdapDnsProviderTest
- * @run main/othervm LdapDnsProviderTest nosm
- * @run main/othervm -Djava.security.manager=allow LdapDnsProviderTest smnodns
- * @run main/othervm -Djava.security.manager=allow LdapDnsProviderTest smdns
- * @run main/othervm LdapDnsProviderTest nosmbaddns
+ * @run main/othervm LdapDnsProviderTest serviceloader
+ * @run main/othervm LdapDnsProviderTest missingprovider
  */
 
-class DNSSecurityManager extends SecurityManager {
-
-    private boolean dnsProvider = false;
-
-    public void setAllowDnsProvider(boolean allow) {
-        dnsProvider = allow;
-    }
-
-    @Override
-    public void checkPermission(Permission p) {
-        if (p.getName().equals("ldapDnsProvider") && !dnsProvider) {
-            throw new SecurityException(p.getName());
-        }
-    }
-}
 
 class ProviderTest implements Callable<Boolean> {
 
@@ -172,32 +155,18 @@ public static void installServiceConfigurationFile(String content) {
     }
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 0 && args[0].equals("nosm")) {
-            // no security manager, serviceloader
+        if (args.length > 0 && args[0].equals("serviceloader")) {
+            // service loader
+            // TestDnsProvider
             installServiceConfigurationFile("dnsprovider.TestDnsProvider");
             runTest("ldap:///dc=example,dc=com", "yupyupyup:389");
-        } else if (args.length > 0 && args[0].equals("smnodns")) {
-            // security manager & serviceloader
-            installServiceConfigurationFile("dnsprovider.TestDnsProvider");
-            // install security manager
-            System.setSecurityManager(new DNSSecurityManager());
-            runTest("ldap:///dc=example,dc=com", "ServiceConfigurationError");
-        } else if (args.length > 0 && args[0].equals("smdns")) {
-            // security manager & serviceloader
-            DNSSecurityManager sm = new DNSSecurityManager();
-            installServiceConfigurationFile("dnsprovider.TestDnsProvider");
-            // install security manager
-            System.setSecurityManager(sm);
-            sm.setAllowDnsProvider(true);
-            runTest("ldap:///dc=example,dc=com", "yupyupyup:389");
-        } else if (args.length > 0 && args[0].equals("nosmbaddns")) {
-            // no security manager, no serviceloader
-            // DefaultLdapDnsProvider
+        } else if (args.length > 0 && args[0].equals("missingprovider")) {
+            // no service loader
+            // MissingDnsProvider
             installServiceConfigurationFile("dnsprovider.MissingDnsProvider");
-            // no SecurityManager
             runTest("ldap:///dc=example,dc=com", "not found");
         } else {
-            // no security manager, no serviceloader
+            // no service loader
             // DefaultLdapDnsProvider
             System.err.println("TEST_CLASSES:");
             System.err.println(TEST_CLASSES);
@@ -207,7 +176,6 @@ public static void main(String[] args) throws Exception {
                 f.delete();
             }
 
-            // no SecurityManager
             runTest("ldap:///dc=example,dc=com", "localhost:389");
             runTest("ldap://localhost/dc=example,dc=com", "localhost:389");
             runLocalHostTestWithRandomPort("ldap", "/dc=example,dc=com", 5);
diff --git a/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java b/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java
deleted file mode 100644
index a7fa5ae303a..00000000000
--- a/test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug     7150256
- * @summary Permissions Tests for the DiagnosticCommandMBean
- * @author  Frederic Parain
- *
- * @modules java.logging
- *          java.management
- *
- * @run main/othervm -Djava.security.manager=allow DcmdMBeanPermissionsTest
- */
-
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.ReflectPermission;
-import java.security.Permission;
-import java.util.HashSet;
-import java.util.Iterator;
-import javax.management.Descriptor;
-import javax.management.InstanceNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanPermission;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import javax.management.RuntimeMBeanException;
-
-/**
- *
- * @author fparain
- */
-public class DcmdMBeanPermissionsTest {
-
-    private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
-        "com.sun.management:type=DiagnosticCommand";
-
-    static public class CustomSecurityManager extends SecurityManager {
-
-        private HashSet<Permission> grantedPermissions;
-
-        public CustomSecurityManager() {
-            grantedPermissions = new HashSet<Permission>();
-        }
-
-        public final void grantPermission(final Permission perm) {
-            grantedPermissions.add(perm);
-        }
-
-        public final void denyPermission(final Permission perm) {
-            Iterator<Permission> it = grantedPermissions.iterator();
-            while (it.hasNext()) {
-                Permission p = it.next();
-                if (p.equals(perm)) {
-                    it.remove();
-                }
-            }
-        }
-
-        public final void checkPermission(final Permission perm) {
-            for (Permission p : grantedPermissions) {
-                if (p.implies(perm)) {
-                    return;
-                }
-            }
-            throw new SecurityException(perm.toString());
-        }
-    };
-
-    static Permission createPermission(String classname, String name,
-            String action) {
-        Permission permission = null;
-        try {
-            Class c = Class.forName(classname);
-            if (action == null) {
-                try {
-                    Constructor constructor = c.getConstructor(String.class);
-                    permission = (Permission) constructor.newInstance(name);
-
-                } catch (InstantiationException | IllegalAccessException
-                        | IllegalArgumentException | InvocationTargetException
-                        | NoSuchMethodException | SecurityException ex) {
-                    ex.printStackTrace();
-                    throw new RuntimeException("TEST FAILED");
-                }
-            }
-            if (permission == null) {
-                try {
-                    Constructor constructor = c.getConstructor(String.class,
-                            String.class);
-                    permission = (Permission) constructor.newInstance(
-                            name,
-                            action);
-                } catch (InstantiationException | IllegalAccessException
-                        | IllegalArgumentException | InvocationTargetException
-                        | NoSuchMethodException | SecurityException ex) {
-                    ex.printStackTrace();
-                    throw new RuntimeException("TEST FAILED");
-                }
-            }
-        } catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
-                    throw new RuntimeException("TEST FAILED");
-        }
-        if (permission == null) {
-            throw new RuntimeException("TEST FAILED");
-        }
-        return permission;
-    }
-
-    // return true if invokation triggered a SecurityException
-    static boolean invokeOperation(MBeanServer mbs, ObjectName on,
-            MBeanOperationInfo opInfo) {
-        try {
-            if (opInfo.getSignature().length == 0) {
-                mbs.invoke(on, opInfo.getName(),
-                        new Object[0], new String[0]);
-            } else {
-                mbs.invoke(on, opInfo.getName(),
-                        new Object[1], new String[]{ String[].class.getName()});
-            }
-        } catch (SecurityException ex) {
-            ex.printStackTrace();
-            return true;
-        } catch (RuntimeMBeanException ex) {
-            if (ex.getCause() instanceof SecurityException) {
-                //ex.printStackTrace();
-                return true;
-            }
-        } catch (MBeanException | InstanceNotFoundException
-                | ReflectionException ex) {
-            throw new RuntimeException("TEST FAILED");
-        }
-        return false;
-    }
-
-    static void testOperation(MBeanServer mbs, CustomSecurityManager sm,
-            ObjectName on, MBeanOperationInfo opInfo) {
-        System.out.println("Testing " + opInfo.getName());
-        Descriptor desc = opInfo.getDescriptor();
-        if (desc.getFieldValue("dcmd.permissionClass") == null) {
-        // No special permission required, execution should not trigger
-        // any security exception
-            if (invokeOperation(mbs, on, opInfo)) {
-                throw new RuntimeException("TEST FAILED");
-            }
-        } else {
-            // Building the required permission
-            Permission reqPerm = createPermission(
-                    (String)desc.getFieldValue("dcmd.permissionClass"),
-                    (String)desc.getFieldValue("dcmd.permissionName"),
-                    (String)desc.getFieldValue("dcmd.permissionAction"));
-            // Paranoid mode: check that the SecurityManager has not already
-            // been granted the permission
-            sm.denyPermission(reqPerm);
-            // A special permission is required for this operation,
-            // invoking it without the permission granted must trigger
-            // a security exception
-            if(!invokeOperation(mbs, on, opInfo)) {
-                throw new RuntimeException("TEST FAILED");
-            }
-            // grant the permission and re-try invoking the operation
-            sm.grantPermission(reqPerm);
-            if(invokeOperation(mbs, on, opInfo)) {
-                throw new RuntimeException("TEST FAILED");
-            }
-            // Clean up
-            sm.denyPermission(reqPerm);
-        }
-    }
-
-    public static void main(final String[] args) {
-        final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-        ObjectName on = null;
-        try {
-            on = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME);
-        } catch (MalformedObjectNameException ex) {
-            ex.printStackTrace();
-            throw new RuntimeException("TEST FAILED");
-        }
-        MBeanInfo info = null;
-        try {
-            info = mbs.getMBeanInfo(on);
-        } catch (InstanceNotFoundException | IntrospectionException
-                | ReflectionException ex) {
-            ex.printStackTrace();
-            throw new RuntimeException("TEST FAILED");
-        }
-        CustomSecurityManager sm = new CustomSecurityManager();
-        System.setSecurityManager(sm);
-        // Set of permission required to run the test cleanly
-        // Some permissions are required by the MBeanServer and other
-        // platform services (RuntimePermission("createClassLoader"),
-        // ReflectPermission("suppressAccessChecks"),
-        // java.util.logging.LoggingPermission("control"),
-        // RuntimePermission("exitVM.97")).
-        // Other permissions are required by commands being invoked
-        // in the test (for instance, RuntimePermission("modifyThreadGroup")
-        // and RuntimePermission("modifyThread") are checked when
-        // runFinalization() is invoked by the gcRunFinalization command.
-        sm.grantPermission(new RuntimePermission("createClassLoader"));
-        sm.grantPermission(new ReflectPermission("suppressAccessChecks"));
-        sm.grantPermission(new java.util.logging.LoggingPermission("control", ""));
-        sm.grantPermission(new java.lang.RuntimePermission("exitVM.*"));
-        sm.grantPermission(new java.lang.RuntimePermission("modifyThreadGroup"));
-        sm.grantPermission(new java.lang.RuntimePermission("modifyThread"));
-        sm.grantPermission(new java.security.SecurityPermission("getProperty.jdk.jar.disabledAlgorithms"));
-        for(MBeanOperationInfo opInfo : info.getOperations()) {
-            Permission opPermission = new MBeanPermission(info.getClassName(),
-                    opInfo.getName(),
-                    on,
-                    "invoke");
-            sm.grantPermission(opPermission);
-            testOperation(mbs, sm, on, opInfo);
-            sm.denyPermission(opPermission);
-        }
-        System.out.println("TEST PASSED");
-    }
-}
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
similarity index 56%
rename from test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTest.java
rename to test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
index 72d0050b2af..79477d23782 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@
  * @summary Tests for FileServerHandler with SecurityManager
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run main/othervm/java.security.policy=SecurityManagerTestRead.policy -ea SecurityManagerTest true
- * @run main/othervm/java.security.policy=SecurityManagerTestNoRead.policy -ea SecurityManagerTest false
- * @run main/othervm -ea SecurityManagerTest true
+ * @run main/othervm -ea RootDirPermissionsTest true
+ * @run main/othervm -ea RootDirPermissionsTest false
  */
 
 import java.io.IOException;
@@ -40,9 +39,18 @@
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AccessControlException;
+import java.nio.file.attribute.AclEntry;
+import java.nio.file.attribute.AclEntryPermission;
+import java.nio.file.attribute.AclEntryType;
+import java.nio.file.attribute.AclFileAttributeView;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.UserPrincipal;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -56,21 +64,19 @@
 import static java.nio.file.StandardOpenOption.CREATE;
 
 /**
- * Tests the permission checks during the creation of a FileServerHandler.
+ * Tests file permission checks during the creation of a FileServerHandler.
  *
- * A FileServerHandler can only be created if a "read" FilePermission is
- * granted for the root directory passed. The test consists of 3 runs:
- *     1) security manager enabled and "read" FilePermission granted
- *     2) security manager enabled and "read" FilePermission NOT granted
- *     3) security manager NOT enabled
- * 2) misses the required permissions to call many of the java.nio.file methods,
- * the test works around this by reusing the test directory created in the
- * previous run.
+ * A FileServerHandler can only be created if its root directory
+ * is readable. The test consists of 2 runs:
+ *     1) RootDir is readable
+ *     2) RootDir is NOT readable
+ * 2)  reuses the test directory created in the previous run, revoking
+ *     read access.
 * */
-public class SecurityManagerTest {
+public class RootDirPermissionsTest {
 
     static final Path CWD = Path.of(".").toAbsolutePath().normalize();
-    static final Path TEST_DIR = CWD.resolve("SecurityManagerTest");
+    static final Path TEST_DIR = CWD.resolve("RootDir");
     static final InetSocketAddress LOOPBACK_ADDR =
             new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
@@ -81,6 +87,9 @@ public class SecurityManagerTest {
     static String lastModifiedDir;
     static String lastModifiedFile;
 
+    static Set<PosixFilePermission> posixPermissions;
+    static List<AclEntry> acls;
+
     public static void main(String[] args) throws Exception {
         setupLogging();
         readPermitted = Boolean.parseBoolean(args[0]);
@@ -88,9 +97,87 @@ public static void main(String[] args) throws Exception {
             createTestDir();
             testDirectoryGET();
             testFileGET();
-        } else {  // no FilePermission "read" for TEST_DIR granted,
-                  // assert handler cannot be created
-            testCreateHandler();
+        } else {
+            revokePermissions();
+            try {
+                testCreateHandler();
+            } finally {
+                restorePermissions();
+            }
+        }
+    }
+
+    private static void revokePermissions() throws IOException {
+        if (!Files.isReadable(TEST_DIR)) {
+            // good nothing to do:
+            System.out.println("File is already not readable: nothing to do");
+            return;
+        }
+        System.out.println("FileSystem: " + Files.getFileStore(TEST_DIR).type());
+        if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("posix")) {
+            System.out.println("Revoking owner's read access in POSIX permissions for " + TEST_DIR);
+            posixPermissions = Files.getPosixFilePermissions(TEST_DIR);
+            Set<PosixFilePermission> newPerms = new HashSet<>(posixPermissions);
+            newPerms.remove(PosixFilePermission.OWNER_READ);
+            newPerms.remove(PosixFilePermission.OWNER_EXECUTE);
+            Files.setPosixFilePermissions(TEST_DIR, newPerms);
+        } else if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("acl")) {
+            System.out.println("Revoking owner's read access in ACLs for " + TEST_DIR);
+            AclFileAttributeView view = Files.getFileAttributeView(TEST_DIR, AclFileAttributeView.class);
+            acls = view.getAcl();
+            List<AclEntry> entries = new ArrayList<>();
+            UserPrincipal owner = view.getOwner();
+            // Deny owner
+            entries.add(AclEntry.newBuilder().setType(AclEntryType.DENY)
+                    .setPrincipal(owner).setPermissions(AclEntryPermission.READ_DATA,
+                            AclEntryPermission.READ_ATTRIBUTES, AclEntryPermission.READ_NAMED_ATTRS,
+                            AclEntryPermission.EXECUTE)
+                    .build());
+            // Revoke read data and execute
+            for (AclEntry entry : acls) {
+                Set<AclEntryPermission> perms =
+                        new HashSet<>(entry.permissions());
+                if (entry.type() == AclEntryType.ALLOW) {
+                    System.out.println("Revoking read access: " + entry);
+                    perms.remove(AclEntryPermission.READ_DATA);
+                    perms.remove(AclEntryPermission.LIST_DIRECTORY);
+                    perms.remove(AclEntryPermission.READ_ATTRIBUTES);
+                    perms.remove(AclEntryPermission.READ_NAMED_ATTRS);
+                    perms.remove(AclEntryPermission.EXECUTE);
+                    entries.add(AclEntry.newBuilder(entry).setPermissions(perms).build());
+                }
+            }
+            view.setAcl(entries);
+            System.out.println("ACLs: " + view.getAcl());
+            try {
+                System.out.println("File is readable: " + Files.isReadable(TEST_DIR));
+                Thread.sleep(50);
+            } catch (InterruptedException x) {}
+            // The above does not always work, skip the test if we can't make TEST_DIR
+            // read-only.
+            if (Files.isReadable(TEST_DIR)) {
+                throw new jtreg.SkippedException("Can't make directory read-only");
+            }
+        } else {
+            throw new RuntimeException("Required attribute view not supported");
+        }
+        System.out.println("File is readable: " + Files.isReadable(TEST_DIR));
+    }
+
+    private static void restorePermissions() throws IOException {
+        if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("posix")) {
+            if (posixPermissions != null) {
+                System.out.println("Restoring original POSIX permissions");
+                Files.setPosixFilePermissions(TEST_DIR, posixPermissions);
+            }
+        } else if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("acl")) {
+            if (acls != null) {
+                System.out.println("Restoring original ACLs");
+                AclFileAttributeView view = Files.getFileAttributeView(TEST_DIR, AclFileAttributeView.class);
+                view.setAcl(acls);
+            }
+        } else {
+            throw new RuntimeException("Required attribute view not supported");
         }
     }
 
@@ -163,12 +250,12 @@ private static void testCreateHandler(){
         try {
             SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.NONE);
             throw new RuntimeException("Handler creation expected to fail");
-        } catch (AccessControlException expected) { }
+        } catch (IllegalArgumentException expected) { }
 
         try {
             SimpleFileServer.createFileHandler(TEST_DIR);
             throw new RuntimeException("Handler creation expected to fail");
-        } catch (AccessControlException expected) { }
+        } catch (IllegalArgumentException expected) { }
     }
 
     static final String openHTML = """
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestNoRead.policy b/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestNoRead.policy
deleted file mode 100644
index b91171b4145..00000000000
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestNoRead.policy
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/test/lib/jdk/test/lib/util/FileUtils.class
-grant codeBase "file:${test.classes}/../../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "*", "read";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://localhost:*/*", "GET";
-
-    // for HTTP server
-    permission java.net.SocketPermission "localhost:*", "accept,resolve";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestRead.policy b/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestRead.policy
deleted file mode 100644
index b8b6b3a5f37..00000000000
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SecurityManagerTestRead.policy
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/test/lib/jdk/test/lib/util/FileUtils.class
-grant codeBase "file:${test.classes}/../../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "*", "read";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://localhost:*/*", "GET";
-
-    // for test directory tree
-    permission java.io.FilePermission "${user.dir}${/}SecurityManagerTest", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}SecurityManagerTest/-", "read,write,delete";
-
-    // for HTTP server
-    permission java.net.SocketPermission "localhost:*", "accept,resolve";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/com/sun/security/auth/UnixPrincipalHashCode.java b/test/jdk/com/sun/security/auth/UnixPrincipalHashCode.java
index 26ea7ed71c2..26301257247 100644
--- a/test/jdk/com/sun/security/auth/UnixPrincipalHashCode.java
+++ b/test/jdk/com/sun/security/auth/UnixPrincipalHashCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8198352
  * @requires os.family != "windows"
- * @run main/othervm/policy=uphc.policy
+ * @run main/othervm
  *      -Djava.security.auth.login.config=uphc.conf
  *      UnixPrincipalHashCode
  * @summary java.util.MissingResourceException: sun.security.util.AuthResources
diff --git a/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java
index 28f42b58f57..5941672bc1e 100644
--- a/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java
+++ b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4397774
  * @summary ConfigFile does not support nested static classes as Module names
- * @run main/othervm/policy=InnerClassConfig.policy -Djava.security.auth.login.config==file:${test.src}/InnerClassConfig.config InnerClassConfig
+ * @run main/othervm -Djava.security.auth.login.config==file:${test.src}/InnerClassConfig.config InnerClassConfig
  */
 
 import com.sun.security.auth.login.*;
diff --git a/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy b/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy
deleted file mode 100644
index 7fb96e1bac2..00000000000
--- a/test/jdk/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-// grant javatest and jtreg AllPermission
-grant codebase "file:/usr/local/java/-" {
-    permission java.security.AllPermission;
-};
-
-grant {
-    permission javax.security.auth.AuthPermission "getLoginConfiguration";
-};
diff --git a/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java
index 0b1709c785a..f2218d345c4 100644
--- a/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java
+++ b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,61 +25,46 @@
  * @test
  * @bug 4337769
  * @summary     ConfigFile should support system property expansion
- * @run main/othervm/policy=PropertyExpansion.policy -Djava.security.auth.login.config==file:${test.src}/PropertyExpansion.config PropertyExpansion
+ * @run main/othervm -Djava.security.auth.login.config==file:${test.src}/PropertyExpansion.config PropertyExpansion
  */
 
-import com.sun.security.auth.login.*;
 import javax.security.auth.login.*;
 
 public class PropertyExpansion {
 
     public static void main(String[] args) {
 
-        try {
-            ConfigFile config = new ConfigFile();
-            throw new IllegalStateException("test 1 failed");
-        } catch (SecurityException se) {
-            // good
-            se.printStackTrace();
-        }
-
-        Configuration config = null;
-        try {
-            config = Configuration.getConfiguration();
-        } catch (SecurityException se) {
-            System.out.println("test 2 failed");
-            throw se;
-        }
+        Configuration config = Configuration.getConfiguration();
 
         AppConfigurationEntry[] entries =
                 config.getAppConfigurationEntry("PropertyExpansion");
 
         // there are 2 entries
-        if (entries.length != 2)
-                throw new IllegalStateException("test 2 failed");
+        if (entries.length != 2) {
+            throw new IllegalStateException("test 2 failed");
+        }
 
         for (int i = 0; i < 2; i++) {
-                System.out.println("module " + i + " = " +
-                        entries[i].getLoginModuleName());
-                System.out.println("control flag " + i + " = " +
-                        entries[i].getControlFlag());
-                java.util.Map map = entries[i].getOptions();
-                System.out.println("option " + i + " = useFile, " +
-                        "value = " + map.get("useFile"));
-                System.out.println("option " + i + " = debug, " +
-                        "value = " + map.get("debug"));
+            System.out.println("module " + i + " = " +
+                    entries[i].getLoginModuleName());
+            System.out.println("control flag " + i + " = " +
+                    entries[i].getControlFlag());
+            java.util.Map map = entries[i].getOptions();
+            System.out.println("option " + i + " = useFile, " +
+                    "value = " + map.get("useFile"));
+            System.out.println("option " + i + " = debug, " +
+                    "value = " + map.get("debug"));
 
-                if (i == 0 && map.get("useFile") == null ||
+            if (i == 0 && map.get("useFile") == null ||
                     i == 0 && map.get("debug") != null) {
-                    throw new IllegalStateException("test 3 failed");
-                }
-                if (i == 1 && map.get("useFile") != null ||
+                throw new IllegalStateException("test 3 failed");
+            }
+            if (i == 1 && map.get("useFile") != null ||
                     i == 1 && map.get("debug") == null) {
-                    throw new IllegalStateException("test 4 failed");
-                }
+                throw new IllegalStateException("test 4 failed");
+            }
         }
 
         System.out.println("test succeeded");
-
     }
 }
diff --git a/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy b/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy
deleted file mode 100644
index 092f7c373b8..00000000000
--- a/test/jdk/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-// grant jtreg and javatest AllPermission
-grant codebase "file:/usr/local/java/-" {
-    permission java.security.AllPermission;
-};
-
-grant {
-    permission javax.security.auth.AuthPermission "getLoginConfiguration";
-};
diff --git a/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java
index fffcf4a204b..e30e5a88435 100644
--- a/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java
+++ b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  * Run this test twice, once using the default security manager:
  *
  * @run main/othervm CheckConfigs
- * @run main/othervm/policy=CheckConfigs.policy CheckConfigs
  */
 
 import java.io.IOException;
@@ -49,11 +48,6 @@
 public class CheckConfigs {
 
     public static void main(String[] args) throws Exception {
-        SecurityManager securityManager = System.getSecurityManager();
-        System.out.println(securityManager == null
-            ? "[security manager is not running]"
-            : "[security manager is running: " +
-                securityManager.getClass().getName() + "]");
         init();
         checkConfigModes();
     }
diff --git a/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy b/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy
deleted file mode 100644
index 125c4dd1b25..00000000000
--- a/test/jdk/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant codeBase "file:${test.classes}/*" {
-    // The following permissions are not required because the test is
-    // not expected to connect to an LDAP server
-    //
-    //permission java.net.SocketPermission "*:389", "connect";
-    //permission java.net.SocketPermission "*:636", "connect";
-    //permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.jndi.ldap";
-    permission java.lang.RuntimePermission "ldapDnsProvider";
-};
diff --git a/test/jdk/com/sun/security/auth/uphc.policy b/test/jdk/com/sun/security/auth/uphc.policy
deleted file mode 100644
index a158e167f86..00000000000
--- a/test/jdk/com/sun/security/auth/uphc.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-   permission java.io.FilePermission "./-", "write";
-   permission javax.security.auth.AuthPermission "modifyPrincipals";
-   permission javax.security.auth.AuthPermission "createLoginContext";
-   permission javax.security.auth.AuthPermission "doAsPrivileged";
-};
diff --git a/test/jdk/com/sun/tools/attach/PermissionTest.java b/test/jdk/com/sun/tools/attach/PermissionTest.java
deleted file mode 100644
index bf9473b0c8c..00000000000
--- a/test/jdk/com/sun/tools/attach/PermissionTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.tools.attach.VirtualMachine;
-import com.sun.tools.attach.AttachNotSupportedException;
-import java.io.File;
-import jdk.test.lib.thread.ProcessThread;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-/*
- * @test
- * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
- * @summary Basic unit tests for the VM attach mechanism. Unit test for Attach
- * API - this checks that a SecurityException is thrown as expected.
- *
- * @library /test/lib
- * @modules jdk.attach
- *          jdk.jartool/sun.tools.jar
- *
- * @run build Application
- * @run main PermissionTest
- */
-public class PermissionTest {
-
-    /*
-     * The actual test is in the nested class TestMain.
-     * The responsibility of this class is to:
-     * 1. Start the Application class in a separate process.
-     * 2. Find the pid and shutdown port of the running Application.
-     * 3. Run the tests in TstMain that will attach to the Application.
-     * 4. Shut down the Application.
-     */
-    public static void main(String args[]) throws Throwable {
-        ProcessThread processThread = null;
-        try {
-            processThread = RunnerUtil.startApplication();
-            runTests(processThread.getPid());
-        } catch (Throwable t) {
-            System.out.println("TestPermission got unexpected exception: " + t);
-            t.printStackTrace();
-            throw t;
-        } finally {
-            // Make sure the Application process is stopped.
-            RunnerUtil.stopApplication(processThread);
-        }
-    }
-
-    /**
-     * Runs the actual test the nested class TestMain.
-     * The test is run in a separate process because we need to add to the classpath.
-     */
-    private static void runTests(long pid) throws Throwable {
-        final String sep = File.separator;
-
-        String classpath =
-            System.getProperty("test.class.path", "");
-        String testSrc = System.getProperty("test.src", "") + sep;
-
-        // Use a policy that will NOT allow attach. Test will verify exception.
-        String[] args = {
-            "-classpath",
-            classpath,
-            "-Djava.security.manager",
-            String.format("-Djava.security.policy=%sjava.policy.deny", testSrc),
-            "PermissionTest$TestMain",
-            Long.toString(pid),
-            "true" };
-        OutputAnalyzer output = ProcessTools.executeTestJava(args);
-        output.shouldHaveExitValue(0);
-
-        // Use a policy that will allow attach.
-        args = new String[] {
-            "-classpath",
-            classpath,
-            "-Djava.security.manager",
-            String.format("-Djava.security.policy=%sjava.policy.allow", testSrc),
-            "PermissionTest$TestMain",
-            Long.toString(pid),
-            "false" };
-        output = ProcessTools.executeTestJava(args);
-        output.shouldHaveExitValue(0);
-    }
-
-    /**
-     * This is the actual test code. It will attach to the Application and verify
-     * that we get a SecurityException when that is expected.
-     */
-    public static class TestMain {
-        public static void main(String args[]) throws Exception {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm == null) {
-                throw new RuntimeException("Test configuration error - no security manager set");
-            }
-
-            String pid = args[0];
-            boolean shouldFail = Boolean.parseBoolean(args[1]);
-
-            try {
-                VirtualMachine.attach(pid).detach();
-                if (shouldFail) {
-                    throw new RuntimeException("SecurityException should be thrown");
-                }
-                System.out.println(" - attached to target VM as expected.");
-            } catch (Exception x) {
-                // AttachNotSupportedException thrown when no providers can be loaded
-                if (shouldFail && ((x instanceof AttachNotSupportedException) ||
-                    (x instanceof SecurityException))) {
-                    System.out.println(" - exception thrown as expected.");
-                } else {
-                    throw x;
-                }
-            }
-        }
-    }
-}
diff --git a/test/jdk/com/sun/tools/attach/java.policy.allow b/test/jdk/com/sun/tools/attach/java.policy.allow
deleted file mode 100644
index 1d4b714c902..00000000000
--- a/test/jdk/com/sun/tools/attach/java.policy.allow
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Policy file used by unit tests for attach API
- */
-grant {
-    permission com.sun.tools.attach.AttachPermission "attachVirtualMachine";
-    permission com.sun.tools.attach.AttachPermission "createAttachProvider";
-
-    /* implementation specific */
-    permission java.lang.RuntimePermission "manageProcess";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.attach";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.jvmstat.monitor";
-    permission java.lang.RuntimePermission "loadLibrary.attach";
-    permission java.util.PropertyPermission "sun.jvmstat.*", "read";
-
-    /* 
-     * To read configuration file in META-INF/services, write/delete .attach_pid<pid>, 
-     * and read symbolic link of /proc/self/ns/mnt.
-     */
-    permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete,readlink";
-};
-
diff --git a/test/jdk/com/sun/tools/attach/java.policy.deny b/test/jdk/com/sun/tools/attach/java.policy.deny
deleted file mode 100644
index d2eb1f3e3cd..00000000000
--- a/test/jdk/com/sun/tools/attach/java.policy.deny
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *
- *
- * Policy file used by unit tests for attach API
- */
-grant {
-    permission com.sun.tools.attach.AttachPermission "createAttachProvider";
-
-    /* implementation specific */
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.attach";
-    permission java.lang.RuntimePermission "loadLibrary.attach";
-    permission java.util.PropertyPermission "sun.jvmstat.*", "read";
-
-    /* to read configuration file in META-INF/services, and write/delete .attach_pid<pid> */
-    permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-};
-
diff --git a/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java b/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java
index 67b88b0d955..d43f0958058 100644
--- a/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java
+++ b/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,6 @@
  * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=true false
  * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=false false
  * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=false false
- * @run main/othervm/java.security.policy=dump.policy/secure=java.lang.SecurityManager DumpOnKey -Dsun.awt.nativedebug=true true
- * @run main/othervm/java.security.policy=dump.policy/secure=java.lang.SecurityManager DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=false false
  */
 public final class DumpOnKey {
 
diff --git a/test/jdk/java/awt/Debug/DumpOnKey/dump.policy b/test/jdk/java/awt/Debug/DumpOnKey/dump.policy
deleted file mode 100644
index 6dcf57155ff..00000000000
--- a/test/jdk/java/awt/Debug/DumpOnKey/dump.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.awt.AWTPermission "createRobot";
-};
diff --git a/test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java b/test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java
deleted file mode 100644
index cca9b07a433..00000000000
--- a/test/jdk/java/awt/Desktop/DefaultPermissions/DefaultPermissions.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Desktop;
-
-/**
- * @test
- * @bug 8195624
- * @summary Desktop.getDesktop() should work without permissions
- * @run main/othervm/policy=java.policy -Djava.security.manager DefaultPermissions
- */
-public final class DefaultPermissions {
-
-    public static void main(final String[] args) {
-        if (Desktop.isDesktopSupported()) {
-            Desktop.getDesktop();
-        }
-    }
-}
diff --git a/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy b/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy
deleted file mode 100644
index 1c8a0e79762..00000000000
--- a/test/jdk/java/awt/Desktop/DefaultPermissions/java.policy
+++ /dev/null
@@ -1 +0,0 @@
-;
\ No newline at end of file
diff --git a/test/jdk/java/awt/Desktop/SecurityTest/DesktopSecurityTest.java b/test/jdk/java/awt/Desktop/SecurityTest/DesktopSecurityTest.java
deleted file mode 100644
index 0c831156c7c..00000000000
--- a/test/jdk/java/awt/Desktop/SecurityTest/DesktopSecurityTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Desktop;
-import java.awt.desktop.AppForegroundEvent;
-import java.awt.desktop.AppForegroundListener;
-import java.awt.desktop.AppHiddenEvent;
-import java.awt.desktop.AppHiddenListener;
-import java.awt.desktop.AppReopenedListener;
-import java.awt.desktop.QuitStrategy;
-import java.awt.desktop.ScreenSleepEvent;
-import java.awt.desktop.ScreenSleepListener;
-import java.awt.desktop.SystemSleepEvent;
-import java.awt.desktop.SystemSleepListener;
-import java.awt.desktop.UserSessionEvent;
-import java.awt.desktop.UserSessionListener;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-/**
- * @test
- * @bug 6255196 8143227
- * @key headful
- * @summary Tests that Desktop.browse() throws SecurityException without
- *          permission of java.awt.AWTPermission showWindowWithoutWarningBanner
- * @run main/othervm/policy=desktop.policy DesktopSecurityTest
- */
-public final class DesktopSecurityTest {
-
-    public static void main(String[] args) throws Exception {
-        if(!Desktop.isDesktopSupported()){
-            System.out.println("Desktop is not supported");
-            return;
-        }
-
-        URI webURI = URI.create(System.getProperty("java.vendor.url",
-                                                   "http://www.sun.com"));
-        File testFile = new File("JDIC-test.txt").getAbsoluteFile();
-        try {
-            try (Writer writer = new FileWriter(testFile)) {
-                writer.write("temp file used to test print() method of Desktop.");
-                writer.flush();
-            }
-            test(webURI, testFile);
-        } finally {
-            Files.delete(Paths.get(testFile.getAbsolutePath()));
-        }
-    }
-
-    private static void test(URI webURI, File testFile) throws Exception {
-        Desktop desktop = Desktop.getDesktop();
-        for (Desktop.Action action : Desktop.Action.values()) {
-            if (!desktop.isSupported(action)) {
-                continue;   // skip if this action is unsupported.
-            }
-
-           try {
-               switch (action) {
-                   case OPEN -> desktop.open(testFile);
-                   case EDIT -> desktop.edit(testFile);
-                   case PRINT -> desktop.print(testFile);
-                   case MAIL -> desktop.mail();
-                   case BROWSE -> desktop.browse(webURI);
-                   case APP_EVENT_FOREGROUND -> {
-                       desktop.addAppEventListener(new AppForegroundListener() {
-                           @Override
-                           public void appRaisedToForeground(AppForegroundEvent e) {
-                           }
-                           @Override
-                           public void appMovedToBackground(AppForegroundEvent e) {
-                           }
-                       });
-                   }
-                   case APP_EVENT_HIDDEN -> {
-                       desktop.addAppEventListener(new AppHiddenListener() {
-                           @Override
-                           public void appHidden(AppHiddenEvent e) {
-                           }
-                           @Override
-                           public void appUnhidden(AppHiddenEvent e) {
-                           }
-                       });
-                   }
-                   case APP_EVENT_REOPENED -> {
-                       desktop.addAppEventListener((AppReopenedListener) e -> {});
-                   }
-                   case APP_EVENT_SCREEN_SLEEP -> {
-                       desktop.addAppEventListener(new ScreenSleepListener() {
-                           @Override
-                           public void screenAboutToSleep(ScreenSleepEvent e) {
-                           }
-                           @Override
-                           public void screenAwoke(ScreenSleepEvent e) {
-                           }
-                       });
-                   }
-                   case APP_EVENT_SYSTEM_SLEEP -> {
-                       desktop.addAppEventListener(new SystemSleepListener() {
-                           @Override
-                           public void systemAboutToSleep(SystemSleepEvent e) {
-                           }
-                           @Override
-                           public void systemAwoke(SystemSleepEvent e) {
-                           }
-                       });
-                   }
-                   case APP_EVENT_USER_SESSION -> {
-                       desktop.addAppEventListener(new UserSessionListener() {
-                           @Override
-                           public void userSessionDeactivated(UserSessionEvent e) {
-                           }
-                           @Override
-                           public void userSessionActivated(UserSessionEvent e) {
-                           }
-                       });
-                   }
-                   case APP_ABOUT -> {
-                       desktop.setAboutHandler(e -> {});
-                   }
-                   case APP_PREFERENCES -> {
-                       desktop.setPreferencesHandler(e -> {});
-                   }
-                   case APP_OPEN_FILE -> {
-                       desktop.setOpenFileHandler(e -> {});
-                   }
-                   case APP_PRINT_FILE -> {
-                       desktop.setPrintFileHandler(e -> {});
-                   }
-                   case APP_OPEN_URI -> {
-                       desktop.setOpenURIHandler(e -> {});
-                   }
-                   case APP_QUIT_HANDLER -> {
-                       desktop.setQuitHandler((e, response) -> {});
-                   }
-                   case APP_QUIT_STRATEGY -> {
-                       desktop.setQuitStrategy(QuitStrategy.NORMAL_EXIT);
-                   }
-                   case APP_SUDDEN_TERMINATION -> {
-                        desktop.enableSuddenTermination();
-                   }
-                   case APP_REQUEST_FOREGROUND -> {
-                       desktop.requestForeground(true);
-                   }
-                   case APP_HELP_VIEWER -> {
-                       desktop.openHelpViewer();
-                   }
-                   case APP_MENU_BAR -> {
-                       desktop.setDefaultMenuBar(null);
-                   }
-                   case BROWSE_FILE_DIR -> {
-                       desktop.browseFileDirectory(testFile.getParentFile());
-                   }
-                   case MOVE_TO_TRASH -> {
-                       // The test have permission to create/delete files, skip
-                       continue;
-                   }
-                   default -> throw new IllegalStateException(
-                           "Unexpected value: " + action);
-               }
-               // no exception has been thrown.
-               throw new RuntimeException(
-                       "SecurityException wax expected for: " + action);
-           } catch (SecurityException ignored) {
-               // expected
-           }
-       }
-    }
-}
diff --git a/test/jdk/java/awt/Desktop/SecurityTest/desktop.policy b/test/jdk/java/awt/Desktop/SecurityTest/desktop.policy
deleted file mode 100644
index be1edc7bc9e..00000000000
--- a/test/jdk/java/awt/Desktop/SecurityTest/desktop.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-// default permissions granted to all domains
-
-grant { 
-	permission java.util.PropertyPermission "*", "read";
-	permission java.io.FilePermission "<<ALL FILES>>", "read,write,execute,delete";
-};
-
diff --git a/test/jdk/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java b/test/jdk/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java
deleted file mode 100644
index 2c3755e46b6..00000000000
--- a/test/jdk/java/awt/Dialog/ModalDialogPermission/ModalDialogPermission.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/*
-  @test
-  @key headful
-  @bug 7080109
-  @summary Dialog.show() lacks doPrivileged() to access system event queue.
-  @author sergey.bylokhov@oracle.com: area=awt.dialog
-  @run main/othervm/policy=java.policy -Djava.security.manager ModalDialogPermission
-*/
-public final class ModalDialogPermission {
-
-    public static void main(final String[] args) {
-        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(final Thread t, final Throwable e) {
-                throw new RuntimeException(e);
-            }
-        });
-        final Frame frame = new Frame();
-        final Dialog dialog = new Dialog(frame, "ModalDialog", true);
-        final Timer t = new Timer();
-        t.schedule(new TimerTask() {
-
-            @Override
-            public void run() {
-                dialog.setVisible(false);
-                dialog.dispose();
-            }
-        }, 3000L);
-        dialog.show();
-        frame.dispose();
-        t.cancel();
-    }
-}
diff --git a/test/jdk/java/awt/Dialog/ModalDialogPermission/java.policy b/test/jdk/java/awt/Dialog/ModalDialogPermission/java.policy
deleted file mode 100644
index d0a94d14263..00000000000
--- a/test/jdk/java/awt/Dialog/ModalDialogPermission/java.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setDefaultUncaughtExceptionHandler";
-};
diff --git a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileFrame.java b/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileFrame.java
deleted file mode 100644
index a117622d570..00000000000
--- a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileFrame.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import java.awt.Button;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.PrintJob;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-class PrintToFileFrame extends Frame implements ActionListener {
-    Button nativeDlg = new Button("Show print dialog");
-
-    public PrintToFileFrame() {
-        this.setLayout(new FlowLayout());
-        add(nativeDlg);
-        nativeDlg.addActionListener(this);
-
-        setSize(300, 300);
-    }
-
-    @SuppressWarnings("removal")
-    public void actionPerformed(ActionEvent ae) {
-        if (System.getSecurityManager() == null) {
-            throw new RuntimeException("Security manager isn't installed.");
-        }
-
-        try {
-            System.getSecurityManager().checkPrintJobAccess();
-            System.out.println("checkPrintJobAccess - OK");
-        } catch (SecurityException e) {
-            System.out.println("checkPrintJobAccess - ERROR " + e);
-        }
-
-        PrintJob printJob = getToolkit().getPrintJob(this, null, null);
-
-        if (printJob != null) {
-            System.out.println("Print Job: " + printJob);
-        } else {
-            System.out.println("Print Job is null.");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java b/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java
deleted file mode 100644
index 05d73123d98..00000000000
--- a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.print.PrinterJob;
-
-/*
- * @test
- * @bug 6275359
- * @summary Test to verify system menu of a dialog on win32
- * @requires (os.family == "windows")
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @compile PrintToFileFrame.java
- * @compile PrintToFileGranted.java
- * @run main/manual/policy=granted/othervm PrintToFileGranted
- */
-
-public class PrintToFileGranted {
-    public static void main(String[] args) throws Exception {
-        String INSTRUCTIONS;
-        if (isPrintSupport()) {
-            INSTRUCTIONS = """
-                    1. Click on 'Show file dialog' button A print dialog will come up
-                    2. If checkbox 'Print to file' is enabled then the test passed
-                       else the test failed
-                    3. Close the print dialog before pressing PASS or FAIL buttons
-                    """;
-        } else {
-            INSTRUCTIONS = """
-                    1. The test requires printer installed in your system,
-                       but there is no printers found
-                       Please install one and re-run the test
-                    """;
-        }
-
-        PassFailJFrame.builder()
-                .title("Test Instructions")
-                .instructions(INSTRUCTIONS)
-                .rows((int) INSTRUCTIONS.lines().count() + 2)
-                .columns(35)
-                .testUI(new PrintToFileFrame())
-                .build()
-                .awaitAndCheck();
-    }
-
-    public static boolean isPrintSupport() {
-        PrinterJob pj = PrinterJob.getPrinterJob();
-        return pj.getPrintService() != null;
-    }
-}
diff --git a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java b/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java
deleted file mode 100644
index 7c724e97bed..00000000000
--- a/test/jdk/java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.print.PrinterJob;
-
-/*
- * @test
- * @bug 6275359
- * @summary Test to verify Printing ignores Security permissions
- *          using native dialog
- * @requires (os.family == "windows")
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @compile PrintToFileRevoked.java
- * @run main/manual/policy=revoked/othervm PrintToFileRevoked
- */
-
-public class PrintToFileRevoked {
-    public static void main(String[] args) throws Exception {
-        String INSTRUCTIONS;
-        if (isPrintSupport()) {
-            INSTRUCTIONS = """
-                    1. Click on 'Show file dialog' button A print dialog will come up
-                    2. If checkbox 'Print to file' is disabled then the test passed
-                       else the test failed
-                    3. Close the print dialog before pressing PASS or FAIL buttons
-                    """;
-        } else {
-            INSTRUCTIONS = """
-                    1. The test requires printer installed in your system,
-                       but there is no printers found
-                       Please install one and re-run the test
-                    """;
-        }
-        PassFailJFrame.builder()
-                .title("Test Instructions")
-                .instructions(INSTRUCTIONS)
-                .rows((int) INSTRUCTIONS.lines().count() + 2)
-                .columns(35)
-                .testUI(new PrintToFileFrame())
-                .build()
-                .awaitAndCheck();
-    }
-
-    public static boolean isPrintSupport() {
-        PrinterJob pj = PrinterJob.getPrinterJob();
-        return pj.getPrintService() != null;
-    }
-}
diff --git a/test/jdk/java/awt/Dialog/PrintToFileTest/granted b/test/jdk/java/awt/Dialog/PrintToFileTest/granted
deleted file mode 100644
index e73b0fdf3cd..00000000000
--- a/test/jdk/java/awt/Dialog/PrintToFileTest/granted
+++ /dev/null
@@ -1,10 +0,0 @@
-/* AUTOMATICALLY GENERATED ON Thu Jan 03 15:48:39 PST 2002*/
-/* DO NOT EDIT */
-
-grant {
- permission java.lang.RuntimePermission "queuePrintJob";
- permission java.util.PropertyPermission "*", "read";
- permission java.io.FilePermission "<<ALL FILES>>", "read";
- permission java.io.FilePermission "<<ALL FILES>>", "write";
- permission java.lang.RuntimePermission "accessClassInPackage.sun.util.locale.provider";
-};
diff --git a/test/jdk/java/awt/Dialog/PrintToFileTest/revoked b/test/jdk/java/awt/Dialog/PrintToFileTest/revoked
deleted file mode 100644
index d2545e15e11..00000000000
--- a/test/jdk/java/awt/Dialog/PrintToFileTest/revoked
+++ /dev/null
@@ -1,9 +0,0 @@
-/* AUTOMATICALLY GENERATED ON Thu Jan 03 15:48:39 PST 2002*/
-/* DO NOT EDIT */
-
-grant {
- permission java.lang.RuntimePermission "queuePrintJob";
- permission java.util.PropertyPermission "*", "read";
- permission java.lang.RuntimePermission "accessClassInPackage.sun.util.locale.provider";
-};
-
diff --git a/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java b/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java
deleted file mode 100644
index 5810065e8ce..00000000000
--- a/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-
-/**
- * @test
- * @key headful
- * @bug 8080405
- * @run main/othervm/policy=java.policy -Djava.security.manager PropertyPermissionOnEDT
- */
-public final class PropertyPermissionOnEDT {
-
-    public static void main(final String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(PropertyPermissionOnEDT::test);
-
-        JFrame frame = new JFrame();
-        frame.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseClicked(final MouseEvent e) {
-                test();
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                test();
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                test();
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-                test();
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-                test();
-            }
-        });
-        frame.addFocusListener(new FocusListener() {
-            @Override
-            public void focusGained(FocusEvent e) {
-                test();
-            }
-
-            @Override
-            public void focusLost(FocusEvent e) {
-                test();
-            }
-        });
-        frame.addMouseWheelListener(e -> test());
-        frame.addWindowStateListener(e -> test());
-
-        frame.setSize(100, 100);
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
-        Robot robot = new Robot();
-        robot.setAutoWaitForIdle(true);
-        robot.setAutoDelay(100);
-        Point loc = frame.getLocationOnScreen();
-        robot.mouseMove(loc.x + frame.getWidth() / 2,
-                        loc.y + frame.getHeight() / 2);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
-        robot.mouseWheel(100);
-        frame.dispose();
-    }
-
-    private static void test() {
-        String property = System.getProperty("os.name");
-        System.out.println("property = " + property);
-    }
-}
diff --git a/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy b/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy
deleted file mode 100644
index 461664148ba..00000000000
--- a/test/jdk/java/awt/EventDispatchThread/PropertyPermissionOnEDT/java.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-  permission java.util.PropertyPermission "os.name", "read";
-  permission java.awt.AWTPermission "createRobot";
-};
diff --git a/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java b/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java
deleted file mode 100644
index ec423dac60c..00000000000
--- a/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
-  @test
-  @key headful
-  @bug       6785058
-  @summary   Tests that an owner is activated on closing its owned dialog with the warning icon.
-  @library   ../../regtesthelpers
-  @build     Util
-  @run       main/othervm/policy=java.policy -Djava.security.manager CloseDialogActivateOwnerTest
-*/
-
-import java.awt.*;
-import test.java.awt.regtesthelpers.Util;
-
-public class CloseDialogActivateOwnerTest {
-    Robot robot;
-
-    public static void main(String[] args) {
-        CloseDialogActivateOwnerTest app = new CloseDialogActivateOwnerTest();
-        app.init();
-        app.start();
-    }
-
-    public void init() {
-        robot = Util.createRobot();
-    }
-
-    public void start() {
-        final Frame frame = new Frame("Owner Frame");
-        final Dialog dialog = new Dialog(frame, "Owned Dialog");
-
-        frame.setSize(100, 100);
-        dialog.setSize(100, 100);
-
-        // Show the owner. Check that it's focused.
-        if (!Util.trackWindowGainedFocus(frame, new Runnable() {
-                public void run() {
-                    frame.setVisible(true);
-                }
-            }, 2000, false))
-        {
-            throw new TestErrorException("the owner frame hasn't been activated on show");
-        }
-
-        // Show the owned dialog. Check that it's focused.
-        if (!Util.trackWindowGainedFocus(dialog, new Runnable() {
-                public void run() {
-                    dialog.setVisible(true);
-                }
-            }, 2000, true))
-        {
-            throw new TestErrorException("the owned dialog hasn't been activated on show");
-        }
-
-        robot.delay(2000); // wait for the warning icon is shown
-
-        // Close the dialog. Check that the owner is activated.
-        if (!Util.trackWindowGainedFocus(frame, new Runnable() {
-                public void run() {
-                    dialog.dispose();
-                }
-            }, 2000, false))
-        {
-            throw new TestFailedException("the owner hasn't been activated on closing the owned dialog");
-        }
-
-        System.out.println("Test passed.");
-    }
-}
-
-/**
- * Thrown when the behavior being verified is found wrong.
- */
-class TestFailedException extends RuntimeException {
-    TestFailedException(String msg) {
-        super("Test failed: " + msg);
-    }
-}
-
-/**
- * Thrown when an error not related to the behavior being verified is encountered.
- */
-class TestErrorException extends Error {
-    TestErrorException(String msg) {
-        super("Unexpected error: " + msg);
-    }
-}
-
diff --git a/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy b/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy
deleted file mode 100644
index c691dabc15d..00000000000
--- a/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-	permission java.awt.AWTPermission "createRobot";
-};
diff --git a/test/jdk/java/awt/FontClass/CreateFont/BigFont.java b/test/jdk/java/awt/FontClass/CreateFont/BigFont.java
deleted file mode 100644
index 34a98c15119..00000000000
--- a/test/jdk/java/awt/FontClass/CreateFont/BigFont.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Font;
-import java.awt.FontFormatException;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Paths;
-
-/**
- * @test
- * @key headful
- * @bug 6522586
- * @summary Enforce limits on font creation
- * @run main/othervm -Djava.security.manager=allow BigFont 1 A.ttf
- * @run main/othervm -Djava.security.manager=allow BigFont 2 A.ttf
- */
-public class BigFont {
-
-   static private class SizedInputStream extends InputStream {
-
-       int size;
-       int cnt = 0;
-
-       SizedInputStream(int size) {
-           this.size = size;
-       }
-
-       public int read() {
-           if (cnt < size) {
-              cnt++;
-              return 0;
-           } else {
-              return -1;
-           }
-       }
-
-       public int getCurrentSize() {
-           return cnt;
-       }
-   }
-
-    static String id;
-    static String fileName;
-
-    public static void main(final String[] args) {
-        id = args[0];
-        fileName = args[1];
-
-        System.out.println("Applet " + id + " "+
-                           Thread.currentThread().getThreadGroup());
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new SecurityManager());
-        }
-        // Larger than size for a single font.
-        int fontSize = 64 * 1000 * 1000;
-        SizedInputStream sis = new SizedInputStream(fontSize);
-        try {
-             Font font = Font.createFont(Font.TRUETYPE_FONT, sis);
-        } catch (Throwable t) {
-            t.printStackTrace();
-            if (t instanceof FontFormatException ||
-                fontSize <= sis.getCurrentSize())
-            {
-                System.out.println(sis.getCurrentSize());
-                System.out.println(t);
-                throw new RuntimeException("Allowed file to be too large.");
-            }
-        }
-        // The following part of the test was verified manually but
-        // is impractical to enable  because it requires a fairly large
-        // valid font to be part of the test, and we can't easily include
-        // that, nor dependably reference one from the applet environment.
-        /*
-        if (fileName == null) {
-            return;
-        }
-        int size = getFileSize(fileName);
-        if (size == 0) {
-            return;
-        }
-        int fontCnt = 1000 * 1000 * 1000 / size;
-        loadMany(size, fontCnt, fileName);
-        System.gc(); System.gc();
-        fontCnt = fontCnt / 2;
-        System.out.println("Applet " + id + " load more.");
-        loadMany(size, fontCnt, fileName);
-        */
-        System.out.println("Applet " + id + " finished.");
-    }
-
-    int getFileSize(String fileName) {
-        try {
-            String path = Paths.get(System.getProperty("test.src", "."),
-                                    fileName).toAbsolutePath().normalize()
-                                             .toString();
-            URL url = new URL(path);
-            InputStream inStream = url.openStream();
-            BufferedInputStream fontStream = new BufferedInputStream(inStream);
-            int size = 0;
-            while (fontStream.read() != -1) {
-                size++;
-            }
-            fontStream.close();
-            return size;
-        } catch (IOException e) {
-            return 0;
-        }
-
-    }
-    void loadMany(int oneFont, int fontCnt, String fileName) {
-        System.out.println("fontcnt= " + fontCnt);
-        Font[] fonts = new Font[fontCnt];
-        int totalSize = 0;
-        boolean gotException = false;
-        for (int i=0; i<fontCnt; i++) {
-            try {
-                String path = Paths.get(System.getProperty("test.src", "."),
-                                        fileName).toAbsolutePath().normalize()
-                                                 .toString();
-                URL url = new URL(path);
-                InputStream inStream = url.openStream();
-                BufferedInputStream fontStream =
-                    new BufferedInputStream(inStream);
-                fonts[i] = Font.createFont(Font.TRUETYPE_FONT, fontStream);
-                totalSize += oneFont;
-                fontStream.close();
-            } catch (Throwable t) {
-                gotException = true;
-                System.out.println("Applet " + id + " " + t);
-            }
-        }
-        if (!gotException) {
-          throw new RuntimeException("No expected exception");
-        }
-    }
-}
-
diff --git a/test/jdk/java/awt/FontClass/CreateFont/fileaccess/FontFile.java b/test/jdk/java/awt/FontClass/CreateFont/fileaccess/FontFile.java
deleted file mode 100644
index 0196591d245..00000000000
--- a/test/jdk/java/awt/FontClass/CreateFont/fileaccess/FontFile.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6652929
- * @summary verify handling of File.getPath()
- * @compile FontFile.java
- * @run shell TestFontFile.sh
- */
-
-/*
- * When using jtreg this test needs to be run by shell script,
- * since otherwise jtreg reflectively invokes the main method
- * and the codebase for the purposes of the security manager
- * is that of the jtreg harness, not the codebase (class file location)
- * of this program, thus access to read to that location is not available.
- */
-
-import java.awt.*;
-import java.io.*;
-
-public class FontFile {
-    public static void main(String[] args) throws Exception {
-        String sep = System.getProperty("file.separator");
-        String fname = ".." + sep + "A.ttf";
-        //String dir = System.getProperty("test.src");
-        String dir = System.getenv("TESTSRC");
-        if (dir != null) {
-            fname = dir + sep + fname;
-        }
-        //String classesDir = System.getProperty("test.classes");
-        String classesDir = System.getenv("TESTCLASSES");
-        System.out.println("classesDir="+classesDir);
-        String testfile = "somefile";
-        if (classesDir != null) {
-            testfile = classesDir + sep + testfile;
-        }
-        final String somefile = testfile;
-        System.out.println("somefile="+somefile);
-        System.out.println("userdir="+System.getProperty("user.dir"));
-        final String name = fname;
-        System.out.println("Will try to access " + name);
-        if (!(new File(name)).canRead()) {
-           System.out.println("File not available : can't run test");
-           return;
-        }
-        System.out.println("File is available. Verify no access under SM");
-
-        System.setSecurityManager(new SecurityManager());
-
-
-        // Check cannot read file.
-        try {
-            new FileInputStream(name);
-            throw new Error("Something wrong with test environment");
-        } catch (SecurityException exc) {
-            // Good.
-        }
-
-        try {
-            Font font = Font.createFont(Font.TRUETYPE_FONT,
-            new File("nosuchfile") {
-                    private boolean read;
-                    @Override public String getPath() {
-                        if (read) {
-                            return name;
-                        } else {
-                            read = true;
-                            return somefile;
-                        }
-                    }
-                    @Override public boolean canRead() {
-                        return true;
-                    }
-               }
-            );
-          System.err.println(font.getFontName());
-          throw new RuntimeException("No expected exception");
-        }  catch (IOException e) {
-          System.err.println("Test passed.");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh b/test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh
deleted file mode 100644
index d8930f3b3fa..00000000000
--- a/test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#!/bin/sh
-
-if [ "${TESTSRC}" = "" ]
-then TESTSRC=.
-fi
-
-if [ "${TESTJAVA}" = "" ]
-then
-  PARENT=`dirname \`which java\``
-  TESTJAVA=`dirname ${PARENT}`
-  echo "TESTJAVA not set, selecting " ${TESTJAVA}
-  echo "If this is incorrect, try setting the variable manually."
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
-  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
-  exit 1
-fi
-
-BIT_FLAG=""
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  AIX | Darwin | Linux )
-    NULL=/dev/null
-    PS=":"
-    FS="/"
-    ## for linux it's HOME
-    FILE_LOCATION=$HOME
-    ;;
-  Windows_* | CYGWIN* )
-    NULL=NUL
-    PS=";"
-    FS="\\"
-    ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
-esac
-
-JEMMYPATH=${CPAPPEND}
-CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
-
-THIS_DIR=`pwd`
-
-${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
-
-${TESTJAVA}${FS}bin${FS}java -Djava.security.manager=allow ${BIT_FLAG} FontFile > test.out 2>&1
-
-STATUS=$?
-
-cat test.out
-
-exit $STATUS
diff --git a/test/jdk/java/awt/FontClass/FontAccess.java b/test/jdk/java/awt/FontClass/FontAccess.java
deleted file mode 100644
index bcd561b8cbc..00000000000
--- a/test/jdk/java/awt/FontClass/FontAccess.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6785424
- * @summary Test no SecurityException searching for a font.
- * @run main/othervm -Djava.security.manager=allow FontAccess
- *
- * This can only test the specific bug if run on something like
- * Windows Citrix Server where SystemDirectory and WindowsDirectory
- * are different locations.
- */
-
-import java.awt.*;
-import java.awt.image.*;
-
-public class FontAccess {
-
-     public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        Font f = new Font("Verdana", Font.PLAIN, 12);
-        BufferedImage bi = new BufferedImage(1,1,1);
-        Graphics2D g = bi.createGraphics();
-        g.setFont(f);
-        System.out.println(g.getFontMetrics());
-     }
-}
diff --git a/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java b/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java
index ca836dfce84..adc62fa3e4c 100644
--- a/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java
+++ b/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,22 @@
  * @key headful
  * @bug 6240507 6662642
  * @summary verify that isFullScreenSupported and getFullScreenWindow work
- * correctly with and without a SecurityManager. Note that the test may fail
- * on older Gnome versions (see bug 6500686).
- * @run main/othervm -Djava.security.manager=allow FSFrame
- * @run main/othervm -Djava.security.manager=allow -Dsun.java2d.noddraw=true FSFrame
+ * correctly. Note that the test may fail on older Gnome versions (see bug 6500686).
+ * @run main FSFrame
+ * @run main/othervm -Dsun.java2d.noddraw=true FSFrame
  */
 
-import java.awt.*;
-import java.awt.image.*;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -121,12 +129,8 @@ void checkFSDisplay(boolean fsSupported) {
         }
     }
 
-    void checkFSFunctionality(boolean withSecurity) {
+    void checkFSFunctionality() {
         GraphicsDevice gd = getGraphicsConfiguration().getDevice();
-        if (withSecurity) {
-            SecurityManager sm = new SecurityManager();
-            System.setSecurityManager(sm);
-        }
         try {
             // None of these should throw an exception
             final boolean fs = gd.isFullScreenSupported();
@@ -137,20 +141,16 @@ void checkFSFunctionality(boolean withSecurity) {
                 // properly
                 Thread.sleep(2000);
             } catch (Exception e) {}
-            if (!withSecurity) {
                 // See if FS window got displayed correctly
-                try {
-                    EventQueue.invokeAndWait(new Runnable() {
-                        public void run() {
-                            repaint();
-                            checkFSDisplay(fs);
-                        }
-                    });
-                } catch (InvocationTargetException ex) {
-                    ex.printStackTrace();
-                } catch (InterruptedException ex) {
-                    ex.printStackTrace();
-                }
+            try {
+                EventQueue.invokeAndWait(new Runnable() {
+                    public void run() {
+                        repaint();
+                        checkFSDisplay(fs);
+                    }
+                });
+            } catch (InvocationTargetException | InterruptedException ex) {
+                ex.printStackTrace();
             }
             // reset window
             gd.setFullScreenWindow(null);
@@ -170,8 +170,7 @@ public void run() {
         boolean firstTime = true;
         while (!done) {
             if (visible) {
-                checkFSFunctionality(false);
-                checkFSFunctionality(true);
+                checkFSFunctionality();
                 done = true;
             } else {
                 // sleep while we wait
diff --git a/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java b/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java
index 6a256914527..44487a57200 100644
--- a/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java
+++ b/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
  * questions.
  */
 import java.awt.Dialog;
+import java.awt.EventQueue;
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -29,63 +30,93 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Panel;
 import java.awt.geom.AffineTransform;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /*
  * @test
  * @bug 8069361
  * @key headful
  * @summary SunGraphics2D.getDefaultTransform() does not include scale factor
- * @author Alexander Scherbatiy
- * @run main ScaledTransform
+ * @run main/timeout=300 ScaledTransform
  */
 public class ScaledTransform {
 
-    private static volatile boolean passed = false;
+    private static volatile CountDownLatch painted;
+    private static volatile boolean passed;
+    private static volatile Dialog dialog;
+    private static volatile long startTime;
+    private static volatile long endTime;
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         GraphicsEnvironment ge = GraphicsEnvironment.
                 getLocalGraphicsEnvironment();
 
-        if (ge.isHeadlessInstance()) {
-            return;
-        }
-
         for (GraphicsDevice gd : ge.getScreenDevices()) {
-            for (GraphicsConfiguration gc : gd.getConfigurations()) {
-                testScaleFactor(gc);
+            System.out.println("Screen = " + gd);
+            test(gd.getDefaultConfiguration());
+            /* Don't want to run too long. Test the default and up to 10 more */
+            GraphicsConfiguration[] configs = gd.getConfigurations();
+            for (int c = 0; c < configs.length && c < 10; c++) {
+                test(configs[c]);
             }
         }
     }
 
-    private static void testScaleFactor(final GraphicsConfiguration gc) {
-        final Dialog dialog = new Dialog((Frame) null, "Test", true, gc);
-
+    static void test(GraphicsConfiguration gc) throws Exception {
         try {
-            dialog.setSize(100, 100);
-            Panel panel = new Panel() {
-
-                @Override
-                public void paint(Graphics g) {
-                    if (g instanceof Graphics2D) {
-                        AffineTransform gcTx = gc.getDefaultTransform();
-                        AffineTransform gTx
-                                = ((Graphics2D) g).getTransform();
-                        passed = gcTx.getScaleX() == gTx.getScaleX()
-                                && gcTx.getScaleY() == gTx.getScaleY();
-                    } else {
-                        passed = true;
-                    }
-                    dialog.setVisible(false);
-                }
-            };
-            dialog.add(panel);
-            dialog.setVisible(true);
-
+            /* reset vars for each run */
+            passed = false;
+            dialog = null;
+            painted = new CountDownLatch(1);
+            EventQueue.invokeLater(() -> showDialog(gc));
+            startTime = System.currentTimeMillis();
+            endTime = startTime;
+            if (!painted.await(5, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Panel is not painted!");
+            }
+            System.out.println("Time to paint = " + (endTime - startTime) + "ms.");
             if (!passed) {
                 throw new RuntimeException("Transform is not scaled!");
             }
         } finally {
-            dialog.dispose();
+            EventQueue.invokeAndWait(() -> disposeDialog());
         }
     }
+
+    private static void showDialog(final GraphicsConfiguration gc) {
+        System.out.println("Creating dialog for gc=" + gc + " with tx=" + gc.getDefaultTransform());
+        dialog = new Dialog((Frame) null, "ScaledTransform", true, gc);
+        dialog.setSize(300, 100);
+
+        Panel panel = new Panel() {
+
+            @Override
+            public void paint(Graphics g) {
+                System.out.println("Painting panel");
+                if (g instanceof Graphics2D g2d) {
+                    AffineTransform gcTx = gc.getDefaultTransform();
+                    AffineTransform gTx = g2d.getTransform();
+                    System.out.println("GTX = " + gTx);
+                    passed = (gcTx.getScaleX() == gTx.getScaleX()) &&
+                             (gcTx.getScaleY() == gTx.getScaleY());
+                } else {
+                    passed = true;
+                }
+                endTime = System.currentTimeMillis();
+                painted.countDown();
+                System.out.println("Painted panel");
+            }
+        };
+        dialog.add(panel);
+        dialog.setVisible(true);
+    }
+
+    private static void disposeDialog() {
+       if (dialog != null) {
+           System.out.println("Disposing dialog");
+           dialog.setVisible(false);
+           dialog.dispose();
+       }
+    }
 }
diff --git a/test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java b/test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java
index 4fd3ee8ef16..72ad2a4589e 100644
--- a/test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java
+++ b/test/jdk/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,84 +22,52 @@
  */
 
 /*
-  @test
-  @bug 5045936 5055171
-  @summary Tests that there is no ClassCastException thrown in printing
-   checkbox and scrollbar with XAWT
-  @key printer
-  @run applet/manual=yesno PrintCheckboxManualTest.html
-*/
-
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-
-
-
-import java.awt.*;
-import java.awt.event.*;
-
-
-//Manual tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests the way you do in main
-// tests...
-
-
-public class PrintCheckboxManualTest extends Panel
-{
-    //Declare things used in the test, like buttons and labels here
-    Frame f;
-
-    public static void main(String[] args) {
-        PrintCheckboxManualTest a = new PrintCheckboxManualTest();
+ * @test
+ * @bug 5045936 5055171
+ * @summary Tests that there is no ClassCastException thrown in printing
+ *          checkbox and scrollbar with XAWT
+ * @key printer
+ * @requires (os.family == "linux")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual PrintCheckboxManualTest
+ */
 
-        a.init();
-        a.start();
+import java.awt.Button;
+import java.awt.Checkbox;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.Panel;
+import java.awt.PrintJob;
+import java.awt.Scrollbar;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class PrintCheckboxManualTest extends Panel {
+
+    private static final String INSTRUCTIONS = """
+            This test is for Linux with XToolkit ONLY!,
+            1. Click the 'Print' button on the frame
+            2. Select a printer in the print dialog and proceed
+            3. If the frame with checkbox and button on it
+               is printed without any exception test PASSED else FAILED.
+        """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(PrintCheckboxManualTest::createTestUI)
+                .build()
+                .awaitAndCheck();
     }
 
-    public void init()
-    {
-        //Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
-
-        String[] instructions =
-        {
-            "Linux or Solaris with XToolkit ONLY!",
-            "1. Click the 'Print' button on the frame",
-            "2. Select a printer in the print dialog and proceed",
-            "3. If the frame with checkbox and button on it is printed successfully test PASSED else FAILED"
-        };
-        Sysout.createDialogWithInstructions( instructions );
-
-    }//End  init()
+    private static Frame createTestUI() {
 
-    public void start ()
-    {
-        //Get things going.  Request focus, set size, et cetera
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
-        //What would normally go into main() will probably go here.
-        //Use System.out.println for diagnostic messages that you want
-        // to read after the test is done.
-        //Use Sysout.println for messages you want the tester to read.
-
-        f = new Frame("Print checkbox");
+        Frame f = new Frame("Print checkbox");
         f.setLayout(new GridLayout(2, 2));
         f.setSize(200, 100);
 
@@ -111,185 +79,26 @@ public void start ()
         f.add(sb);
 
         Button b = new Button("Print");
-        b.addActionListener(new ActionListener()
-        {
-        public void actionPerformed(ActionEvent ev)
-        {
-                PrintJob pj = Toolkit.getDefaultToolkit().getPrintJob(f, "PrintCheckboxManualTest", null);
-                if (pj != null)
-                {
-                        try
-                        {
-                                Graphics g = pj.getGraphics();
-                                f.printAll(g);
-                                g.dispose();
-                                pj.end();
-                                Sysout.println("Test PASSED");
-                        }
-                        catch (ClassCastException cce)
-                        {
-                                Sysout.println("Test FAILED: ClassCastException");
-//                              throw new RuntimeException("Test FAILED: ClassCastException", cce);
-                        }
-                        catch (Exception e)
-                        {
-                                Sysout.println("Test FAILED: unknown Exception");
-//                              throw new Error("Test FAILED: unknown exception", e);
-                        }
+        b.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent ev) {
+                PrintJob pj = Toolkit.getDefaultToolkit().
+                                      getPrintJob(f, "PrintCheckboxManualTest",
+                                                  null);
+                if (pj != null) {
+                    try {
+                        Graphics g = pj.getGraphics();
+                        f.printAll(g);
+                        g.dispose();
+                        pj.end();
+                    } catch (ClassCastException cce) {
+                        throw new RuntimeException("Test FAILED: ClassCastException", cce);
+                    } catch (Exception e) {
+                        throw new Error("Test FAILED: unknown exception", e);
+                    }
                 }
-        }
+            }
         });
         f.add(b);
-
-        f.setVisible(true);
-    }// start()
-
-    //The rest of this class is the actions which perform the test...
-
-    //Use Sysout.println to communicate with the user NOT System.out!!
-    //Sysout.println ("Something Happened!");
-
-}
-
-/* Place other classes related to the test after this line */
-
-
-
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
-  chunk of code whose purpose is to make user
-  interaction uniform, and thereby make it simpler
-  to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
-  for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
-  WithInstructions method.  Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
-  with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
-  as standalone.
- */
-
-class Sysout
-{
-    private static TestDialog dialog;
-
-    public static void createDialogWithInstructions( String[] instructions )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        dialog.printInstructions( instructions );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
+        return f;
     }
-
-    public static void createDialog( )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        String[] defInstr = { "Instructions will appear here. ", "" } ;
-        dialog.printInstructions( defInstr );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
-    }
-
-
-    public static void printInstructions( String[] instructions )
-    {
-        dialog.printInstructions( instructions );
-    }
-
-
-    public static void println( String messageIn )
-    {
-        dialog.displayMessage( messageIn );
-    }
-
-}// Sysout  class
-
-/**
-  This is part of the standard test machinery.  It provides a place for the
-   test instructions to be displayed, and a place for interactive messages
-   to the user to be displayed.
-  To have the test instructions displayed, see Sysout.
-  To have a message to the user be displayed, see Sysout.
-  Do not call anything in this dialog directly.
-  */
-class TestDialog extends Dialog
-{
-
-    TextArea instructionsText;
-    TextArea messageText;
-    int maxStringLength = 80;
-
-    //DO NOT call this directly, go through Sysout
-    public TestDialog( Frame frame, String name )
-    {
-        super( frame, name );
-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
-        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-        add( "North", instructionsText );
-
-        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-        add("Center", messageText);
-
-        pack();
-
-        setVisible(true);
-    }// TestDialog()
-
-    //DO NOT call this directly, go through Sysout
-    public void printInstructions( String[] instructions )
-    {
-        //Clear out any current instructions
-        instructionsText.setText( "" );
-
-        //Go down array of instruction strings
-
-        String printStr, remainingStr;
-        for( int i=0; i < instructions.length; i++ )
-        {
-            //chop up each into pieces maxSringLength long
-            remainingStr = instructions[ i ];
-            while( remainingStr.length() > 0 )
-            {
-                //if longer than max then chop off first max chars to print
-                if( remainingStr.length() >= maxStringLength )
-                {
-                    //Try to chop on a word boundary
-                    int posOfSpace = remainingStr.
-                        lastIndexOf( ' ', maxStringLength - 1 );
-
-                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
-                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
-                    remainingStr = remainingStr.substring( posOfSpace + 1 );
-                }
-                //else just print
-                else
-                {
-                    printStr = remainingStr;
-                    remainingStr = "";
-                }
-
-                instructionsText.append( printStr + "\n" );
-
-            }// while
-
-        }// for
-
-    }//printInstructions()
-
-    //DO NOT call this directly, go through Sysout
-    public void displayMessage( String messageIn )
-    {
-        messageText.append( messageIn + "\n" );
-        System.out.println(messageIn);
-    }
-
-}// TestDialog  class
+}
diff --git a/test/jdk/java/awt/PrintJob/Security/SecurityDialogTest.java b/test/jdk/java/awt/PrintJob/Security/SecurityDialogTest.java
deleted file mode 100644
index b84afc6eb9b..00000000000
--- a/test/jdk/java/awt/PrintJob/Security/SecurityDialogTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @key headful printer
- * @bug 6195901 6195923 6195928 6195933 6491273 6888734
- * @summary No SecurityException should be thrown when printing to a file
-            using the given policy.
-            Print to file option should be selected.
- * @run main/othervm/policy=policy SecurityDialogTest
- */
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.io.*;
-
-
-public class SecurityDialogTest extends Frame implements ActionListener {
-    // Declare things used in the test, like buttons and labels here
-
-    Button nativeDlg, setSecurity;
-        boolean isNative = true;
-
-    public SecurityDialogTest() {
-
-        nativeDlg = new Button("Print Dialog");
-        nativeDlg.addActionListener(this);
-        setSecurity = new Button("Toggle Dialog");
-        setSecurity.addActionListener(this);
-        add("South", nativeDlg);
-        add("North", setSecurity);
-        setSize(300, 300);
-        setVisible(true);
-    }
-
-    public static void main(String args[]) {
-        System.out.println("Native dialog is the default");
-        SecurityDialogTest test = new SecurityDialogTest();
-    }
-
-    public void actionPerformed(ActionEvent e) {
-
-        if (e.getSource() == setSecurity) {
-            if (isNative) {
-                isNative = false;
-                System.out.println("Common dialog is the default");
-
-            } else {
-                isNative = true;
-                System.out.println("Native dialog is the default");
-            }
-            return;
-        }
-
-        JobAttributes  ja = new JobAttributes();
-        PageAttributes pa = new PageAttributes();
-
-        if (isNative) {
-            ja.setDialog(JobAttributes.DialogType.NATIVE);
-        } else {
-            ja.setDialog(JobAttributes.DialogType.COMMON);
-        }
-        ja.setDestination(JobAttributes.DestinationType.FILE);
-        ja.setFileName("mohan.ps");
-
-
-        PrintJob pjob = getToolkit().getPrintJob(this, null, ja, pa);
-
-        if (pjob != null) {
-            Graphics pg = pjob.getGraphics();
-            System.out.println("PJOB: " + pjob);
-            if (pg != null) {
-                System.out.println("Printer Graphics: " + pg);
-                this.printAll(pg);
-                pg.dispose();
-            } else {
-                System.out.println("Printer Graphics is null");
-            }
-            pjob.end();
-            System.out.println("DONE");
-        } else {
-            System.out.println("PJOB is null");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/PrintJob/Security/policy b/test/jdk/java/awt/PrintJob/Security/policy
deleted file mode 100644
index 172a87f8f85..00000000000
--- a/test/jdk/java/awt/PrintJob/Security/policy
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* AUTOMATICALLY GENERATED ON Thu Jan 03 15:48:39 PST 2002*/
-/* DO NOT EDIT */
-
-grant {
- permission java.io.FilePermission "<<ALL FILES>>", "read,write";
- permission java.lang.RuntimePermission "queuePrintJob"; 
- permission java.lang.RuntimePermission "setSecurityManager"; 
-};
-
diff --git a/test/jdk/java/awt/Toolkit/GetImage/bug8078165.java b/test/jdk/java/awt/Toolkit/GetImage/bug8078165.java
index 169ad706616..ac6e2f0c61b 100644
--- a/test/jdk/java/awt/Toolkit/GetImage/bug8078165.java
+++ b/test/jdk/java/awt/Toolkit/GetImage/bug8078165.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,28 +22,18 @@
  */
 
 
-import java.awt.*;
+import java.awt.Toolkit;
 import java.net.URL;
-import java.security.Permission;
 
-
-/**
+/*
  * @test
  * @bug 8078165
- * @run main/othervm -Djava.security.manager=allow bug8078165
+ * @run main bug8078165
  * @summary NPE when attempting to get image from toolkit
- * @author Anton Nashatyrev
  */
 public final class bug8078165 {
 
     public static void main(final String[] args) throws Exception {
-        // Mac only
-        System.setSecurityManager(new SecurityManager() {
-            @Override
-            public void checkPermission(Permission permission) {
-                // Just allows everything
-            }
-        });
         // The method shouldn't throw NPE
         Toolkit.getDefaultToolkit().getImage(new URL("file://./dummyImage@2x.png"));
         Toolkit.getDefaultToolkit().getImage("./dummyImage@2x.png");
diff --git a/test/jdk/java/awt/Toolkit/SecurityTest/SecurityTest2.java b/test/jdk/java/awt/Toolkit/SecurityTest/SecurityTest2.java
deleted file mode 100644
index e3be3e8fdea..00000000000
--- a/test/jdk/java/awt/Toolkit/SecurityTest/SecurityTest2.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 6599601
- * @summary tests that a simple GUI application runs without any
- *          exceptions thrown
- * @author Artem.Ananiev area=awt.Toolkit
- * @run main/othervm -Djava.security.manager=allow SecurityTest2
- */
-
-import java.awt.*;
-
-public class SecurityTest2
-{
-    public static void main(String[] args)
-    {
-        System.setSecurityManager(new SecurityManager());
-
-        try
-        {
-            Frame f = new Frame();
-            f.setVisible(true);
-            f.dispose();
-        }
-        catch (Exception z)
-        {
-            throw new RuntimeException("Test FAILED because of some Exception thrown", z);
-        }
-    }
-}
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java
index e9352a2adca..d4492385474 100644
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java
+++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,12 @@
  * @test
  * @key headful
  * @summary Check for MouseEvents with all mouse buttons
- * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
  * @library /lib/client ../../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
- * @run main/othervm/policy=tray.policy -Djava.security.manager FunctionalityCheck
+ * @run main FunctionalityCheck
  */
 
 public class FunctionalityCheck {
@@ -58,9 +57,9 @@ public class FunctionalityCheck {
     static boolean isOel7orLater;
 
     static final int[] buttonTypes = {
-        InputEvent.BUTTON1_MASK,
-        InputEvent.BUTTON2_MASK,
-        InputEvent.BUTTON3_MASK
+        InputEvent.BUTTON1_DOWN_MASK,
+        InputEvent.BUTTON2_DOWN_MASK,
+        InputEvent.BUTTON3_DOWN_MASK
     };
 
     static final String[] buttonNames = {
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy
deleted file mode 100644
index c2c76434cd3..00000000000
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/tray.policy
+++ /dev/null
@@ -1,23 +0,0 @@
-grant {
-  permission java.io.FilePermission "<<ALL FILES>>", "read, write, delete, execute";
-  permission java.awt.AWTPermission "accessSystemTray";
-  permission java.awt.AWTPermission "createRobot";
-  permission java.util.PropertyPermission "resultsDir", "read";
-  permission java.util.PropertyPermission "user.home", "read";
-  permission java.util.PropertyPermission "os.name", "read";
-  permission java.util.PropertyPermission "os.version", "read";
-  permission java.awt.AWTPermission "accessEventQueue";
-  permission java.lang.RuntimePermission "setIO";
-  permission java.lang.RuntimePermission "accessDeclaredMembers";
-  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.lwawt.macosx";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.awt.X11";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.awt";
-  permission java.lang.RuntimePermission "loadLibrary.stl";
-  permission java.util.PropertyPermission "java.home", "read";
-  permission java.util.PropertyPermission "java.class.path", "read";
-  permission java.awt.AWTPermission "readDisplayPixels";
-  permission java.awt.AWTPermission "watchMousePointer";
-
-};
-
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java
deleted file mode 100644
index 7f54ad2e016..00000000000
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-/*
- * @test
- * @key headful
- * @summary Check for SecurityException occurrence if no permissions for system tray granted
- * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @run main/othervm/policy=tray.policy -Djava.security.manager NoPermissionTest
- */
-
-public class NoPermissionTest {
-
-    public static void main(String[] args) {
-        if (! SystemTray.isSupported()) {
-            System.out.println("SystemTray is not supported on this platform. Marking the test passed");
-        } else {
-
-            BufferedImage im = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-            Graphics gr = im.createGraphics();
-            gr.setColor(Color.white);
-            gr.fillRect(0, 0, 16, 16);
-
-            try {
-                SystemTray.getSystemTray();
-                throw new RuntimeException("FAIL: SecurityException not thrown by getSystemTray method");
-            } catch (SecurityException ex) {
-                if (!ex.getMessage().matches(".+java.awt.AWTPermission.+accessSystemTray.*"))
-                    throw new RuntimeException("FAIL: Security exception thrown due to unexpected reason");
-            }
-
-            try {
-                TrayIcon icon = new TrayIcon(im, "Caption");
-                throw new RuntimeException("FAIL: SecurityException not thrown by TrayIcon constructor");
-            } catch (SecurityException ex) {
-                if (!ex.getMessage().matches(".+java.awt.AWTPermission.+accessSystemTray.*"))
-                    throw new RuntimeException("FAIL: Security exception thrown due to unexpected reason");
-            }
-        }
-    }
-
-}
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy
deleted file mode 100644
index da9ee9c0c5c..00000000000
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/tray.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-//NoPermission Test
-grant{
-};
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java
deleted file mode 100644
index e3e8412c589..00000000000
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-/*
- * @test
- * @key headful
- * @summary Check for no Exception occurrence if permissions for system tray granted
- * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @run main/othervm/policy=tray.policy -Djava.security.manager PermissionTest
- */
-
-public class PermissionTest {
-
-    public static void main(String[] args) {
-
-        if (!SystemTray.isSupported()) {
-            System.out.println("SystemTray is not supported on this platform. Marking the test passed");
-        } else {
-            BufferedImage im = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-            Graphics gr = im.createGraphics();
-            gr.setColor(Color.white);
-            gr.fillRect(0, 0, 16, 16);
-
-            SystemTray.getSystemTray();
-            TrayIcon icon = new TrayIcon(im, "Caption");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy b/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy
deleted file mode 100644
index be273f8fdf4..00000000000
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/tray.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-  permission java.awt.AWTPermission "accessSystemTray";
-};
diff --git a/test/jdk/java/awt/color/LoadProfileWithSM.java b/test/jdk/java/awt/color/LoadProfileWithSM.java
deleted file mode 100644
index 1d9ba02163a..00000000000
--- a/test/jdk/java/awt/color/LoadProfileWithSM.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.color.*;
-
-/*
- * @test
- * @bug 8058969 8178708
- * @summary test standard profiles loads with SecurityManager installed.
- * @run main/othervm -Djava.security.manager=allow LoadProfileWithSM
- */
-
-public class LoadProfileWithSM {
-
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        ICC_Profile profile =
-            ((ICC_ColorSpace)(ColorSpace.getInstance(
-                ColorSpace.CS_GRAY))).getProfile();
-        /* request profile data in order to force profile loading */
-        profile.getData();
-   }
-}
diff --git a/test/jdk/java/awt/color/StandardProfileTest.java b/test/jdk/java/awt/color/StandardProfileTest.java
deleted file mode 100644
index 24ff53b7dd7..00000000000
--- a/test/jdk/java/awt/color/StandardProfileTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
-
-/**
- * @test
- * @bug 5042429
- * @summary This test verifies if ICC_profile instances for standard ColorSpace
- *          types are created without security exceptions if access to file
- *          system is prohibited.
- * @run main/othervm/policy=StandardProfileTest.policy StandardProfileTest
- */
-public final class StandardProfileTest {
-
-    public static void main(String[] args) {
-        if (System.getSecurityManager() == null) {
-            throw new RuntimeException("SecurityManager is null");
-        }
-
-        int[] types = {
-            ColorSpace.CS_CIEXYZ,
-            ColorSpace.CS_GRAY,
-            ColorSpace.CS_LINEAR_RGB,
-            ColorSpace.CS_PYCC,
-            ColorSpace.CS_sRGB } ;
-
-        for (int t = 0; t<types.length; t++) {
-            System.out.println("type " + t);
-            ICC_Profile p = ICC_Profile.getInstance(types[t]);
-            p.getPCSType();
-        }
-    }
-}
diff --git a/test/jdk/java/awt/color/StandardProfileTest.policy b/test/jdk/java/awt/color/StandardProfileTest.policy
deleted file mode 100644
index 67de1e84f0a..00000000000
--- a/test/jdk/java/awt/color/StandardProfileTest.policy
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @bug     5042429
- * @summary This policy file prohibits access to the file system.
- */
-
-grant {
-};
diff --git a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java
deleted file mode 100644
index b2996c3be7d..00000000000
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
-  @test
-  @key headful
-  @bug 6887703
-  @summary Unsigned applet can retrieve the dragged information before drop action occurs
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator
-  @run main/othervm DragInterceptorAppletTest main
-*/
-
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.event.InputEvent;
-
-import test.java.awt.regtesthelpers.Util;
-import test.java.awt.regtesthelpers.process.ProcessCommunicator;
-import test.java.awt.regtesthelpers.process.ProcessResults;
-
-import static java.lang.Thread.sleep;
-
-public class DragInterceptorAppletTest {
-
-    public void start() {
-
-        SourceFrame sourceFrame = new SourceFrame();
-
-        Util.waitForIdle(null);
-
-        String [] args = new String [] {
-            String.valueOf(sourceFrame.getNextLocationX()),
-            String.valueOf(sourceFrame.getNextLocationY()),
-            String.valueOf(sourceFrame.getDragSourcePointX()),
-            String.valueOf(sourceFrame.getDragSourcePointY()),
-        };
-        String classpath = System.getProperty("java.class.path");
-        ProcessResults processResults =
-            ProcessCommunicator.executeChildProcess(this.getClass(),classpath,args);
-
-        verifyTestResults(processResults);
-
-    }// start()
-
-    private static void verifyTestResults(ProcessResults processResults) {
-
-    switch (processResults.getExitValue()) {
-        case InterprocessMessages.DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED:
-            processResults.printProcessErrorOutput(System.err);
-            throw new RuntimeException("TEST IS FAILED: Target applet can intercept data " +
-                    "without a clipboard permission and an exception handler was not triggered.");
-            //Unreachable...
-
-        case InterprocessMessages.DATA_WAS_INTERCEPTED:
-            processResults.printProcessErrorOutput(System.err);
-            throw new RuntimeException("TEST IS FAILED: Target applet can intercept data " +
-                    "without a clipboard permission");
-            //Unreachable...
-
-        case InterprocessMessages.EXCEPTION_HANDLER_WAS_NOT_TRIGGERED:
-            processResults.printProcessErrorOutput(System.err);
-            throw new RuntimeException("TEST IS FAILED: An exception handler was not triggered.");
-            //Unreachable...
-
-    }
-
-        //    The child process throws an exception. do not look at the stderr.
-        processResults.verifyStdErr(System.err);
-        processResults.verifyProcessExitValue(System.err);
-        processResults.printProcessStandartOutput(System.out);
-    }
-
-    //We cannot make an instance of the applet without the default constructor
-    public DragInterceptorAppletTest() {
-        super();
-    }
-
-    //We need in this constructor to pass frame position between JVMs
-    public DragInterceptorAppletTest(Point targetFrameLocation, Point dragSourcePoint)
-            throws InterruptedException
-    {
-        DragInterceptorFrame targetFrame = new DragInterceptorFrame(targetFrameLocation);
-
-        Util.waitForIdle(null);
-
-        final Robot robot = Util.createRobot();
-
-        robot.mouseMove((int)dragSourcePoint.getX(),(int)dragSourcePoint.getY());
-        sleep(100);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        sleep(100);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
-        sleep(100);
-
-        Util.drag(robot, dragSourcePoint, targetFrame.getDropTargetPoint(),
-                InputEvent.BUTTON1_MASK);
-
-        sleep(2000);
-        ProcessCommunicator.destroyProcess();
-    }
-
-    enum InterprocessArguments {
-        TARGET_FRAME_X_POSITION_ARGUMENT,
-        TARGET_FRAME_Y_POSITION_ARGUMENT,
-        DRAG_SOURCE_POINT_X_ARGUMENT,
-        DRAG_SOURCE_POINT_Y_ARGUMENT;
-
-        int extract (String [] args) {
-            return Integer.parseInt(args[this.ordinal()]);
-        }
-    }
-
-    public static void main(final String[] args) {
-        if (args.length > 0 && args[0].equals("main")) {
-            new DragInterceptorAppletTest().start();
-            return;
-        }
-        Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
-                InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
-        Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
-                InterprocessArguments.TARGET_FRAME_Y_POSITION_ARGUMENT.extract(args));
-        try {
-            new DragInterceptorAppletTest(targetFrameLocation, dragSourcePoint);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-}// class DragInterceptorAppletTest
diff --git a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java
deleted file mode 100644
index 69d4a014ba9..00000000000
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.*;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.dnd.*;
-import java.io.IOException;
-import java.security.Permission;
-import java.security.AccessControlException;
-
-class DragInterceptorFrame extends Frame implements DropTargetListener {
-
-    private static int exitMessage = InterprocessMessages.TEST_PASSED;
-    private static boolean dataIsAccessible = false;
-    private static boolean exceptionHasBeenThrown = false;
-
-    DragInterceptorFrame(Point location) {
-        System.setSecurityManager(new ClipboardDefender());
-        initGUI(location);
-        setDropTarget(new DropTarget(this, DnDConstants.ACTION_COPY,
-                this));
-    }
-
-    private void initGUI(Point location) {
-        this.setLocation(location);
-        this.addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
-                DragInterceptorFrame.this.dispose();
-            }
-        });
-        setSize (200, 200);
-        this.setVisible(true);
-    }
-
-    public void dragEnter(DropTargetDragEvent dtde) {
-        // We want to set the exception handler on EDT
-        Thread.currentThread().setUncaughtExceptionHandler (
-            new Thread.UncaughtExceptionHandler() {
-                public void uncaughtException(Thread t, Throwable e) {
-                    exceptionHasBeenThrown = true;
-                }
-            }
-        );
-        examineTransferable(dtde);
-    }
-
-    public void dragOver(DropTargetDragEvent dtde) {
-        examineTransferable(dtde);
-    }
-
-    public void dropActionChanged(DropTargetDragEvent dtde) {
-        examineTransferable(dtde);
-    }
-
-    public void dragExit(DropTargetEvent dte) {}
-
-    public void drop(DropTargetDropEvent dtde) {
-
-        if (dataIsAccessible && !exceptionHasBeenThrown) {
-            exitMessage = InterprocessMessages.DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED;
-        } else if (dataIsAccessible) {
-            exitMessage = InterprocessMessages.DATA_WAS_INTERCEPTED;
-        } else if (!exceptionHasBeenThrown) {
-            exitMessage = InterprocessMessages.EXCEPTION_HANDLER_WAS_NOT_TRIGGERED;
-        }
-
-        // This returns the diagnostic code from the child VM
-        System.exit(exitMessage);
-    }
-
-    Point getDropTargetPoint() {
-        return new Point((int)getLocationOnScreen().getX()+(getWidth()/2),
-                (int)getLocationOnScreen().getY()+(getHeight()/2));
-    }
-
-    private void examineTransferable(DropTargetDragEvent dtde) {
-        if (dtde.getCurrentDataFlavorsAsList().contains(DataFlavor.stringFlavor)) {
-            dtde.acceptDrag(DnDConstants.ACTION_COPY);
-            try{
-                if (null != dtde.getTransferable().getTransferData(DataFlavor.stringFlavor)) {
-                    dataIsAccessible = true;
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                exitMessage = InterprocessMessages.UNEXPECTED_IO_EXCEPTION;
-            } catch (UnsupportedFlavorException e) {
-                e.printStackTrace();
-                exitMessage = InterprocessMessages.UNEXPECTED_UNSUPPORTED_FLAVOR_EXCEPTION;
-            }
-        }
-    }
-
-    static class ClipboardDefender extends SecurityManager {
-        public void checkPermission(Permission p) {
-           if (p instanceof java.awt.AWTPermission &&
-                   p.getName().equals("accessClipboard")) {
-               throw new AccessControlException("access denied ");
-           }
-        }
-    }
-
-    public static void main(String[] args) {
-        new DragInterceptorFrame(new Point(200,200));
-    }
-}
diff --git a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java
deleted file mode 100644
index 6506565cd05..00000000000
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public interface InterprocessMessages {
-    final static int TEST_PASSED = 0;
-    final static int DATA_WAS_INTERCEPTED = 212;
-    final static int EXCEPTION_HANDLER_WAS_NOT_TRIGGERED = 213;
-    final static int DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED  = 214;
-
-    final static int UNEXPECTED_IO_EXCEPTION = 400;
-    final static int UNEXPECTED_UNSUPPORTED_FLAVOR_EXCEPTION = 401;
-}
diff --git a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java
deleted file mode 100644
index 7a7c833b91a..00000000000
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import test.java.awt.regtesthelpers.Util;
-
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-
-class SourceFrame extends Frame implements DragGestureListener {
-
-    SourceFrame() {
-        super("Source File List Frame");
-        initGUI();
-        new DragSource().createDefaultDragGestureRecognizer(this,
-                DnDConstants.ACTION_COPY,this);
-    }
-
-    private void initGUI() {
-        this.addWindowListener(Util.getClosingWindowAdapter());
-        this.setLocation(300,250);
-        this.setSize(200,200);
-        this.setVisible(true);
-    }
-
-    int getNextLocationX() {
-        return getX()+getWidth();
-    }
-
-    int getNextLocationY() {
-        return getY();
-    }
-
-    int getDragSourcePointX() {
-        return (int)getLocationOnScreen().getX()+(getWidth()/2);
-    }
-
-   int getDragSourcePointY() {
-        return (int)getLocationOnScreen().getY()+ (getHeight()/2);
-    }
-
-    public void dragGestureRecognized(DragGestureEvent dge) {
-        dge.startDrag(null, new StringSelection("A TEXT"));
-    }
-}
diff --git a/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java b/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java
index a6221b480c5..3cce1f7e2e6 100644
--- a/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java
+++ b/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/TestAWTKeyStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,7 @@
  * @test
  * @bug 8133453
  * @summary Remove AWTKeyStroke.registerSubclass(Class) method
- * @author Alexander Scherbatiy
- * @run main/othervm TestAWTKeyStroke
- * @run main/othervm/policy=policy -Djava.security.manager TestAWTKeyStroke
+ * @run main TestAWTKeyStroke
  */
 public class TestAWTKeyStroke {
 
diff --git a/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/policy b/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/policy
deleted file mode 100644
index e89913b9f24..00000000000
--- a/test/jdk/java/awt/event/KeyEvent/RegisterKeyStroke/policy
+++ /dev/null
@@ -1,2 +0,0 @@
-grant {
-};
diff --git a/test/jdk/java/awt/image/mlib/MlibOpsTest.java b/test/jdk/java/awt/image/mlib/MlibOpsTest.java
index 0f1fe717c78..803e0b31d19 100644
--- a/test/jdk/java/awt/image/mlib/MlibOpsTest.java
+++ b/test/jdk/java/awt/image/mlib/MlibOpsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,10 @@
 /*
  * @test
  * @bug     6556332 8011992 8012112
- * @summary Test verifies that on-demnad loading of medialib library does
- *          not break imageing ops based on this library.
+ * @summary Test verifies that on-demand loading of medialib library does
+ *          not break imaging ops based on this library.
  * @modules java.desktop/sun.awt.image
  * @run     main MlibOpsTest
- * @run     main/othervm/policy=mlib.security.policy MlibOpsTest
  */
 
 
diff --git a/test/jdk/java/awt/image/mlib/mlib.security.policy b/test/jdk/java/awt/image/mlib/mlib.security.policy
deleted file mode 100644
index 74af89c2db6..00000000000
--- a/test/jdk/java/awt/image/mlib/mlib.security.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-        permission java.lang.RuntimePermission "accessClassInPackage.sun.awt.image";
-};
diff --git a/test/jdk/java/awt/print/PrintServicesSecurityManager.java b/test/jdk/java/awt/print/PrintServicesSecurityManager.java
deleted file mode 100644
index 7f551476422..00000000000
--- a/test/jdk/java/awt/print/PrintServicesSecurityManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.Arrays;
-
-import javax.print.PrintServiceLookup;
-
-/*
- * @test
- * @bug 8241829
- * @run main/othervm -Djava.security.manager=allow PrintServicesSecurityManager
- */
-public final class PrintServicesSecurityManager {
-
-    public static void main(String[] args) throws InterruptedException {
-        System.setSecurityManager(new SecurityManager());
-        test();
-        Thread.sleep(3000); // to be sure the pooling thread started
-        test();
-    }
-
-    private static void test() {
-        Object[] services = PrintServiceLookup.lookupPrintServices(null, null);
-        if (services.length != 0) {
-            System.err.println("services = " + Arrays.toString(services));
-            throw new RuntimeException("The array of Services must be empty");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/print/PrinterJob/CheckAccess.java b/test/jdk/java/awt/print/PrinterJob/CheckAccess.java
deleted file mode 100644
index f962610c6fb..00000000000
--- a/test/jdk/java/awt/print/PrinterJob/CheckAccess.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 4151121
- * @run main/othervm -Djava.security.manager=allow CheckAccess
- * @summary Confirm that PrinterJob.getPrinterJob is access checked.
- * @author Graham Hamilton
- */
-
-import java.awt.print.*;
-import java.security.*;
-
-public class CheckAccess {
-
-    static boolean verbose;
-
-    private static void println(String mess) {
-        if (verbose) {
-            System.err.println(mess);
-        }
-    }
-
-    /**
-     * SecurityManager that rejects all print requests,
-     * but allows everything else.
-     */
-    static class PrintHater extends SecurityManager {
-
-        public void checkPermission(Permission p) {
-           // We're easy.
-        }
-
-        public void checkPrintJobAccess() {
-            throw new SecurityException("No way!");
-        }
-    }
-
-    public static void main(String argv[]) {
-
-        if (argv.length > 0 && argv[0].equals("-v")) {
-            verbose = true;
-        }
-
-        // Try to install our own security manager.
-        try {
-            SecurityManager sm = new PrintHater();
-            println("Installing PrintHater security manager");
-            System.setSecurityManager(sm);
-            println("Installed security manager OK");
-
-        } catch (Throwable th) {
-            System.err.println("Failed to install SecurityManager");
-            th.printStackTrace();
-            throw new RuntimeException("Failed to install SecurityManager");
-        }
-
-        try {
-
-            println("Calling PrinterJob.getPrinterJob()");
-            PrinterJob.getPrinterJob();
-
-            // Woops.  We did not get the SecurityException we expected.
-            println("Failed to get SecurityException");
-            throw new RuntimeException("Failed to get expected SecurityException");
-
-        } catch (SecurityException ex) {
-            // Happy, happy.  This is what we want.
-            println("Got expected SecurityException OK.");
-            return;
-        }
-
-    }
-}
diff --git a/test/jdk/java/awt/print/PrinterJob/CheckPrivilege.java b/test/jdk/java/awt/print/PrinterJob/CheckPrivilege.java
deleted file mode 100644
index 533516664ed..00000000000
--- a/test/jdk/java/awt/print/PrinterJob/CheckPrivilege.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @key printer
- * @bug 4151151
- * @summary Confirm that low-level print code does doPrivilege.
- * @author Graham Hamilton
- * @run main/othervm -Djava.security.manager=allow CheckPrivilege
- */
-
-import java.awt.print.*;
-
-public class CheckPrivilege implements Printable {
-
-    static boolean verbose;
-
-    private static void println(String mess) {
-        if (verbose) {
-            System.err.println(mess);
-        }
-    }
-
-    /**
-     * SecurityManager that allows print requests, but
-     * causes things like "exec" to get checked.
-     */
-    static class PrintLover extends SecurityManager {
-        public void checkPrintJobAccess() {
-        }
-        public void checkPackageAccess(String pkg) {
-        }
-        public void checkPropertyAccess(String key) {
-        }
-    }
-
-    /**
-     * Internal exception to boucne us out of the print code
-     */
-    class Printing extends RuntimeException {
-    }
-
-    public static void main(String argv[]) {
-
-        System.out.println( "-----------------------------------------------------------------------");
-        System.out.println( "INSTRUCTIONS: You should have a printer configured in your system to do this test. Test fails if you get this error message:");
-        System.out.println("   \"Regression: printing causes a NullPointerException\"");
-    System.out.println( "-----------------------------------------------------------------------");
-
-        if (argv.length > 0 && argv[0].equals("-v")) {
-            verbose = true;
-        }
-
-        // We need to make sure AWT is initialized.  This is bug #4162674
-        java.awt.Toolkit.getDefaultToolkit();
-
-        // Try to install our own security manager.
-        try {
-            SecurityManager sm = new PrintLover();
-            println("Installing PrintLover security manager");
-            System.setSecurityManager(sm);
-            println("Installed security manager OK");
-
-        } catch (Throwable th) {
-            System.err.println("Failed to install SecurityManager");
-            th.printStackTrace();
-            throw new RuntimeException("Failed to install SecurityManager");
-        }
-
-        try {
-            println("calling getPrinterJob");
-            PrinterJob pj = PrinterJob.getPrinterJob();
-            if ((pj == null) || (pj.getPrintService() == null)){
-                return;
-            }
-
-            println("PrinterJob class is " + pj.getClass());
-            println("calling pj.setPrintable");
-            pj.setPrintable(new CheckPrivilege());
-            println("calling pj.print");
-            pj.print();
-            println("done pj.print");
-
-        } catch (Printing ex) {
-            // We get here if the print request started OK.
-            println("Caught \"Printing\" exception OK");
-
-        } catch (PrinterException ex) {
-            System.err.println("Caught " + ex);
-            throw new RuntimeException("" + ex);
-
-        } catch (NullPointerException ex) {
-            // This is the bug:
-            System.err.println("Caught " + ex);
-            System.err.println("Regression: printing causes a NullPointerException");
-            throw ex;
-        }
-
-        //System.exit(0);
-
-    }
-
-    // Back-call from the new print APIs.
-    // We always say we have bothing to print.
-    public int print(java.awt.Graphics g, PageFormat pf, int index) {
-        println("Started printing " + index);
-        return Printable.NO_SUCH_PAGE;
-    }
-
-
-}
diff --git a/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.java b/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.java
deleted file mode 100644
index 8e35a5f4204..00000000000
--- a/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * @test
- * @bug 6197099
- * @summary Verifies PrinterJob's getUserName() throws a security exception when
- *          username permission is not given
- * @run main/othervm/java.security.policy=GetUserNameTest.policy GetUserNameTest
- */
-import java.awt.print.PrinterJob;
-
-public class GetUserNameTest {
-
-    public static void main(String args[]) {
-        System.setSecurityManager(new SecurityManager());
-        PrinterJob pj = PrinterJob.getPrinterJob();
-        boolean secExcpn = false;
-        try {
-            System.out.println(pj.getUserName());
-        } catch (SecurityException ex) {
-            secExcpn = true;
-            System.out.println("SecurityException thrown as user.name permission "
-                    + "not given");
-        }
-        if (!secExcpn) {
-            throw new RuntimeException("SecurityException not thrown");
-        }
-    }
-}
diff --git a/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.policy b/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.policy
deleted file mode 100644
index b7b7d70df3d..00000000000
--- a/test/jdk/java/awt/print/PrinterJob/GetUserNameTest.policy
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-grant {
-  permission java.lang.RuntimePermission "setSecurityManager";
-  permission java.lang.RuntimePermission "createSecurityManager";
-  permission java.lang.RuntimePermission "usePolicy";
-  permission java.lang.RuntimePermission "queuePrintJob";
-};
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
index 95bf177aa2f..f2ec4e15a8a 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,193 +21,207 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6425068 7157659 8132890
  * @key printer
  * @summary Confirm that text prints where we expect to the length we expect.
- * @run main/manual=yesno PrintTextTest
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual PrintTextTest
  */
 
-import java.awt.*;
-import java.awt.event.*;
-import java.text.*;
-import java.util.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.awt.print.*;
-import javax.swing.*;
-
-public class PrintTextTest extends Component implements Printable {
-
-    static int preferredSize;
-    Font textFont;
-    AffineTransform gxTx;
-    String page;
-    boolean useFM;
-
-    public static void main(String args[]) {
-        String[] instructions =
-        {
-            "This tests that printed text renders similarly to on-screen",
-            "under a variety of APIs and graphics and font transforms",
-            "Print to your preferred printer. Collect the output.",
-            "Refer to the onscreen buttons to cycle through the on-screen",
-            "content",
-            "For each page, confirm that the printed content corresponds to",
-            "the on-screen rendering for that *same* page.",
-            "Some cases may look odd but its intentional. Verify",
-            "it looks the same on screen and on the printer.",
-            "Note that text does not scale linearly from screen to printer",
-            "so some differences are normal and not a bug.",
-            "The easiest way to spot real problems is to check that",
-            "any underlines are the same length as the underlined text",
-            "and that any rotations are the same in each case.",
-            "Note that each on-screen page is printed in both portrait",
-            "and landscape mode",
-            "So for example, Page 1/Portrait, and Page 1/Landscape when",
-            "rotated to view properly, should both match Page 1 on screen.",
-        };
-        Sysout.createDialogWithInstructions(instructions);
-
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
+import java.awt.RenderingHints;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.print.Book;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.util.HashMap;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JTabbedPane;
+
+public class PrintTextTest {
+
+    static final String INSTRUCTIONS = """
+        This tests that printed text renders similarly to on-screen under a variety
+        of APIs and graphics and font transforms.
+        1. Print to your preferred printer.
+        2. Collect the output.
+        3. Refer to the onscreen buttons to cycle through the on-screen content.
+        4. For each page, confirm that the printed content corresponds to the
+           on-screen rendering for that *same* page. Some cases may look odd but
+           its intentional. Verify it looks the same on screen and on the printer.
+        Note that text does not scale linearly from screen to printer so some
+        differences are normal and not a bug.
+        The easiest way to spot real problems is to check that any underlines are
+        the same length as the underlined text and that any rotations are the same
+        in each case.
+        Note that each on-screen page is printed in both portrait and landscape mode.
+        So for example, Page 1/Portrait, and Page 1/Landscape when rotated to view
+        properly, should both match Page 1 on screen.
+        """;
+
+    public static void main(String[] args) throws Exception {
 
         PrinterJob pjob = PrinterJob.getPrinterJob();
         PageFormat portrait = pjob.defaultPage();
         portrait.setOrientation(PageFormat.PORTRAIT);
-        preferredSize = (int)portrait.getImageableWidth();
+        int preferredSize = (int) portrait.getImageableWidth();
 
         PageFormat landscape = pjob.defaultPage();
         landscape.setOrientation(PageFormat.LANDSCAPE);
 
         Book book = new Book();
 
-        JTabbedPane p = new JTabbedPane();
+        JTabbedPane pane = new JTabbedPane();
 
         int page = 1;
-        Font font = new Font("Dialog", Font.PLAIN, 18);
-        String name = "Page " + new Integer(page++);
-        PrintTextTest ptt = new PrintTextTest(name, font, null, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
-
-        font = new Font("Dialog", Font.PLAIN, 18);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, null, true);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        Font font = new Font(Font.DIALOG, Font.PLAIN, 18);
+        String name = "Page " + page++;
+        PrintText pt = new PrintText(name, font, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
+
+        font = new Font(Font.DIALOG, Font.PLAIN, 18);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, null, true, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         font = getPhysicalFont();
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, null, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         font = getPhysicalFont();
         AffineTransform rotTx = AffineTransform.getRotateInstance(0.15);
-        rotTx.translate(60,0);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, rotTx, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
-
-        font = new Font("Dialog", Font.PLAIN, 18);
+        rotTx.translate(60, 0);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, rotTx, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
+
+        font = new Font(Font.DIALOG, Font.PLAIN, 18);
         AffineTransform scaleTx = AffineTransform.getScaleInstance(1.25, 1.25);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, scaleTx, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, scaleTx, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
-        font = new Font("Dialog", Font.PLAIN, 18);
+        font = new Font(Font.DIALOG, Font.PLAIN, 18);
         scaleTx = AffineTransform.getScaleInstance(-1.25, 1.25);
-        scaleTx.translate(-preferredSize/1.25, 0);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, scaleTx, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
-
-        font = new Font("Dialog", Font.PLAIN, 18);
+        scaleTx.translate(-preferredSize / 1.25, 0);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, scaleTx, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
+
+        font = new Font(Font.DIALOG, Font.PLAIN, 18);
         scaleTx = AffineTransform.getScaleInstance(1.25, -1.25);
-        scaleTx.translate(0, -preferredSize/1.25);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, scaleTx, false);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        scaleTx.translate(0, -preferredSize / 1.25);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, scaleTx, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         font = font.deriveFont(rotTx);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, null, false);
-        p.add(ptt, BorderLayout.CENTER);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
-
-        font = new Font("Monospaced", Font.PLAIN, 12);
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, font, null, false);
-        p.add(ptt, BorderLayout.CENTER);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
+
+        font = new Font(Font.MONOSPACED, Font.PLAIN, 12);
+        name = "Page " + page++;
+        pt = new PrintText(name, font, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         Font xfont = font.deriveFont(AffineTransform.getScaleInstance(1.5, 1));
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, xfont, null, false);
-        p.add(ptt, BorderLayout.CENTER);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        name = "Page " + page++;
+        pt = new PrintText(name, xfont, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         Font yfont = font.deriveFont(AffineTransform.getScaleInstance(1, 1.5));
-        name = "Page " + new Integer(page++);
-        ptt = new PrintTextTest(name, yfont, null, false);
-        p.add(ptt, BorderLayout.CENTER);
-        p.add(name, ptt);
-        book.append(ptt, portrait);
-        book.append(ptt, landscape);
+        name = "Page " + page++;
+        pt = new PrintText(name, yfont, null, false, preferredSize);
+        pane.addTab(name, pt);
+        book.append(pt, portrait);
+        book.append(pt, landscape);
 
         if (System.getProperty("os.name").startsWith("Windows")) {
             font = new Font("MS Gothic", Font.PLAIN, 12);
-            name = "Page " + new Integer(page++);
-            ptt = new PrintJAText(name, font, null, true);
-            p.add(ptt, BorderLayout.CENTER);
-            p.add(name, ptt);
-            book.append(ptt, portrait);
-            book.append(ptt, landscape);
+            name = "Page " + page++;
+            pt = new PrintJapaneseText(name, font, null, true, preferredSize);
+            pane.addTab(name, pt);
+            book.append(pt, portrait);
+            book.append(pt, landscape);
 
             font = new Font("MS Gothic", Font.PLAIN, 12);
-            name = "Page " + new Integer(page++);
+            name = "Page " + page++;
             rotTx = AffineTransform.getRotateInstance(0.15);
-            ptt = new PrintJAText(name, font, rotTx, true);
-            p.add(ptt, BorderLayout.CENTER);
-            p.add(name, ptt);
-            book.append(ptt, portrait);
-            book.append(ptt, landscape);
+            pt = new PrintJapaneseText(name, font, rotTx, true, preferredSize);
+            pane.addTab(name, pt);
+            book.append(pt, portrait);
+            book.append(pt, landscape);
         }
 
         pjob.setPageable(book);
 
-        JFrame f = new JFrame();
-        f.add(BorderLayout.CENTER, p);
-        f.addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {System.exit(0);}
+        JButton printButton = new JButton("Print");
+        printButton.addActionListener(event -> {
+            try {
+                if (pjob.printDialog()) {
+                    pjob.print();
+                }
+            } catch (PrinterException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
         });
+
+        JFrame f = new JFrame("PrintTextTest");
+        f.add(BorderLayout.CENTER, pane);
+        f.add(BorderLayout.SOUTH, printButton);
         f.pack();
-        f.show();
 
-        try {
-            if (pjob.printDialog()) {
-                pjob.print();
-            }
-        } catch (PrinterException e) {
-            throw new RuntimeException(e.getMessage());
-        }
+        PassFailJFrame.builder()
+            .title("PrintTextTest")
+            .instructions(INSTRUCTIONS)
+            .testTimeOut(10)
+            .columns(60)
+            .testUI(f)
+            .build()
+            .awaitAndCheck();
     }
 
     // The test needs a physical font that supports Latin.
@@ -221,338 +235,228 @@ private static Font getPhysicalFont() {
         String[] names = ge.getAvailableFontFamilyNames();
 
         for (String n : names) {
-            switch (n.toLowerCase()) {
-                case "dialog":
-                case "dialoginput":
-                case "serif":
-                case "sansserif":
-                case "monospaced":
-                     break;
+            switch (n) {
+                case Font.DIALOG:
+                case Font.DIALOG_INPUT:
+                case Font.SERIF:
+                case Font.SANS_SERIF:
+                case Font.MONOSPACED:
+                     continue;
                 default:
                     Font f = new Font(n, Font.PLAIN, 18);
                     if (f.canDisplayUpTo("AZaz09") == -1) {
                         physicalFont = f;
                         return f;
                     }
-             }
+            }
         }
         physicalFont = new Font(Font.DIALOG, Font.PLAIN, 18);
         return physicalFont;
     }
 
-    public PrintTextTest(String page, Font font, AffineTransform gxTx,
-                         boolean fm) {
-        this.page = page;
-        textFont = font;
-        this.gxTx = gxTx;
-        this.useFM = fm;
-        setBackground(Color.white);
-    }
-
-    public static AttributedCharacterIterator getIterator(String s) {
-        return new AttributedString(s).getIterator();
-    }
-
-    static String orient(PageFormat pf) {
-        if (pf.getOrientation() == PageFormat.PORTRAIT) {
-            return "Portrait";
-        } else {
-            return "Landscape";
+    private static class PrintText extends Component implements Printable {
+
+        protected final Font textFont;
+        protected final AffineTransform gxTx;
+        protected final String page;
+        protected final boolean useFM;
+        protected final int preferredSize;
+
+        public PrintText(String page, Font font, AffineTransform gxTx, boolean fm, int size) {
+            this.page = page;
+            this.textFont = font;
+            this.gxTx = gxTx;
+            this.useFM = fm;
+            this.preferredSize = size;
+            setBackground(Color.WHITE);
         }
-    }
 
-    public int print(Graphics g, PageFormat pf, int pageIndex) {
-
-        Graphics2D g2d = (Graphics2D)g;
-        g2d.translate(pf.getImageableX(),  pf.getImageableY());
-        g.drawString(page+" "+orient(pf),50,20);
-        g.translate(0, 25);
-        paint(g);
-        return PAGE_EXISTS;
-    }
-
-    public Dimension getMinimumSize() {
-        return getPreferredSize();
-    }
-
-    public Dimension getPreferredSize() {
-        return new Dimension(preferredSize, preferredSize);
-    }
-
-    public void paint(Graphics g) {
-
-        /* fill with white before any transformation is applied */
-        g.setColor(Color.white);
-        g.fillRect(0, 0, getSize().width, getSize().height);
-
-
-        Graphics2D g2d = (Graphics2D) g;
-        if (gxTx != null) {
-            g2d.transform(gxTx);
+        private static AttributedCharacterIterator getIterator(String s) {
+            return new AttributedString(s).getIterator();
         }
-        if (useFM) {
-            g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                                 RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        }
-
-        g.setFont(textFont);
-        FontMetrics fm = g.getFontMetrics();
 
-        String s;
-        int LS = 30;
-        int ix=10, iy=LS+10;
-        g.setColor(Color.black);
-
-        s = "drawString(String str, int x, int y)";
-        g.drawString(s, ix, iy);
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+fm.stringWidth(s), iy+1);
+        private static String orient(PageFormat pf) {
+            if (pf.getOrientation() == PageFormat.PORTRAIT) {
+                return "Portrait";
+            } else {
+                return "Landscape";
+            }
         }
 
-        iy += LS;
-        s = "drawString(AttributedCharacterIterator iterator, int x, int y)";
-        g.drawString(getIterator(s), ix, iy);
-
-        iy += LS;
-        s = "\tdrawChars(\t\r\nchar[], int off, int len, int x, int y\t)";
-        g.drawChars(s.toCharArray(), 0, s.length(), ix, iy);
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+fm.stringWidth(s), iy+1);
+        @Override
+        public int print(Graphics g, PageFormat pf, int pageIndex) {
+            Graphics2D g2d = (Graphics2D) g;
+            g2d.translate(pf.getImageableX(), pf.getImageableY());
+            g.drawString(page + " " + orient(pf), 50, 20);
+            g.translate(0, 25);
+            paint(g);
+            return PAGE_EXISTS;
         }
 
-        iy += LS;
-        s = "drawBytes(byte[], int off, int len, int x, int y)";
-        byte data[] = new byte[s.length()];
-        for (int i = 0; i < data.length; i++) {
-            data[i] = (byte) s.charAt(i);
+        @Override
+        public Dimension getMinimumSize() {
+            return getPreferredSize();
         }
-        g.drawBytes(data, 0, data.length, ix, iy);
 
-        Font f = g2d.getFont();
-        FontRenderContext frc = g2d.getFontRenderContext();
-
-        iy += LS;
-        s = "drawString(String s, float x, float y)";
-        g2d.drawString(s, (float) ix, (float) iy);
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+fm.stringWidth(s), iy+1);
+        @Override
+        public Dimension getPreferredSize() {
+            return new Dimension(preferredSize, preferredSize);
         }
 
-        iy += LS;
-        s = "drawString(AttributedCharacterIterator iterator, "+
-            "float x, float y)";
-        g2d.drawString(getIterator(s), (float) ix, (float) iy);
-
-        iy += LS;
-        s = "drawGlyphVector(GlyphVector g, float x, float y)";
-        GlyphVector gv = f.createGlyphVector(frc, s);
-        g2d.drawGlyphVector(gv, ix, iy);
-        Point2D adv = gv.getGlyphPosition(gv.getNumGlyphs());
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+(int)adv.getX(), iy+1);
-        }
+        @Override
+        public void paint(Graphics g) {
 
-        iy += LS;
-        s = "GlyphVector with position adjustments";
-
-        gv = f.createGlyphVector(frc, s);
-        int ng = gv.getNumGlyphs();
-        adv = gv.getGlyphPosition(ng);
-        for (int i=0; i<ng; i++) {
-            Point2D gp = gv.getGlyphPosition(i);
-            double gx = gp.getX();
-            double gy = gp.getY();
-            if (i % 2 == 0) {
-                gy+=5;
-            } else {
-                gy-=5;
+            g.setColor(Color.WHITE);
+            g.fillRect(0, 0, getSize().width, getSize().height);
+
+            Graphics2D g2d = (Graphics2D) g;
+            if (gxTx != null) {
+                g2d.transform(gxTx);
+            }
+            if (useFM) {
+                g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
+                                     RenderingHints.VALUE_FRACTIONALMETRICS_ON);
             }
-            gp.setLocation(gx, gy);
-            gv.setGlyphPosition(i, gp);
-        }
-        g2d.drawGlyphVector(gv, ix, iy);
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+(int)adv.getX(), iy+1);
-        }
 
-        iy +=LS;
-        s = "drawString: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
-        g.drawString(s, ix, iy);
-        if (!textFont.isTransformed()) {
-            g.drawLine(ix, iy+1, ix+fm.stringWidth(s), iy+1);
-        }
+            g.setFont(textFont);
+            FontMetrics fm = g.getFontMetrics();
 
-        iy += LS;
-        s = "TextLayout 1: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
-        TextLayout tl = new TextLayout(s, new HashMap(), frc);
-        tl.draw(g2d,  ix, iy);
+            String s;
+            int LS = 30;
+            int ix = 10, iy = LS + 10;
+            g.setColor(Color.BLACK);
 
-        iy += LS;
-        s = "TextLayout 2: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
-        tl = new TextLayout(s, f, frc);
-        tl.draw(g2d,  ix, iy);
-    }
-}
+            s = "drawString(String str, int x, int y)";
+            g.drawString(s, ix, iy);
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + fm.stringWidth(s), iy + 1);
+            }
 
-class PrintJAText extends PrintTextTest {
+            iy += LS;
+            s = "drawString(AttributedCharacterIterator iterator, int x, int y)";
+            g.drawString(getIterator(s), ix, iy);
 
+            iy += LS;
+            s = "\tdrawChars(\t\r\nchar[], int off, int len, int x, int y\t)";
+            g.drawChars(s.toCharArray(), 0, s.length(), ix, iy);
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + fm.stringWidth(s), iy + 1);
+            }
 
-    public PrintJAText(String page, Font font, AffineTransform gxTx,
-                         boolean fm) {
-        super(page, font, gxTx, fm);
-    }
+            iy += LS;
+            s = "drawBytes(byte[], int off, int len, int x, int y)";
+            byte[] data = new byte[s.length()];
+            for (int i = 0; i < data.length; i++) {
+                data[i] = (byte) s.charAt(i);
+            }
+            g.drawBytes(data, 0, data.length, ix, iy);
 
-    private static final String TEXT =
-        "\u3042\u3044\u3046\u3048\u304a\u30a4\u30ed\u30cf" +
-        "\u30cb\u30db\u30d8\u30c8\u4e00\u4e01\u4e02\u4e05\uff08";
+            Font f = g2d.getFont();
+            FontRenderContext frc = g2d.getFontRenderContext();
 
+            iy += LS;
+            s = "drawString(String s, float x, float y)";
+            g2d.drawString(s, (float) ix, (float) iy);
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + fm.stringWidth(s), iy + 1);
+            }
 
-    public void paint(Graphics g) {
+            iy += LS;
+            s = "drawString(AttributedCharacterIterator iterator, " +
+                "float x, float y)";
+            g2d.drawString(getIterator(s), (float) ix, (float) iy);
+
+            iy += LS;
+            s = "drawGlyphVector(GlyphVector g, float x, float y)";
+            GlyphVector gv = f.createGlyphVector(frc, s);
+            g2d.drawGlyphVector(gv, ix, iy);
+            Point2D adv = gv.getGlyphPosition(gv.getNumGlyphs());
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + (int) adv.getX(), iy + 1);
+            }
 
-        /* fill with white before any transformation is applied */
-        g.setColor(Color.white);
-        g.fillRect(0, 0, getSize().width, getSize().height);
+            iy += LS;
+            s = "GlyphVector with position adjustments";
+
+            gv = f.createGlyphVector(frc, s);
+            int ng = gv.getNumGlyphs();
+            adv = gv.getGlyphPosition(ng);
+            for (int i = 0; i < ng; i++) {
+                Point2D gp = gv.getGlyphPosition(i);
+                double gx = gp.getX();
+                double gy = gp.getY();
+                if (i % 2 == 0) {
+                    gy += 5;
+                } else {
+                    gy -= 5;
+                }
+                gp.setLocation(gx, gy);
+                gv.setGlyphPosition(i, gp);
+            }
+            g2d.drawGlyphVector(gv, ix, iy);
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + (int) adv.getX(), iy + 1);
+            }
 
+            iy += LS;
+            s = "drawString: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
+            g.drawString(s, ix, iy);
+            if (!textFont.isTransformed()) {
+                g.drawLine(ix, iy + 1, ix + fm.stringWidth(s), iy + 1);
+            }
 
-        Graphics2D g2d = (Graphics2D) g;
-        if (gxTx != null) {
-            g2d.transform(gxTx);
-        }
-        if (useFM) {
-            g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                                 RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        }
+            iy += LS;
+            s = "TextLayout 1: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
+            TextLayout tl = new TextLayout(s, new HashMap<>(), frc);
+            tl.draw(g2d, ix, iy);
 
-        String text = TEXT + TEXT + TEXT;
-        g.setColor(Color.black);
-        int y = 20;
-        float origSize = 7f;
-        for (int i=0;i<11;i++) {
-            float size = origSize+(i*0.1f);
-            g2d.translate(0, size+6);
-            Font f = textFont.deriveFont(size);
-            g2d.setFont(f);
-            FontMetrics fontMetrics = g2d.getFontMetrics();
-            int stringWidth = fontMetrics.stringWidth(text);
-            g.drawLine(0, y+1, stringWidth, y+1);
-            g.drawString(text, 0, y);
-            y +=10;
+            iy += LS;
+            s = "TextLayout 2: \u0924\u094d\u0930 \u0915\u0948\u0930\u0947 End.";
+            tl = new TextLayout(s, f, frc);
+            tl.draw(g2d, ix, iy);
         }
     }
-}
-
-class Sysout
- {
-   private static TestDialog dialog;
 
-   public static void createDialogWithInstructions( String[] instructions )
-    {
-      dialog = new TestDialog( new Frame(), "Instructions" );
-      dialog.printInstructions( instructions );
-      dialog.show();
-      println( "Any messages for the tester will display here." );
-    }
+    private static class PrintJapaneseText extends PrintText {
 
-   public static void createDialog( )
-    {
-      dialog = new TestDialog( new Frame(), "Instructions" );
-      String[] defInstr = { "Instructions will appear here. ", "" } ;
-      dialog.printInstructions( defInstr );
-      dialog.show();
-      println( "Any messages for the tester will display here." );
-    }
+        public PrintJapaneseText(String page, Font font, AffineTransform gxTx, boolean fm, int size) {
+            super(page, font, gxTx, fm, size);
+        }
 
+        private static final String TEXT =
+            "\u3042\u3044\u3046\u3048\u304a\u30a4\u30ed\u30cf" +
+            "\u30cb\u30db\u30d8\u30c8\u4e00\u4e01\u4e02\u4e05\uff08";
 
-   public static void printInstructions( String[] instructions )
-    {
-      dialog.printInstructions( instructions );
-    }
+        @Override
+        public void paint(Graphics g) {
 
+            g.setColor(Color.WHITE);
+            g.fillRect(0, 0, getSize().width, getSize().height);
 
-   public static void println( String messageIn )
-    {
-      dialog.displayMessage( messageIn );
-    }
+            Graphics2D g2d = (Graphics2D) g;
+            if (gxTx != null) {
+                g2d.transform(gxTx);
+            }
+            if (useFM) {
+                g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
+                                     RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+            }
 
- }// Sysout  class
-
-/**
-  This is part of the standard test machinery.  It provides a place for the
-   test instructions to be displayed, and a place for interactive messages
-   to the user to be displayed.
-  To have the test instructions displayed, see Sysout.
-  To have a message to the user be displayed, see Sysout.
-  Do not call anything in this dialog directly.
-  */
-class TestDialog extends Dialog
- {
-
-   TextArea instructionsText;
-   TextArea messageText;
-   int maxStringLength = 80;
-
-   //DO NOT call this directly, go through Sysout
-   public TestDialog( Frame frame, String name )
-    {
-      super( frame, name );
-      int scrollBoth = TextArea.SCROLLBARS_BOTH;
-      instructionsText = new TextArea( "", 20, maxStringLength, scrollBoth );
-      add( "North", instructionsText );
-
-      messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-      add("South", messageText);
-
-      pack();
-
-      show();
-    }// TestDialog()
-
-   //DO NOT call this directly, go through Sysout
-   public void printInstructions( String[] instructions )
-    {
-      //Clear out any current instructions
-      instructionsText.setText( "" );
-
-      //Go down array of instruction strings
-
-      String printStr, remainingStr;
-      for( int i=0; i < instructions.length; i++ )
-       {
-     //chop up each into pieces maxSringLength long
-     remainingStr = instructions[ i ];
-     while( remainingStr.length() > 0 )
-      {
-        //if longer than max then chop off first max chars to print
-        if( remainingStr.length() >= maxStringLength )
-         {
-           //Try to chop on a word boundary
-           int posOfSpace = remainingStr.
-          lastIndexOf( ' ', maxStringLength - 1 );
-
-           if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
-           printStr = remainingStr.substring( 0, posOfSpace + 1 );
-           remainingStr = remainingStr.substring( posOfSpace + 1 );
-         }
-        //else just print
-        else
-         {
-           printStr = remainingStr;
-           remainingStr = "";
-         }
-
-            instructionsText.append( printStr + "\n" );
-
-      }// while
-
-       }// for
-
-    }//printInstructions()
-
-   //DO NOT call this directly, go through Sysout
-   public void displayMessage( String messageIn )
-    {
-      messageText.append( messageIn + "\n" );
+            String text = TEXT + TEXT + TEXT;
+            g.setColor(Color.BLACK);
+            int y = 20;
+            float origSize = 7f;
+            for (int i = 0; i < 11; i++) {
+                float size = origSize + (i * 0.1f);
+                g2d.translate(0, size + 6);
+                Font f = textFont.deriveFont(size);
+                g2d.setFont(f);
+                FontMetrics fontMetrics = g2d.getFontMetrics();
+                int stringWidth = fontMetrics.stringWidth(text);
+                g.drawLine(0, y + 1, stringWidth, y + 1);
+                g.drawString(text, 0, y);
+                y += 10;
+            }
+        }
     }
-
-}// TestDialog  class
+}
diff --git a/test/jdk/java/awt/print/PrinterJob/SecurityDialogTest.java b/test/jdk/java/awt/print/PrinterJob/SecurityDialogTest.java
deleted file mode 100644
index dc103dc6f56..00000000000
--- a/test/jdk/java/awt/print/PrinterJob/SecurityDialogTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Frame;
-import java.awt.print.PageFormat;
-import java.awt.print.PrinterJob;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.print.PrintService;
-import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.print.attribute.PrintRequestAttributeSet;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.SwingUtilities;
-
-/*
- * @test
- * @bug 4937672 5100706 6252456
- * @key printer
- * @summary Verifies "Print to file" option is disable if reading/writing files
- *          is not allowed by Security Manager.
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @run main/manual/othervm -Djava.security.manager=allow SecurityDialogTest
- */
-public class SecurityDialogTest {
-    private static final String INSTRUCTIONS =
-            "This test brings up a native and cross-platform page and print dialogs.\n" +
-            "\n" +
-            "If the dialog has an option to save to file, the option ought " +
-            "to be disabled.\n" +
-            "\n" +
-            "Press the Pass button if the \"Print to file\" option was disabled in\n" +
-            "all the dialogs where it was present.\n" +
-            "Otherwise, press the Fail button.\n" +
-            "\n" +
-            "The dialogs should be displayed even when " +
-            "there is no queuePrintJob permission.";
-
-    private static JLabel dialogType;
-
-    public static void main(String[] args) throws Exception {
-        if (PrinterJob.lookupPrintServices().length == 0) {
-            throw new RuntimeException("Printer not configured or available.");
-        }
-
-        PassFailJFrame passFailJFrame = PassFailJFrame.builder()
-                .instructions(INSTRUCTIONS)
-                .splitUIBottom(SecurityDialogTest::createTestUI)
-                .rows((int) INSTRUCTIONS.lines().count() + 1)
-                .columns(45)
-                .build();
-
-        displayDialogs();
-
-        passFailJFrame.awaitAndCheck();
-    }
-
-    private static JComponent createTestUI() {
-        dialogType = new JLabel(" ");
-
-        Box main = Box.createVerticalBox();
-        main.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
-        main.add(new JLabel("Current Dialog:"));
-        main.add(Box.createVerticalStrut(4));
-        main.add(dialogType);
-        return main;
-    }
-
-    private static void displayDialogs()
-            throws InterruptedException, InvocationTargetException {
-        final PrinterJob pj = PrinterJob.getPrinterJob();
-
-        // Install a security manager which does not allow reading and
-        // writing of files.
-        SecurityManager ptsm = new SecurityManager();
-        System.setSecurityManager(ptsm);
-
-        PrintService[] services = PrinterJob.lookupPrintServices();
-        for (int i = 0; i < services.length; i++) {
-            System.out.println("SecurityDialogTest service " + i + " : " + services[i]);
-        }
-
-        System.out.println("SecurityDialogTest default service : " + pj.getPrintService());
-
-        setDialogType("Native Page Dialog");
-        pj.pageDialog(new PageFormat());
-
-        setDialogType("Swing Page Dialog");
-        PrintRequestAttributeSet attributes = new HashPrintRequestAttributeSet();
-        pj.pageDialog(attributes);
-
-        // With the security manager installed, save to file should now
-        // be denied.
-        setDialogType("Native Print Dialog");
-        pj.printDialog();
-
-        setDialogType("Swing Print Dialog");
-        pj.printDialog(attributes);
-
-        setDialogType("Test completed");
-    }
-
-    private static void setDialogType(String type)
-            throws InterruptedException, InvocationTargetException {
-        SwingUtilities.invokeAndWait(() -> dialogType.setText(type));
-    }
-}
diff --git a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
index 474a23717ea..d6806947af2 100644
--- a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
+++ b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,7 +152,6 @@ private static String buildCommand(final Class classToExecute,
     {
         StringBuilder commandBuilder = new StringBuilder();
         commandBuilder.append(javaPath).append(" ");
-        commandBuilder.append("-Djava.security.manager=allow ");
         commandBuilder.append("-cp ").append(System.getProperty("test.classes", ".")).append(File.pathSeparatorChar);
 
         if (classPathArguments.trim().length() > 0) {
diff --git a/test/jdk/java/awt/security/Permissions.java b/test/jdk/java/awt/security/Permissions.java
deleted file mode 100644
index 1ee7f7ed726..00000000000
--- a/test/jdk/java/awt/security/Permissions.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 8008981
- * @summary Test that selected Toolkit and Window methods/constructors do
- *   the appropriate permission check
- * @run main/othervm -Djava.security.manager=allow Permissions
- */
-
-import java.awt.AWTPermission;
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.util.ArrayList;
-import java.util.List;
-import java.security.Permission;
-
-public class Permissions {
-
-    static class MySecurityManager extends SecurityManager {
-        private List<Permission> permissionsChecked = new ArrayList<>();
-
-        static MySecurityManager install() {
-            MySecurityManager sm = new MySecurityManager();
-            System.setSecurityManager(sm);
-            return sm;
-        }
-
-        @Override
-        public void checkPermission(Permission perm) {
-            permissionsChecked.add(perm);
-        }
-
-        void prepare(String msg) {
-            System.out.println(msg);
-            permissionsChecked.clear();
-        }
-
-        /**
-         * Checks the security manager's checkPermission method was invoked
-         * to check the given permission and target name.
-         */
-        void assertChecked(Class<? extends Permission> type, String name) {
-            for (Permission perm: permissionsChecked) {
-                if (type.isInstance(perm) && perm.getName().equals(name))
-                    return;
-            }
-            throw new RuntimeException(type.getName() + "(\"" + name + "\") not checked");
-        }
-    }
-
-    public static void main(String[] args) {
-        MySecurityManager sm = MySecurityManager.install();
-
-        Toolkit toolkit = Toolkit.getDefaultToolkit();
-
-        sm.prepare("Toolkit.getSystemClipboard()");
-        toolkit.getSystemClipboard();
-        sm.assertChecked(AWTPermission.class, "accessClipboard");
-
-        sm.prepare("Toolkit.getSystemEventQueue()");
-        toolkit.getSystemEventQueue();
-        sm.assertChecked(AWTPermission.class, "accessEventQueue");
-
-        sm.prepare("Toolkit.getSystemSelection()");
-        toolkit.getSystemSelection();
-        //sm.assertChecked(AWTPermission.class, "accessClipboard");
-
-        sm.prepare("Window(Frame)");
-        new Window((Frame)null);
-        sm.assertChecked(AWTPermission.class, "showWindowWithoutWarningBanner");
-
-        sm.prepare("Window(Window)");
-        new Window((Window)null);
-        sm.assertChecked(AWTPermission.class, "showWindowWithoutWarningBanner");
-
-        sm.prepare("Window(Window,GraphicsConfiguration)");
-        new Window((Window)null, (GraphicsConfiguration)null);
-        sm.assertChecked(AWTPermission.class, "showWindowWithoutWarningBanner");
-    }
-}
diff --git a/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java b/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java
deleted file mode 100644
index d2c45b76c60..00000000000
--- a/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
-  @test
-  @key headful
-  @bug 8041490
-  @summary tests that the WarningWindow's surface is invalidated on dispose
-  @author Petr Pchelko
-  @run main/othervm/policy=policy  -Djava.security.manager WarningWindowDisposeCrashTest
-*/
-
-
-
-import java.awt.*;
-
-public class WarningWindowDisposeCrashTest {
-    public static void main(String[] args) throws Exception {
-        Frame f = new Frame();
-        f.setVisible(true);
-        Robot robot;
-        try{
-            robot = new Robot();
-            robot.waitForIdle();
-        }catch(Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException("Cannot create Robot");
-        }
-        Thread.sleep(1000);
-        f.dispose();
-        // If the bug is present VM could crash after this call
-        for (int i = 0; i < 1000; i++) Toolkit.getDefaultToolkit().sync();
-    }
-}
diff --git a/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java b/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java
deleted file mode 100644
index 7eaa578df29..00000000000
--- a/test/jdk/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
-  @test
-  @key headful
-  @bug 8037776 8167288
-  @summary tests that the WarningWindow is properly disposed
-  @library ../../regtesthelpers/process
-  @build ProcessResults ProcessCommunicator
-  @run main WarningWindowDisposeTest
-*/
-
-import java.awt.*;
-import java.awt.Toolkit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.security.Permission;
-import java.io.File;
-
-import test.java.awt.regtesthelpers.process.ProcessCommunicator;
-import test.java.awt.regtesthelpers.process.ProcessResults;
-
-public class WarningWindowDisposeTest {
-
-    public static void main(String[] args) {
-        final AtomicBoolean passed = new AtomicBoolean(false);
-        new Thread(() -> {
-            for (int trial = 0; trial < 5; ++trial) {
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException("Test FAILED!", e);
-                }
-                if (passed.get()) {
-                    break;
-                } else if (trial == 4) {
-                    throw new RuntimeException("Child process never exits");
-                }
-            }
-        }, "TimeoutThread").start();
-
-        String classpath = System.getProperty("java.class.path");
-        String policyPath = System.getProperty("test.src")+File.separatorChar+"policy";
-        System.out.println("policyPath in main: "+policyPath);
-        ProcessResults pres = ProcessCommunicator.executeChildProcess(TestApplication.class, classpath+" -Djava.security.manager -Djava.security.policy="+policyPath, new String[0]);
-        passed.set(true);
-        if (pres.getStdErr() != null && pres.getStdErr().length() > 0) {
-            System.err.println("========= Child VM System.err ========");
-            System.err.print(pres.getStdErr());
-            System.err.println("======================================");
-        }
-
-        if (pres.getStdOut() != null && pres.getStdOut().length() > 0) {
-            System.err.println("========= Child VM System.out ========");
-            System.err.print(pres.getStdOut());
-            System.err.println("======================================");
-        }
-    }
-
-    public static class TestApplication {
-        public static void main(String[] args) throws Exception {
-            Robot robot;
-            try{
-                robot = new Robot();
-            }catch(Exception ex) {
-                ex.printStackTrace();
-                throw new RuntimeException("Cannot create Robot");
-            }
-            Frame f = new Frame("Test frame");
-            f.setVisible(true);
-            robot.waitForIdle();
-            Thread.sleep(500);
-            f.setVisible(false);
-            f.dispose();
-        }
-    }
-}
diff --git a/test/jdk/java/awt/security/WarningWindowDisposeTest/policy b/test/jdk/java/awt/security/WarningWindowDisposeTest/policy
deleted file mode 100644
index 22405359e59..00000000000
--- a/test/jdk/java/awt/security/WarningWindowDisposeTest/policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-        permission java.awt.AWTPermission "createRobot";
-};
diff --git a/test/jdk/java/beans/Beans/Test4080522.java b/test/jdk/java/beans/Beans/Test4080522.java
deleted file mode 100644
index 1c2d5bb9815..00000000000
--- a/test/jdk/java/beans/Beans/Test4080522.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4080522
- * @summary Tests security checks for calls on:
- *          Beans.setDesignTime
- *          Beans.setGuiAvailable
- *          Introspector.setBeanInfoSearchPath
- *          PropertyEditorManager.setEditorSearchPath
- * @run main/othervm -Djava.security.manager=allow Test4080522
- * @author Graham Hamilton
- */
-
-import java.beans.Introspector;
-import java.beans.Beans;
-import java.beans.PropertyEditorManager;
-
-public class Test4080522 {
-    public static void main(String[] args) {
-        OurSecurityManager sm = new OurSecurityManager();
-        String[] path = {"a", "b"};
-        // with no security manager we shuld be able to do these calls OK
-        test(path);
-        // add our own security manager
-        System.setSecurityManager(sm);
-        // now each of the calls should raise an exception
-        try {
-            Beans.setDesignTime(true);
-            throw new Error("Beans.setDesignTime should throw SecurityException");
-        } catch (SecurityException exception) {
-            // expected exception
-        }
-        try {
-            Beans.setGuiAvailable(true);
-            throw new Error("Beans.setGuiAvailable should throw SecurityException");
-        } catch (SecurityException exception) {
-            // expected exception
-        }
-        try {
-            Introspector.setBeanInfoSearchPath(path);
-            throw new Error("Introspector.setBeanInfoSearchPath should throw SecurityException");
-        } catch (SecurityException exception) {
-            // expected exception
-        }
-        try {
-            PropertyEditorManager.setEditorSearchPath(path);
-            throw new Error("PropertyEditorManager.setEditorSearchPath should throw SecurityException");
-        } catch (SecurityException exception) {
-            // expected exception
-        }
-        // now set the security manager to be friendly
-        sm.friendly = true;
-        // now the calls should be OK again.
-        test(path);
-    }
-
-    private static void test(String[] path) {
-        try {
-            Beans.setDesignTime(true);
-            Beans.setGuiAvailable(true);
-            Introspector.setBeanInfoSearchPath(path);
-            PropertyEditorManager.setEditorSearchPath(path);
-        } catch (SecurityException exception) {
-            throw new Error("unexpected security exception", exception);
-        }
-    }
-
-    private static class OurSecurityManager extends SecurityManager {
-        boolean friendly;
-
-        public void checkPropertiesAccess() {
-            if (!friendly) {
-                throw new SecurityException("No way");
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/beans/EventHandler/Test6277246.java b/test/jdk/java/beans/EventHandler/Test6277246.java
deleted file mode 100644
index 158b250bcaa..00000000000
--- a/test/jdk/java/beans/EventHandler/Test6277246.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6277246
- * @summary Tests problem with java.beans use of reflection
- * @run main/othervm -Djava.security.manager=allow Test6277246
- * @author Jeff Nisewanger
- */
-
-import java.lang.reflect.Method;
-import java.beans.EventHandler;
-
-public class Test6277246 {
-    public static void main(String[] args) {
-        try {
-            System.setSecurityManager(new SecurityManager());
-            Class container = Class.forName("java.lang.Class");
-            Class parameter = Class.forName("java.lang.String");
-            Method method = container.getMethod("forName", parameter);
-            Object[] arglist = new Object[] {"sun.security.x509.X509CertInfo"};
-            EventHandler eh = new EventHandler(Test6277246.class, "forName", "", "forName");
-            Object object = eh.invoke(null, method, arglist);
-            throw new Error((object != null) ? "test failure" : "test error");
-        }
-        catch (ClassNotFoundException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-        catch (NoSuchMethodException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-        catch (SecurityException exception) {
-            // expected security exception
-        }
-        catch (RuntimeException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-    }
-}
diff --git a/test/jdk/java/beans/EventHandler/Test6277266.java b/test/jdk/java/beans/EventHandler/Test6277266.java
deleted file mode 100644
index 0bed290ae4a..00000000000
--- a/test/jdk/java/beans/EventHandler/Test6277266.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6277266
- * @summary Tests access control issue in EventHandler
- * @run main/othervm -Djava.security.manager=allow Test6277266
- * @author Jeff Nisewanger
- */
-
-import java.beans.EventHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Proxy;
-import javax.swing.SwingUtilities;
-
-public class Test6277266 {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        try {
-            SwingUtilities.invokeAndWait(
-                    (Runnable) Proxy.newProxyInstance(
-                            null,
-                            new Class[] {Runnable.class},
-                            new EventHandler(
-                                    Test6277266.class,
-                                    "getProtectionDomain",
-                                    null,
-                                    null
-                            )
-                    )
-            );
-            throw new Error("SecurityException expected");
-        } catch (SecurityException exception) {
-            return; // expected security exception in JDK 7
-        } catch (InvocationTargetException exception) {
-            if (exception.getCause() instanceof SecurityException){
-                return; // expected security exception in JDK 8
-            }
-            throw new Error("unexpected exception", exception);
-        } catch (InterruptedException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-    }
-}
diff --git a/test/jdk/java/beans/Introspector/7084904/Test7084904.java b/test/jdk/java/beans/Introspector/7084904/Test7084904.java
index 3ca6970d0a2..27cc3800539 100644
--- a/test/jdk/java/beans/Introspector/7084904/Test7084904.java
+++ b/test/jdk/java/beans/Introspector/7084904/Test7084904.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,11 @@
  * @bug 7084904
  * @summary Compares reflection and bean introspection
  * @library ..
- * @run main/othervm -Djava.security.manager=allow Test7084904
+ * @run main Test7084904
  * @author Sergey Malenkov
  */
 public class Test7084904 {
     public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new SecurityManager());
         Derived bean = new Derived();
         Class<?> type = bean.getClass();
         Method method1 = test("reflection", bean, type.getMethod("isAllowed"));
diff --git a/test/jdk/java/beans/Introspector/Test4683761.java b/test/jdk/java/beans/Introspector/Test4683761.java
index 08654c07f8b..bd9e2d98002 100644
--- a/test/jdk/java/beans/Introspector/Test4683761.java
+++ b/test/jdk/java/beans/Introspector/Test4683761.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 4683761
  * @summary Tests that all public methods in a public class
- * @run main/othervm -Djava.security.manager=allow Test4683761
- * @author Sergey Malenkov
+ * @run main Test4683761
  */
 
 import java.beans.PropertyDescriptor;
@@ -35,7 +34,6 @@
 
 public class Test4683761 {
     public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new SecurityManager());
         Map<String, String> map = new HashMap<String, String>();
         map.put("key", "value");
         Map.Entry<String, String> entry = map.entrySet().iterator().next();
diff --git a/test/jdk/java/beans/Introspector/Test6277246.java b/test/jdk/java/beans/Introspector/Test6277246.java
deleted file mode 100644
index 6adecc0e792..00000000000
--- a/test/jdk/java/beans/Introspector/Test6277246.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6277246
- * @summary Tests problem with java.beans use of reflection
- * @modules java.base/sun.security.x509
- *          java.desktop
- * @run main/othervm -Djava.security.manager=allow Test6277246
- * @author Jeff Nisewanger
- */
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.MethodDescriptor;
-import java.lang.reflect.Method;
-
-public class Test6277246 {
-    public static void main(String[] args) throws IntrospectionException {
-        Class type = sun.security.x509.X509CertInfo.class;
-        System.setSecurityManager(new SecurityManager());
-        BeanInfo info = Introspector.getBeanInfo(type);
-        for (MethodDescriptor md : info.getMethodDescriptors()) {
-            Method method = md.getMethod();
-            System.out.println(method);
-
-            String name = method.getDeclaringClass().getName();
-            if (name.startsWith("sun.")) {
-                throw new Error("found inaccessible method");
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestBooleanClass.java b/test/jdk/java/beans/PropertyEditor/TestBooleanClass.java
deleted file mode 100644
index 64d76e4555e..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestBooleanClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510 6498158
- * @summary Tests PropertyEditor for value of type Boolean with security manager
- * @run main/othervm -Djava.security.manager=allow TestBooleanClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestBooleanClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Boolean.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestBooleanType.java b/test/jdk/java/beans/PropertyEditor/TestBooleanType.java
deleted file mode 100644
index cd8ac27015f..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestBooleanType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type boolean with security manager
- * @run main/othervm -Djava.security.manager=allow TestBooleanType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestBooleanType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Boolean.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestByteClass.java b/test/jdk/java/beans/PropertyEditor/TestByteClass.java
deleted file mode 100644
index 73998caa642..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestByteClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Byte with security manager
- * @run main/othervm -Djava.security.manager=allow TestByteClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestByteClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Byte.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestByteType.java b/test/jdk/java/beans/PropertyEditor/TestByteType.java
deleted file mode 100644
index cfb33ce819a..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestByteType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type byte with security manager
- * @run main/othervm -Djava.security.manager=allow TestByteType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestByteType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Byte.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestColorClass.java b/test/jdk/java/beans/PropertyEditor/TestColorClass.java
deleted file mode 100644
index 94452e64339..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestColorClass.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Color with security manager
- * @author Sergey Malenkov
- * @key headful
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- * @run main/othervm -Djava.security.manager=allow TestColorClass
- */
-
-import java.awt.Color;
-
-public class TestColorClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Color.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestDoubleClass.java b/test/jdk/java/beans/PropertyEditor/TestDoubleClass.java
deleted file mode 100644
index 7018bfda44f..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestDoubleClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Double with security manager
- * @run main/othervm -Djava.security.manager=allow TestDoubleClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestDoubleClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Double.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestDoubleType.java b/test/jdk/java/beans/PropertyEditor/TestDoubleType.java
deleted file mode 100644
index 699a5a455ed..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestDoubleType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type double with security manager
- * @run main/othervm -Djava.security.manager=allow TestDoubleType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestDoubleType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Double.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestEnumClass.java b/test/jdk/java/beans/PropertyEditor/TestEnumClass.java
deleted file mode 100644
index 419d8be2a9a..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestEnumClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6219769 6258510
- * @summary Tests PropertyEditor for value of type Enum with security manager
- * @run main/othervm -Djava.security.manager=allow TestEnumClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestEnumClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(HexLetter.class);
-    }
-
-    public enum HexLetter {A,B,C,D,E,F}
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestFloatClass.java b/test/jdk/java/beans/PropertyEditor/TestFloatClass.java
deleted file mode 100644
index 65bfb7c511c..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestFloatClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Float with security manager
- * @run main/othervm -Djava.security.manager=allow TestFloatClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestFloatClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Float.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestFloatType.java b/test/jdk/java/beans/PropertyEditor/TestFloatType.java
deleted file mode 100644
index e2aa79fff37..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestFloatType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type float with security manager
- * @run main/othervm -Djava.security.manager=allow TestFloatType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestFloatType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Float.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestFontClass.java b/test/jdk/java/beans/PropertyEditor/TestFontClass.java
deleted file mode 100644
index c2627791541..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestFontClass.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510 6538853
- * @summary Tests PropertyEditor for value of type Font with security manager
- * @author Sergey Malenkov
- * @key headful
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- * @run main/othervm -Djava.security.manager=allow TestFontClass
- */
-
-import java.awt.Font;
-
-public class TestFontClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Font.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestIntegerClass.java b/test/jdk/java/beans/PropertyEditor/TestIntegerClass.java
deleted file mode 100644
index 2243c4ddd52..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestIntegerClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510 6498158
- * @summary Tests PropertyEditor for value of type Integer with security manager
- * @run main/othervm -Djava.security.manager=allow TestIntegerClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestIntegerClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Integer.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestIntegerType.java b/test/jdk/java/beans/PropertyEditor/TestIntegerType.java
deleted file mode 100644
index 5264ee1932d..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestIntegerType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type int with security manager
- * @run main/othervm -Djava.security.manager=allow TestIntegerType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestIntegerType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Integer.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestLongClass.java b/test/jdk/java/beans/PropertyEditor/TestLongClass.java
deleted file mode 100644
index 79667c15deb..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestLongClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Long with security manager
- * @run main/othervm -Djava.security.manager=allow TestLongClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestLongClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Long.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestLongType.java b/test/jdk/java/beans/PropertyEditor/TestLongType.java
deleted file mode 100644
index 2c650385469..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestLongType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type long with security manager
- * @run main/othervm -Djava.security.manager=allow TestLongType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestLongType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Long.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestShortClass.java b/test/jdk/java/beans/PropertyEditor/TestShortClass.java
deleted file mode 100644
index 40dedb00146..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestShortClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type Short with security manager
- * @run main/othervm -Djava.security.manager=allow TestShortClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestShortClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Short.class);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestShortType.java b/test/jdk/java/beans/PropertyEditor/TestShortType.java
deleted file mode 100644
index 43f613e3d37..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestShortType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510
- * @summary Tests PropertyEditor for value of type short with security manager
- * @run main/othervm -Djava.security.manager=allow TestShortType
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestShortType {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Short.TYPE);
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestStringClass.java b/test/jdk/java/beans/PropertyEditor/TestStringClass.java
deleted file mode 100644
index c27169dfa32..00000000000
--- a/test/jdk/java/beans/PropertyEditor/TestStringClass.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4506596 6258510 6457659
- * @summary Tests PropertyEditor for value of type String with security manager
- * @run main/othervm -Djava.security.manager=allow TestStringClass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
-
-public class TestStringClass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(String.class);
-    }
-}
diff --git a/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java b/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java
index 9b96bd2f668..2a0f626a9b0 100644
--- a/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java
+++ b/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 /**
  * @test
  * @bug 4141523
- * @run main/othervm/policy=java.policy -Djava.security.manager LoadingStandardIcons
+ * @run main LoadingStandardIcons
  */
 public final class LoadingStandardIcons {
 
diff --git a/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy b/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy
deleted file mode 100644
index 092bc2b0412..00000000000
--- a/test/jdk/java/beans/SimpleBeanInfo/LoadingStandardIcons/java.policy
+++ /dev/null
@@ -1 +0,0 @@
-;
diff --git a/test/jdk/java/beans/Statement/ClassForName/ClassForName.java b/test/jdk/java/beans/Statement/ClassForName/ClassForName.java
index e819df85acd..ea3e0a05986 100644
--- a/test/jdk/java/beans/Statement/ClassForName/ClassForName.java
+++ b/test/jdk/java/beans/Statement/ClassForName/ClassForName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @test
  * @bug 8146313
  * @run main/othervm ClassForName
- * @run main/othervm/policy=java.policy -Djava.security.manager ClassForName
  */
 public final class ClassForName {
 
diff --git a/test/jdk/java/beans/Statement/ClassForName/java.policy b/test/jdk/java/beans/Statement/ClassForName/java.policy
deleted file mode 100644
index 1c8a0e79762..00000000000
--- a/test/jdk/java/beans/Statement/ClassForName/java.policy
+++ /dev/null
@@ -1 +0,0 @@
-;
\ No newline at end of file
diff --git a/test/jdk/java/beans/Statement/Test6224433.java b/test/jdk/java/beans/Statement/Test6224433.java
deleted file mode 100644
index c5aededcb7d..00000000000
--- a/test/jdk/java/beans/Statement/Test6224433.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6224433
- * @summary Tests class loader lookup problem in Statement
- * @run main/othervm -Djava.security.manager=allow Test6224433
- * @author Jeff Nisewanger
- */
-
-import java.beans.Expression;
-
-public class Test6224433 {
-    public static void main(String[] args) {
-        try {
-            System.setSecurityManager(new SecurityManager());
-            Class target = Test6224433.class;
-            String method = "forName";
-            String[] params = {"sun.security.x509.X509CertInfo"};
-            if (null != new Expression(target, method, params).getValue())
-                throw new Error("failure: bug exists");
-
-            throw new Error("unexpected condition");
-        }
-        catch (ClassNotFoundException exception) {
-            throw new Error("expected class missing", exception);
-        }
-        catch (SecurityException exception) {
-            // expected
-        }
-        catch (Exception exception) {
-            throw new Error("unexpected condition", exception);
-        }
-    }
-}
diff --git a/test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java b/test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java
index 534b4dc13ff..42cbf8e4366 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,11 +42,8 @@ public void exceptionThrown(Exception exception) {
 
     /**
      * This is entry point to start testing.
-     *
-     * @param security  use {@code true} to start
-     *                  second pass in secure context
      */
-    final void test(boolean security) {
+    final void test() {
         byte[] array = getFieldValue("XML").getBytes(); // NON-NLS: the field name
         ByteArrayInputStream input = new ByteArrayInputStream(array);
         XMLDecoder decoder = new XMLDecoder(input);
@@ -58,10 +55,6 @@ final void test(boolean security) {
             // expected exception
         }
         decoder.close();
-        if (security) {
-            System.setSecurityManager(new SecurityManager());
-            test(false);
-        }
     }
 
     private String getFieldValue(String field) {
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestArray.java b/test/jdk/java/beans/XMLDecoder/spec/TestArray.java
index 5681a0411c1..e423431544f 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestArray.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <array> element
- * @run main/othervm -Djava.security.manager=allow TestArray
+ * @run main/othervm TestArray
  * @author Sergey Malenkov
  */
 
@@ -46,7 +46,7 @@ public final class TestArray extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestArray().test(true);
+        new TestArray().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java b/test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java
index 7f886353ca2..269583fb17d 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <boolean> element
- * @run main/othervm -Djava.security.manager=allow TestBoolean
+ * @run main/othervm TestBoolean
  * @author Sergey Malenkov
  */
 
@@ -38,7 +38,7 @@ public final class TestBoolean extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestBoolean().test(true);
+        new TestBoolean().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestByte.java b/test/jdk/java/beans/XMLDecoder/spec/TestByte.java
index c8b12c654bf..ad76cfffd0a 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestByte.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <byte> element
- * @run main/othervm -Djava.security.manager=allow TestByte
+ * @run main/othervm TestByte
  * @author Sergey Malenkov
  */
 
@@ -39,7 +39,7 @@ public final class TestByte extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestByte().test(true);
+        new TestByte().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestChar.java b/test/jdk/java/beans/XMLDecoder/spec/TestChar.java
index b7bc4bf93b1..6929844f01d 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestChar.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <char> element
- * @run main/othervm -Djava.security.manager=allow TestChar
+ * @run main/othervm TestChar
  * @author Sergey Malenkov
  */
 
@@ -38,7 +38,7 @@ public final class TestChar extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestChar().test(true);
+        new TestChar().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestClass.java b/test/jdk/java/beans/XMLDecoder/spec/TestClass.java
index 36f33531cf9..3188638eedf 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestClass.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <class> element
- * @run main/othervm -Djava.security.manager=allow TestClass
+ * @run main/othervm TestClass
  * @author Sergey Malenkov
  */
 
@@ -43,7 +43,7 @@ public final class TestClass extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestClass().test(true);
+        new TestClass().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestDouble.java b/test/jdk/java/beans/XMLDecoder/spec/TestDouble.java
index 07660b29f8c..96ed7c60b5b 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestDouble.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <double> element
- * @run main/othervm -Djava.security.manager=allow TestDouble
+ * @run main/othervm TestDouble
  * @author Sergey Malenkov
  */
 
@@ -40,7 +40,7 @@ public final class TestDouble extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestDouble().test(true);
+        new TestDouble().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestFalse.java b/test/jdk/java/beans/XMLDecoder/spec/TestFalse.java
index 6e4dd7f6506..b162adbef10 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestFalse.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestFalse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <false> element
- * @run main/othervm -Djava.security.manager=allow TestFalse
+ * @run main/othervm TestFalse
  * @author Sergey Malenkov
  */
 
@@ -37,7 +37,7 @@ public final class TestFalse extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestFalse().test(true);
+        new TestFalse().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestField.java b/test/jdk/java/beans/XMLDecoder/spec/TestField.java
index 36451134480..64ec8a3ca64 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestField.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <field> element
- * @run main/othervm -Djava.security.manager=allow TestField
+ * @run main/othervm TestField
  * @author Sergey Malenkov
  */
 
@@ -50,7 +50,7 @@ public final class TestField extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestField().test(true);
+        new TestField().test();
     }
 
     public static String FIELD;
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestFloat.java b/test/jdk/java/beans/XMLDecoder/spec/TestFloat.java
index 2cd8ca826ce..4f60aef0beb 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestFloat.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <float> element
- * @run main/othervm -Djava.security.manager=allow TestFloat
+ * @run main/othervm TestFloat
  * @author Sergey Malenkov
  */
 
@@ -40,7 +40,7 @@ public final class TestFloat extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestFloat().test(true);
+        new TestFloat().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestInt.java b/test/jdk/java/beans/XMLDecoder/spec/TestInt.java
index 9df3de81700..fcaf7cda6fe 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestInt.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <int> element
- * @run main/othervm -Djava.security.manager=allow TestInt
+ * @run main/othervm TestInt
  * @author Sergey Malenkov
  */
 
@@ -43,7 +43,7 @@ public final class TestInt extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestInt().test(true);
+        new TestInt().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestJava.java b/test/jdk/java/beans/XMLDecoder/spec/TestJava.java
index d01b3ee530d..28067032ace 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestJava.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestJava.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <java> element
- * @run main/othervm -Djava.security.manager=allow TestJava
+ * @run main/othervm TestJava
  * @author Sergey Malenkov
  */
 
@@ -42,7 +42,7 @@ public final class TestJava extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestJava().test(true);
+        new TestJava().test();
     }
 
     private String message;
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestLong.java b/test/jdk/java/beans/XMLDecoder/spec/TestLong.java
index e8a87b9ef30..42d2c003531 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestLong.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <long> element
- * @run main/othervm -Djava.security.manager=allow TestLong
+ * @run main/othervm TestLong
  * @author Sergey Malenkov
  */
 
@@ -45,7 +45,7 @@ public final class TestLong extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestLong().test(true);
+        new TestLong().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestMethod.java b/test/jdk/java/beans/XMLDecoder/spec/TestMethod.java
index 025aa45e8d4..86c144ccb90 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestMethod.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <method> element
- * @run main/othervm -Djava.security.manager=allow TestMethod
+ * @run main/othervm TestMethod
  * @author Sergey Malenkov
  */
 
@@ -66,7 +66,7 @@ public final class TestMethod extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestMethod().test(true);
+        new TestMethod().test();
     }
 
     private NoSuchMethodException exception;
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestNew.java b/test/jdk/java/beans/XMLDecoder/spec/TestNew.java
index 7a503cf4a28..b3e39c99ffb 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestNew.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestNew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <new> element
- * @run main/othervm -Djava.security.manager=allow TestNew
+ * @run main/othervm TestNew
  * @author Sergey Malenkov
  */
 
@@ -50,7 +50,7 @@ public final class TestNew extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestNew().test(true);
+        new TestNew().test();
     }
 
     private List<String> list;
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestNull.java b/test/jdk/java/beans/XMLDecoder/spec/TestNull.java
index 1adf5d18a88..8692acdcc70 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestNull.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <null> element
- * @run main/othervm -Djava.security.manager=allow TestNull
+ * @run main/othervm TestNull
  * @author Sergey Malenkov
  */
 
@@ -37,7 +37,7 @@ public final class TestNull extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestNull().test(true);
+        new TestNull().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestObject.java b/test/jdk/java/beans/XMLDecoder/spec/TestObject.java
index c25ad7d27b4..a5a4af1abdf 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestObject.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <object> element
- * @run main/othervm -Djava.security.manager=allow TestObject
+ * @run main/othervm TestObject
  * @author Sergey Malenkov
  */
 
@@ -58,7 +58,7 @@ public final class TestObject extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestObject().test(true);
+        new TestObject().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestProperty.java b/test/jdk/java/beans/XMLDecoder/spec/TestProperty.java
index f1c75ccaed3..cb4e5f1a753 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestProperty.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <property> element
- * @run main/othervm -Djava.security.manager=allow TestProperty
+ * @run main/othervm TestProperty
  * @author Sergey Malenkov
  */
 
@@ -48,7 +48,7 @@ public final class TestProperty extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestProperty().test(true);
+        new TestProperty().test();
     }
 
     private int index;
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestShort.java b/test/jdk/java/beans/XMLDecoder/spec/TestShort.java
index 9c0212bfbc8..913e397c9ad 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestShort.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <short> element
- * @run main/othervm -Djava.security.manager=allow TestShort
+ * @run main/othervm TestShort
  * @author Sergey Malenkov
  */
 
@@ -41,7 +41,7 @@ public final class TestShort extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestShort().test(true);
+        new TestShort().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestString.java b/test/jdk/java/beans/XMLDecoder/spec/TestString.java
index e082be5523e..54a0f4c92c7 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestString.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <string> element
- * @run main/othervm -Djava.security.manager=allow TestString
+ * @run main/othervm TestString
  * @author Sergey Malenkov
  */
 
@@ -42,7 +42,7 @@ public final class TestString extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestString().test(true);
+        new TestString().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestTrue.java b/test/jdk/java/beans/XMLDecoder/spec/TestTrue.java
index 805abc0bf40..3270779b937 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestTrue.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestTrue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <true> element
- * @run main/othervm -Djava.security.manager=allow TestTrue
+ * @run main/othervm TestTrue
  * @author Sergey Malenkov
  */
 
@@ -37,7 +37,7 @@ public final class TestTrue extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestTrue().test(true);
+        new TestTrue().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLDecoder/spec/TestVar.java b/test/jdk/java/beans/XMLDecoder/spec/TestVar.java
index e3f07dc721d..d389bd3d587 100644
--- a/test/jdk/java/beans/XMLDecoder/spec/TestVar.java
+++ b/test/jdk/java/beans/XMLDecoder/spec/TestVar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests <var> element
- * @run main/othervm -Djava.security.manager=allow TestVar
+ * @run main/othervm TestVar
  * @author Sergey Malenkov
  */
 
@@ -41,7 +41,7 @@ public final class TestVar extends AbstractTest {
             + "</java>";
 
     public static void main(String[] args) {
-        new TestVar().test(true);
+        new TestVar().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/4741757/TestSecurityManager.java b/test/jdk/java/beans/XMLEncoder/4741757/TestSecurityManager.java
deleted file mode 100644
index d6df6a28e05..00000000000
--- a/test/jdk/java/beans/XMLEncoder/4741757/TestSecurityManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4741757
- * @summary Tests encoding with security manager
- * @run main/othervm -Djava.security.manager=allow TestSecurityManager
- * @author Sergey Malenkov
- */
-
-public final class TestSecurityManager extends AbstractTest {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        test(new TestSecurityManager(5));
-    }
-
-    private int value;
-
-    public TestSecurityManager(int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return this.value;
-    }
-}
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestBox.java b/test/jdk/java/beans/XMLEncoder/6777487/TestBox.java
index a45082b6912..46fdf0a513d 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestBox.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for BoxLayout
- * @run main/othervm -Djava.security.manager=allow TestBox
- * @author Sergey Malenkov
+ * @run main TestBox
  */
 
 import java.awt.FlowLayout;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java
index 6acbc6489c3..97b2bc8c55a 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedCollection
- * @run main/othervm -Djava.security.manager=allow TestCheckedCollection
- * @author Sergey Malenkov
+ * @run main TestCheckedCollection
  */
 
 import java.util.ArrayList;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java
index e522895d5f4..de3587ec123 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedList
- * @run main/othervm -Djava.security.manager=allow TestCheckedList
- * @author Sergey Malenkov
+ * @run main TestCheckedList
  */
 
 import java.util.ArrayList;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java
index 4fd5d87eb67..4ed430c761e 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedMap
- * @run main/othervm -Djava.security.manager=allow TestCheckedMap
- * @author Sergey Malenkov
+ * @run main TestCheckedMap
  */
 
 import java.util.Collections;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java
index 0d34eab2e0e..9fdd805de1a 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedRandomAccessList
- * @run main/othervm -Djava.security.manager=allow TestCheckedRandomAccessList
- * @author Sergey Malenkov
+ * @run main TestCheckedRandomAccessList
  */
 
 import java.util.ArrayList;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java
index 025cb63ca97..7027caeed0d 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedSet
- * @run main/othervm -Djava.security.manager=allow TestCheckedSet
- * @author Sergey Malenkov
+ * @run main TestCheckedSet
  */
 
 import java.util.Collections;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java
index 819e46141f7..4063c379438 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedSortedMap
- * @run main/othervm -Djava.security.manager=allow TestCheckedSortedMap
- * @author Sergey Malenkov
+ * @run main TestCheckedSortedMap
  */
 
 import java.util.Collections;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java
index 957107fc5d2..8b7f316b81e 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for CheckedSortedSet
- * @run main/othervm -Djava.security.manager=allow TestCheckedSortedSet
- * @author Sergey Malenkov
+ * @run main TestCheckedSortedSet
  */
 
 import java.util.Collections;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java
index e3dbeccc556..453ce8ee5e7 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,6 @@ public void writeExpression(Expression expression) {
     }
 
     public static void test(Object provider, Object object, Object value) {
-        System.setSecurityManager(new SecurityManager());
-
         TestEncoder encoder = new TestEncoder();
         encoder.setPersistenceDelegate(
                 object.getClass(),
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java
index b11a6ee99c5..6e2302a7c21 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for EnumMap
- * @run main/othervm -Djava.security.manager=allow TestEnumMap
- * @author Sergey Malenkov
+ * @run main TestEnumMap
  */
 
 import java.util.EnumMap;
diff --git a/test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java
index 6e3e3bf50a3..56255517596 100644
--- a/test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java
+++ b/test/jdk/java/beans/XMLEncoder/6777487/TestEnumSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 6777487
  * @summary Tests private field access for EnumSet
- * @run main/othervm -Djava.security.manager=allow TestEnumSet
- * @author Sergey Malenkov
+ * @run main TestEnumSet
  */
 
 import java.util.EnumSet;
diff --git a/test/jdk/java/beans/XMLEncoder/AbstractTest.java b/test/jdk/java/beans/XMLEncoder/AbstractTest.java
index 9b387544b1f..0d7a1ef3293 100644
--- a/test/jdk/java/beans/XMLEncoder/AbstractTest.java
+++ b/test/jdk/java/beans/XMLEncoder/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,11 +91,8 @@ protected void validate(T before, T after) {
 
     /**
      * This is entry point to start testing.
-     *
-     * @param security  use {@code true} to start
-     *                  second pass in secure context
      */
-    final void test(boolean security) {
+    final void test() {
         Bean.DEFAULT = null;
         T object = getObject();
 
@@ -114,10 +111,6 @@ final void test(boolean security) {
             System.out.println("Test object updating");
             validate(object, testBean(object));
         }
-        if (security) {
-            System.setSecurityManager(new SecurityManager());
-            test(false);
-        }
     }
 
     private T testBean(T object) {
diff --git a/test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java b/test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java
index fd8b36e49e7..e684e9b7d97 100644
--- a/test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java
+++ b/test/jdk/java/beans/XMLEncoder/ReferenceToNonStaticField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 /**
  * @test
  * @bug 8060027
- * @run main/othervm -Djava.security.manager=allow ReferenceToNonStaticField
+ * @run main/othervm ReferenceToNonStaticField
  */
 public final class ReferenceToNonStaticField
         extends AbstractTest<ReferenceToNonStaticField.TestValue> {
@@ -82,7 +82,7 @@ public TestValue(final Object ignored) {
     }
 
     public static void main(final String[] args) {
-        new ReferenceToNonStaticField().test(true);
+        new ReferenceToNonStaticField().test();
     }
 
     protected TestValue getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4631471.java b/test/jdk/java/beans/XMLEncoder/Test4631471.java
index e5e44b3fd28..c3114465174 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4631471.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4631471.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4631471 6972468
  * @summary Tests DefaultTreeModel encoding
- * @run main/othervm -Djava.security.manager=allow Test4631471
+ * @run main/othervm Test4631471
  * @author Sergey Malenkov, Mark Davidson
  */
 
@@ -38,8 +38,6 @@
 public abstract class Test4631471 extends AbstractTest {
     public static void main(String[] args) throws Exception {
         main();
-        System.setSecurityManager(new SecurityManager());
-        main();
     }
 
     private static void main() throws Exception {
@@ -48,14 +46,14 @@ private static void main() throws Exception {
             protected Object getObject() {
                 return getRoot();
             }
-        }.test(false);
+        }.test();
 
         // the DefaultTreeModel will also archive correctly
         new Test4631471() {
             protected Object getObject() {
                 return getModel();
             }
-        }.test(false);
+        }.test();
 
         // create a new model from the root node
         // this simulates the MetaData ctor:
@@ -64,14 +62,14 @@ protected Object getObject() {
             protected Object getObject() {
                 return new DefaultTreeModel((TreeNode) getModel().getRoot());
             }
-        }.test(false);
+        }.test();
 
         // the JTree will archive correctly too
         new Test4631471() {
             protected Object getObject() {
                 return getTree();
             }
-        }.test(false);
+        }.test();
     }
 
     protected final void validate(Object before, Object after) {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4652928.java b/test/jdk/java/beans/XMLEncoder/Test4652928.java
index 940decfb156..58997207145 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4652928.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4652928.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4652928
  * @summary Tests encoding of collections
- * @run main/othervm -Djava.security.manager=allow Test4652928
+ * @run main/othervm Test4652928
  * @author Sergey Malenkov, Mark Davidson
  */
 
@@ -40,7 +40,7 @@
 
 public class Test4652928 extends AbstractTest<List> {
     public static void main(String[] args) {
-        new Test4652928().test(true);
+        new Test4652928().test();
     }
 
     protected List getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4679556.java b/test/jdk/java/beans/XMLEncoder/Test4679556.java
index ebeb45534a5..6bac9671441 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4679556.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4679556.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4679556
  * @summary Tests for duplication of some kind instances
- * @run main/othervm -Djava.security.manager=allow Test4679556
+ * @run main/othervm Test4679556
  * @author Sergey Malenkov, Mark Davidson, Philip Milne
  */
 
@@ -89,7 +89,7 @@
  */
 public class Test4679556 extends AbstractTest {
     public static void main(String[] args) {
-        new Test4679556().test(true);
+        new Test4679556().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4903007.java b/test/jdk/java/beans/XMLEncoder/Test4903007.java
index 8fcc9c1c4e1..ba8d625af8e 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4903007.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4903007.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4903007 6972468
  * @summary Tests encoding of container with boxes and BoxLayout
- * @run main/othervm -Djava.security.manager=allow Test4903007
+ * @run main/othervm Test4903007
  * @author Sergey Malenkov, Mark Davidson
  */
 
@@ -37,7 +37,7 @@
 
 public class Test4903007 extends AbstractTest<JPanel> {
     public static void main(String[] args) throws Exception {
-        new Test4903007().test(true);
+        new Test4903007().test();
     }
 
     protected JPanel getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4935607.java b/test/jdk/java/beans/XMLEncoder/Test4935607.java
index 6bcf3006853..bc947819332 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4935607.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4935607.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test %I% %G%
  * @bug 4935607
  * @summary Tests transient properties
- * @run main/othervm -Djava.security.manager=allow Test4935607
+ * @run main/othervm Test4935607
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public class Test4935607 extends AbstractTest<Test4935607.TransientBean> {
     public static void main(String[] args) {
-        new Test4935607().test(true);
+        new Test4935607().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/Test4936682.java b/test/jdk/java/beans/XMLEncoder/Test4936682.java
index fc2952bbff7..185a089ae27 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4936682.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4936682.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4936682
  * @summary Tests encoding of reference to target
- * @run main/othervm -Djava.security.manager=allow Test4936682
+ * @run main/othervm Test4936682
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class Test4936682 extends AbstractTest<Object[]> {
     public static void main(String[] args) {
-        new Test4936682().test(true);
+        new Test4936682().test();
     }
 
     protected Object[] getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4993777.java b/test/jdk/java/beans/XMLEncoder/Test4993777.java
index 3208cbd58b0..dc074382107 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4993777.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4993777.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 4993777
  * @summary Tests encoding of multi-dimensional arrays
- * @run main/othervm -Djava.security.manager=allow Test4993777
+ * @run main/othervm Test4993777
  * @author Sergey Malenkov
  */
 
 public final class Test4993777 extends AbstractTest {
     public static void main(String[] args) {
-        new Test4993777().test(true);
+        new Test4993777().test();
     }
 
     protected ArrayBean getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test4994637.java b/test/jdk/java/beans/XMLEncoder/Test4994637.java
index 866a816f28d..dc8b512a350 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4994637.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4994637.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4994637
  * @summary Tests custom map encoding
- * @run main/othervm -Djava.security.manager=allow Test4994637
+ * @run main/othervm Test4994637
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class Test4994637 extends AbstractTest<HashMap> {
     public static void main(String[] args) {
-        new Test4994637().test(true);
+        new Test4994637().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/Test5023550.java b/test/jdk/java/beans/XMLEncoder/Test5023550.java
index fc3e7da709c..41d184183d7 100644
--- a/test/jdk/java/beans/XMLEncoder/Test5023550.java
+++ b/test/jdk/java/beans/XMLEncoder/Test5023550.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 5023550
  * @summary Tests complex references to owner
- * @run main/othervm -Djava.security.manager=allow Test5023550
+ * @run main/othervm Test5023550
  * @author Sergey Malenkov
  */
 
@@ -37,7 +37,7 @@
 
 public class Test5023550 extends AbstractTest {
     public static void main(String[] args) {
-        new Test5023550().test(true);
+        new Test5023550().test();
     }
 
     private final Owner owner = new Owner();
diff --git a/test/jdk/java/beans/XMLEncoder/Test5023552.java b/test/jdk/java/beans/XMLEncoder/Test5023552.java
index 11b0cefe758..a0b519782f0 100644
--- a/test/jdk/java/beans/XMLEncoder/Test5023552.java
+++ b/test/jdk/java/beans/XMLEncoder/Test5023552.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 5023552
  * @summary Tests reference count updating
- * @run main/othervm -Djava.security.manager=allow Test5023552
+ * @run main/othervm Test5023552
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class Test5023552 extends AbstractTest {
     public static void main(String[] args) {
-        new Test5023552().test(true);
+        new Test5023552().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test5023557.java b/test/jdk/java/beans/XMLEncoder/Test5023557.java
index efce0d5ddaa..de6a2e47c97 100644
--- a/test/jdk/java/beans/XMLEncoder/Test5023557.java
+++ b/test/jdk/java/beans/XMLEncoder/Test5023557.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 5023557
  * @summary Tests complex references
- * @run main/othervm -Djava.security.manager=allow Test5023557
+ * @run main/othervm Test5023557
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public class Test5023557 extends AbstractTest {
     public static void main(String[] args) {
-        new Test5023557().test(true);
+        new Test5023557().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/Test5023559.java b/test/jdk/java/beans/XMLEncoder/Test5023559.java
index 9fda201d3b9..7568b7850ff 100644
--- a/test/jdk/java/beans/XMLEncoder/Test5023559.java
+++ b/test/jdk/java/beans/XMLEncoder/Test5023559.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 5023559
  * @summary Tests encoding of the object with nested target
- * @run main/othervm -Djava.security.manager=allow Test5023559
+ * @run main/othervm Test5023559
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class Test5023559 extends AbstractTest {
     public static void main(String[] args) {
-        new Test5023559().test(true);
+        new Test5023559().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6176120.java b/test/jdk/java/beans/XMLEncoder/Test6176120.java
index 7725b2ab3a0..25e7e0e873e 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6176120.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6176120.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6176120
  * @summary Tests bean that contains constructor marked with ConstructorProperties annotation
- * @run main/othervm -Djava.security.manager=allow Test6176120
+ * @run main/othervm Test6176120
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class Test6176120 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6176120().test(true);
+        new Test6176120().test();
     }
 
     protected ImmutableBean getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6187118.java b/test/jdk/java/beans/XMLEncoder/Test6187118.java
index 97506c14132..7a15a1ae849 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6187118.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6187118.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6187118
  * @summary Tests encoding of immutable list that creates itself
- * @run main/othervm -Djava.security.manager=allow Test6187118
+ * @run main/othervm Test6187118
  * @author Sergey Malenkov
  */
 
@@ -41,7 +41,7 @@
 
 public final class Test6187118 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6187118().test(true);
+        new Test6187118().test();
     }
 
     protected ImmutableList<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6256805.java b/test/jdk/java/beans/XMLEncoder/Test6256805.java
index 676fe49d344..c02de963548 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6256805.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6256805.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 6256805
  * @summary Tests invalid XML characters encoding
- * @run main/othervm -Djava.security.manager=allow Test6256805
+ * @run main/othervm Test6256805
  * @author Sergey Malenkov
  */
 
 public final class Test6256805 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6256805().test(true);
+        new Test6256805().test();
     }
 
     protected CharacterBean getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6437265.java b/test/jdk/java/beans/XMLEncoder/Test6437265.java
index c4f97a43b85..0a67c6806d6 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6437265.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6437265.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6437265
  * @summary Tests encoding of container with BorderLayout
- * @run main/othervm -Djava.security.manager=allow Test6437265
+ * @run main/othervm Test6437265
  * @author Sergey Malenkov
  */
 
@@ -47,7 +47,7 @@ public final class Test6437265 extends AbstractTest<JPanel> {
             BorderLayout.PAGE_START};
 
     public static void main(String[] args) {
-        new Test6437265().test(true);
+        new Test6437265().test();
     }
 
     protected JPanel getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6501431.java b/test/jdk/java/beans/XMLEncoder/Test6501431.java
index 9d93935242f..29fb6e30326 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6501431.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6501431.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6501431
  * @summary Tests encoding of JMenuItem with accelerator property
- * @run main/othervm -Djava.security.manager=allow Test6501431
+ * @run main/othervm Test6501431
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class Test6501431 extends AbstractTest<JMenuItem> {
     public static void main(String[] args) {
-        new Test6501431().test(true);
+        new Test6501431().test();
     }
 
     protected JMenuItem getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6505888.java b/test/jdk/java/beans/XMLEncoder/Test6505888.java
index 443d7287c8c..f80d3e1880f 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6505888.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6505888.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests bean with the property that is guarded by UnmodifiableList
- * @run main/othervm -Djava.security.manager=allow Test6505888
+ * @run main/othervm Test6505888
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class Test6505888 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6505888().test(true);
+        new Test6505888().test();
     }
 
     protected ListBean getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6531597.java b/test/jdk/java/beans/XMLEncoder/Test6531597.java
index 58ca311a98a..bec631e30b1 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6531597.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6531597.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 6531597
  * @summary Tests encoding of arrays of primitives
- * @run main/othervm -Djava.security.manager=allow Test6531597
+ * @run main/othervm Test6531597
  * @author Sergey Malenkov
  */
 
 public final class Test6531597 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6531597().test(true);
+        new Test6531597().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6570354.java b/test/jdk/java/beans/XMLEncoder/Test6570354.java
index c2cffd5a408..b49822d3c58 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6570354.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6570354.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6570354
  * @summary Tests listeners removing
- * @run main/othervm -Djava.security.manager=allow Test6570354
+ * @run main/othervm Test6570354
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class Test6570354 extends AbstractTest<JLabel> {
     public static void main(String[] args) {
-        new Test6570354().test(true);
+        new Test6570354().test();
     }
 
     protected JLabel getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6852574.java b/test/jdk/java/beans/XMLEncoder/Test6852574.java
index 40098cdfc64..5def16e4452 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6852574.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6852574.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 6852574
  * @summary Tests Enum subclass encoding
- * @run main/othervm -Djava.security.manager=allow Test6852574
+ * @run main/othervm Test6852574
  * @author Sergey Malenkov
  */
 
 public final class Test6852574 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6852574().test(true);
+        new Test6852574().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6921644.java b/test/jdk/java/beans/XMLEncoder/Test6921644.java
index 9ccbe31bcf5..a1334bb5046 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6921644.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6921644.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6921644
  * @summary Tests references to cached integer
- * @run main/othervm -Djava.security.manager=allow Test6921644
+ * @run main/othervm Test6921644
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class Test6921644 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6921644().test(true);
+        new Test6921644().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test6989223.java b/test/jdk/java/beans/XMLEncoder/Test6989223.java
index 1bbc7fd96a7..979309eb196 100644
--- a/test/jdk/java/beans/XMLEncoder/Test6989223.java
+++ b/test/jdk/java/beans/XMLEncoder/Test6989223.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6989223
  * @summary Tests Rectangle2D.Double encoding
- * @run main/othervm -Djava.security.manager=allow Test6989223
+ * @run main/othervm Test6989223
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public class Test6989223 extends AbstractTest {
     public static void main(String[] args) {
-        new Test6989223().test(true);
+        new Test6989223().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test7080156.java b/test/jdk/java/beans/XMLEncoder/Test7080156.java
index 1d6e86144b4..cc112c444c1 100644
--- a/test/jdk/java/beans/XMLEncoder/Test7080156.java
+++ b/test/jdk/java/beans/XMLEncoder/Test7080156.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 7080156 7094245
  * @summary Tests beans with public arrays
- * @run main/othervm -Djava.security.manager=allow Test7080156
+ * @run main/othervm Test7080156
  * @author Sergey Malenkov
  */
 
 public class Test7080156 extends AbstractTest {
     public static void main(String[] args) {
-        new Test7080156().test(true);
+        new Test7080156().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test7092744.java b/test/jdk/java/beans/XMLEncoder/Test7092744.java
index 838fdd60bea..f6beda0ec06 100644
--- a/test/jdk/java/beans/XMLEncoder/Test7092744.java
+++ b/test/jdk/java/beans/XMLEncoder/Test7092744.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,14 @@
  * @test
  * @bug 7092744
  * @summary Tests for ambiguous methods
- * @run main/othervm -Djava.security.manager=allow Test7092744
+ * @run main/othervm Test7092744
  * @author Sergey Malenkov
  */
 
 public class Test7092744 extends AbstractTest {
 
     public static void main(String[] args) {
-        new Test7092744().test(true);
+        new Test7092744().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test7169395.java b/test/jdk/java/beans/XMLEncoder/Test7169395.java
index 70df96bfb54..a1729548549 100644
--- a/test/jdk/java/beans/XMLEncoder/Test7169395.java
+++ b/test/jdk/java/beans/XMLEncoder/Test7169395.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 7169395
  * @summary Tests that array list initialized correctly
- * @run main/othervm -Djava.security.manager=allow Test7169395
+ * @run main/othervm Test7169395
  * @author Sergey Malenkov
  */
 
@@ -38,7 +38,7 @@
 public class Test7169395 extends AbstractTest {
 
     public static void main(String[] args) {
-        new Test7169395().test(true);
+        new Test7169395().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test8013416.java b/test/jdk/java/beans/XMLEncoder/Test8013416.java
index 3f5e3b4887f..d412f20aa97 100644
--- a/test/jdk/java/beans/XMLEncoder/Test8013416.java
+++ b/test/jdk/java/beans/XMLEncoder/Test8013416.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8013416
  * @summary Tests public synthetic methods
- * @run main/othervm -Djava.security.manager=allow Test8013416
+ * @run main/othervm Test8013416
  * @author Sergey Malenkov
  */
 
@@ -40,7 +40,7 @@
 
 public class Test8013416 extends AbstractTest {
     public static void main(String[] args) {
-        new Test8013416().test(true);
+        new Test8013416().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test8013557.java b/test/jdk/java/beans/XMLEncoder/Test8013557.java
index e5ea44b302d..e20bff50688 100644
--- a/test/jdk/java/beans/XMLEncoder/Test8013557.java
+++ b/test/jdk/java/beans/XMLEncoder/Test8013557.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 8013557
  * @summary Tests beans with public fields
- * @run main/othervm -Djava.security.manager=allow Test8013557
+ * @run main/othervm Test8013557
  * @author Sergey Malenkov
  */
 
 public class Test8013557 extends AbstractTest {
     public static void main(String[] args) {
-        new Test8013557().test(true);
+        new Test8013557().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/Test8016545.java b/test/jdk/java/beans/XMLEncoder/Test8016545.java
index 789eb116c9d..b82def5d5b2 100644
--- a/test/jdk/java/beans/XMLEncoder/Test8016545.java
+++ b/test/jdk/java/beans/XMLEncoder/Test8016545.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 8016545
  * @summary Tests beans with predefined fields
- * @run main/othervm -Djava.security.manager=allow Test8016545
+ * @run main/othervm Test8016545
  * @author Sergey Malenkov
  */
 
 public class Test8016545 extends AbstractTest {
     public static void main(String[] args) {
-        new Test8016545().test(true);
+        new Test8016545().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/Test8027066.java b/test/jdk/java/beans/XMLEncoder/Test8027066.java
index a2183208b4e..031dfb1b813 100644
--- a/test/jdk/java/beans/XMLEncoder/Test8027066.java
+++ b/test/jdk/java/beans/XMLEncoder/Test8027066.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
  * @test
  * @bug 8027066
  * @summary Tests that the same array can be encoded twice
- * @run main/othervm -Djava.security.manager=allow Test8027066
+ * @run main/othervm Test8027066
  * @author Anton Nashatyrev
  */
 public class Test8027066 extends AbstractTest<String[][]> {
     public static void main(String[] args) {
-        new Test8027066().test(true);
+        new Test8027066().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java b/test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java
index 93b02ac29b7..0f0714a999c 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6501431
  * @summary Tests AWTKeyStroke encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_AWTKeyStroke
+ * @run main/othervm java_awt_AWTKeyStroke
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_awt_AWTKeyStroke extends AbstractTest<AWTKeyStroke> {
     public static void main(String[] args) {
-        new java_awt_AWTKeyStroke().test(true);
+        new java_awt_AWTKeyStroke().test();
     }
 
     protected AWTKeyStroke getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java b/test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java
index 9f7631d80a2..39b2bf30015 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_BasicStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4358979
  * @summary Tests BasicStroke encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_BasicStroke
+ * @run main/othervm java_awt_BasicStroke
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_BasicStroke extends AbstractTest<BasicStroke> {
     public static void main(String[] args) {
-        new java_awt_BasicStroke().test(true);
+        new java_awt_BasicStroke().test();
     }
 
     protected BasicStroke getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java
index beec75e2825..01c00172a6f 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_BorderLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4916852
  * @summary Tests BorderLayout encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_BorderLayout
+ * @run main/othervm java_awt_BorderLayout
  * @author Sergey Malenkov
  */
 
@@ -46,7 +46,7 @@ public final class java_awt_BorderLayout extends AbstractTest<BorderLayout> {
     };
 
     public static void main(String[] args) {
-        new java_awt_BorderLayout().test(true);
+        new java_awt_BorderLayout().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java
index 2b58b2724b5..2e6085ea1f4 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_CardLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8007458
  * @summary Tests CardLayout encoding
  * @modules java.desktop/java.awt:open
- * @run main/othervm -Djava.security.manager=allow java_awt_CardLayout
+ * @run main/othervm java_awt_CardLayout
  * @author Sergey Malenkov
  */
 
@@ -41,7 +41,7 @@ public final class java_awt_CardLayout extends AbstractTest<CardLayout> {
     private static final Field COMP = getField("java.awt.CardLayout$Card.comp");
 
     public static void main(String[] args) throws Exception {
-        new java_awt_CardLayout().test(true);
+        new java_awt_CardLayout().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Color.java b/test/jdk/java/beans/XMLEncoder/java_awt_Color.java
index 935b36f52da..8d0e0e36dde 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Color.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests Color encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Color
+ * @run main/othervm java_awt_Color
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Color extends AbstractTest<Color> {
     public static void main(String[] args) {
-        new java_awt_Color().test(true);
+        new java_awt_Color().test();
     }
 
     protected Color getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Component.java b/test/jdk/java/beans/XMLEncoder/java_awt_Component.java
index 71329201ed4..9e150d1eb78 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Component.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Component.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4916852
  * @summary Tests Component encoding (background, foreground and font)
- * @run main/othervm -Djava.security.manager=allow java_awt_Component
+ * @run main/othervm java_awt_Component
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_awt_Component extends AbstractTest<Component> {
     public static void main(String[] args) {
-        new java_awt_Component().test(true);
+        new java_awt_Component().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java b/test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java
index 7612925c898..ff333abc564 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Cursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests Cursor encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Cursor
+ * @run main/othervm java_awt_Cursor
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Cursor extends AbstractTest<Cursor> {
     public static void main(String[] args) {
-        new java_awt_Cursor().test(true);
+        new java_awt_Cursor().test();
     }
 
     protected Cursor getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java b/test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java
index 3a9f61ac90d..fb4812c5c89 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Dimension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4741757 6402062 6471539
  * @summary Tests Dimension encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Dimension
+ * @run main/othervm java_awt_Dimension
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Dimension extends AbstractTest<Dimension> {
     public static void main(String[] args) {
-        new java_awt_Dimension().test(true);
+        new java_awt_Dimension().test();
     }
 
     protected Dimension getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Font.java b/test/jdk/java/beans/XMLEncoder/java_awt_Font.java
index 45a3ef61d9c..070622f48c2 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Font.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Font.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4951733 6402062
  * @summary Tests Font encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Font
+ * @run main/othervm java_awt_Font
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class java_awt_Font extends AbstractTest<Font> {
     public static void main(String[] args) {
-        new java_awt_Font().test(true);
+        new java_awt_Font().test();
     }
 
     protected Font getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java
index ccf7022ae7f..b463f425328 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_GradientPaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4358979
  * @summary Tests GradientPaint encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_GradientPaint
+ * @run main/othervm java_awt_GradientPaint
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_awt_GradientPaint extends AbstractTest<GradientPaint> {
     public static void main(String[] args) {
-        new java_awt_GradientPaint().test(true);
+        new java_awt_GradientPaint().test();
     }
 
     protected GradientPaint getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java
index 2d80d9cd731..b241a806b82 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062
  * @summary Tests GridBagConstraints encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_GridBagConstraints
+ * @run main/othervm java_awt_GridBagConstraints
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_GridBagConstraints extends AbstractTest<GridBagConstraints> {
     public static void main(String[] args) {
-        new java_awt_GridBagConstraints().test(true);
+        new java_awt_GridBagConstraints().test();
     }
 
     protected GridBagConstraints getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java
index 98a5cc48715..1ed932aab3a 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_GridBagLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,23 +26,21 @@
  * @bug 8007458
  * @summary Tests GridBagLayout encoding
  * @modules java.desktop/java.awt:open
- * @run main/othervm -Djava.security.manager=allow java_awt_GridBagLayout
+ * @run main/othervm java_awt_GridBagLayout
  * @author Sergey Malenkov
  */
 
-import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.lang.reflect.Field;
 import java.util.Hashtable;
-import java.util.Map;
 import javax.swing.JLabel;
 
 public final class java_awt_GridBagLayout extends AbstractTest<GridBagLayout> {
     private static final Field HASHTABLE = getField("java.awt.GridBagLayout.comptable");
 
     public static void main(String[] args) {
-        new java_awt_GridBagLayout().test(true);
+        new java_awt_GridBagLayout().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Insets.java b/test/jdk/java/beans/XMLEncoder/java_awt_Insets.java
index cac3c10516a..221a7176d06 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Insets.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Insets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6471539
  * @summary Tests Insets encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Insets
+ * @run main/othervm java_awt_Insets
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Insets extends AbstractTest<Insets> {
     public static void main(String[] args) {
-        new java_awt_Insets().test(true);
+        new java_awt_Insets().test();
     }
 
     protected Insets getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java
index 47b9f28e67e..c597b3fbc26 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,16 @@
  * @test
  * @bug 4358979
  * @summary Tests LinearGradientPaint encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_LinearGradientPaint
+ * @run main/othervm java_awt_LinearGradientPaint
  * @author Sergey Malenkov
  */
 
 import java.awt.Color;
 import java.awt.LinearGradientPaint;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-
-import static java.awt.MultipleGradientPaint.ColorSpaceType.LINEAR_RGB;
-import static java.awt.MultipleGradientPaint.CycleMethod.REFLECT;
 
 public final class java_awt_LinearGradientPaint extends AbstractTest<LinearGradientPaint> {
     public static void main(String[] args) {
-        new java_awt_LinearGradientPaint().test(true);
+        new java_awt_LinearGradientPaint().test();
     }
 
     protected LinearGradientPaint getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java b/test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java
index 5b0a7f1f43e..782e8b65397 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_MenuShortcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4818598
  * @summary Tests MenuShortcut value encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_MenuShortcut
+ * @run main/othervm java_awt_MenuShortcut
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_awt_MenuShortcut extends AbstractTest<MenuShortcut> {
     public static void main(String[] args) {
-        new java_awt_MenuShortcut().test(true);
+        new java_awt_MenuShortcut().test();
     }
 
     protected MenuShortcut getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Point.java b/test/jdk/java/beans/XMLEncoder/java_awt_Point.java
index 6aeb17f6bb0..e494d70e9f5 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Point.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Point.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4741757 6402062 6471539
  * @summary Tests Point encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Point
+ * @run main/othervm java_awt_Point
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Point extends AbstractTest<Point> {
     public static void main(String[] args) {
-        new java_awt_Point().test(true);
+        new java_awt_Point().test();
     }
 
     protected Point getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java b/test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java
index f432153504e..0464508cce8 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,16 @@
  * @test
  * @bug 4358979
  * @summary Tests RadialGradientPaint encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_RadialGradientPaint
+ * @run main/othervm java_awt_RadialGradientPaint
  * @author Sergey Malenkov
  */
 
 import java.awt.Color;
 import java.awt.RadialGradientPaint;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-
-import static java.awt.MultipleGradientPaint.ColorSpaceType.LINEAR_RGB;
-import static java.awt.MultipleGradientPaint.CycleMethod.REFLECT;
 
 public final class java_awt_RadialGradientPaint extends AbstractTest<RadialGradientPaint> {
     public static void main(String[] args) {
-        new java_awt_RadialGradientPaint().test(true);
+        new java_awt_RadialGradientPaint().test();
     }
 
     protected RadialGradientPaint getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java b/test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java
index 132c6ffdcce..668c6bde27d 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_Rectangle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4741757 6402062 6471539
  * @summary Tests Rectangle encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_Rectangle
+ * @run main/othervm java_awt_Rectangle
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_Rectangle extends AbstractTest<Rectangle> {
     public static void main(String[] args) {
-        new java_awt_Rectangle().test(true);
+        new java_awt_Rectangle().test();
     }
 
     protected Rectangle getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java b/test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java
index a3a7552b90b..d67bc71bb29 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_ScrollPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 6402062 6487891
  * @summary Tests ScrollPane encoding
  * @key headful
- * @run main/othervm -Djava.security.manager=allow java_awt_ScrollPane
+ * @run main/othervm java_awt_ScrollPane
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_awt_ScrollPane extends AbstractTest<ScrollPane> {
     public static void main(String[] args) {
-        new java_awt_ScrollPane().test(true);
+        new java_awt_ScrollPane().test();
     }
 
     protected ScrollPane getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java b/test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java
index d7d7e16eb9a..9b5dcd7cd76 100644
--- a/test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java
+++ b/test/jdk/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4358979
  * @summary Tests AffineTransform encoding
- * @run main/othervm -Djava.security.manager=allow java_awt_geom_AffineTransform
+ * @run main/othervm java_awt_geom_AffineTransform
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_awt_geom_AffineTransform extends AbstractTest<AffineTransform> {
     public static void main(String[] args) {
-        new java_awt_geom_AffineTransform().test(true);
+        new java_awt_geom_AffineTransform().test();
     }
 
     protected AffineTransform getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java b/test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java
index 700032b7d65..c419ad4992c 100644
--- a/test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java
+++ b/test/jdk/java/beans/XMLEncoder/java_beans_EventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests EventHandler encoding
- * @run main/othervm -Djava.security.manager=allow java_beans_EventHandler
+ * @run main/othervm java_beans_EventHandler
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_beans_EventHandler extends AbstractTest<EventHandler> {
     public static void main(String[] args) {
-        new java_beans_EventHandler().test(true);
+        new java_beans_EventHandler().test();
     }
 
     protected EventHandler getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_beans_Expression.java b/test/jdk/java/beans/XMLEncoder/java_beans_Expression.java
index b4fa548f2de..af26bd7a52f 100644
--- a/test/jdk/java/beans/XMLEncoder/java_beans_Expression.java
+++ b/test/jdk/java/beans/XMLEncoder/java_beans_Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests Expression encoding
- * @run main/othervm -Djava.security.manager=allow java_beans_Expression
+ * @run main/othervm java_beans_Expression
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_beans_Expression extends AbstractTest<Expression> {
     public static void main(String[] args) {
-        new java_beans_Expression().test(true);
+        new java_beans_Expression().test();
     }
 
     protected Expression getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_beans_Statement.java b/test/jdk/java/beans/XMLEncoder/java_beans_Statement.java
index 9fa576a6a1b..f4753411e20 100644
--- a/test/jdk/java/beans/XMLEncoder/java_beans_Statement.java
+++ b/test/jdk/java/beans/XMLEncoder/java_beans_Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests Statement encoding
- * @run main/othervm -Djava.security.manager=allow java_beans_Statement
+ * @run main/othervm java_beans_Statement
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_beans_Statement extends AbstractTest<Statement> {
     public static void main(String[] args) {
-        new java_beans_Statement().test(true);
+        new java_beans_Statement().test();
     }
 
     protected Statement getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_Character.java b/test/jdk/java/beans/XMLEncoder/java_lang_Character.java
index f2970d159c2..76aadefa220 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_Character.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_Character.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 6256805
  * @summary Tests invalid XML character encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_Character
+ * @run main/othervm java_lang_Character
  * @author Sergey Malenkov
  */
 
 public final class java_lang_Character extends AbstractTest<Character> {
     public static void main(String[] args) {
-        new java_lang_Character().test(true);
+        new java_lang_Character().test();
     }
 
     protected Character getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_Class.java b/test/jdk/java/beans/XMLEncoder/java_lang_Class.java
index fb1613a0164..6a54f65fb25 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_Class.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_Class.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 4818598
  * @summary Tests Class value encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_Class
+ * @run main/othervm java_lang_Class
  * @author Sergey Malenkov
  */
 
 public final class java_lang_Class extends AbstractTest<Class> {
     public static void main(String[] args) {
-        new java_lang_Class().test(true);
+        new java_lang_Class().test();
     }
 
     protected Class getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_Enum.java b/test/jdk/java/beans/XMLEncoder/java_lang_Enum.java
index 445e9364eb9..e0a656e1ce8 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_Enum.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_Enum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 5015403
  * @summary Tests Enum value encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_Enum
+ * @run main/othervm java_lang_Enum
  * @author Sergey Malenkov
  */
 
 public final class java_lang_Enum extends AbstractTest {
     public static void main(String[] args) {
-        new java_lang_Enum().test(true);
+        new java_lang_Enum().test();
     }
 
     protected Object getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_String.java b/test/jdk/java/beans/XMLEncoder/java_lang_String.java
index 9d2c68a06bd..e2950e28922 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_String.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_String.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 6256805
  * @summary Tests invalid XML string encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_String
+ * @run main/othervm java_lang_String
  * @author Sergey Malenkov
  */
 
 public final class java_lang_String extends AbstractTest<String> {
     public static void main(String[] args) {
-        new java_lang_String().test(true);
+        new java_lang_String().test();
     }
 
     protected String getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java
index 3a06079dd19..7f2de0f4967 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4818598
  * @summary Tests Field value encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_reflect_Field
+ * @run main/othervm java_lang_reflect_Field
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@ public final class java_lang_reflect_Field extends AbstractTest<Field> {
     public int f2;
 
     public static void main(String[] args) {
-        new java_lang_reflect_Field().test(true);
+        new java_lang_reflect_Field().test();
     }
 
     protected Field getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java
index 684bfb40375..d0e65700d19 100644
--- a/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java
+++ b/test/jdk/java/beans/XMLEncoder/java_lang_reflect_Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4818598
  * @summary Tests Method value encoding
- * @run main/othervm -Djava.security.manager=allow java_lang_reflect_Method
+ * @run main/othervm java_lang_reflect_Method
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_lang_reflect_Method extends AbstractTest<Method> {
     public static void main(String[] args) {
-        new java_lang_reflect_Method().test(true);
+        new java_lang_reflect_Method().test();
     }
 
     protected Method getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_net_URI.java b/test/jdk/java/beans/XMLEncoder/java_net_URI.java
index dff6df732da..dab5c1dc982 100644
--- a/test/jdk/java/beans/XMLEncoder/java_net_URI.java
+++ b/test/jdk/java/beans/XMLEncoder/java_net_URI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6245149
  * @summary Tests URI encoding
- * @run main/othervm -Djava.security.manager=allow java_net_URI
+ * @run main/othervm java_net_URI
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_net_URI extends AbstractTest<URI> {
     public static void main(String[] args) {
-        new java_net_URI().test(true);
+        new java_net_URI().test();
     }
 
     protected URI getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_sql_Date.java b/test/jdk/java/beans/XMLEncoder/java_sql_Date.java
index 032fad774ba..dee5a71254e 100644
--- a/test/jdk/java/beans/XMLEncoder/java_sql_Date.java
+++ b/test/jdk/java/beans/XMLEncoder/java_sql_Date.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4733558 6471539
  * @summary Tests Date encoding
- * @run main/othervm -Djava.security.manager=allow java_sql_Date
+ * @run main/othervm java_sql_Date
  * @author Sergey Malenkov
  * @modules java.desktop
  *          java.sql
@@ -35,7 +35,7 @@
 
 public final class java_sql_Date extends AbstractTest<Date> {
     public static void main(String[] args) {
-        new java_sql_Date().test(true);
+        new java_sql_Date().test();
     }
 
     protected Date getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_sql_Time.java b/test/jdk/java/beans/XMLEncoder/java_sql_Time.java
index 5302da13805..ac43333b575 100644
--- a/test/jdk/java/beans/XMLEncoder/java_sql_Time.java
+++ b/test/jdk/java/beans/XMLEncoder/java_sql_Time.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4733558 6471539
  * @summary Tests Time encoding
- * @run main/othervm -Djava.security.manager=allow java_sql_Time
+ * @run main/othervm java_sql_Time
  * @author Sergey Malenkov
  * @modules java.desktop
  *          java.sql
@@ -35,7 +35,7 @@
 
 public final class java_sql_Time extends AbstractTest<Time> {
     public static void main(String[] args) {
-        new java_sql_Time().test(true);
+        new java_sql_Time().test();
     }
 
     protected Time getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java b/test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java
index 0f2f80a8ccb..c6485f8b948 100644
--- a/test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java
+++ b/test/jdk/java/beans/XMLEncoder/java_sql_Timestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4733558 6471539
  * @summary Tests Timestamp encoding
- * @run main/othervm -Djava.security.manager=allow java_sql_Timestamp
+ * @run main/othervm java_sql_Timestamp
  * @author Sergey Malenkov
  * @modules java.desktop
  *          java.sql
@@ -35,7 +35,7 @@
 
 public final class java_sql_Timestamp extends AbstractTest<Timestamp> {
     public static void main(String[] args) {
-        new java_sql_Timestamp().test(true);
+        new java_sql_Timestamp().test();
     }
 
     protected Timestamp getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java b/test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java
index ece00580ec3..e9f61e3981f 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_ArrayList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4631471
  * @summary Tests ArrayList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_ArrayList
+ * @run main/othervm java_util_ArrayList
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_ArrayList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_ArrayList().test(true);
+        new java_util_ArrayList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java
index b5b0e12c5e6..2a1be1724c3 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests EmptyList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_EmptyList
+ * @run main/othervm java_util_Collections_EmptyList
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_EmptyList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_EmptyList().test(true);
+        new java_util_Collections_EmptyList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java
index ccc4385ed92..479760781dc 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests EmptyMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_EmptyMap
+ * @run main/othervm java_util_Collections_EmptyMap
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_EmptyMap extends AbstractTest<Map<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_EmptyMap().test(true);
+        new java_util_Collections_EmptyMap().test();
     }
 
     protected Map<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java
index f74d409445a..480f1131f4a 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_EmptySet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests EmptySet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_EmptySet
+ * @run main/othervm java_util_Collections_EmptySet
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_EmptySet extends AbstractTest<Set<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_EmptySet().test(true);
+        new java_util_Collections_EmptySet().test();
     }
 
     protected Set<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java
index 5942217a59c..fb33fed0933 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SingletonList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SingletonList
+ * @run main/othervm java_util_Collections_SingletonList
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SingletonList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SingletonList().test(true);
+        new java_util_Collections_SingletonList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java
index e9fd90abf81..244e116f549 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SingletonMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SingletonMap
+ * @run main/othervm java_util_Collections_SingletonMap
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SingletonMap extends AbstractTest<Map<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SingletonMap().test(true);
+        new java_util_Collections_SingletonMap().test();
     }
 
     protected Map<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java
index fddd57c104f..a1bec8bae2b 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SingletonSet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SingletonSet
+ * @run main/othervm java_util_Collections_SingletonSet
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SingletonSet extends AbstractTest<Set<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SingletonSet().test(true);
+        new java_util_Collections_SingletonSet().test();
     }
 
     protected Set<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java
index f92ec82690c..c4168aecb1d 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedCollection encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedCollection
+ * @run main/othervm java_util_Collections_SynchronizedCollection
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_SynchronizedCollection extends AbstractTest<Collection<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedCollection().test(true);
+        new java_util_Collections_SynchronizedCollection().test();
     }
 
     protected Collection<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java
index fbc9ea6e464..3d40f20015e 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedList
+ * @run main/othervm java_util_Collections_SynchronizedList
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SynchronizedList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedList().test(true);
+        new java_util_Collections_SynchronizedList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java
index 998abe17ef3..7422333150e 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedMap
+ * @run main/othervm java_util_Collections_SynchronizedMap
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SynchronizedMap extends AbstractTest<Map<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedMap().test(true);
+        new java_util_Collections_SynchronizedMap().test();
     }
 
     protected Map<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java
index 15eb8bf1980..52b6ff9801e 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedRandomAccessList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedRandomAccessList
+ * @run main/othervm java_util_Collections_SynchronizedRandomAccessList
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_SynchronizedRandomAccessList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedRandomAccessList().test(true);
+        new java_util_Collections_SynchronizedRandomAccessList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java
index 54e88a1ccfd..e551a6aa426 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedSet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedSet
+ * @run main/othervm java_util_Collections_SynchronizedSet
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_SynchronizedSet extends AbstractTest<Set<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedSet().test(true);
+        new java_util_Collections_SynchronizedSet().test();
     }
 
     protected Set<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java
index 4ff12e4ebe8..58d7cffc135 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedSortedMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedSortedMap
+ * @run main/othervm java_util_Collections_SynchronizedSortedMap
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_SynchronizedSortedMap extends AbstractTest<SortedMap<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedSortedMap().test(true);
+        new java_util_Collections_SynchronizedSortedMap().test();
     }
 
     protected SortedMap<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java
index 548e3c41d40..0529af2d766 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests SynchronizedSortedSet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_SynchronizedSortedSet
+ * @run main/othervm java_util_Collections_SynchronizedSortedSet
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_SynchronizedSortedSet extends AbstractTest<SortedSet<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_SynchronizedSortedSet().test(true);
+        new java_util_Collections_SynchronizedSortedSet().test();
     }
 
     protected SortedSet<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java
index 6f2a24205c8..692a8e90c7f 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableCollection encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableCollection
+ * @run main/othervm java_util_Collections_UnmodifiableCollection
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_UnmodifiableCollection extends AbstractTest<Collection<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableCollection().test(true);
+        new java_util_Collections_UnmodifiableCollection().test();
     }
 
     protected Collection<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java
index 478759e4263..5f1150524bd 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableList
+ * @run main/othervm java_util_Collections_UnmodifiableList
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_UnmodifiableList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableList().test(true);
+        new java_util_Collections_UnmodifiableList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java
index 7ff79708166..f94b0aa500d 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableMap
+ * @run main/othervm java_util_Collections_UnmodifiableMap
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_UnmodifiableMap extends AbstractTest<Map<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableMap().test(true);
+        new java_util_Collections_UnmodifiableMap().test();
     }
 
     protected Map<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java
index e2bd7ff2004..f9133fa6dd4 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableRandomAccessList encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableRandomAccessList
+ * @run main/othervm java_util_Collections_UnmodifiableRandomAccessList
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_UnmodifiableRandomAccessList extends AbstractTest<List<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableRandomAccessList().test(true);
+        new java_util_Collections_UnmodifiableRandomAccessList().test();
     }
 
     protected List<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java
index 92f82fb5319..7e4bfac961c 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableSet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableSet
+ * @run main/othervm java_util_Collections_UnmodifiableSet
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_Collections_UnmodifiableSet extends AbstractTest<Set<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableSet().test(true);
+        new java_util_Collections_UnmodifiableSet().test();
     }
 
     protected Set<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java
index 414f404dc71..aa951e71af4 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableSortedMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableSortedMap
+ * @run main/othervm java_util_Collections_UnmodifiableSortedMap
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_UnmodifiableSortedMap extends AbstractTest<SortedMap<String, String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableSortedMap().test(true);
+        new java_util_Collections_UnmodifiableSortedMap().test();
     }
 
     protected SortedMap<String, String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java
index 1103fc3d3d2..10746439915 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505888
  * @summary Tests UnmodifiableSortedSet encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Collections_UnmodifiableSortedSet
+ * @run main/othervm java_util_Collections_UnmodifiableSortedSet
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class java_util_Collections_UnmodifiableSortedSet extends AbstractTest<SortedSet<String>> {
     public static void main(String[] args) {
-        new java_util_Collections_UnmodifiableSortedSet().test(true);
+        new java_util_Collections_UnmodifiableSortedSet().test();
     }
 
     protected SortedSet<String> getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_Date.java b/test/jdk/java/beans/XMLEncoder/java_util_Date.java
index b2b2b6062be..2d15421ccd0 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_Date.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_Date.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4733558 6471539
  * @summary Tests Date encoding
- * @run main/othervm -Djava.security.manager=allow java_util_Date
+ * @run main/othervm java_util_Date
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class java_util_Date extends AbstractTest<Date> {
     public static void main(String[] args) {
-        new java_util_Date().test(true);
+        new java_util_Date().test();
     }
 
     protected Date getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/java_util_HashMap.java b/test/jdk/java/beans/XMLEncoder/java_util_HashMap.java
index f4359fbcc12..6936c02882f 100644
--- a/test/jdk/java/beans/XMLEncoder/java_util_HashMap.java
+++ b/test/jdk/java/beans/XMLEncoder/java_util_HashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4631471 4921212 4994637
  * @summary Tests HashMap encoding
- * @run main/othervm -Djava.security.manager=allow java_util_HashMap
+ * @run main/othervm java_util_HashMap
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class java_util_HashMap extends AbstractTest<Map<String, String>> {
     public static void main(String[] args) {
-        new java_util_HashMap().test(true);
+        new java_util_HashMap().test();
     }
 
     @Override
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_Box.java b/test/jdk/java/beans/XMLEncoder/javax_swing_Box.java
index ef3ae7b9903..696a4fec23b 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_Box.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_Box.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4818598
  * @summary Tests Box value encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_Box
+ * @run main/othervm javax_swing_Box
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_Box extends AbstractTest<Box> {
     public static void main(String[] args) {
-        new javax_swing_Box().test(true);
+        new javax_swing_Box().test();
     }
 
     protected Box getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java b/test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java
index d70b96a49e5..85213b6d361 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_BoxLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6405175 6487891
  * @summary Tests BoxLayout encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_BoxLayout
+ * @run main/othervm javax_swing_BoxLayout
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_BoxLayout extends AbstractTest<BoxLayout> {
     public static void main(String[] args) {
-        new javax_swing_BoxLayout().test(true);
+        new javax_swing_BoxLayout().test();
     }
 
     protected BoxLayout getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java b/test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java
index b08ce2f113c..e9a94387b04 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_Box_Filler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests Filler encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_Box_Filler
+ * @run main/othervm javax_swing_Box_Filler
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_Box_Filler extends AbstractTest<Filler> {
     public static void main(String[] args) {
-        new javax_swing_Box_Filler().test(true);
+        new javax_swing_Box_Filler().test();
     }
 
     protected Filler getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java b/test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java
index ae9bf62047f..57f2775380b 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests DefaultCellEditor encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_DefaultCellEditor
+ * @run main/othervm javax_swing_DefaultCellEditor
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class javax_swing_DefaultCellEditor extends AbstractTest<DefaultCellEditor> {
     public static void main(String[] args) {
-        new javax_swing_DefaultCellEditor().test(true);
+        new javax_swing_DefaultCellEditor().test();
     }
 
     protected DefaultCellEditor getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java
index 8dbb2414819..b663a2a97fc 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_JButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests JButton encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_JButton
+ * @run main/othervm javax_swing_JButton
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_JButton extends AbstractTest<JButton> {
     public static void main(String[] args) {
-        new javax_swing_JButton().test(true);
+        new javax_swing_JButton().test();
     }
 
     protected JButton getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java
index 2695538ce24..403e17af105 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_JComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,12 @@
  * @test
  * @bug 8131754
  * @summary Tests JComponent encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_JComponent
+ * @run main/othervm javax_swing_JComponent
  */
 public final class javax_swing_JComponent extends AbstractTest<JComponent> {
 
     public static void main(final String[] args) {
-        new javax_swing_JComponent().test(true);
+        new javax_swing_JComponent().test();
     }
 
     protected JComponent getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java
index 9ca4ceabd63..921ee3138b0 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_JLayeredPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 5023552 6972468
  * @summary Tests JLayeredPane encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_JLayeredPane
+ * @run main/othervm javax_swing_JLayeredPane
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class javax_swing_JLayeredPane extends AbstractTest<JLayeredPane> {
     public static void main(String[] args) {
-        new javax_swing_JLayeredPane().test(true);
+        new javax_swing_JLayeredPane().test();
     }
 
     private static void init(JLayeredPane pane, int layer, int x, int y, int w, int h, Color color) {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java
index 020e3c85db6..cb9b5693d51 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_JSplitPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests JSplitPane encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_JSplitPane
+ * @run main/othervm javax_swing_JSplitPane
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_JSplitPane extends AbstractTest<JSplitPane> {
     public static void main(String[] args) {
-        new javax_swing_JSplitPane().test(true);
+        new javax_swing_JSplitPane().test();
     }
 
     protected JSplitPane getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java b/test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java
index 2ee375c1763..7dca3704a5b 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_JTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests JTree encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_JTree
+ * @run main/othervm javax_swing_JTree
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class javax_swing_JTree extends AbstractTest<JTree> {
     public static void main(String[] args) {
-        new javax_swing_JTree().test(true);
+        new javax_swing_JTree().test();
     }
 
     protected JTree getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java b/test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java
index 3ad47cb95f2..ead0f586a9c 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_KeyStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6501431
  * @summary Tests KeyStroke encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_KeyStroke
+ * @run main/othervm javax_swing_KeyStroke
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class javax_swing_KeyStroke extends AbstractTest<KeyStroke> {
     public static void main(String[] args) {
-        new javax_swing_KeyStroke().test(true);
+        new javax_swing_KeyStroke().test();
     }
 
     protected KeyStroke getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java b/test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java
index 447aba0791a..26249b0ce46 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_OverlayLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6405175 6487891
  * @summary Tests OverlayLayout encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_OverlayLayout
+ * @run main/othervm javax_swing_OverlayLayout
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_OverlayLayout extends AbstractTest<OverlayLayout> {
     public static void main(String[] args) {
-        new javax_swing_OverlayLayout().test(true);
+        new javax_swing_OverlayLayout().test();
     }
 
     protected OverlayLayout getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java
index f6b1ab2e817..2f5d1e9cbae 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests BevelBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_BevelBorder
+ * @run main/othervm javax_swing_border_BevelBorder
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_border_BevelBorder extends AbstractTest<BevelBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_BevelBorder().test(true);
+        new javax_swing_border_BevelBorder().test();
     }
 
     protected BevelBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java
index 9e146a3af09..ac3bc9eee53 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests CompoundBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_CompoundBorder
+ * @run main/othervm javax_swing_border_CompoundBorder
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_border_CompoundBorder extends AbstractTest<CompoundBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_CompoundBorder().test(true);
+        new javax_swing_border_CompoundBorder().test();
     }
 
     protected CompoundBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java
index 578fe315149..6e0c6416e22 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests EmptyBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_EmptyBorder
+ * @run main/othervm javax_swing_border_EmptyBorder
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_border_EmptyBorder extends AbstractTest<EmptyBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_EmptyBorder().test(true);
+        new javax_swing_border_EmptyBorder().test();
     }
 
     protected EmptyBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java
index 04418dc89ec..a91cde1f10e 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests EtchedBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_EtchedBorder
+ * @run main/othervm javax_swing_border_EtchedBorder
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_border_EtchedBorder extends AbstractTest<EtchedBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_EtchedBorder().test(true);
+        new javax_swing_border_EtchedBorder().test();
     }
 
     protected EtchedBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java
index b4cee00a9b9..ebfffcdf51d 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_LineBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests LineBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_LineBorder
+ * @run main/othervm javax_swing_border_LineBorder
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_border_LineBorder extends AbstractTest<LineBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_LineBorder().test(true);
+        new javax_swing_border_LineBorder().test();
     }
 
     protected LineBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java
index 60e24780503..9a9bf16d499 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062
  * @summary Tests MatteBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_MatteBorder
+ * @run main/othervm javax_swing_border_MatteBorder
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_border_MatteBorder extends AbstractTest<MatteBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_MatteBorder().test(true);
+        new javax_swing_border_MatteBorder().test();
     }
 
     protected MatteBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java
index 4e6fbed0393..addbd82c482 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests SoftBevelBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_SoftBevelBorder
+ * @run main/othervm javax_swing_border_SoftBevelBorder
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class javax_swing_border_SoftBevelBorder extends AbstractTest<SoftBevelBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_SoftBevelBorder().test(true);
+        new javax_swing_border_SoftBevelBorder().test();
     }
 
     protected SoftBevelBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java
index fb9420d9a90..bc5d13600a6 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4358979
  * @summary Tests StrokeBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_StrokeBorder
+ * @run main/othervm javax_swing_border_StrokeBorder
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class javax_swing_border_StrokeBorder extends AbstractTest<StrokeBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_StrokeBorder().test(true);
+        new javax_swing_border_StrokeBorder().test();
     }
 
     protected StrokeBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java b/test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java
index 257b6497b65..da3546914ab 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests TitledBorder encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_border_TitledBorder
+ * @run main/othervm javax_swing_border_TitledBorder
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class javax_swing_border_TitledBorder extends AbstractTest<TitledBorder> {
     public static void main(String[] args) {
-        new javax_swing_border_TitledBorder().test(true);
+        new javax_swing_border_TitledBorder().test();
     }
 
     protected TitledBorder getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java
index 770a6603659..58d3dd29179 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests BevelBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_BevelBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_BevelBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_BevelBorderUIResource extends AbstractTest<BevelBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_BevelBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_BevelBorderUIResource().test();
     }
 
     protected BevelBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java
index 936a76fb661..60f33382e5a 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,15 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests CompoundBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_CompoundBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_CompoundBorderUIResource
  * @author Sergey Malenkov
  */
 
-import javax.swing.border.CompoundBorder;
 import javax.swing.plaf.BorderUIResource.CompoundBorderUIResource;
 
 public final class javax_swing_plaf_BorderUIResource_CompoundBorderUIResource extends AbstractTest<CompoundBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_CompoundBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_CompoundBorderUIResource().test();
     }
 
     protected CompoundBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java
index 9721f6c487b..0f7d5f8fcd1 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EmptyBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests EmptyBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_EmptyBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_EmptyBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_EmptyBorderUIResource extends AbstractTest<EmptyBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_EmptyBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_EmptyBorderUIResource().test();
     }
 
     protected EmptyBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java
index ce818c6afbc..02f1f99099d 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests EtchedBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_EtchedBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_EtchedBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_EtchedBorderUIResource extends AbstractTest<EtchedBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_EtchedBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_EtchedBorderUIResource().test();
     }
 
     protected EtchedBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java
index abc67c6d51f..13cbc31d0e4 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests LineBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_LineBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_LineBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_LineBorderUIResource extends AbstractTest<LineBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_LineBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_LineBorderUIResource().test();
     }
 
     protected LineBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java
index 4be66912568..c605f70e332 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062
  * @summary Tests MatteBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_MatteBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_MatteBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -34,7 +34,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_MatteBorderUIResource extends AbstractTest<MatteBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_MatteBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_MatteBorderUIResource().test();
     }
 
     protected MatteBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java
index 03e59c15562..4599bc6b82b 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests TitledBorderUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_BorderUIResource_TitledBorderUIResource
+ * @run main/othervm javax_swing_plaf_BorderUIResource_TitledBorderUIResource
  * @author Sergey Malenkov
  */
 
@@ -37,7 +37,7 @@
 
 public final class javax_swing_plaf_BorderUIResource_TitledBorderUIResource extends AbstractTest<TitledBorderUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_BorderUIResource_TitledBorderUIResource().test(true);
+        new javax_swing_plaf_BorderUIResource_TitledBorderUIResource().test();
     }
 
     protected TitledBorderUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java
index 86f04ac3fa8..761e18938a2 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests ColorUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_ColorUIResource
+ * @run main/othervm javax_swing_plaf_ColorUIResource
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_plaf_ColorUIResource extends AbstractTest<ColorUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_ColorUIResource().test(true);
+        new javax_swing_plaf_ColorUIResource().test();
     }
 
     protected ColorUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java
index 32770bc60f0..8e13c1ac663 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4951733 6402062
  * @summary Tests FontUIResource encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_plaf_FontUIResource
+ * @run main/othervm javax_swing_plaf_FontUIResource
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class javax_swing_plaf_FontUIResource extends AbstractTest<FontUIResource> {
     public static void main(String[] args) {
-        new javax_swing_plaf_FontUIResource().test(true);
+        new javax_swing_plaf_FontUIResource().test();
     }
 
     protected FontUIResource getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java
index 93e7d91175e..19c8c7147dd 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests DefaultTreeModel encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_tree_DefaultTreeModel
+ * @run main/othervm javax_swing_tree_DefaultTreeModel
  * @author Sergey Malenkov
  */
 
@@ -35,7 +35,7 @@
 
 public final class javax_swing_tree_DefaultTreeModel extends AbstractTest<DefaultTreeModel> {
     public static void main(String[] args) {
-        new javax_swing_tree_DefaultTreeModel().test(true);
+        new javax_swing_tree_DefaultTreeModel().test();
     }
 
     protected DefaultTreeModel getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java
index c154be327ea..175944065b3 100644
--- a/test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java
+++ b/test/jdk/java/beans/XMLEncoder/javax_swing_tree_TreePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6402062 6487891
  * @summary Tests TreePath encoding
- * @run main/othervm -Djava.security.manager=allow javax_swing_tree_TreePath
+ * @run main/othervm javax_swing_tree_TreePath
  * @author Sergey Malenkov
  */
 
@@ -33,7 +33,7 @@
 
 public final class javax_swing_tree_TreePath extends AbstractTest<TreePath> {
     public static void main(String[] args) {
-        new javax_swing_tree_TreePath().test(true);
+        new javax_swing_tree_TreePath().test();
     }
 
     protected TreePath getObject() {
diff --git a/test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java b/test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
index 5ae0f23ed4e..6d9c2d920e0 100644
--- a/test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
+++ b/test/jdk/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 6589532
  * @summary Tests PrintColorUIResource value encoding
  * @modules java.desktop/sun.swing
- * @run main/othervm -Djava.security.manager=allow sun_swing_PrintColorUIResource
+ * @run main/othervm sun_swing_PrintColorUIResource
  * @author Sergey Malenkov
  */
 
@@ -36,7 +36,7 @@
 
 public final class sun_swing_PrintColorUIResource extends AbstractTest<Color> {
     public static void main(String[] args) {
-        new sun_swing_PrintColorUIResource().test(true);
+        new sun_swing_PrintColorUIResource().test();
     }
 
     protected Color getObject() {
diff --git a/test/jdk/java/foreign/TestLinker.java b/test/jdk/java/foreign/TestLinker.java
index 42a373d5426..82d58300088 100644
--- a/test/jdk/java/foreign/TestLinker.java
+++ b/test/jdk/java/foreign/TestLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @modules java.base/jdk.internal.foreign
  * @run testng TestLinker
- * @run testng/othervm/policy=security.policy
- *          -Djava.security.manager=default TestLinker
+ * @run testng/othervm TestLinker
  */
 
 import jdk.internal.foreign.CABI;
diff --git a/test/jdk/java/foreign/TestMemorySession.java b/test/jdk/java/foreign/TestMemorySession.java
index 617951f6b6b..b06e2707c39 100644
--- a/test/jdk/java/foreign/TestMemorySession.java
+++ b/test/jdk/java/foreign/TestMemorySession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,6 @@
  */
 
 import java.lang.foreign.Arena;
-
-import jdk.internal.foreign.MemorySessionImpl;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,6 +35,11 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.stream.IntStream;
+import jdk.internal.foreign.MemorySessionImpl;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
 
 public class TestMemorySession {
 
@@ -319,6 +318,74 @@ public void testIsCloseableBy(ArenaSupplier arenaSupplier) {
         assertEquals(sessionImpl.isCloseableBy(otherThread), isCloseableByOther);
     }
 
+    /**
+     * Test that a thread failing to acquire a scope will not observe it as alive afterwards.
+     */
+    @Test
+    public void testAcquireCloseRace() throws InterruptedException {
+        int iteration = 1000;
+        AtomicInteger lock = new AtomicInteger();
+        boolean[] result = new boolean[1];
+        MemorySessionImpl[] scopes = new MemorySessionImpl[iteration];
+        for (int i = 0; i < iteration; i++) {
+            scopes[i] = MemorySessionImpl.toMemorySession(Arena.ofShared());
+        }
+
+        // These two threads proceed the scopes array in a lock-step manner, the first thread wait
+        // for the second thread on the lock variable, while the second thread wait for the first
+        // thread on the closing of the current scope
+
+        // This thread tries to close the scopes
+        Thread t1 = new Thread(() -> {
+            for (int i = 0; i < iteration;) {
+                MemorySessionImpl scope = scopes[i];
+                while (true) {
+                    try {
+                        scope.close();
+                        // Continue to the next iteration after a successful close
+                        break;
+                    } catch (IllegalStateException e) {
+                        // Wait for the release and try again
+                    }
+                }
+                // Wait for the other thread to complete its iteration
+                int prev = i;
+                while (prev == i) {
+                    i = lock.get();
+                    Thread.onSpinWait();
+                }
+            }
+        });
+
+        // This thread tries to acquire the scopes, then check if it is alive after an acquire failure
+        Thread t2 = new Thread(() -> {
+            for (int i = 0; i < iteration;) {
+                MemorySessionImpl scope = scopes[i];
+                while (true) {
+                    try {
+                        scope.acquire0();
+                    } catch (IllegalStateException e) {
+                        // The scope has been closed, proceed to the next iteration
+                        if (scope.isAlive()) {
+                            result[0] = true;
+                        }
+                        break;
+                    }
+                    // Release and try again
+                    scope.release0();
+                }
+                // Proceed to the next iteration
+                i = lock.getAndAdd(1) + 1;
+            }
+        });
+
+        t1.start();
+        t2.start();
+        t1.join();
+        t2.join();
+        assertFalse(result[0]);
+    }
+
     private void waitSomeTime() {
         try {
             Thread.sleep(10);
diff --git a/test/jdk/java/foreign/security.policy b/test/jdk/java/foreign/security.policy
deleted file mode 100644
index 60a1ffafde4..00000000000
--- a/test/jdk/java/foreign/security.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant codeBase "file:${test.classes}/*" {
-    // Permissions needed to run the test
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "NativeTestHelper.DEFAULT_RANDOM.seed", "read";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.foreign";
-};
-
diff --git a/test/jdk/java/io/Console/SecurityManagerTest.java b/test/jdk/java/io/Console/SecurityManagerTest.java
deleted file mode 100644
index 5eed29a7669..00000000000
--- a/test/jdk/java/io/Console/SecurityManagerTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8295803
- * @summary Tests System.console() works with the security manager
- * @run main/othervm/java.security.policy=test.policy -Djava.security.manager -Djdk.console=jdk.internal.le SecurityManagerTest
- */
-public class SecurityManagerTest {
-    public static void main(String... args) {
-        System.console();
-        // consider it successful if ServiceConfigurationError was not thrown here
-    }
-}
diff --git a/test/jdk/java/io/Console/test.policy b/test/jdk/java/io/Console/test.policy
deleted file mode 100644
index 61fda0ca63a..00000000000
--- a/test/jdk/java/io/Console/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-};
diff --git a/test/jdk/java/io/File/CheckPermission.java b/test/jdk/java/io/File/CheckPermission.java
deleted file mode 100644
index b1976c84b46..00000000000
--- a/test/jdk/java/io/File/CheckPermission.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8017212
- * @summary Examine methods in File.java that access the file system do the
- *          right permission check when a security manager exists.
- * @run main/othervm -Djava.security.manager=allow CheckPermission
- * @author Dan Xu
- */
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.security.Permission;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class CheckPermission {
-
-    private static final String CHECK_PERMISSION_TEST = "CheckPermissionTest";
-
-    public enum FileOperation {
-        READ, WRITE, DELETE, EXEC
-    }
-
-    static class Checks {
-        private List<Permission> permissionsChecked = new ArrayList<>();
-        private Set<String> propertiesChecked = new HashSet<>();
-
-        private Map<FileOperation, List<String>> fileOperationChecked =
-            new EnumMap<>(FileOperation.class);
-
-        List<Permission> permissionsChecked() {
-            return permissionsChecked;
-        }
-
-        Set<String> propertiesChecked() {
-            return propertiesChecked;
-        }
-
-        List<String> fileOperationChecked(FileOperation op) {
-            return fileOperationChecked.get(op);
-        }
-
-        void addFileOperation(FileOperation op, String file) {
-            List<String> opList = fileOperationChecked.get(op);
-            if (opList == null) {
-                opList = new ArrayList<>();
-                fileOperationChecked.put(op, opList);
-            }
-            opList.add(file);
-        }
-    }
-
-    static ThreadLocal<Checks> myChecks = new ThreadLocal<>();
-
-    static void prepare() {
-        myChecks.set(new Checks());
-    }
-
-    static class LoggingSecurityManager extends SecurityManager {
-        static void install() {
-            System.setSecurityManager(new LoggingSecurityManager());
-        }
-
-        private void checkFileOperation(FileOperation op, String file) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.addFileOperation(op, file);
-        }
-
-        @Override
-        public void checkRead(String file) {
-            checkFileOperation(FileOperation.READ, file);
-        }
-
-        @Override
-        public void checkWrite(String file) {
-            checkFileOperation(FileOperation.WRITE, file);
-        }
-
-        @Override
-        public void checkDelete(String file) {
-            checkFileOperation(FileOperation.DELETE, file);
-        }
-
-        @Override
-        public void checkExec(String file) {
-            checkFileOperation(FileOperation.EXEC, file);
-        }
-
-        @Override
-        public void checkPermission(Permission perm) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.permissionsChecked().add(perm);
-        }
-
-        @Override
-        public void checkPropertyAccess(String key) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.propertiesChecked().add(key);
-        }
-    }
-
-    static void assertCheckPermission(Class<? extends Permission> type,
-            String name)
-    {
-        for (Permission perm : myChecks.get().permissionsChecked()) {
-            if (type.isInstance(perm) && perm.getName().equals(name))
-                return;
-        }
-        throw new RuntimeException(type.getName() + "(\"" + name
-            + "\") not checked");
-    }
-
-    static void assertCheckPropertyAccess(String key) {
-        if (!myChecks.get().propertiesChecked().contains(key))
-            throw new RuntimeException("Property " + key + " not checked");
-    }
-
-    static void assertChecked(File file, List<String> list) {
-        if (list != null && !list.isEmpty()) {
-            for (String path : list) {
-                if (path.equals(file.getPath()))
-                    return;
-            }
-        }
-        throw new RuntimeException("Access not checked");
-    }
-
-    static void assertNotChecked(File file, List<String> list) {
-        if (list != null && !list.isEmpty()) {
-            for (String path : list) {
-                if (path.equals(file.getPath()))
-                    throw new RuntimeException("Access checked");
-            }
-        }
-    }
-
-    static void assertCheckOperation(File file, Set<FileOperation> ops) {
-        for (FileOperation op : ops)
-            assertChecked(file, myChecks.get().fileOperationChecked(op));
-    }
-
-    static void assertNotCheckOperation(File file, Set<FileOperation> ops) {
-        for (FileOperation op : ops)
-            assertNotChecked(file, myChecks.get().fileOperationChecked(op));
-    }
-
-    static void assertOnlyCheckOperation(File file,
-            EnumSet<FileOperation> ops)
-    {
-        assertCheckOperation(file, ops);
-        assertNotCheckOperation(file, EnumSet.complementOf(ops));
-    }
-
-    static File testFile, another;
-
-    static void setup() {
-        testFile = new File(CHECK_PERMISSION_TEST + System.currentTimeMillis());
-        if (testFile.exists()) {
-            testFile.delete();
-        }
-
-        another = new File(CHECK_PERMISSION_TEST + "Another"
-                           + System.currentTimeMillis());
-        if (another.exists()) {
-            another.delete();
-        }
-
-        LoggingSecurityManager.install();
-    }
-
-    public static void main(String[] args) throws IOException {
-        setup();
-
-        prepare();
-        testFile.canRead();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.canWrite();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.exists();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.isDirectory();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.isFile();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.isHidden();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.lastModified();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.length();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.createNewFile();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.list();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.list(new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                return false;
-            }
-        });
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.listFiles();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.listFiles(new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                return false;
-            }
-        });
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.listFiles(new FileFilter() {
-            @Override
-            public boolean accept(File file) {
-                return false;
-            }
-        });
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-
-        prepare();
-        testFile.mkdir();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        if (testFile.exists()) {
-            prepare();
-            testFile.mkdirs();
-            assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-        }
-
-        if (!another.exists()) {
-            prepare();
-            another.mkdirs();
-            assertOnlyCheckOperation(another,
-                    EnumSet.of(FileOperation.READ, FileOperation.WRITE));
-        }
-
-        prepare();
-        another.delete();
-        assertOnlyCheckOperation(another, EnumSet.of(FileOperation.DELETE));
-
-        prepare();
-        boolean renRst = testFile.renameTo(another);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-        assertOnlyCheckOperation(another, EnumSet.of(FileOperation.WRITE));
-
-        if (renRst) {
-            if (testFile.exists())
-                throw new RuntimeException(testFile + " is already renamed to "
-                    + another);
-            testFile = another;
-        }
-
-        prepare();
-        testFile.setLastModified(0);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setReadOnly();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setWritable(true, true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setWritable(true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setReadable(true, true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setReadable(true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setExecutable(true, true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.setExecutable(true);
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
-
-        prepare();
-        testFile.canExecute();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.EXEC));
-
-        prepare();
-        testFile.getTotalSpace();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-        assertCheckPermission(RuntimePermission.class,
-                "getFileSystemAttributes");
-
-        prepare();
-        testFile.getFreeSpace();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-        assertCheckPermission(RuntimePermission.class,
-                "getFileSystemAttributes");
-
-        prepare();
-        testFile.getUsableSpace();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
-        assertCheckPermission(RuntimePermission.class,
-                "getFileSystemAttributes");
-
-        prepare();
-        File tmpFile = File.createTempFile(CHECK_PERMISSION_TEST, null, new File("."));
-        assertOnlyCheckOperation(tmpFile, EnumSet.of(FileOperation.WRITE));
-        tmpFile.delete();
-        assertCheckOperation(tmpFile, EnumSet.of(FileOperation.DELETE));
-
-        prepare();
-        tmpFile = File.createTempFile(CHECK_PERMISSION_TEST, null, new File("."));
-        assertOnlyCheckOperation(tmpFile, EnumSet.of(FileOperation.WRITE));
-        tmpFile.delete();
-        assertCheckOperation(tmpFile, EnumSet.of(FileOperation.DELETE));
-
-        prepare();
-        testFile.deleteOnExit();
-        assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.DELETE));
-    }
-}
diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
index 79fd10d4533..d76000dbef5 100644
--- a/test/jdk/java/io/File/GetXSpace.java
+++ b/test/jdk/java/io/File/GetXSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @summary Basic functionality of File.get-X-Space methods.
  * @library .. /test/lib
  * @build jdk.test.lib.Platform
- * @run main/othervm/native -Djava.security.manager=allow GetXSpace
+ * @run main/othervm/native GetXSpace
  */
 
 import java.io.BufferedReader;
@@ -40,7 +40,6 @@
 import java.nio.file.FileStore;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
-import java.security.Permission;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50,15 +49,11 @@
 import static java.lang.System.err;
 import static java.lang.System.out;
 
-@SuppressWarnings("removal")
 public class GetXSpace {
     static {
         System.loadLibrary("GetXSpace");
     }
 
-    private static SecurityManager [] sma = { null, new Allow(), new DenyFSA(),
-                                              new DenyRead() };
-
     private static int fail = 0;
     private static int pass = 0;
     private static Throwable first;
@@ -164,36 +159,6 @@ private static ArrayList<String> paths() throws IOException {
         return al;
     }
 
-    private static void tryCatch(Space s) {
-        out.format("%s:%n", s.name());
-        File f = new File(s.name());
-        SecurityManager sm = System.getSecurityManager();
-        if (sm instanceof Deny) {
-            String fmt = "  %14s: \"%s\" thrown as expected%n";
-            try {
-                f.getTotalSpace();
-                fail(s.name(), SecurityException.class);
-            } catch (SecurityException x) {
-                out.format(fmt, "getTotalSpace", x);
-                pass();
-            }
-            try {
-                f.getFreeSpace();
-                fail(s.name(), SecurityException.class);
-            } catch (SecurityException x) {
-                out.format(fmt, "getFreeSpace", x);
-                pass();
-            }
-            try {
-                f.getUsableSpace();
-                fail(s.name(), SecurityException.class);
-            } catch (SecurityException x) {
-                out.format(fmt, "getUsableSpace", x);
-                pass();
-            }
-        }
-    }
-
     private static void compare(Space s) {
         File f = new File(s.name());
         long ts = f.getTotalSpace();
@@ -341,52 +306,6 @@ private static void compareZeroExist() {
         }
     }
 
-    private static class Allow extends SecurityManager {
-        public void checkRead(String file) {}
-        public void checkPermission(Permission p) {}
-        public void checkPermission(Permission p, Object context) {}
-    }
-
-    private static class Deny extends SecurityManager {
-        public void checkPermission(Permission p) {
-            if (p.implies(new RuntimePermission("setSecurityManager"))
-                || p.implies(new RuntimePermission("getProtectionDomain")))
-                return;
-            super.checkPermission(p);
-        }
-
-        public void checkPermission(Permission p, Object context) {
-            if (p.implies(new RuntimePermission("setSecurityManager"))
-                || p.implies(new RuntimePermission("getProtectionDomain")))
-                return;
-            super.checkPermission(p, context);
-        }
-    }
-
-    private static class DenyFSA extends Deny {
-        private String err = "sorry - getFileSystemAttributes";
-
-        public void checkPermission(Permission p) {
-            if (p.implies(new RuntimePermission("getFileSystemAttributes")))
-                throw new SecurityException(err);
-            super.checkPermission(p);
-        }
-
-        public void checkPermission(Permission p, Object context) {
-            if (p.implies(new RuntimePermission("getFileSystemAttributes")))
-                throw new SecurityException(err);
-            super.checkPermission(p, context);
-        }
-    }
-
-    private static class DenyRead extends Deny {
-        private String err = "sorry - checkRead()";
-
-        public void checkRead(String file) {
-            throw new SecurityException(err);
-        }
-    }
-
     private static int testFile(Path dir) {
         String dirName = dir.toString();
         out.format("--- Testing %s%n", dirName);
@@ -418,29 +337,13 @@ private static int testVolumes() {
         if (l.size() == 0)
             throw new RuntimeException("no partitions?");
 
-        for (int i = 0; i < sma.length; i++) {
-            System.setSecurityManager(sma[i]);
-            SecurityManager sm = System.getSecurityManager();
-            if (sma[i] != null && sm == null)
-                throw new RuntimeException("Test configuration error "
-                                           + " - can't set security manager");
-
-            out.format("%nSecurityManager = %s%n" ,
-                       (sm == null ? "null" : sm.getClass().getName()));
-            for (var p : l) {
-                Space s = new Space(p);
-                if (sm instanceof Deny) {
-                    tryCatch(s);
-                } else {
-                    compare(s);
-                    compareZeroNonExist();
-                    compareZeroExist();
-                }
-            }
+        for (var p : l) {
+            Space s = new Space(p);
+            compare(s);
+            compareZeroNonExist();
+            compareZeroExist();
         }
 
-        System.setSecurityManager(null);
-
         if (fail != 0) {
             err.format("%d tests: %d failure(s); first: %s%n",
                        fail + pass, fail, first);
diff --git a/test/jdk/java/io/File/createTempFile/SecurityTest.java b/test/jdk/java/io/File/createTempFile/SecurityTest.java
deleted file mode 100644
index f3985da88a9..00000000000
--- a/test/jdk/java/io/File/createTempFile/SecurityTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4138064
- * @build SecurityTest
- * @run main/othervm/policy=java.policy SecurityTest
- */
-
-import java.io.File;
-
-public class SecurityTest {
-
-    public static void main(String[] args) throws Exception {
-        try {
-            File f = File.createTempFile("foo", null);
-        } catch (java.security.AccessControlException x) {
-            throw x;
-        } catch (SecurityException x) {
-            if (x.getMessage().equals("Unable to create temporary file")) {
-                return;
-            }
-            throw x;
-        }
-        throw new Exception("SecurityException not thrown");
-    }
-}
diff --git a/test/jdk/java/io/File/createTempFile/java.policy b/test/jdk/java/io/File/createTempFile/java.policy
deleted file mode 100644
index e89913b9f24..00000000000
--- a/test/jdk/java/io/File/createTempFile/java.policy
+++ /dev/null
@@ -1,2 +0,0 @@
-grant {
-};
diff --git a/test/jdk/java/io/FilePermission/MergeName.java b/test/jdk/java/io/FilePermission/MergeName.java
deleted file mode 100644
index 715b9851209..00000000000
--- a/test/jdk/java/io/FilePermission/MergeName.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.process.ProcessTools;
-
-import java.io.File;
-import java.io.FilePermission;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-/**
- * @test
- * @bug 8170364
- * @summary FilePermission path modified during merge
- * @library /test/lib
- * @build jdk.test.lib.Utils
- *        jdk.test.lib.Asserts
- *        jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.Platform
- *        jdk.test.lib.process.*
- * @run main MergeName
- */
-
-public class MergeName {
-
-    public static final String[] ALL_ACTIONS
-            = {"read", "write", "execute", "delete"};
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            test("p1", "read", "write", "delete", "execute");
-            test("p2", "read,write", "delete,execute");
-            test("p3", "read,write,delete", "execute");
-            test("p4", "read,write,delete,execute");
-        } else {
-            SecurityManager sm = System.getSecurityManager();
-            for (String arg : args) {
-                // Use bits to create powerset of ALL_ACTIONS
-                IntStream.range(1, 16)
-                        .mapToObj(n -> IntStream.range(0, 4)
-                                .filter(x -> (n & (1 << x)) != 0)
-                                .mapToObj(x -> ALL_ACTIONS[x])
-                                .collect(Collectors.joining(",")))
-                        .forEach(a -> sm.checkPermission(
-                                new FilePermission(arg, a)));
-            }
-        }
-    }
-
-    private static void test(String file, String... actions) throws Exception {
-        List<String> content = new ArrayList<>();
-        content.add("grant {");
-        for (String action : actions) {
-            content.add("   permission java.io.FilePermission " +
-                    "\"x\", \"" +action + "\";");
-        }
-        content.add("};");
-        Files.write(Paths.get(file), content);
-        ProcessTools.executeTestJava("-Djava.security.manager",
-                "-Djava.security.policy=" + file,
-                "MergeName",
-                "x",
-                new File(System.getProperty("user.dir"), "x").getPath())
-            .shouldHaveExitValue(0);
-    }
-}
diff --git a/test/jdk/java/io/FilePermission/ReadFileOnPath.java b/test/jdk/java/io/FilePermission/ReadFileOnPath.java
deleted file mode 100644
index 06e2c6c435a..00000000000
--- a/test/jdk/java/io/FilePermission/ReadFileOnPath.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8164705
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.compiler
- * @build jdk.test.lib.compiler.CompilerUtils
- *        jdk.test.lib.Utils
- *        jdk.test.lib.Asserts
- *        jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.Platform
- *        jdk.test.lib.process.*
- *        jdk.test.lib.util.JarUtils
- * @run main ReadFileOnPath
- * @summary Still able to read file on the same path
- */
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.compiler.CompilerUtils;
-import jdk.test.lib.util.JarUtils;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class ReadFileOnPath {
-
-    private static final Path SRC_DIR    = Paths.get(System.getProperty("test.src"));
-    private static final Path HERE_DIR   = Paths.get(".");
-    private static final Path MODS_DIR   = Paths.get("modules");
-
-    public static void main(String args[]) throws Exception {
-        CompilerUtils.compile(SRC_DIR.resolve("m"), MODS_DIR.resolve("m"));
-        Files.write(MODS_DIR.resolve("m/base"), "base".getBytes());
-        Files.write(MODS_DIR.resolve("m/p/child"), "child".getBytes());
-        JarUtils.createJarFile(HERE_DIR.resolve("old.jar"),
-                MODS_DIR.resolve("m"),
-                "base", "p/App.class", "p/child");
-        JarUtils.createJarFile(HERE_DIR.resolve("new.jar"),
-                MODS_DIR.resolve("m"),
-                "module-info.class", "base", "p/App.class", "p/child");
-
-        // exploded module
-        test("--module-path", "modules", "-m", "m/p.App", "SS++++0");
-
-        // module in jar
-        test("--module-path", "new.jar", "-m", "m/p.App", "SSSS++0");
-
-        // exploded classpath
-        test("-cp", "modules/m", "p.App", "SS+++++");
-
-        // classpath in jar
-        test("-cp", "old.jar", "p.App", "SSSS++0");
-    }
-
-    static void test(String... args) throws Exception {
-        List<String> cmds = new ArrayList<>();
-        cmds.add("-Djava.security.manager");
-        cmds.addAll(Arrays.asList(args));
-        cmds.addAll(List.of(
-                "x", "modules/m", "modules/m/base", "modules/m/p/child",
-                "-", "child", "/base", "../base"));
-        ProcessTools.executeTestJava(cmds.toArray(new String[cmds.size()]))
-                .shouldHaveExitValue(0);
-    }
-}
diff --git a/test/jdk/java/io/FilePermission/m/module-info.java b/test/jdk/java/io/FilePermission/m/module-info.java
deleted file mode 100644
index f41a7e878b9..00000000000
--- a/test/jdk/java/io/FilePermission/m/module-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-module m {
-    exports p;
-}
diff --git a/test/jdk/java/io/FilePermission/m/p/App.java b/test/jdk/java/io/FilePermission/m/p/App.java
deleted file mode 100644
index 3ac96ecc24f..00000000000
--- a/test/jdk/java/io/FilePermission/m/p/App.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package p;
-import java.io.InputStream;
-import java.io.FileInputStream;
-public class App {
-    public static void main(String[] args) throws Exception {
-        boolean f = true;
-        StringBuilder sb = new StringBuilder();
-        String expected = null;
-        for (String s: args) {
-            if (expected == null) {
-                expected = s;
-            } else if (s.equals("-")) {
-                f = false;
-            } else if (f) {
-                try (InputStream is = new FileInputStream(s)) {
-                    is.readAllBytes();
-                    sb.append('+');
-                } catch (SecurityException se) {
-                    System.out.println(se);
-                    sb.append('S');
-                } catch (Exception e) {
-                    System.out.println(e);
-                    sb.append('-');
-                }
-            } else {
-                try (InputStream is = App.class.getResourceAsStream(s)) {
-                    is.readAllBytes();
-                    sb.append('+');
-                } catch (NullPointerException npe) {
-                    System.out.println(npe);
-                    sb.append('0');
-                } catch (Exception e) {
-                    System.out.println(e);
-                    sb.append('-');
-                }
-            }
-        }
-        if (!sb.toString().equals(expected)) {
-            throw new Exception("Expected " + expected + ", actually " + sb);
-        } else {
-            System.out.println("OK");
-        }
-    }
-}
diff --git a/test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java b/test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java
index 093ef1c98c9..29c333c4551 100644
--- a/test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java
+++ b/test/jdk/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,9 @@
 
 /* @test
  * @bug 4311940
- * @summary Verify that unauthorized ObjectOutputStream and ObjectInputStream
- *          cannot be constructed if they override security-sensitive non-final
- *          methods.
+ * @summary Verify that ObjectOutputStream and ObjectInputStream can be constructed
  * @build AuditStreamSubclass
- * @run main/othervm -Djava.security.manager=allow AuditStreamSubclass
+ * @run main AuditStreamSubclass
  */
 import java.io.*;
 
@@ -39,22 +37,6 @@ class GoodOOS2 extends GoodOOS1 {
     GoodOOS2(OutputStream out) throws IOException { super(out); }
 }
 
-class BadOOS1 extends ObjectOutputStream {
-    BadOOS1(OutputStream out) throws IOException { super(out); }
-    public PutField putFields() throws IOException { return null; }
-}
-
-class BadOOS2 extends ObjectOutputStream {
-    BadOOS2(OutputStream out) throws IOException { super(out); }
-    public void writeUnshared(Object obj) throws IOException {}
-}
-
-class BadOOS3 extends GoodOOS1 {
-    BadOOS3(OutputStream out) throws IOException { super(out); }
-    public void writeUnshared(Object obj) throws IOException {}
-}
-
-
 class GoodOIS1 extends ObjectInputStream {
     GoodOIS1(InputStream in) throws IOException { super(in); }
 }
@@ -63,32 +45,9 @@ class GoodOIS2 extends GoodOIS1 {
     GoodOIS2(InputStream in) throws IOException { super(in); }
 }
 
-class BadOIS1 extends ObjectInputStream {
-    BadOIS1(InputStream in) throws IOException { super(in); }
-    public GetField readFields() throws IOException, ClassNotFoundException {
-        return null;
-    }
-}
-
-class BadOIS2 extends ObjectInputStream {
-    BadOIS2(InputStream in) throws IOException { super(in); }
-    public Object readUnshared() throws IOException, ClassNotFoundException {
-        return null;
-    }
-}
-
-class BadOIS3 extends GoodOIS1 {
-    BadOIS3(InputStream in) throws IOException { super(in); }
-    public Object readUnshared() throws IOException, ClassNotFoundException {
-        return null;
-    }
-}
-
 public class AuditStreamSubclass {
     public static void main(String[] args) throws Exception {
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new SecurityManager());
-        }
+
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         ObjectOutputStream oout = new ObjectOutputStream(bout);
         oout.flush();
@@ -98,41 +57,5 @@ public static void main(String[] args) throws Exception {
         new GoodOOS2(bout);
         new GoodOIS1(new ByteArrayInputStream(buf));
         new GoodOIS2(new ByteArrayInputStream(buf));
-
-        try {
-            new BadOOS1(bout);
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
-
-        try {
-            new BadOOS2(bout);
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
-
-        try {
-            new BadOOS3(bout);
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
-
-        try {
-            new BadOIS1(new ByteArrayInputStream(buf));
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
-
-        try {
-            new BadOIS2(new ByteArrayInputStream(buf));
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
-
-        try {
-            new BadOIS3(new ByteArrayInputStream(buf));
-            throw new Error();
-        } catch (SecurityException ex) {
-        }
     }
 }
diff --git a/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java b/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
index 153d0a6e995..0f72b9f8f67 100644
--- a/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
+++ b/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Checks that the appropriate default value is given to the canonical ctr
  * @run testng AbsentStreamValuesTest
- * @run testng/othervm/java.security.policy=empty_security.policy AbsentStreamValuesTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/BasicRecordSer.java b/test/jdk/java/io/Serializable/records/BasicRecordSer.java
index ee50f630351..94a79e85b38 100644
--- a/test/jdk/java/io/Serializable/records/BasicRecordSer.java
+++ b/test/jdk/java/io/Serializable/records/BasicRecordSer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic test that serializes and deserializes a number of records
  * @run testng BasicRecordSer
- * @run testng/othervm/java.security.policy=empty_security.policy BasicRecordSer
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java b/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
index c9f2be0e18f..5057fcc7cbb 100644
--- a/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
+++ b/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Ensures that the serialization implementation can *always* access
  *          the record constructor
  * @run testng ConstructorAccessTest
- * @run testng/othervm/java.security.policy=empty_security.policy ConstructorAccessTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java b/test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java
deleted file mode 100644
index 6b0109230b0..00000000000
--- a/test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8246774
- * @summary Verifies that privileged operations performed in the record
- *          constructor throw, when run without the required permissions
- * @run testng/othervm/java.security.policy=empty_security.policy ConstructorPermissionTest
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.net.Socket;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.AccessControlException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static java.lang.System.out;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
-
-/**
- * Ensures that the appropriate exception, invalid object exception, with a
- * suitable cause, is thrown when the record constructor performs a privileged
- * operation without permission.
- */
-public class ConstructorPermissionTest {
-
-    /** "big switch" that can be used to allow/disallow record construction
-     * set to true after the data provider has constructed all record objects */
-    private static volatile boolean firstDataSetCreated;
-
-    record R1 () implements Serializable {
-        public R1 {
-            if (firstDataSetCreated) {
-                try { Files.list(Path.of(".")); }
-                catch (IOException unexpected) { throw new AssertionError(unexpected); }
-            }
-        }
-    }
-
-    record R2 (int x) implements Serializable {
-        public R2 {
-            if (firstDataSetCreated) {
-                try { new Socket("localhost", 8080); }
-                catch (IOException unexpected) { throw new AssertionError(unexpected); }
-            }
-        }
-    }
-
-    record R3 (String... args) implements Serializable {
-        public R3 {
-            if (firstDataSetCreated)
-                ProcessHandle.current();
-        }
-    }
-
-    static final Class<InvalidObjectException> IOE = InvalidObjectException.class;
-
-    @DataProvider(name = "exceptionInstances")
-    public Object[][] exceptionInstances() {
-        var objs = new Object[][] {
-            new Object[] { new R1(),     AccessControlException.class, "FilePermission"   },
-            new Object[] { new R2(1),    AccessControlException.class, "SocketPermission" },
-            new Object[] { new R3("s"),  AccessControlException.class, "manageProcess"    },
-        };
-        firstDataSetCreated = true;
-        return objs;
-    }
-
-    @Test(dataProvider = "exceptionInstances")
-    public void testExceptions(Object objectToSerialize,
-                               Class<? extends Throwable> expectedExType,
-                               String expectedExMessage)
-        throws Exception
-    {
-        out.println("\n---");
-        out.println("serializing: " + objectToSerialize);
-        byte[] bytes = serialize(objectToSerialize);
-        InvalidObjectException ioe = expectThrows(IOE, () -> deserialize(bytes));
-        out.println("caught expected IOE: " + ioe);
-        Throwable t = ioe.getCause();
-        assertTrue(t.getClass().equals(expectedExType),
-                   "Expected:" + expectedExType + ", got:" + t);
-        out.println("expected cause " + expectedExType +" : " + t);
-        String msg = t.getMessage();
-        assertTrue(msg.contains(expectedExMessage),
-                   "Expected message to contain [" + expectedExMessage + "], in " + msg);
-    }
-
-    // TODO: add positive tests with permissions granted.
-
-    // --- infra
-
-    static <T> byte[] serialize(T obj) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(obj);
-        oos.close();
-        return baos.toByteArray();
-    }
-
-    @SuppressWarnings("unchecked")
-    static <T> T deserialize(byte[] streamBytes)
-        throws IOException, ClassNotFoundException
-    {
-        ByteArrayInputStream bais = new ByteArrayInputStream(streamBytes);
-        ObjectInputStream ois  = new ObjectInputStream(bais);
-        return (T) ois.readObject();
-    }
-}
diff --git a/test/jdk/java/io/Serializable/records/CycleTest.java b/test/jdk/java/io/Serializable/records/CycleTest.java
index 9df703c3bc1..53d1247e808 100644
--- a/test/jdk/java/io/Serializable/records/CycleTest.java
+++ b/test/jdk/java/io/Serializable/records/CycleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Ensures basic behavior of cycles from record components
  * @run testng CycleTest
- * @run testng/othervm/java.security.policy=empty_security.policy CycleTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java b/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
index d4101f9894b..02175c53bb8 100644
--- a/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Checks that the appropriate value is given to the canonical ctr
  * @library /test/lib
  * @run testng DifferentStreamFieldsTest
- * @run testng/othervm/java.security.policy=empty_security.policy DifferentStreamFieldsTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/ReadResolveTest.java b/test/jdk/java/io/Serializable/records/ReadResolveTest.java
index 725f2cb49ea..04de34781f9 100644
--- a/test/jdk/java/io/Serializable/records/ReadResolveTest.java
+++ b/test/jdk/java/io/Serializable/records/ReadResolveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic tests for readResolve
  * @run testng ReadResolveTest
- * @run testng/othervm/java.security.policy=empty_security.policy ReadResolveTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -157,4 +156,3 @@ static <T> T serializeDeserialize(T obj)
         return deserialize(serialize(obj));
     }
 }
-
diff --git a/test/jdk/java/io/Serializable/records/RecordClassTest.java b/test/jdk/java/io/Serializable/records/RecordClassTest.java
index 6506f9f85e4..401512056e6 100644
--- a/test/jdk/java/io/Serializable/records/RecordClassTest.java
+++ b/test/jdk/java/io/Serializable/records/RecordClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic tests for serializing and deserializing record classes
  * @run testng RecordClassTest
- * @run testng/othervm/java.security.policy=empty_security.policy RecordClassTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
index d1018c12554..abc0c63b0f2 100644
--- a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic tests for SUID in the serial stream
  * @run testng SerialVersionUIDTest
- * @run testng/othervm/java.security.policy=empty_security.policy SerialVersionUIDTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java b/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
index feb148f5d5c..8e43a11a832 100644
--- a/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
+++ b/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Tests constructor invocation exceptions are handled appropriately
  * @run testng ThrowingConstructorTest
- * @run testng/othervm/java.security.policy=empty_security.policy ThrowingConstructorTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/WriteReplaceTest.java b/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
index 8dda381e671..c64d6355dd2 100644
--- a/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
+++ b/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic tests for writeReplace
  * @run testng WriteReplaceTest
- * @run testng/othervm/java.security.policy=empty_security.policy WriteReplaceTest
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/java/io/Serializable/records/empty_security.policy b/test/jdk/java/io/Serializable/records/empty_security.policy
deleted file mode 100644
index a034ea7a3f9..00000000000
--- a/test/jdk/java/io/Serializable/records/empty_security.policy
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// This policy is used by tests not requiring permissions, to assert that the
-// JDK implementation has the correct privileged blocks.
diff --git a/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java b/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
index b70925b0304..0230eb653ce 100644
--- a/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import java.security.Security;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java b/test/jdk/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java
deleted file mode 100644
index 72be35c4e09..00000000000
--- a/test/jdk/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputFilter;
-import java.io.ObjectInputStream;
-import java.security.AccessControlException;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-/* @test
- * @build FilterWithSecurityManagerTest SerialFilterTest
- * @run testng/othervm FilterWithSecurityManagerTest
- * @run testng/othervm/policy=security.policy.without.globalFilter
- *          -Djava.security.manager=default FilterWithSecurityManagerTest
- * @run testng/othervm/policy=security.policy
- *          -Djava.security.manager=default
- *          -Djdk.serialFilter=java.lang.Integer FilterWithSecurityManagerTest
- *
- * @summary Test that setting specific filter is checked by security manager,
- *          setting process-wide filter is checked by security manager.
- */
-
-@Test
-public class FilterWithSecurityManagerTest {
-
-    byte[] bytes;
-    boolean setSecurityManager;
-    ObjectInputFilter filter;
-
-    @BeforeClass
-    @SuppressWarnings("removal")
-    public void setup() throws Exception {
-        setSecurityManager = System.getSecurityManager() != null;
-        Object toDeserialized = Long.MAX_VALUE;
-        bytes = SerialFilterTest.writeObjects(toDeserialized);
-        filter = ObjectInputFilter.Config.createFilter("java.lang.Long");
-    }
-
-    /**
-     * Test that setting process-wide filter is checked by security manager.
-     */
-    @Test
-    @SuppressWarnings("removal")
-    public void testGlobalFilter() {
-        ObjectInputFilter global = ObjectInputFilter.Config.getSerialFilter();
-
-        try  {
-            ObjectInputFilter.Config.setSerialFilter(filter);
-            assertFalse(setSecurityManager,
-                    "When SecurityManager exists, without "
-                    + "java.io.SerializablePermission(serialFilter) "
-                    + "IllegalStateException should be thrown");
-        } catch (AccessControlException ex) {
-            assertTrue(setSecurityManager);
-            assertTrue(ex.getMessage().contains("java.io.SerializablePermission"));
-            assertTrue(ex.getMessage().contains("serialFilter"));
-        } catch (IllegalStateException ise) {
-            // ISE should occur only if global filter already set
-            Assert.assertNotNull(global, "Global filter should be non-null");
-        }
-    }
-
-    /**
-     * Test that setting specific filter is checked by security manager.
-     */
-    @Test(dependsOnMethods = { "testGlobalFilter" })
-    @SuppressWarnings("removal")
-    public void testSpecificFilter() throws Exception {
-        try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-                ObjectInputStream ois = new ObjectInputStream(bais)) {
-            ois.setObjectInputFilter(filter);
-            Object o = ois.readObject();
-        } catch (AccessControlException ex) {
-            assertTrue(setSecurityManager);
-            assertTrue(ex.getMessage().contains("java.io.SerializablePermission"));
-            assertTrue(ex.getMessage().contains("serialFilter"));
-        }
-    }
-}
diff --git a/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
index 0852cf96cbb..9e38d6c499d 100644
--- a/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
 
-import java.io.SerializablePermission;
 import java.security.Security;
 import java.util.Objects;
 
@@ -46,11 +45,6 @@
  * @run testng/othervm GlobalFilterTest
  * @run testng/othervm -Djdk.serialFilter=java.**
  *          -Dexpected-jdk.serialFilter=java.** GlobalFilterTest
- * @run testng/othervm/policy=security.policy GlobalFilterTest
- * @run testng/othervm/policy=security.policy
- *        -Djava.security.properties=${test.src}/java.security-extra1
- *        -Djava.security.debug=properties GlobalFilterTest
- *
  * @summary Test Global Filters
  */
 @Test
@@ -125,14 +119,10 @@ static void globalFilter() {
     /**
      * If the Global filter is already set, it should always refuse to be
      * set again.
-     * If there is a security manager, setting the serialFilter should fail
-     * without the appropriate permission.
-     * If there is no security manager then setting it should work.
      */
     @Test()
     @SuppressWarnings("removal")
     static void setGlobalFilter() {
-        SecurityManager sm = System.getSecurityManager();
         ObjectInputFilter filter = new SerialFilterTest.Validator();
         ObjectInputFilter global = ObjectInputFilter.Config.getSerialFilter();
         if (global != null) {
@@ -141,49 +131,19 @@ static void setGlobalFilter() {
                 ObjectInputFilter.Config.setSerialFilter(filter);
                 Assert.fail("set only once process-wide filter");
             } catch (IllegalStateException ise) {
-                // Normal, once set can never be re-set even if no security manager
-            } catch (SecurityException se) {
-                if (sm == null) {
-                    Assert.fail("wrong exception when security manager is not set", se);
-                }
+                // Normal, once set can never be re-set
             }
         } else {
-            if (sm == null) {
-                // no security manager
-                try {
-                    ObjectInputFilter.Config.setSerialFilter(filter);
-                    // Note once set, it can not be reset; so other tests
-                    System.out.printf("Global Filter set to Validator%n");
-                } catch (SecurityException se) {
-                    Assert.fail("setGlobalFilter should not get SecurityException", se);
-                }
-                try {
-                    // Try to set it again, expecting it to throw
-                    ObjectInputFilter.Config.setSerialFilter(filter);
-                    Assert.fail("set only once process-wide filter");
-                } catch (IllegalStateException ise) {
-                    // Normal case
-                }
-            } else {
-                // Security manager
-                SecurityException expectSE = null;
-                try {
-                    sm.checkPermission(new SerializablePermission("serialFilter"));
-                } catch (SecurityException se1) {
-                    expectSE = se1;
-                }
-                SecurityException actualSE = null;
-                try {
-                    ObjectInputFilter.Config.setSerialFilter(filter);
-                } catch (SecurityException se2) {
-                    actualSE = se2;
-                }
-                if (expectSE == null | actualSE == null) {
-                    Assert.assertEquals(expectSE, actualSE, "SecurityException");
-                } else {
-                    Assert.assertEquals(expectSE.getClass(), actualSE.getClass(),
-                            "SecurityException class");
-                }
+            ObjectInputFilter.Config.setSerialFilter(filter);
+            // Note once set, it can not be reset; so other tests
+            System.out.printf("Global Filter set to Validator%n");
+
+            try {
+                // Try to set it again, expecting it to throw
+                ObjectInputFilter.Config.setSerialFilter(filter);
+                Assert.fail("set only once process-wide filter");
+            } catch (IllegalStateException ise) {
+                // Normal case
             }
         }
     }
diff --git a/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java b/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
index 916cd9ab058..8e24f27f598 100644
--- a/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
index a64c185921f..6842eabe9b0 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,6 @@
 import java.io.ObjectOutputStream;
 import java.io.Serial;
 import java.io.Serializable;
-import java.io.SerializablePermission;
-import java.security.AccessControlException;
-import java.security.Permission;
 import java.util.function.BinaryOperator;
 
 /* @test
@@ -48,11 +45,6 @@
  *                     -Djava.util.logging.config.file=${test.src}/logging.properties SerialFilterFactoryTest
  * @run testng/othervm -Djdk.serialFilterFactory=SerialFilterFactoryTest$NotMyFilterFactory
  *                     -Djava.util.logging.config.file=${test.src}/logging.properties SerialFilterFactoryTest
- * @run testng/othervm/policy=security.policy
- *        -Djava.security.properties=${test.src}/java.security-extra-factory
- *        -Djava.security.debug=properties SerialFilterFactoryTest
- * @run testng/othervm/policy=security.policy SerialFilterFactoryTest
- * @run testng/othervm/policy=security.policy.without.globalFilter SerialFilterFactoryTest
  *
  * @summary Test Context-specific Deserialization Filters
  */
@@ -117,25 +109,6 @@ private static boolean isValidFilterFactory() {
         return !(ObjectInputFilter.Config.getSerialFilterFactory() instanceof NotMyFilterFactory);
     }
 
-    /**
-     * Returns true if serialFilter actions are ok, either no SM or SM has serialFilter Permission
-     */
-    @SuppressWarnings("removal")
-    private static boolean hasFilterPerm() {
-        boolean hasSerialPerm = true;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                Permission p = new SerializablePermission("serialFilter");
-                sm.checkPermission(p);
-                hasSerialPerm = true;
-            } catch (AccessControlException ace2) {
-                hasSerialPerm = false;      // SM and serialFilter not allowed
-            }
-        }
-        return hasSerialPerm;
-    }
-
     @DataProvider(name="FilterCases")
     static Object[][] filterCases() {
         if (isValidFilterFactory()) {
@@ -165,10 +138,6 @@ void testNull() {
     @Test
     @SuppressWarnings("removal")
     void testSecondSetShouldThrow() {
-        if (System.getSecurityManager() != null) {
-            // Skip test when running with SM
-            return;
-        }
         var currFF = Config.getSerialFilterFactory();
         if (currFF.getClass().getClassLoader() == null) {
             try {
@@ -206,16 +175,8 @@ void testCase(MyFilterFactory dynFilterFactory, Validator dynFilter, Validator s
         // Set the Filter Factory and System-wide filter
         ObjectInputFilter configFilter;
         MyFilterFactory factory;
-        try {
-            configFilter = setupFilter(dynFilter);
-            factory = setupFilterFactory(dynFilterFactory);
-            Assert.assertTrue(hasFilterPerm(),
-                    "setSerialFilterFactory and setFilterFactory succeeded without serialFilter permission");
-        } catch (AccessControlException ace) {
-            Assert.assertFalse(hasFilterPerm(),
-                    "setSerialFilterFactory failed even with serialFilter permission");
-            return;         // test complete
-        }
+        configFilter = setupFilter(dynFilter);
+        factory = setupFilterFactory(dynFilterFactory);
         factory.reset();
 
         InputStream is = new ByteArrayInputStream(simpleStream);
@@ -265,12 +226,9 @@ void testPropertyFilterFactory() {
     // throws IllegalStateException with the specific message
     @Test(dependsOnMethods="testCase")
     void testSetFactoryAfterDeserialization() {
-        if (hasFilterPerm()) {
-            // Only test if is allowed by SM.
-            BinaryOperator<ObjectInputFilter> factory = Config.getSerialFilterFactory();
-            IllegalStateException ise = Assert.expectThrows(IllegalStateException.class, () -> Config.setSerialFilterFactory(factory));
-            Assert.assertTrue(ise.getMessage().startsWith("Cannot replace filter factory: "));
-        }
+        BinaryOperator<ObjectInputFilter> factory = Config.getSerialFilterFactory();
+        IllegalStateException ise = Assert.expectThrows(IllegalStateException.class, () -> Config.setSerialFilterFactory(factory));
+        Assert.assertTrue(ise.getMessage().startsWith("Cannot replace filter factory: "));
     }
 
 
@@ -278,20 +236,18 @@ void testSetFactoryAfterDeserialization() {
     // a non-null filter.  And does allow a null filter to replace a null filter
     @Test
     void testDisableFailFilter() throws IOException {
-        if (hasFilterPerm()) {
-            // Only test if is allowed by SM.
-            ObjectInputFilter curr = null;
-            try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(simpleStream))) {
-                curr = ois.getObjectInputFilter();
-                // Try to set the filter to null
-                ois.setObjectInputFilter(null);
-                if (curr != null) {
-                    Assert.fail("setting filter to null after a non-null filter should throw");
-                }
-            } catch (IllegalStateException ise) {
-                if (curr == null) {
-                    Assert.fail("setting filter to null after a null filter should not throw");
-                }
+        // Only test if is allowed by SM.
+        ObjectInputFilter curr = null;
+        try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(simpleStream))) {
+            curr = ois.getObjectInputFilter();
+            // Try to set the filter to null
+            ois.setObjectInputFilter(null);
+            if (curr != null) {
+                Assert.fail("setting filter to null after a non-null filter should throw");
+            }
+        } catch (IllegalStateException ise) {
+            if (curr == null) {
+                Assert.fail("setting filter to null after a null filter should not throw");
             }
         }
     }
diff --git a/test/jdk/java/io/Serializable/serialFilter/security.policy b/test/jdk/java/io/Serializable/serialFilter/security.policy
deleted file mode 100644
index 7362da3af34..00000000000
--- a/test/jdk/java/io/Serializable/serialFilter/security.policy
+++ /dev/null
@@ -1,13 +0,0 @@
-// Individual Permissions to for GlobalFilterTest and FilterWithSecurityManager
-grant {
-        // Specific permission under test
-        permission java.io.SerializablePermission "serialFilter";
-
-        // Permissions needed to run the test
-        permission java.util.PropertyPermission "*", "read,write";
-        permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-        permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-        permission java.security.SecurityPermission "*";
-        permission java.lang.RuntimePermission "accessDeclaredMembers";
-};
-
diff --git a/test/jdk/java/io/Serializable/serialFilter/security.policy.without.globalFilter b/test/jdk/java/io/Serializable/serialFilter/security.policy.without.globalFilter
deleted file mode 100644
index 0e98d698179..00000000000
--- a/test/jdk/java/io/Serializable/serialFilter/security.policy.without.globalFilter
+++ /dev/null
@@ -1,9 +0,0 @@
-// Individual Permissions for FilterWithSecurityManagerTest
-grant {
-        // Permissions needed to run the test
-        permission java.util.PropertyPermission "*", "read";
-        permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-        permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-        permission java.lang.RuntimePermission "accessDeclaredMembers";
-};
-
diff --git a/test/jdk/java/io/Serializable/subclass/Allow.policy b/test/jdk/java/io/Serializable/subclass/Allow.policy
deleted file mode 100644
index a31cebf4926..00000000000
--- a/test/jdk/java/io/Serializable/subclass/Allow.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-grant { 
-	// "standard" properies that can be read by anyone
-	permission java.io.FilePermission "-","read,write,execute";
-	permission java.io.SerializablePermission "enableSubstitution";
-
-	// Needed to get access to private writeObjectMethod and
-        // to be able to call it.
-	permission java.lang.reflect.ReflectPermission "access";
-};
diff --git a/test/jdk/java/io/Serializable/subclass/SubclassTest.java b/test/jdk/java/io/Serializable/subclass/SubclassTest.java
index 1b604f16b28..c1e8c7d4ac3 100644
--- a/test/jdk/java/io/Serializable/subclass/SubclassTest.java
+++ b/test/jdk/java/io/Serializable/subclass/SubclassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
  * @compile XObjectInputStream.java XObjectOutputStream.java
  * @compile SubclassTest.java
  * @run main SubclassTest
- * @run main/othervm/policy=Allow.policy SubclassTest -expectSecurityException
  */
 
 import java.io.ByteArrayInputStream;
@@ -132,24 +131,9 @@ public static void main(String argv[])
     {
         boolean expectSecurityException = false;
 
-        if (argv.length > 0 &&
-            argv[0].compareTo("-expectSecurityException") == 0)
-            expectSecurityException = true;
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream(20);
         XObjectOutputStream os = null;
-        try {
-            os = new XObjectOutputStream(baos);
-            if (expectSecurityException)
-                throw new Error("Assertion failure. " +
-                                "Expected a security exception on previous line.");
-        } catch (SecurityException e) {
-            if (expectSecurityException) {
-                System.err.println("Caught expected security exception.");
-                return;
-            }
-            throw e;
-        }
+        os = new XObjectOutputStream(baos);
         os.writeObject(new A());
         os.close();
         if (B.numWriteObjectCalled != 3)
diff --git a/test/jdk/java/io/Serializable/subclassGC/SubclassGC.java b/test/jdk/java/io/Serializable/subclassGC/SubclassGC.java
index ae16712c97f..3a23f7a33a6 100644
--- a/test/jdk/java/io/Serializable/subclassGC/SubclassGC.java
+++ b/test/jdk/java/io/Serializable/subclassGC/SubclassGC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
  * @summary this test checks that replacing SoftCache class with ConcurrentMap
  *          in ObjectInputStream/ObjectOutputStream gives an opportunity to
  *          classes which are inherited from OIS and OOS and loaded through
- *          separete ClassLoaders be available for garbage collection
+ *          separate ClassLoaders be available for garbage collection
  *
  * @author Andrey Ozerov
- * @run main/othervm/policy=security.policy SubclassGC
+ * @run main/othervm SubclassGC
  */
 
 import java.io.*;
@@ -45,9 +45,6 @@ public class SubclassGC {
 
         public static final void main(String[] args) throws Exception {
                 System.err.println("\n Regression test for bug 6232010\n");
-                if (System.getSecurityManager() == null) {
-                        System.setSecurityManager(new SecurityManager());
-                }
 
                 ClassLoader systemLoader = ClassLoader.getSystemClassLoader();
                 URL testClassesURL = new File(System.getProperty("test.classes")).toURI().toURL();
diff --git a/test/jdk/java/io/Serializable/subclassGC/security.policy b/test/jdk/java/io/Serializable/subclassGC/security.policy
deleted file mode 100644
index a3ef804b37a..00000000000
--- a/test/jdk/java/io/Serializable/subclassGC/security.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-
-grant {
-	permission java.lang.RuntimePermission "createClassLoader";
-	permission java.lang.RuntimePermission "getClassLoader";
-	permission java.util.PropertyPermission "test.classes", "read";
-	permission java.io.FilePermission "<<ALL FILES>>", "read";
-};
-
diff --git a/test/jdk/java/lang/Class/forName/modules/TestDriver.java b/test/jdk/java/lang/Class/forName/modules/TestDriver.java
index de5505063a2..420b0b2a18e 100644
--- a/test/jdk/java/lang/Class/forName/modules/TestDriver.java
+++ b/test/jdk/java/lang/Class/forName/modules/TestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public class TestDriver {
     private static final Path MOD_SRC_DIR = Paths.get(TEST_SRC, "src");
     private static final Path MOD_DEST_DIR = Paths.get("mods");
 
-    private static final String[] modules = new String[] {"m1", "m2", "m3"};
+    private static final String[] modules = new String[] {"m1", "m2"};
 
     /**
      * Compiles all modules used by the test.
@@ -109,55 +109,11 @@ public void testLayer() throws Exception {
         runTest(options);
     }
 
-    @Test
-    public void testDeniedClassLoaderAccess() throws Exception {
-        String[] options = new String[] {
-                "--module-path", MOD_DEST_DIR.toString(),
-                "--add-modules", String.join(",", modules),
-                "-Djava.security.manager=allow",
-                "-m", "m3/p3.NoGetClassLoaderAccess"
-        };
-        assertTrue(executeTestJava(options)
-                        .outputTo(System.out)
-                        .errorTo(System.err)
-                        .getExitValue() == 0);
-    }
-
-    @Test
-    public void testDeniedAccess() throws Exception {
-        Path policyFile = Paths.get(TEST_SRC, "policy.denied");
-
-        String[] options = new String[] {
-                "-Djava.security.manager",
-                "-Djava.security.policy=" + policyFile.toString(),
-                "--module-path", MOD_DEST_DIR.toString(),
-                "--add-modules", String.join(",", modules),
-                "-m", "m3/p3.NoAccess"
-        };
-        assertTrue(executeTestJava(options)
-                        .outputTo(System.out)
-                        .errorTo(System.err)
-                        .getExitValue() == 0);
-    }
-
-    private String[] runWithSecurityManager(String[] options) {
-        Path policyFile = Paths.get(TEST_SRC, "policy");
-        Stream<String> opts = Stream.concat(Stream.of("-Djava.security.manager",
-                                                      "-Djava.security.policy=" + policyFile.toString()),
-                                            Arrays.stream(options));
-        return opts.toArray(String[]::new);
-    }
-
     private void runTest(String[] options) throws Exception {
         assertTrue(executeTestJava(options)
                         .outputTo(System.out)
                         .errorTo(System.err)
                         .getExitValue() == 0);
-
-        assertTrue(executeTestJava(runWithSecurityManager(options))
-                        .outputTo(System.out)
-                        .errorTo(System.err)
-                        .getExitValue() == 0);
     }
 
     private void copyDirectories(Path source, Path dest) throws IOException {
diff --git a/test/jdk/java/lang/Class/forName/modules/TestLayer.java b/test/jdk/java/lang/Class/forName/modules/TestLayer.java
index 45460d19d32..141d612bae1 100644
--- a/test/jdk/java/lang/Class/forName/modules/TestLayer.java
+++ b/test/jdk/java/lang/Class/forName/modules/TestLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,6 @@ public class TestLayer {
     private static final Set<String> modules = Set.of("m1", "m2");
 
     public static void main(String[] args) throws Exception {
-        // disable security manager until Class.forName is called.
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            System.setSecurityManager(null);
-        }
-
         ModuleFinder finder = ModuleFinder.of(MODS_DIR);
 
         Configuration parent = ModuleLayer.boot().configuration();
@@ -54,10 +48,6 @@ public static void main(String[] args) throws Exception {
         Module m1 = layer.findModule("m1").get();
         Module m2 = layer.findModule("m2").get();
 
-        if (sm != null) {
-            System.setSecurityManager(sm);
-        }
-
         // find exported and non-exported class from a named module
         findClass(m1, "p1.A");
         findClass(m1, "p1.internal.B");
diff --git a/test/jdk/java/lang/Class/forName/modules/policy b/test/jdk/java/lang/Class/forName/modules/policy
deleted file mode 100644
index a95eccaab71..00000000000
--- a/test/jdk/java/lang/Class/forName/modules/policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.lang.RuntimePermission "getBootLayer";
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.io.FilePermission "mods/-", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-};
diff --git a/test/jdk/java/lang/Class/forName/modules/policy.denied b/test/jdk/java/lang/Class/forName/modules/policy.denied
deleted file mode 100644
index 763f6152191..00000000000
--- a/test/jdk/java/lang/Class/forName/modules/policy.denied
+++ /dev/null
@@ -1,11 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.lang.RuntimePermission "getBootLayer";
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.io.FilePermission "mods1", "read";
-    permission java.io.FilePermission "mods2", "read";
-    // only grant access to p1.* classes
-    // no access to p1.internal.* and p2.* classes
-    permission java.io.FilePermission "mods1/p1/*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-};
diff --git a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java b/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java
deleted file mode 100644
index 92002a613e1..00000000000
--- a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoAccess.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p3;
-
-import java.io.FilePermission;
-import java.lang.module.Configuration;
-import java.lang.module.ModuleFinder;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.util.Set;
-
-public class NoAccess {
-    private static final Module M3 = NoAccess.class.getModule();
-    private static final Path MODS_DIR1 = Paths.get("mods1");
-    private static final Path MODS_DIR2 = Paths.get("mods2");
-    public static void main(String[] args) throws Exception {
-        // disable security manager until Class.forName is called.
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            System.setSecurityManager(null);
-        }
-
-        ModuleFinder finder = ModuleFinder.of(Paths.get("mods1"), Paths.get("mods2"));
-
-        ModuleLayer bootLayer = ModuleLayer.boot();
-        Configuration parent = bootLayer.configuration();
-
-        Configuration cf = parent.resolveAndBind(finder,
-                                                 ModuleFinder.of(),
-                                                 Set.of("m1", "m2"));
-
-        ClassLoader scl = ClassLoader.getSystemClassLoader();
-        ModuleLayer layer = bootLayer.defineModulesWithManyLoaders(cf, scl);
-
-        if (sm != null) {
-            System.setSecurityManager(sm);
-        }
-
-        Module m1 = bootLayer.findModule("m1").get();
-        Module m2 = bootLayer.findModule("m2").get();
-        Module m3 = bootLayer.findModule("m3").get();
-
-        findClass(m1, "p1.internal.B");
-        findClass(m2, "p2.C");
-        findClass(m3, "p3.internal.Foo");
-
-        // permissions granted
-        findClass(m1, "p1.A");
-        findClass(m1, "p1.internal.B");
-        findClass(m2, "p2.C");
-        findClass(m3, "p3.internal.Foo");
-
-
-        // m1 and m2 from a different layer
-        m1 = layer.findModule("m1").get();
-        m2 = layer.findModule("m2").get();
-        m3 = layer.findModule("m3").get();
-
-        findClass(m1, "p1.A");
-        findClass(m3, "p3.internal.Foo");
-
-        // no permission
-        Path path = MODS_DIR1.resolve("p1").resolve("internal").resolve("B.class");
-        findClass(m1, "p1.internal.B", new FilePermission(path.toString(), "read"));
-        path = MODS_DIR2.resolve("p2").resolve("C.class");
-        findClass(m2, "p2.C", new FilePermission(path.toString(), "read"));
-    }
-
-    static Class<?> findClass(Module module, String cn) {
-        return findClass(module, cn, null);
-    }
-
-    static Class<?> findClass(Module module, String cn, Permission perm) {
-        try {
-            Class<?> c = Class.forName(module, cn);
-            if (c == null) {
-                throw new RuntimeException(cn + " not found in " + module);
-            }
-            if (c.getModule() != module) {
-                throw new RuntimeException(c.getModule() + " != " + module);
-            }
-            return c;
-        } catch (AccessControlException e) {
-            if (e.getPermission().equals(perm))
-                return null;
-            throw e;
-        }
-    }
-}
diff --git a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java b/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java
deleted file mode 100644
index aeed218ee5d..00000000000
--- a/test/jdk/java/lang/Class/forName/modules/src/m3/p3/NoGetClassLoaderAccess.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p3;
-
-import java.security.AccessControlException;
-import java.security.Permission;
-
-/**
- * Verify RuntimePermission("getClassLoader") is needed to load
- * a class in another module
- */
-public class NoGetClassLoaderAccess {
-    private static final Module m3 = NoGetClassLoaderAccess.class.getModule();
-    private static final Permission GET_CLASSLOADER_PERMISSION = new RuntimePermission("getClassLoader");
-
-    public static void main(String[] args) throws Exception {
-        ModuleLayer boot = ModuleLayer.boot();
-
-        System.setSecurityManager(new SecurityManager());
-        Module m1 = boot.findModule("m1").get();
-        Module m2 = boot.findModule("m2").get();
-        findClass(m1, "p1.A");
-        findClass(m1, "p1.internal.B");
-        findClass(m2, "p2.C");
-        findClass(m3, "p3.internal.Foo");
-    }
-
-    static Class<?> findClass(Module module, String cn) {
-        try {
-            Class<?> c = Class.forName(module, cn);
-            if (c == null) {
-                throw new RuntimeException(cn + " not found in " + module);
-            }
-            if (c.getModule() != module) {
-                throw new RuntimeException(c.getModule() + " != " + module);
-            }
-            return c;
-        } catch (AccessControlException e) {
-            if (module != m3) {
-                if (e.getPermission().equals(GET_CLASSLOADER_PERMISSION))
-                    return null;
-            }
-            throw e;
-        }
-    }
-}
diff --git a/test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java b/test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
index f62e80dddbb..274caecdd2d 100644
--- a/test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
+++ b/test/jdk/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,56 +22,25 @@
  */
 
 import java.lang.reflect.Field;
-import java.lang.reflect.ReflectPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @test
  * @bug 8065552
  * @summary test that all fields returned by getDeclaredFields() can be
- *          set accessible if the right permission is granted; this test
- *          also verifies that Class.classLoader final private field is
- *          hidden from reflection access.
+ *          set accessible if package java.lang is open to unnamed module;
+ *          this test also verifies that Class.classLoader final private field
+ *          is hidden from reflection access.
  * @modules java.base/java.lang:open
- * @run main/othervm ClassDeclaredFieldsTest UNSECURE
- * @run main/othervm -Djava.security.manager=allow ClassDeclaredFieldsTest SECURE
+ * @run main/othervm ClassDeclaredFieldsTest
  *
  * @author danielfuchs
  */
 public class ClassDeclaredFieldsTest {
-
-    // Test with or without a security manager
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run() throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this);
-            test(this);
-        }
-    }
     /**
      * @param args the command line arguments
      */
     public static void main(String[] args) throws Exception {
         System.out.println(System.getProperty("java.version"));
-        if (args == null || args.length == 0) {
-            args = new String[] { "SECURE" };
-        } else if (args.length != 1) {
-            throw new IllegalArgumentException("Only one arg expected: "
-                    + Arrays.asList(args));
-        }
-        TestCase.valueOf(args[0]).run();
-    }
-
-    static void test(TestCase test) {
         for (Field f : Class.class.getDeclaredFields()) {
             f.setAccessible(true);
             System.out.println("Field "+f.getName()+" is now accessible.");
@@ -86,122 +55,6 @@ static void test(TestCase test) {
         } catch(NoSuchFieldException x) {
             System.out.println("Got expected exception: " + x);
         }
-        System.out.println("Passed "+test);
-    }
-
-    // A helper class to configure the security manager for the test,
-    // and bypass it when needed.
-    static class Configure {
-        static Policy policy = null;
-        static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return  new AtomicBoolean(false);
-            }
-        };
-        static void setUp(TestCase test) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    throw new InternalError("No such testcase: " + test);
-            }
-        }
-        static void doPrivileged(Runnable run) {
-            allowAll.get().set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.get().set(false);
-            }
-        }
-    }
-
-    // A Helper class to build a set of permissions.
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
+        System.out.println("Passed");
     }
-
-    // Policy for the test...
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-        public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowAll = allowAll;
-            // we don't actually need any permission to create our
-            // FileHandlers because we're passing invalid parameters
-            // which will make the creation fail...
-            permissions = new Permissions();
-            permissions.add(new RuntimePermission("accessDeclaredMembers"));
-            permissions.add(new ReflectPermission("suppressAccessChecks"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
index ede0bfcb9e1..51ce41d837b 100644
--- a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
+++ b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,6 @@
  * questions.
  */
 
-import java.io.FilePermission;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.module.ModuleDescriptor;
@@ -30,22 +29,14 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.InaccessibleObjectException;
-import java.lang.reflect.ReflectPermission;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -53,8 +44,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.PropertyPermission;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
@@ -64,12 +53,11 @@
  * @test
  * @bug 8065552 8309532
  * @summary test that all public fields returned by getDeclaredFields() can
- *          be set accessible if the right permission is granted; this test
+ *          be set accessible; this test
  *          loads all classes and get their declared fields
  *          and call setAccessible(false) followed by setAccessible(true);
  * @modules java.base/jdk.internal.module
- * @run main/othervm --add-modules=ALL-SYSTEM FieldSetAccessibleTest UNSECURE
- * @run main/othervm --add-modules=ALL-SYSTEM -Djava.security.manager=allow FieldSetAccessibleTest SECURE
+ * @run main/othervm --add-modules=ALL-SYSTEM FieldSetAccessibleTest
  *
  * @author danielfuchs
  */
@@ -149,46 +137,40 @@ static void printSummary(long secs, long millis, long nanos) {
     /**
      * @param args the command line arguments:
      *
-     *     SECURE|UNSECURE [startIndex (default=0)] [maxSize (default=Long.MAX_VALUE)]
+     *     [startIndex (default=0)] [maxSize (default=Long.MAX_VALUE)]
      *
      * @throws java.lang.Exception if the test fails
      */
     public static void main(String[] args) throws Exception {
         if (args == null || args.length == 0) {
-            args = new String[] {"SECURE", "0"};
-        } else if (args.length > 3) {
+            args = new String[] {"0"};
+        } else if (args.length > 2) {
             throw new RuntimeException("Expected at most one argument. Found "
                     + Arrays.asList(args));
         }
         try {
-            if (args.length > 1) {
-                startIndex = Long.parseLong(args[1]);
+            if (args.length > 0) {
+                startIndex = Long.parseLong(args[0]);
                 if (startIndex < 0) {
-                    throw new IllegalArgumentException("startIndex args[1]: "
+                    throw new IllegalArgumentException("startIndex args[0]: "
                             + startIndex);
                 }
             }
-            if (args.length > 2) {
-                maxSize = Long.parseLong(args[2]);
+            if (args.length > 1) {
+                maxSize = Long.parseLong(args[1]);
                 if (maxSize <= 0) {
                     maxSize = Long.MAX_VALUE;
                 }
                 maxIndex = (Long.MAX_VALUE - startIndex) < maxSize
                         ? Long.MAX_VALUE : startIndex + maxSize;
             }
-            TestCase.valueOf(args[0]).run();
+            test(listAllClassNames());
         } catch (OutOfMemoryError oome) {
             System.err.println(classCount.get());
             throw oome;
         }
     }
 
-    public static void run(TestCase test) {
-        System.out.println("Testing " + test);
-        test(listAllClassNames());
-        System.out.println("Passed " + test);
-    }
-
     static Iterable<String> listAllClassNames() {
         return new ClassNameJrtStreamBuilder();
     }
@@ -345,146 +327,4 @@ static Set<String> findDeps(String name, Map<String, Set<String>> graph) {
             return visited;
         }
     }
-
-    // Test with or without a security manager
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run() throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this);
-            FieldSetAccessibleTest.run(this);
-        }
-    }
-
-    // A helper class to configure the security manager for the test,
-    // and bypass it when needed.
-    static class Configure {
-        static Policy policy = null;
-        static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return  new AtomicBoolean(false);
-            }
-        };
-        static void setUp(TestCase test) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    throw new InternalError("No such testcase: " + test);
-            }
-        }
-        static void doPrivileged(Runnable run) {
-            allowAll.get().set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.get().set(false);
-            }
-        }
-    }
-
-    // A Helper class to build a set of permissions.
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    // Policy for the test...
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowAll = allowAll;
-
-            // Permission needed by the tested code exercised in the test
-            permissions = new Permissions();
-            permissions.add(new RuntimePermission("fileSystemProvider"));
-            permissions.add(new RuntimePermission("createClassLoader"));
-            permissions.add(new RuntimePermission("closeClassLoader"));
-            permissions.add(new RuntimePermission("getClassLoader"));
-            permissions.add(new RuntimePermission("accessDeclaredMembers"));
-            permissions.add(new RuntimePermission("accessSystemModules"));
-            permissions.add(new ReflectPermission("suppressAccessChecks"));
-            permissions.add(new PropertyPermission("*", "read"));
-            permissions.add(new FilePermission("<<ALL FILES>>", "read"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            if (permissions.implies(permission)) return true;
-            if (permission instanceof java.lang.RuntimePermission) {
-                if (permission.getName().startsWith("accessClassInPackage.")) {
-                    // add these along to the set of permission we have, when we
-                    // discover that we need them.
-                    permissions.add(permission);
-                    return true;
-                }
-            }
-            if (DEFAULT_POLICY.implies(domain, permission)) return true;
-            return false;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java b/test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java
deleted file mode 100644
index e74942bef74..00000000000
--- a/test/jdk/java/lang/Class/getEnclosingConstructor/EnclosingConstructorWithSecurityManager.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8014678
- * @run main EnclosingConstructorWithSecurityManager
- * @run main/othervm -Djava.security.manager=allow EnclosingConstructorWithSecurityManager "WithSecurityManager"
- */
-
-public class EnclosingConstructorWithSecurityManager {
-    public static void main(String[] args) {
-        if (args.length == 1) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        new Inner();
-        Inner.theInner.getEnclosingConstructor();
-    }
-
-    public static class Inner {
-        public static Class<?> theInner;
-
-        public Inner() {
-            Object o = new Object() {
-            };
-            Inner.theInner = o.getClass();
-        }
-    }
-}
diff --git a/test/jdk/java/lang/Class/getResource/Main.java b/test/jdk/java/lang/Class/getResource/Main.java
index efd50262be2..5fb4255490d 100644
--- a/test/jdk/java/lang/Class/getResource/Main.java
+++ b/test/jdk/java/lang/Class/getResource/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -228,17 +228,6 @@ public static void main(String[] args) throws IOException {
             assertTrue(false);
         } catch (NullPointerException expected) { }
 
-        // SecurityManager case
-        System.setSecurityManager(new SecurityManager());
-
-        assertNull(Main.class.getResource("/" + NAME));
-        assertNull(p1.Main.getResource("/" + NAME));
-        assertNull(p2.Main.getResource("/" + NAME));
-
-        assertNull(Main.class.getResourceAsStream("/" + NAME));
-        assertNull(p1.Main.getResourceAsStream("/" + NAME));
-        assertNull(p2.Main.getResourceAsStream("/" + NAME));
-
         System.out.println("Success!");
     }
 
diff --git a/test/jdk/java/lang/Class/getResource/ResourcesTest.java b/test/jdk/java/lang/Class/getResource/ResourcesTest.java
index ef02568c788..ffef2dfcfe4 100644
--- a/test/jdk/java/lang/Class/getResource/ResourcesTest.java
+++ b/test/jdk/java/lang/Class/getResource/ResourcesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,6 @@ public void runTest() throws Exception {
             = executeTestJava("--module-path", MODS_DIR.toString(),
                               "--add-modules", "m1,m2",
                               "-cp", CLASSES_DIR.toString(),
-                              "-Djava.security.manager=allow",
                               "Main")
                 .outputTo(System.out)
                 .errorTo(System.out)
diff --git a/test/jdk/java/lang/ClassLoader/UninitializedParent.java b/test/jdk/java/lang/ClassLoader/UninitializedParent.java
deleted file mode 100644
index f84003257ff..00000000000
--- a/test/jdk/java/lang/ClassLoader/UninitializedParent.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6636650
- * @summary Uninitialized class loaders should not be a parent of other
- *          class loaders.
- * @run main/othervm -Djava.security.manager=allow UninitializedParent
- */
-
-
-import java.net.*;
-
-public class UninitializedParent {
-    private static ClassLoader loader;
-    public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new SecurityManager());
-
-        // Create an uninitialized class loader
-        try {
-            new ClassLoader(null) {
-                @Override
-                protected void finalize() {
-                    loader = this;
-                }
-            };
-        } catch (SecurityException exc) {
-            // Expected
-        }
-        System.gc();
-        System.runFinalization();
-
-        // if 'loader' isn't null, need to ensure that it can't be used as
-        // parent
-        if (loader != null) {
-            try {
-                // Create a class loader with 'loader' being the parent
-                URLClassLoader child = URLClassLoader.newInstance
-                    (new URL[0], loader);
-                throw new RuntimeException("Test Failed!");
-            } catch (SecurityException se) {
-                System.out.println("Test Passed: Exception thrown");
-            }
-        } else {
-            System.out.println("Test Passed: Loader is null");
-        }
-    }
-}
diff --git a/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java b/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java
index 045e26bf3c3..60380624d73 100644
--- a/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java
+++ b/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *        jdk.test.lib.util.ForceGC
  *        jdk.test.lib.util.JarUtils
  * @build ClassForName ClassForNameLeak
- * @run main/othervm/policy=test.policy -Djava.security.manager ClassForNameLeak
+ * @run main/othervm ClassForNameLeak
  */
 
 import java.io.IOException;
diff --git a/test/jdk/java/lang/ClassLoader/forNameLeak/test.policy b/test/jdk/java/lang/ClassLoader/forNameLeak/test.policy
deleted file mode 100644
index 667f2ddef01..00000000000
--- a/test/jdk/java/lang/ClassLoader/forNameLeak/test.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-  permission java.io.FilePermission "<<ALL FILES>>", "read, write, delete";
-  permission java.lang.RuntimePermission "createClassLoader";
-  permission java.lang.RuntimePermission "getClassLoader";
-  permission java.lang.RuntimePermission "modifyThread";
-  permission java.util.PropertyPermission "*", "read"; /* for Utils */
-};
diff --git a/test/jdk/java/lang/ClassLoader/getResource/modules/Main.java b/test/jdk/java/lang/ClassLoader/getResource/modules/Main.java
index 405132067db..24ca36d9bbc 100644
--- a/test/jdk/java/lang/ClassLoader/getResource/modules/Main.java
+++ b/test/jdk/java/lang/ClassLoader/getResource/modules/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -280,18 +280,6 @@ public static void main(String[] args) throws IOException {
         in = p2.Main.getResourceAsStreamInClassLoader("p2/resources/" + NAME);
         assertNull(in);
 
-
-        // SecurityManager case
-        System.setSecurityManager(new SecurityManager());
-
-        assertNull(Main.class.getClassLoader().getResource("/" + NAME));
-        assertNull(p1.Main.getResourceInClassLoader("/" + NAME));
-        assertNull(p2.Main.getResourceInClassLoader("/" + NAME));
-
-        assertNull(Main.class.getClassLoader().getResourceAsStream("/" + NAME));
-        assertNull(p1.Main.getResourceAsStreamInClassLoader("/" + NAME));
-        assertNull(p2.Main.getResourceAsStreamInClassLoader("/" + NAME));
-
         System.out.println("Success!");
     }
 
diff --git a/test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java b/test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java
index 804494d8733..af2bad80b40 100644
--- a/test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java
+++ b/test/jdk/java/lang/ClassLoader/getResource/modules/ResourcesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,6 @@ public void runTest() throws Exception {
             = executeTestJava("--module-path", MODS_DIR.toString(),
                               "--add-modules", "m1,m2",
                               "-cp", CLASSES_DIR.toString(),
-                              "-Djava.security.manager=allow",
                               "Main")
                 .outputTo(System.out)
                 .errorTo(System.out)
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java b/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java
deleted file mode 100644
index b25dcda7841..00000000000
--- a/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8168423
- * @summary Different types of ClassLoader running with(out) SecurityManager and
- *          (in)valid security policy file.
- * @enablePreview
- * @modules java.base/jdk.internal.module
- * @library /test/lib
- * @build jdk.test.lib.util.JarUtils
- *        jdk.test.lib.util.ModuleInfoWriter
- * @build TestClassLoader TestClient
- * @run main ClassLoaderTest -noPolicy
- * @run main ClassLoaderTest -validPolicy
- * @run main ClassLoaderTest -invalidPolicy
- * @run main ClassLoaderTest -noPolicy      -customSCL
- * @run main ClassLoaderTest -validPolicy   -customSCL
- * @run main ClassLoaderTest -invalidPolicy -customSCL
- */
-import java.io.File;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.stream.Stream;
-import java.lang.module.ModuleDescriptor;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.util.JarUtils;
-import jdk.test.lib.util.ModuleInfoWriter;
-
-public class ClassLoaderTest {
-
-    private static final String SRC = System.getProperty("test.src");
-    private static final Path TEST_CLASSES =
-            Paths.get(System.getProperty("test.classes"));
-    private static final Path ARTIFACT_DIR = Paths.get("jars");
-    private static final Path VALID_POLICY = Paths.get(SRC, "valid.policy");
-    private static final Path INVALID_POLICY
-            = Paths.get(SRC, "malformed.policy");
-    /*
-     * Here is the naming convention followed for each jar.
-     * cl.jar   - Regular custom class loader jar.
-     * mcl.jar  - Modular custom class loader jar.
-     * c.jar    - Regular client jar.
-     * mc.jar   - Modular client jar.
-     * amc.jar  - Modular client referring automated custom class loader jar.
-     */
-    private static final Path CL_JAR = ARTIFACT_DIR.resolve("cl.jar");
-    private static final Path MCL_JAR = ARTIFACT_DIR.resolve("mcl.jar");
-    private static final Path C_JAR = ARTIFACT_DIR.resolve("c.jar");
-    private static final Path MC_JAR = ARTIFACT_DIR.resolve("mc.jar");
-    private static final Path AMC_JAR = ARTIFACT_DIR.resolve("amc.jar");
-
-    // Expected output messages
-    private static final String MISSING_MODULE =
-            "Module cl not found, required by mc";
-    private static final String POLICY_ERROR =
-            "java.security.policy: error parsing file";
-    private static final String SYSTEM_CL_MSG =
-            "jdk.internal.loader.ClassLoaders$AppClassLoader";
-    private static final String CUSTOM_CL_MSG = "cl.TestClassLoader";
-
-    // Member vars
-    private final boolean useSCL;       // Use default system loader, or custom
-    private final String smMsg;         // Security manager message, or ""
-    private final String autoAddModArg; // Flag to add cl modules, or ""
-    private final String addmodArg;     // Flag to add mcl modules, or ""
-    private final String expectedStatus;// Expected exit status from client
-    private final String expectedMsg;   // Expected output message from client
-
-    // Common set of VM arguments used in all test cases
-    private final List<String> commonArgs;
-
-    public ClassLoaderTest(Path policy, boolean useSCL) {
-        this.useSCL = useSCL;
-
-        List<String> argList = new LinkedList<>();
-        argList.add("-Duser.language=en");
-        argList.add("-Duser.region=US");
-
-        boolean malformedPolicy = false;
-        if (policy == null) {
-            smMsg = "Without SecurityManager";
-        } else {
-            malformedPolicy = policy.equals(INVALID_POLICY);
-            argList.add("-Djava.security.manager");
-            argList.add("-Djava.security.policy=" +
-                    policy.toFile().getAbsolutePath());
-            smMsg = "With SecurityManager";
-        }
-
-        if (useSCL) {
-            autoAddModArg = "";
-            addmodArg = "";
-        } else {
-            argList.add("-Djava.system.class.loader=cl.TestClassLoader");
-            autoAddModArg = "--add-modules=cl";
-            addmodArg = "--add-modules=mcl";
-        }
-
-        if (malformedPolicy) {
-            expectedStatus = "FAIL";
-            expectedMsg = POLICY_ERROR;
-        } else if (useSCL) {
-            expectedStatus = "PASS";
-            expectedMsg = SYSTEM_CL_MSG;
-        } else {
-            expectedStatus = "PASS";
-            expectedMsg = CUSTOM_CL_MSG;
-        }
-        commonArgs = Collections.unmodifiableList(argList);
-    }
-
-    public static void main(String[] args) throws Exception {
-        Path policy;
-        if (args[0].equals("-noPolicy")) {
-            policy = null;
-        } else if (args[0].equals("-validPolicy")) {
-            policy = VALID_POLICY;
-        } else if (args[0].equals("-invalidPolicy")) {
-            policy = INVALID_POLICY;
-        } else {
-            throw new RuntimeException("Unknown policy arg: " + args[0]);
-        }
-
-        boolean useSystemLoader = true;
-        if (args.length > 1) {
-            if (args[1].equals("-customSCL")) {
-                useSystemLoader = false;
-            } else {
-                throw new RuntimeException("Unknown custom loader arg: " + args[1]);
-            }
-        }
-
-        ClassLoaderTest test = new ClassLoaderTest(policy, useSystemLoader);
-        setUp();
-        test.processForPolicyFile();
-    }
-
-    /**
-     * Test cases are based on the following logic,
-     *  given: a policyFile in {none, valid, malformed} and
-     *         a classLoader in {SystemClassLoader, CustomClassLoader}:
-     *  for (clientModule : {"NAMED", "UNNAMED"}) {
-     *      for (classLoaderModule : {"NAMED", "UNNAMED"}) {
-     *          Create and run java command for each possible Test case
-     *      }
-     *  }
-     */
-    private void processForPolicyFile() throws Exception {
-        final String regLoaderLoc = CL_JAR.toFile().getAbsolutePath();
-        final String modLoadrLoc = MCL_JAR.toFile().getAbsolutePath();
-        final String regClientLoc = C_JAR.toFile().getAbsolutePath();
-        final String modClientLoc = MC_JAR.toFile().getAbsolutePath();
-        final String autoModCloc = AMC_JAR.toFile().getAbsolutePath();
-        final String separator = File.pathSeparator;
-
-        // NAMED-NAMED:
-        System.out.println("Case:- Modular Client and " +
-                ((useSCL) ? "SystemClassLoader"
-                        : "Modular CustomClassLoader") + " " + smMsg);
-        execute("--module-path", modClientLoc + separator + modLoadrLoc, "-m",
-                "mc/c.TestClient");
-
-        // NAMED-UNNAMED:
-        System.out.println("Case:- Modular Client and " + ((useSCL)
-                ? "SystemClassLoader"
-                : "Unknown modular CustomClassLoader") + " " + smMsg);
-        execute(new String[] {"--module-path", autoModCloc, "-cp", regLoaderLoc,
-                "-m", "mc/c.TestClient"},
-                "FAIL", MISSING_MODULE);
-
-        // UNNAMED-NAMED:
-        System.out.println("Case:- Unknown modular Client and " +
-                ((useSCL) ? "SystemClassLoader"
-                      : "Modular CustomClassLoader") + " " + smMsg);
-        execute("-cp", regClientLoc, "--module-path", modLoadrLoc, addmodArg,
-                "c.TestClient");
-
-        // UNNAMED-UNNAMED:
-        System.out.println("Case:- Unknown modular Client and " +
-                ((useSCL) ? "SystemClassLoader"
-                        : "Unknown modular CustomClassLoader") + " " + smMsg);
-        execute("-cp", regClientLoc + separator + regLoaderLoc, "c.TestClient");
-
-        // Regular jars in module-path
-        System.out.println("Case:- Regular Client and " + ((useSCL)
-                ? "SystemClassLoader"
-                : "Unknown modular CustomClassLoader") +
-                " inside --module-path " + smMsg);
-        execute("--module-path", regClientLoc + separator + regLoaderLoc,
-                autoAddModArg, "-m", "c/c.TestClient");
-
-        // Modular jars in class-path
-        System.out.println("Case:- Modular Client and " +
-                ((useSCL) ? "SystemClassLoader"
-                        : "Modular CustomClassLoader") + " in -cp " + smMsg);
-        execute("-cp", modClientLoc + separator + modLoadrLoc, "c.TestClient");
-    }
-
-    private void execute(String... args) throws Exception {
-        execute(args, this.expectedStatus, this.expectedMsg);
-    }
-
-    /**
-     * Execute with command arguments and process the result.
-     */
-    private void execute(String[] args, String status, String msg) throws Exception {
-
-        // Combine with commonArgs, and perform sanity check
-        String[] safeArgs = Stream.concat(commonArgs.stream(), Stream.of(args))
-                .filter(s -> {
-                    if (s.contains(" ")) { throw new RuntimeException("No spaces in args");}
-                    return !s.isEmpty();
-                }).toArray(String[]::new);
-        String out = ProcessTools.executeTestJava(safeArgs).getOutput();
-        // Handle response.
-        if ("PASS".equals(status) && out.contains(msg)) {
-            System.out.println("PASS: Expected Result: " + msg);
-        } else if ("FAIL".equals(status) && out.contains(msg)) {
-            System.out.printf("PASS: Expected Failure: " +  msg);
-        } else if (out.contains("Exception") || out.contains("Error")) {
-            System.out.printf("OUTPUT: %s", out);
-            throw new RuntimeException("FAIL: Unknown Exception.");
-        } else {
-            System.out.printf("OUTPUT: %s", out);
-            throw new RuntimeException("FAIL: Unknown Test case found");
-        }
-    }
-
-    /**
-     * Creates regular/modular jar files for TestClient and TestClassLoader.
-     */
-    private static void setUp() throws Exception {
-
-        // Generate regular jar files for TestClient and TestClassLoader
-        JarUtils.createJarFile(CL_JAR, TEST_CLASSES,
-                               "cl/TestClassLoader.class");
-        JarUtils.createJarFile(C_JAR, TEST_CLASSES,
-                               "c/TestClient.class");
-        // Generate modular jar files for TestClient and TestClassLoader with
-        // their corresponding ModuleDescriptor.
-        Files.copy(CL_JAR, MCL_JAR,
-                StandardCopyOption.REPLACE_EXISTING);
-        updateModuleDescr(MCL_JAR, ModuleDescriptor.newModule("mcl")
-                .exports("cl").requires("java.base").build());
-        Files.copy(C_JAR, MC_JAR,
-                StandardCopyOption.REPLACE_EXISTING);
-        updateModuleDescr(MC_JAR, ModuleDescriptor.newModule("mc")
-                .exports("c").requires("java.base").requires("mcl").build());
-        Files.copy(C_JAR, AMC_JAR,
-                StandardCopyOption.REPLACE_EXISTING);
-        updateModuleDescr(AMC_JAR, ModuleDescriptor.newModule("mc")
-                .exports("c").requires("java.base").requires("cl").build());
-    }
-
-    /**
-     * Update regular jars and include module-info.class inside it to make
-     * modular jars.
-     */
-    private static void updateModuleDescr(Path jar, ModuleDescriptor mDescr)
-            throws Exception {
-        if (mDescr != null) {
-            Path dir = Files.createTempDirectory("tmp");
-            Path mi = dir.resolve("module-info.class");
-            try (OutputStream out = Files.newOutputStream(mi)) {
-                ModuleInfoWriter.write(mDescr, out);
-            }
-            System.out.format("Adding 'module-info.class' to jar '%s'%n", jar);
-            JarUtils.updateJarFile(jar, dir);
-        }
-    }
-}
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/TestClient.java b/test/jdk/java/lang/ClassLoader/securityManager/TestClient.java
deleted file mode 100644
index de0fe1039e8..00000000000
--- a/test/jdk/java/lang/ClassLoader/securityManager/TestClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package c;
-
-public class TestClient {
-
-    public static void main(String[] args) {
-
-        // Initialize policy file.
-        System.getProperty("test.src");
-        System.out.printf("ContextClassLoader: %s%n",
-                Thread.currentThread().getContextClassLoader().toString());
-    }
-}
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/malformed.policy b/test/jdk/java/lang/ClassLoader/securityManager/malformed.policy
deleted file mode 100644
index 8afdf6913dc..00000000000
--- a/test/jdk/java/lang/ClassLoader/securityManager/malformed.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    xyz;
-    permission java.util.PropertyPermission "test.src", "read";
-}
\ No newline at end of file
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/valid.policy b/test/jdk/java/lang/ClassLoader/securityManager/valid.policy
deleted file mode 100644
index 54ef7d0a6d0..00000000000
--- a/test/jdk/java/lang/ClassLoader/securityManager/valid.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant codeBase "file:./jars/*" {
-    permission java.lang.RuntimePermission "createClassLoader";
-    permission java.util.PropertyPermission "test.src", "read";
-};
\ No newline at end of file
diff --git a/test/jdk/java/lang/ModuleTests/WithSecurityManager.java b/test/jdk/java/lang/ModuleTests/WithSecurityManager.java
deleted file mode 100644
index 2e0bbc983fe..00000000000
--- a/test/jdk/java/lang/ModuleTests/WithSecurityManager.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @modules jdk.compiler
- * @summary Test java.lang.Module methods that specify permission checks
- * @run main/othervm -Djava.security.manager=allow -Djava.security.policy=${test.src}/allow.policy WithSecurityManager allow
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager deny
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.module.Configuration;
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Test java.lang.Module methods that specify permission checks.
- */
-
-public class WithSecurityManager {
-
-    // a module that will be loaded into a child layer
-    static final String ANOTHER_MODULE          = "jdk.compiler";
-    static final String ANOTHER_MODULE_RESOURCE = "com/sun/tools/javac/Main.class";
-
-    public static void main(String[] args) throws IOException {
-        boolean allow = args[0].equals("allow");
-
-        // base module, in the boot layer
-        Module base = Object.class.getModule();
-
-        // another module, in a child layer
-        Module other = loadModuleInChildLayer(ANOTHER_MODULE);
-        assertTrue(other.getLayer() != ModuleLayer.boot());
-
-        System.setSecurityManager(new SecurityManager());
-
-        test(base, "java/lang/Object.class", allow);
-        test(other, ANOTHER_MODULE_RESOURCE, allow);
-    }
-
-    /**
-     * Test the permission checks by invoking methods on the given module.
-     *
-     * If {@code allow} is {@code true} then the permission checks should succeed.
-     */
-    static void test(Module m, String name, boolean allow) throws IOException {
-
-        // test Module::getClassLoader
-        System.out.format("Test getClassLoader on %s ...%n", m);
-        try {
-            ClassLoader cl = m.getClassLoader();
-            System.out.println(cl);
-            if (!allow)
-                assertTrue("getClassLoader should have failed", false);
-        } catch (SecurityException e) {
-            System.out.println(e + " thrown");
-            if (allow)
-                throw e;
-        }
-
-        // test Module::getResourceAsStream
-        System.out.format("Test getResourceAsStream(\"%s\") on %s ...%n", name, m);
-        try (InputStream in = m.getResourceAsStream(name)) {
-            System.out.println(in);
-            if (allow && (in == null))
-                assertTrue(name + " not found", false);
-            if (!allow && (in != null))
-                assertTrue(name + " should not be found", false);
-        }
-
-    }
-
-    /**
-     * Create a module layer that contains the given system module.
-     */
-    static Module loadModuleInChildLayer(String mn) {
-        Optional<ModuleReference> omref = ModuleFinder.ofSystem().find(mn);
-        assertTrue("module " + mn + " not a system module", omref.isPresent());
-
-        // create a ModuleFinder that only finds this module
-        ModuleReference mref = omref.get();
-        ModuleFinder finder = new ModuleFinder() {
-            @Override
-            public Optional<ModuleReference> find(String name) {
-                if (name.equals(mn))
-                    return Optional.of(mref);
-                else
-                    return Optional.empty();
-            }
-
-            @Override
-            public Set<ModuleReference> findAll() {
-                return Collections.singleton(mref);
-            }
-        };
-
-        // create a child configuration and layer with this module
-        ModuleLayer bootLayer = ModuleLayer.boot();
-        Configuration cf = bootLayer
-            .configuration()
-            .resolve(finder, ModuleFinder.of(), Set.of(ANOTHER_MODULE));
-        ModuleLayer layer = bootLayer.defineModulesWithOneLoader(cf, null);
-
-        Optional<Module> om = layer.findModule(mn);
-        assertTrue("module " + mn + " not in child layer", om.isPresent());
-        return om.get();
-    }
-
-    static void assertTrue(String msg, boolean e) {
-        if (!e)
-            throw new RuntimeException(msg);
-    }
-
-    static void assertTrue(boolean e) {
-        if (!e)
-            throw new RuntimeException();
-    }
-
-}
diff --git a/test/jdk/java/lang/ModuleTests/allow.policy b/test/jdk/java/lang/ModuleTests/allow.policy
deleted file mode 100644
index 51db5b92828..00000000000
--- a/test/jdk/java/lang/ModuleTests/allow.policy
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-grant {
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.lang.RuntimePermission "accessSystemModules";
-    permission java.io.FilePermission "${java.home}/modules/-", "read";    // exploded build
-};
diff --git a/test/jdk/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java
index 382df89050c..e1e2cef9a8a 100644
--- a/test/jdk/java/lang/ProcessBuilder/Basic.java
+++ b/test/jdk/java/lang/ProcessBuilder/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
  * @requires !vm.musl
  * @requires vm.flagless
  * @library /test/lib
- * @run main/othervm/native/timeout=300 -Djava.security.manager=allow Basic
- * @run main/othervm/native/timeout=300 -Djava.security.manager=allow -Djdk.lang.Process.launchMechanism=fork Basic
+ * @run main/othervm/native/timeout=300 Basic
+ * @run main/othervm/native/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
  * @author Martin Buchholz
  */
 
@@ -48,7 +48,7 @@
  *          java.base/jdk.internal.misc
  * @requires (os.family == "linux" & !vm.musl)
  * @library /test/lib
- * @run main/othervm/timeout=300 -Djava.security.manager=allow -Djdk.lang.Process.launchMechanism=posix_spawn Basic
+ * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=posix_spawn Basic
  */
 
 import java.lang.ProcessBuilder.Redirect;
@@ -65,7 +65,6 @@
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.security.*;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import static java.lang.System.getenv;
@@ -1218,77 +1217,6 @@ static void testIORedirection() throws Throwable {
             equal(r.out(), "standard output");
             equal(r.err(), "standard error");
         }
-
-        //----------------------------------------------------------------
-        // Test security implications of I/O redirection
-        //----------------------------------------------------------------
-
-        // Read access to current directory is always granted;
-        // So create a tmpfile for input instead.
-        final File tmpFile = File.createTempFile("Basic", "tmp");
-        setFileContents(tmpFile, "standard input");
-
-        final Policy policy = new Policy();
-        Policy.setPolicy(policy);
-        System.setSecurityManager(new SecurityManager());
-        try {
-            final Permission xPermission
-                = new FilePermission("<<ALL FILES>>", "execute");
-            final Permission rxPermission
-                = new FilePermission("<<ALL FILES>>", "read,execute");
-            final Permission wxPermission
-                = new FilePermission("<<ALL FILES>>", "write,execute");
-            final Permission rwxPermission
-                = new FilePermission("<<ALL FILES>>", "read,write,execute");
-
-            THROWS(SecurityException.class,
-                   () -> { policy.setPermissions(xPermission);
-                           redirectIO(pb, from(tmpFile), PIPE, PIPE);
-                           pb.start();},
-                   () -> { policy.setPermissions(rxPermission);
-                           redirectIO(pb, PIPE, to(ofile), PIPE);
-                           pb.start();},
-                   () -> { policy.setPermissions(rxPermission);
-                           redirectIO(pb, PIPE, PIPE, to(efile));
-                           pb.start();});
-
-            {
-                policy.setPermissions(rxPermission);
-                redirectIO(pb, from(tmpFile), PIPE, PIPE);
-                ProcessResults r = run(pb);
-                equal(r.out(), "standard output");
-                equal(r.err(), "standard error");
-            }
-
-            {
-                policy.setPermissions(wxPermission);
-                redirectIO(pb, PIPE, to(ofile), to(efile));
-                Process p = pb.start();
-                new PrintStream(p.getOutputStream()).print("standard input");
-                p.getOutputStream().close();
-                ProcessResults r = run(p);
-                policy.setPermissions(rwxPermission);
-                equal(fileContents(ofile), "standard output");
-                equal(fileContents(efile), "standard error");
-            }
-
-            {
-                policy.setPermissions(rwxPermission);
-                redirectIO(pb, from(tmpFile), to(ofile), to(efile));
-                ProcessResults r = run(pb);
-                policy.setPermissions(rwxPermission);
-                equal(fileContents(ofile), "standard output");
-                equal(fileContents(efile), "standard error");
-            }
-
-        } finally {
-            policy.setPermissions(new RuntimePermission("setSecurityManager"));
-            System.setSecurityManager(null);
-            tmpFile.delete();
-            ifile.delete();
-            ofile.delete();
-            efile.delete();
-        }
     }
 
     static void checkProcessPid() {
@@ -2347,89 +2275,6 @@ public void run() {
 
         new File("emptyCommand").delete();
 
-        //----------------------------------------------------------------
-        // Check for correct security permission behavior
-        //----------------------------------------------------------------
-        final Policy policy = new Policy();
-        Policy.setPolicy(policy);
-        System.setSecurityManager(new SecurityManager());
-
-        try {
-            // No permissions required to CREATE a ProcessBuilder
-            policy.setPermissions(/* Nothing */);
-            new ProcessBuilder("env").directory(null).directory();
-            new ProcessBuilder("env").directory(new File("dir")).directory();
-            new ProcessBuilder("env").command("??").command();
-        } catch (Throwable t) { unexpected(t); }
-
-        THROWS(SecurityException.class,
-               () -> { policy.setPermissions(/* Nothing */);
-                       System.getenv("foo");},
-               () -> { policy.setPermissions(/* Nothing */);
-                       System.getenv();},
-               () -> { policy.setPermissions(/* Nothing */);
-                       new ProcessBuilder("echo").start();},
-               () -> { policy.setPermissions(/* Nothing */);
-                       Runtime.getRuntime().exec("echo");},
-               () -> { policy.setPermissions(
-                               new RuntimePermission("getenv.bar"));
-                       System.getenv("foo");});
-
-        try {
-            policy.setPermissions(new RuntimePermission("getenv.foo"));
-            System.getenv("foo");
-
-            policy.setPermissions(new RuntimePermission("getenv.*"));
-            System.getenv("foo");
-            System.getenv();
-            new ProcessBuilder().environment();
-        } catch (Throwable t) { unexpected(t); }
-
-
-        final Permission execPermission
-            = new FilePermission("<<ALL FILES>>", "execute");
-
-        THROWS(SecurityException.class,
-               () -> { // environment permission by itself insufficient
-                       policy.setPermissions(new RuntimePermission("getenv.*"));
-                       ProcessBuilder pb = new ProcessBuilder("env");
-                       pb.environment().put("foo","bar");
-                       pb.start();},
-               () -> { // exec permission by itself insufficient
-                       policy.setPermissions(execPermission);
-                       ProcessBuilder pb = new ProcessBuilder("env");
-                       pb.environment().put("foo","bar");
-                       pb.start();});
-
-        try {
-            // Both permissions? OK.
-            policy.setPermissions(new RuntimePermission("getenv.*"),
-                                  execPermission);
-            ProcessBuilder pb = new ProcessBuilder("env");
-            pb.environment().put("foo","bar");
-            Process p = pb.start();
-            closeStreams(p);
-        } catch (IOException e) { // OK
-        } catch (Throwable t) { unexpected(t); }
-
-        try {
-            // Don't need environment permission unless READING environment
-            policy.setPermissions(execPermission);
-            Runtime.getRuntime().exec("env", new String[]{});
-        } catch (IOException e) { // OK
-        } catch (Throwable t) { unexpected(t); }
-
-        try {
-            // Don't need environment permission unless READING environment
-            policy.setPermissions(execPermission);
-            new ProcessBuilder("env").start();
-        } catch (IOException e) { // OK
-        } catch (Throwable t) { unexpected(t); }
-
-        // Restore "normal" state without a security manager
-        policy.setPermissions(new RuntimePermission("setSecurityManager"));
-        System.setSecurityManager(null);
-
         //----------------------------------------------------------------
         // Check that Process.isAlive() &
         // Process.waitFor(0, TimeUnit.MILLISECONDS) work as expected.
@@ -2704,38 +2549,6 @@ static void closeStreams(Process p) {
         } catch (Throwable t) { unexpected(t); }
     }
 
-    //----------------------------------------------------------------
-    // A Policy class designed to make permissions fiddling very easy.
-    //----------------------------------------------------------------
-    @SuppressWarnings("removal")
-    private static class Policy extends java.security.Policy {
-        static final java.security.Policy DEFAULT_POLICY = java.security.Policy.getPolicy();
-
-        private Permissions perms;
-
-        public void setPermissions(Permission...permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions)
-                perms.add(permission);
-        }
-
-        public Policy() { setPermissions(/* Nothing */); }
-
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p) || DEFAULT_POLICY.implies(pd, p);
-        }
-
-        public void refresh() {}
-    }
-
     private static class StreamAccumulator extends Thread {
         private final InputStream is;
         private final StringBuilder sb = new StringBuilder();
diff --git a/test/jdk/java/lang/ProcessBuilder/SecurityManagerClinit.java b/test/jdk/java/lang/ProcessBuilder/SecurityManagerClinit.java
deleted file mode 100644
index 068acad0ed0..00000000000
--- a/test/jdk/java/lang/ProcessBuilder/SecurityManagerClinit.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010 Google Inc.  All Rights Reserved.
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6980747 8297451
- * @summary Check that Process-related classes have the proper
- *     doPrivileged blocks, and can be initialized with an adversarial
- *     security manager.
- * @run main/othervm -Djava.security.manager=allow SecurityManagerClinit
- * @author Martin Buchholz
- */
-
-import java.io.*;
-import java.security.*;
-
-public class SecurityManagerClinit {
-    private static class SimplePolicy extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        private Permissions perms;
-
-        public SimplePolicy(Permission... permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions)
-                perms.add(permission);
-        }
-
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p) || DEFAULT_POLICY.implies(pd, p);
-        }
-    }
-
-    // Security manager that unconditionally performs Thread Modify Access checks.
-    @SuppressWarnings("removal")
-    private static class TMACSecurityManager extends SecurityManager {
-        static final RuntimePermission MODIFY_THREAD_PERMISSION =
-                new RuntimePermission("modifyThread");
-        @Override
-        public void checkAccess(Thread thread) {
-            checkPermission(MODIFY_THREAD_PERMISSION);
-        }
-    }
-
-    public static void main(String[] args) throws Throwable {
-        String javaExe =
-            System.getProperty("java.home") +
-            File.separator + "bin" + File.separator + "java";
-
-        final SimplePolicy policy =
-            new SimplePolicy
-            (new FilePermission("<<ALL FILES>>", "execute"),
-             new RuntimePermission("setSecurityManager"),
-             new RuntimePermission("modifyThread"));
-        Policy.setPolicy(policy);
-
-        System.setSecurityManager(new TMACSecurityManager());
-
-        try {
-            String[] cmd = { javaExe, "-version" };
-            Process p = Runtime.getRuntime().exec(cmd);
-            p.getOutputStream().close();
-            p.getInputStream().close();
-            p.getErrorStream().close();
-            p.waitFor();
-        } finally {
-            System.setSecurityManager(null);
-        }
-    }
-}
diff --git a/test/jdk/java/lang/ProcessHandle/PermissionTest.java b/test/jdk/java/lang/ProcessHandle/PermissionTest.java
deleted file mode 100644
index 92085e70bcb..00000000000
--- a/test/jdk/java/lang/ProcessHandle/PermissionTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.FilePermission;
-import java.io.IOException;
-import java.lang.reflect.ReflectPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.SecurityPermission;
-import java.util.Arrays;
-import java.util.PropertyPermission;
-
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @run testng/othervm -Djava.security.manager=allow PermissionTest
- * @summary Test Permissions to access Info
- */
-
-public class PermissionTest {
-    /**
-     * Backing up policy.
-     */
-    protected static Policy policy;
-
-    /**
-     * Backing up security manager.
-     */
-    private static SecurityManager sm;
-
-    /**
-     * Current process handle.
-     */
-    private final ProcessHandle currentHndl;
-
-    PermissionTest() {
-        policy = Policy.getPolicy();
-        sm = System.getSecurityManager();
-        currentHndl = ProcessHandle.current();
-    }
-
-    @Test
-    public void descendantsWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        currentHndl.descendants();
-    }
-
-    @Test
-    public void allProcessesWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        ProcessHandle.allProcesses();
-    }
-
-    @Test
-    public void childrenWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        currentHndl.children();
-    }
-
-    @Test
-    public void currentWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        ProcessHandle.current();
-    }
-
-    @Test
-    public void ofWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        ProcessHandle.of(0);
-    }
-
-    @Test
-    public void parentWithPermission() {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        currentHndl.parent();
-    }
-
-    @Test
-    public void processToHandleWithPermission() throws IOException {
-        Policy.setPolicy(new TestPolicy(new RuntimePermission("manageProcess")));
-        Process p = null;
-        try {
-            ProcessBuilder pb = new ProcessBuilder("sleep", "30");
-            p = pb.start();
-            ProcessHandle ph = p.toHandle();
-            Assert.assertNotNull(ph, "ProcessHandle expected from Process");
-        } finally {
-            if (p != null) {
-                p.destroy();
-            }
-        }
-    }
-
-    /**
-     * Setup a policy that would reject ProcessHandle requests without Permissions ManageProcess.
-     */
-    public void noPermissionsSetup(){
-        Policy.setPolicy(new TestPolicy());
-        SecurityManager sm = new SecurityManager();
-        System.setSecurityManager(sm);
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionAllChildren() {
-        noPermissionsSetup();
-        currentHndl.descendants();
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionAllProcesses() {
-        noPermissionsSetup();
-        ProcessHandle.allProcesses();
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionChildren() {
-        noPermissionsSetup();
-        currentHndl.children();
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionCurrent() {
-        noPermissionsSetup();
-        ProcessHandle.current();
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionOf() {
-        noPermissionsSetup();
-        ProcessHandle.of(0);
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionParent() {
-        noPermissionsSetup();
-        currentHndl.parent();
-    }
-
-    @Test(expectedExceptions = SecurityException.class)
-    public void noPermissionProcessToHandle() throws IOException {
-        noPermissionsSetup();
-        Process p = null;
-        try {
-            ProcessBuilder pb = new ProcessBuilder("sleep", "30");
-            p = pb.start();
-            ProcessHandle ph = p.toHandle();
-            Assert.assertNotNull(ph, "ProcessHandle expected from Process");
-        } finally {
-            if (p != null) {
-                p.destroy();
-            }
-        }
-    }
-
-    @AfterClass
-    public void tearDownClass() throws Exception {
-        System.setSecurityManager(sm);
-        Policy.setPolicy(policy);
-    }
-}
-
-class TestPolicy extends Policy {
-
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-    private final PermissionCollection permissions = new Permissions();
-
-    public TestPolicy() {
-        setBasicPermissions();
-    }
-
-    /*
-     * Defines the minimal permissions required by testNG and set security
-     * manager permission when running these tests.
-     */
-    public void setBasicPermissions() {
-        permissions.add(new SecurityPermission("getPolicy"));
-        permissions.add(new SecurityPermission("setPolicy"));
-        permissions.add(new RuntimePermission("getClassLoader"));
-        permissions.add(new RuntimePermission("setSecurityManager"));
-        permissions.add(new RuntimePermission("createSecurityManager"));
-        permissions.add(new PropertyPermission("user.dir", "read"));
-        permissions.add(new PropertyPermission("test.src", "read"));
-        permissions.add(new PropertyPermission("file.separator", "read"));
-        permissions.add(new PropertyPermission("line.separator", "read"));
-        permissions.add(new PropertyPermission("fileStringBuffer", "read"));
-        permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
-        permissions.add(new PropertyPermission("testng.show.stack.frames",
-                "read"));
-        permissions.add(new PropertyPermission("testng.thread.affinity", "read"));
-        permissions.add(new PropertyPermission("testng.memory.friendly", "read"));
-        permissions.add(new PropertyPermission("testng.mode.dryrun", "read"));
-        permissions.add(new PropertyPermission("testng.report.xml.name", "read"));
-        permissions.add(new PropertyPermission("testng.timezone", "read"));
-        permissions.add(new ReflectPermission("suppressAccessChecks"));
-        permissions.add(new FilePermission("<<ALL FILES>>", "execute"));
-    }
-
-    public TestPolicy(Permission... ps) {
-        setBasicPermissions();
-        Arrays.stream(ps).forEach(p -> permissions.add(p));
-    }
-
-    @Override
-    public PermissionCollection getPermissions(ProtectionDomain domain) {
-        return permissions;
-    }
-
-    @Override
-    public PermissionCollection getPermissions(CodeSource codesource) {
-        return permissions;
-    }
-
-    @Override
-    public boolean implies(ProtectionDomain domain, Permission perm) {
-        return permissions.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
-    }
-}
diff --git a/test/jdk/java/lang/RuntimeTests/exec/ExecCommand.java b/test/jdk/java/lang/RuntimeTests/exec/ExecCommand.java
index efde74e1eeb..a07d4e19738 100644
--- a/test/jdk/java/lang/RuntimeTests/exec/ExecCommand.java
+++ b/test/jdk/java/lang/RuntimeTests/exec/ExecCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @test
  * @bug 8012453 8016046
  * @requires (os.family == "windows")
- * @run testng/othervm -Djava.security.manager=allow ExecCommand
+ * @run testng/othervm ExecCommand
  * @summary workaround for legacy applications with Runtime.getRuntime().exec(String command)
  */
 
@@ -38,7 +38,6 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AccessControlException;
 import java.security.Permission;
 import java.util.Arrays;
 import java.util.List;
@@ -56,48 +55,6 @@ public class ExecCommand {
     private static final String JDK_LANG_PROCESS_ALLOW_AMBIGUOUS_COMMANDS =
             "jdk.lang.Process.allowAmbiguousCommands";
 
-    static class SecurityMan extends SecurityManager {
-        public static String unquote(String str)
-        {
-            int length = (str == null)
-                ? 0
-                : str.length();
-
-            if (length > 1
-                && str.charAt(0) == '\"'
-                && str.charAt(length - 1) == '\"')
-            {
-               return str.substring(1, length - 1);
-            }
-            return str;
-        }
-
-        @Override public void checkExec(String cmd) {
-            String ncmd = (new File(unquote(cmd))).getPath();
-            if ( ncmd.equals(".\\Program")
-              || ncmd.equals("\".\\Program")
-              || ncmd.equals(".\\Program Files\\do.cmd")
-              || ncmd.equals(".\\Program.cmd")
-              || ncmd.equals("cmd"))
-            {
-                return;
-            }
-            super.checkExec(cmd);
-        }
-
-        public void checkPermission(Permission perm) {
-            if (perm instanceof RuntimePermission ||
-                    perm instanceof java.lang.reflect.ReflectPermission)
-                return;
-            super.checkPermission(perm);
-        };
-        @Override public void checkRead(String file) {}       // TestNG reads files
-        @Override public void checkWrite(String file) {}      // TestNG writes files
-        @Override public void checkDelete(String file) {}
-        @Override public void checkPropertiesAccess() {}
-        @Override public void checkPropertyAccess(String name) {}  // TestNG reads properties
-    }
-
     private static final List<String> doCmdCopy = List.of(
         ".\\Program.cmd",
         ".\\Program Files\\doNot.cmd",
@@ -106,7 +63,7 @@ public void checkPermission(Permission perm) {
     @BeforeClass
     void setup() throws Exception {
 
-        // Create files to be execute
+        // Create files to be executed
         try {
             new File(".\\Program Files").mkdirs();
             for (String cmdFile : doCmdCopy) {
@@ -124,11 +81,10 @@ void setup() throws Exception {
      * Sequence of tests and test results in the TEST_RTE_ARGS DataProvider below.
      * The ordinals are used as indices in the lists of expected results.
      */
-    private enum Mode {
-        UNSET_NO_SM, // 0) no SM and default allowAmbiguousCommands; equivalent to true
-        EMPTY_NO_SM, // 1) no SM and allowAmbiguousCommand is empty; equivalent to true
-        FALSE_NO_SM, // 2) no SM and allowAmbiguousCommands = false
-        EMPTY_SM,    // 3) SM and default allowAmbiguousCommands is empty; equivalent to false
+    private enum AmbiguousMode {
+        UNSET,      // 0) default allowAmbiguousCommands; equivalent to true
+        EMPTY,      // 1) allowAmbiguousCommand is empty; equivalent to true
+        FALSE,      // 2) allowAmbiguousCommands = false
     };
 
     /**
@@ -143,42 +99,35 @@ Object[][] TEST_RTE_ARGS() {
                         "dirOut.txt",
                         Arrays.asList(null,
                                 null,
-                                FileNotFoundException.class,
                                 FileNotFoundException.class)
                 },
                 {"cmd /C dir > \".\\Program Files\\dirOut.txt\"",
                         "./Program Files/dirOut.txt",
                         Arrays.asList(null,
                                 null,
-                                FileNotFoundException.class,
                                 FileNotFoundException.class)
                 },
                 {".\\Program Files\\do.cmd",
                         null,
                         Arrays.asList(null,
                                 null,
-                                IOException.class,
                                 IOException.class)
                 },
                 {"\".\\Program Files\\doNot.cmd\" arg",
                         null,
-                        Arrays.asList(null,
-                                null,
-                                null,
-                                AccessControlException.class)
+                        Arrays.asList(null, null, null)
                 },
                 {"\".\\Program Files\\do.cmd\" arg",
                         null,
-                        // AccessControlException
-                        Arrays.asList(null, null, null, null)
+                        Arrays.asList(null, null, null)
                 },
                 {"\".\\Program.cmd\" arg",
                         null,
-                        Arrays.asList(null, null, null, null)
+                        Arrays.asList(null, null, null)
                 },
                 {".\\Program.cmd arg",
                         null,
-                        Arrays.asList(null, null, null, null)
+                        Arrays.asList(null, null, null)
                 },
         };
     }
@@ -194,10 +143,9 @@ void testCommandAmbiguousUnset(String command, String testFile, List<Class<Excep
         // "true" by default with the legacy verification procedure
         Properties props = System.getProperties();
         props.remove(JDK_LANG_PROCESS_ALLOW_AMBIGUOUS_COMMANDS);
-        System.setSecurityManager(null);
 
         testCommandMode(command, "Ambiguous Unset", testFile,
-                perModeExpected.get(Mode.UNSET_NO_SM.ordinal()));
+                perModeExpected.get(AmbiguousMode.UNSET.ordinal()));
     }
 
     /**
@@ -209,9 +157,8 @@ void testCommandAmbiguousUnset(String command, String testFile, List<Class<Excep
     void testCommandAmbiguousEmpty(String command, String testFile, List<Class<Exception>> perModeExpected) {
         Properties props = System.getProperties();
         props.setProperty(JDK_LANG_PROCESS_ALLOW_AMBIGUOUS_COMMANDS, "");
-        System.setSecurityManager(null);
         testCommandMode(command, "Ambiguous Empty", testFile,
-                perModeExpected.get(Mode.EMPTY_NO_SM.ordinal()));
+                perModeExpected.get(AmbiguousMode.EMPTY.ordinal()));
     }
 
     /**
@@ -223,25 +170,9 @@ void testCommandAmbiguousEmpty(String command, String testFile, List<Class<Excep
     void testCommandAmbiguousFalse(String command, String testFile, List<Class<Exception>> perModeExpected) {
         Properties props = System.getProperties();
         props.setProperty(JDK_LANG_PROCESS_ALLOW_AMBIGUOUS_COMMANDS, "false");
-        System.setSecurityManager(null);
 
         testCommandMode(command, "Ambiguous false", testFile,
-                perModeExpected.get(Mode.FALSE_NO_SM.ordinal()));
-    }
-
-    /**
-     * Test each command with SecurityManager and default allowAmbiguousCommands is empty.
-     * @param command a command
-     * @param perModeExpected an expected Exception class or null
-     */
-    @Test(dataProvider = "TEST_RTE_ARGS")
-    void testCommandWithSM(String command, String testFile, List<Class<Exception>> perModeExpected) {
-        Properties props = System.getProperties();
-        props.setProperty(JDK_LANG_PROCESS_ALLOW_AMBIGUOUS_COMMANDS, "");
-        System.setSecurityManager(new SecurityMan());
-
-        testCommandMode(command, "SecurityManager and Ambiguous Empty", testFile,
-                perModeExpected.get(Mode.EMPTY_SM.ordinal()));
+                perModeExpected.get(AmbiguousMode.FALSE.ordinal()));
     }
 
     private void testCommandMode(String command, String kind,
diff --git a/test/jdk/java/lang/SecurityManager/Basic.java b/test/jdk/java/lang/SecurityManager/Basic.java
new file mode 100644
index 00000000000..0f5a411e41c
--- /dev/null
+++ b/test/jdk/java/lang/SecurityManager/Basic.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test SecurityManager methods
+ * @run junit Basic
+ */
+
+import java.security.AccessControlContext;
+import java.security.AccessControlException;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class Basic {
+
+    @Test
+    void testGetClassContext() {
+        var sm = new SecurityManager() {
+            @Override
+            public Class<?>[] getClassContext() {
+                return super.getClassContext();
+            }
+        };
+        Class<?>[] stack = sm.getClassContext();
+        assertEquals(sm.getClass(), stack[0]);      // currently executing method
+        assertEquals(this.getClass(), stack[1]);    // caller
+    }
+
+    @Test
+    void testGetSecurityContext() {
+        var sm = new SecurityManager();
+        var acc = (AccessControlContext) sm.getSecurityContext();
+        assertThrows(AccessControlException.class,
+                     () -> acc.checkPermission(new RuntimePermission("foo")));
+        assertNull(acc.getDomainCombiner());
+    }
+
+    @Test
+    void testGetThreadGroup() {
+        var sm = new SecurityManager();
+        assertEquals(Thread.currentThread().getThreadGroup(), sm.getThreadGroup());
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/lang/SecurityManager/CheckAccessClassInPackagePermissions.java b/test/jdk/java/lang/SecurityManager/CheckAccessClassInPackagePermissions.java
deleted file mode 100644
index 2fc98ed4494..00000000000
--- a/test/jdk/java/lang/SecurityManager/CheckAccessClassInPackagePermissions.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8055206
- * @summary Check that each module loaded by the platform loader has the
- *          proper "accessClassInPackage" RuntimePermissions to access its
- *          qualified exports.
- * @run main CheckAccessClassInPackagePermissions
- */
-
-import java.lang.module.ModuleDescriptor;
-import java.lang.module.ModuleDescriptor.Exports;
-import java.net.URL;
-import java.security.CodeSigner;
-import java.security.CodeSource;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class CheckAccessClassInPackagePermissions {
-
-    public static void main(String[] args) throws Exception {
-
-        // Get the modules in the boot layer loaded by the boot or platform
-        // loader
-        ModuleLayer bootLayer = ModuleLayer.boot();
-        Set<Module> modules = bootLayer.modules()
-            .stream()
-            .filter(CheckAccessClassInPackagePermissions::isBootOrPlatformMod)
-            .collect(Collectors.toSet());
-
-        // Create map of target module's qualified export packages
-        Map<String, List<String>> map = new HashMap<>();
-        Set<Exports> qualExports =
-            modules.stream()
-                   .map(Module::getDescriptor)
-                   .map(ModuleDescriptor::exports)
-                   .flatMap(Set::stream)
-                   .filter(Exports::isQualified)
-                   .collect(Collectors.toSet());
-        for (Exports e : qualExports) {
-            Set<String> targets = e.targets();
-            for (String t : targets) {
-                map.compute(t, (k, ov) -> {
-                    if (ov == null) {
-                        List<String> v = new ArrayList<>();
-                        v.add(e.source());
-                        return v;
-                    } else {
-                        ov.add(e.source());
-                        return ov;
-                    }
-                });
-            }
-        }
-
-        // Check if each target module has the right permissions to access
-        // its qualified exports
-        Policy policy = Policy.getPolicy();
-        for (Map.Entry<String, List<String>> me : map.entrySet()) {
-            String moduleName = me.getKey();
-
-            // is this a module loaded by the platform loader?
-            Optional<Module> module = bootLayer.findModule(moduleName);
-            if (!module.isPresent()) {
-                continue;
-            }
-            Module mod = module.get();
-            if (mod.getClassLoader() != ClassLoader.getPlatformClassLoader()) {
-                continue;
-            }
-
-            // create ProtectionDomain simulating module
-            URL url = new URL("jrt:/" + moduleName);
-            CodeSource cs = new CodeSource(url, (CodeSigner[])null);
-            ProtectionDomain pd = new ProtectionDomain(cs, null, null, null);
-
-            List<String> pkgs = me.getValue();
-            for (String p : pkgs) {
-                RuntimePermission rp =
-                    new RuntimePermission("accessClassInPackage." + p);
-                if (!policy.implies(pd, rp)) {
-                    throw new Exception("Module " + mod + " has not been " +
-                                        "granted " + rp);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns true if the module's loader is the boot or platform loader.
-     */
-    private static boolean isBootOrPlatformMod(Module m) {
-        return m.getClassLoader() == null ||
-               m.getClassLoader() == ClassLoader.getPlatformClassLoader();
-    }
-}
diff --git a/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java b/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java
deleted file mode 100644
index 683b98b00f9..00000000000
--- a/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- *  @test
- *  @bug 6741606 7146431 8000450 8019830 8022945 8027144 8041633 8078427 8055206
- *  @summary Check that various restricted packages that are supposed to be
- *           restricted by default or are listed in the package.access
- *           property in the java.security file are blocked
- *  @run main/othervm CheckPackageAccess
- */
-
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-public class CheckPackageAccess {
-
-    private static final SecurityManager sm = new SecurityManager();
-    private static final ModuleFinder mf = ModuleFinder.ofSystem();
-
-    /*
-     * The expected list of restricted packages of the package.access property.
-     *
-     * This array should be updated whenever new packages are added to the
-     * package.access property in the java.security file
-     * NOTE: it should be in the same order as the java.security file
-     */
-    private static final String[] EXPECTED = {
-        "sun.misc.",
-        "sun.reflect.",
-    };
-
-    /**
-     * Tests access to various packages of a module.
-     */
-    private static class Test {
-        String moduleName;     // name of module
-        ModuleReference moduleRef;     // module reference
-        String exports;    // exported pkg
-        Optional<String> opens;      // opened pkg
-        String conceals;   // concealed pkg
-        Optional<String> qualExports; // qualified export pkg
-        Optional<String> qualOpens;   // qualified open pkg
-        // qual open and non-qualified export pkg
-        Optional<String> qualOpensAndExports;
-        Test(String module, String exports, String opens, String conceals,
-             String qualExports, String qualOpens, String qualOpensAndExports) {
-            this.moduleName = module;
-            this.moduleRef = mf.find(moduleName).get();
-            this.exports = exports;
-            this.opens = Optional.ofNullable(opens);
-            this.conceals = conceals;
-            this.qualExports = Optional.ofNullable(qualExports);
-            this.qualOpens = Optional.ofNullable(qualOpens);
-            this.qualOpensAndExports = Optional.ofNullable(qualOpensAndExports);
-        }
-
-        void test() {
-            final boolean isModulePresent =
-                        ModuleLayer.boot().findModule(moduleName).isPresent();
-            System.out.format("Testing module: %1$s. Module is%2$s present.\n",
-                        moduleName, isModulePresent ? "" : " NOT");
-
-            if (isModulePresent) {
-
-                // access to exported pkg should pass
-                testNonRestricted(exports);
-
-                // access to opened pkg should pass
-                opens.ifPresent(Test::testNonRestricted);
-
-                // access to concealed pkg should fail
-                testRestricted(conceals);
-
-                // access to qualified export pkg should fail
-                qualExports.ifPresent(Test::testRestricted);
-
-                // access to qualified open pkg should fail
-                qualOpens.ifPresent(Test::testRestricted);
-
-                // access to qualified opened pkg that is also exported should pass
-                qualOpensAndExports.ifPresent(Test::testNonRestricted);
-            } else {
-                System.out.println("Skipping tests for module.");
-            }
-        }
-
-        private static void testRestricted(String pkg) {
-            try {
-                sm.checkPackageAccess(pkg);
-                throw new RuntimeException("Able to access restricted package: "
-                                           + pkg);
-            } catch (SecurityException se) {}
-            try {
-                sm.checkPackageDefinition(pkg);
-                throw new RuntimeException("Able to access restricted package: "
-                                           + pkg);
-            } catch (SecurityException se) {}
-        }
-
-        private static void testNonRestricted(String pkg) {
-            try {
-                sm.checkPackageAccess(pkg);
-            } catch (SecurityException se) {
-                throw new RuntimeException("Unable to access exported package: "
-                                           + pkg, se);
-            }
-            try {
-                sm.checkPackageDefinition(pkg);
-            } catch (SecurityException se) {
-                throw new RuntimeException("Unable to access exported package: "
-                                           + pkg, se);
-            }
-        }
-    }
-
-    private static final Test[] tests = new Test[] {
-        // java.base module loaded by boot loader
-        new Test("java.base", "java.security", null, "jdk.internal.jrtfs",
-                 "jdk.internal.loader", null, null),
-        // java.desktop module loaded by boot loader and has an openQual pkg
-        // that is exported
-        new Test("java.desktop", "java.applet", null, "sun.font",
-                 "sun.awt", null, "javax.swing.plaf.basic"),
-        // java.security.jgss module loaded by platform loader
-        new Test("java.security.jgss", "org.ietf.jgss", null,
-                 "sun.security.krb5.internal.crypto", "sun.security.krb5",
-                 null, null),
-    };
-
-    public static void main(String[] args) throws Exception {
-
-        // check expected list of restricted packages in java.security file
-        checkPackages(Arrays.asList(EXPECTED));
-
-        // check access to each module's packages
-        for (Test test : tests) {
-            test.test();
-        }
-
-        System.out.println("Test passed");
-    }
-
-    private static void checkPackages(List<String> pkgs) {
-        for (String pkg : pkgs) {
-            try {
-                sm.checkPackageAccess(pkg);
-                throw new RuntimeException("Able to access " + pkg +
-                                           " package");
-            } catch (SecurityException se) { }
-            try {
-                sm.checkPackageDefinition(pkg);
-                throw new RuntimeException("Able to define class in " + pkg +
-                                           " package");
-            } catch (SecurityException se) { }
-            String subpkg = pkg + "foo";
-            try {
-                sm.checkPackageAccess(subpkg);
-                throw new RuntimeException("Able to access " + subpkg +
-                                           " package");
-            } catch (SecurityException se) { }
-            try {
-                sm.checkPackageDefinition(subpkg);
-                throw new RuntimeException("Able to define class in " +
-                                           subpkg + " package");
-            } catch (SecurityException se) { }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java b/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java
deleted file mode 100644
index 1ad1f57ff43..00000000000
--- a/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8072692
- * @summary Check the matching implemented by SecurityManager.checkPackageAccess
- * @run main/othervm -Djava.security.manager=allow CheckPackageMatching
- */
-
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/*
- * The purpose of this test is not to verify the content of the package
- * access list - but to ensure that the matching implemented by the
- * SecurityManager is correct. This is why we have our own pattern matching
- * algorithm here.
- */
-public class CheckPackageMatching {
-
-    /**
-     * The restricted packages listed in the package.access property of the
-     * java.security file.
-     */
-    private static final String[] packages = actual().toArray(new String[0]);
-
-    /**
-     * Returns the list of restricted packages in the package.access property.
-     */
-    private static List<String> actual() {
-        String prop = Security.getProperty("package.access");
-        List<String> packages = new ArrayList<>();
-        if (prop != null && !prop.equals("")) {
-            StringTokenizer tok = new StringTokenizer(prop, ",");
-            while (tok.hasMoreElements()) {
-                String s = tok.nextToken().trim();
-                packages.add(s);
-            }
-        }
-        return packages;
-    }
-
-    /**
-     * PackageMatcher implements a state machine that matches package
-     * names against packages parsed from the package access list.
-     */
-    private abstract static class PackageMatcher {
-        // For each state, chars[state] contains the chars that matches.
-        private final char[][] chars;
-        // For each state, states[state][i] contains the next state to go
-        // to when chars[state][i] matches the current character.
-        private final int[][] states;
-
-        // Some markers. We're making the assumption that 0
-        // cannot be a valid character for a package name.
-        //
-        // We use 0 for marking that we expect an end of string in
-        // char[state][i].
-        private static final char END_OF_STRING = 0;
-        // This special state value indicates that we expect the string to end
-        // there.
-        private static final int END_STATE = -1;
-        // This special state value indicates that we can accept any character
-        // from now on.
-        private static final int WILDCARD_STATE = Integer.MIN_VALUE;
-
-        // Create the data for a new state machine to match package names from
-        // the array of package names passed as argument.
-        // Each package name in the array is expected to end with '.'
-        // For each package in packages we're going to compile state data
-        // that will match the regexp:
-        // ^packages[i].substring(0, packages[i].length()-1).replace(".","\\.")$|^packages[i].replace(".","\\.").*
-        //
-        // Let's say the package array is:
-        //
-        // String[] packages = { "sun.", "com.sun.jmx.", "com.sun.proxy.",
-        //                       "apple." };
-        //
-        // then the state machine will need data that looks like:
-        //
-        // char[][] chars = {
-        //    { 'a', 'c', 's' }, { 'p' }, { 'p' }, { 'l' }, { 'e' }, { 0, '.' },
-        //    { 'o' }, { 'm' }, { '.' }, { 's' }, { 'u' }, { 'n' }, { '.' },
-        //    { 'j', 'p'},
-        //    { 'm' }, { 'x' }, { 0, '.' },
-        //    { 'r' }, { 'o' }, { 'x' }, { 'y' }, { 0, '.' },
-        //    { 'u' }, { 'n' }, { 0, '.' }
-        // }
-        // int[][] states = {
-        //    { 1, 6, 22 }, { 2 }, { 3 }, { 4 }, { 5 },
-        //    { END_STATE, WILDCARD_STATE },
-        //    { 7 }, { 8 }, { 9 }, { 10 }, { 11 }, { 12 }, { 13 }, { 14, 17 },
-        //    { 15 }, { 16 }, { END_STATE, WILDCARD_STATE },
-        //    { 18 }, { 19 }, { 20 }, { 21 }, { END_STATE, WILDCARD_STATE },
-        //    { 23 }, { 24 }, { END_STATE, WILDCARD_STATE }
-        // }
-        //
-        // The machine will start by loading the chars and states for state 0
-        // chars[0] => { 'a', 'c', 's' } states[0] => { 1, 6, 22 }
-        // then it examines the char at index 0 in the candidate name.
-        // if the char matches one of the characters in chars[0], then it goes
-        // to the corresponding state in states[0]. For instance - if the first
-        // char in the candidate name is 's', which corresponds to chars[0][2] -
-        // then it will proceed with the next char in the candidate name and go
-        // to state 22 (as indicated by states[0][2]) - where it will load the
-        // chars and states for states 22: chars[22] = { 'u' },
-        // states[22] = { 23 } etc... until the candidate char at the current
-        // index matches no char in chars[states] => the candidate name doesn't
-        // match - or until it finds a success termination condition: the
-        // candidate chars are exhausted and states[state][0] is END_STATE, or
-        // the candidate chars are not exhausted - and
-        // states[state][chars[state]] is WILDCARD_STATE indicating a '.*' like
-        // regexp.
-        //
-        // [Note that the chars in chars[i] are sorted]
-        //
-        // The compile(...) method is reponsible for building the state machine
-        // data and is called only once in the constructor.
-        //
-        // The matches(String candidate) method will tell whether the candidate
-        // matches by implementing the algorithm described above.
-        //
-        PackageMatcher(String[] packages) {
-            final boolean[] selected = new boolean[packages.length];
-            Arrays.fill(selected, true);
-            final ArrayList<char[]> charList = new ArrayList<>();
-            final ArrayList<int[]> stateList = new ArrayList<>();
-            compile(0, 0, packages, selected, charList, stateList);
-            chars = charList.toArray(new char[0][0]);
-            states = stateList.toArray(new int[0][0]);
-        }
-
-        /**
-         * Compiles the state machine data (recursive).
-         *
-         * @param step  The index of the character which we're looking at in
-         *              this step.
-         * @param state The current state (starts at 0).
-         * @param pkgs  The list of packages from which the automaton is built.
-         * @param selected  Indicates which packages we're looking at in this
-                            step.
-         * @param charList  The list from which we will build
-                            {@code char[][] chars;}
-         * @param stateList The list from which we will build
-                            {@code int[][]  states;}
-         * @return the next available state.
-         */
-        private int compile(int step, int state, String[] pkgs,
-                            boolean[] selected, ArrayList<char[]> charList,
-                            ArrayList<int[]> stateList) {
-            final char[] next = new char[pkgs.length];
-            final int[] nexti = new int[pkgs.length];
-            int j = 0;
-            char min = Character.MAX_VALUE; char max = 0;
-            for (int i = 0; i < pkgs.length; i++) {
-                if (!selected[i]) continue;
-                final String p = pkgs[i];
-                final int len = p.length();
-                if (step > len) {
-                    selected[i] = false;
-                    continue;
-                }
-                if (len - 1 == step) {
-                    boolean unknown = true;
-                    for (int k = 0; k < j ; k++) {
-                        if (next[k] == END_OF_STRING) {
-                            unknown = false;
-                            break;
-                        }
-                    }
-                    if (unknown) {
-                        next[j] = END_OF_STRING;
-                        j++;
-                    }
-                    nexti[i] = END_STATE;
-                }
-                final char c = p.charAt(step);
-                nexti[i] = len - 1 == step ? END_STATE : c;
-                boolean unknown = j == 0 || c < min || c > max;
-                if (!unknown) {
-                    if (c != min || c != max) {
-                        unknown = true;
-                        for (int k = 0; k < j ; k++) {
-                            if (next[k] == c) {
-                                unknown = false;
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (unknown) {
-                    min = min > c ? c : min;
-                    max = max < c ? c : max;
-                    next[j] = c;
-                    j++;
-                }
-            }
-            final char[] nc = new char[j];
-            final int[]  nst = new int[j];
-            System.arraycopy(next, 0, nc, 0, nc.length);
-            Arrays.sort(nc);
-            final boolean ns[] = new boolean[pkgs.length];
-
-            charList.ensureCapacity(state + 1);
-            stateList.ensureCapacity(state + 1);
-            charList.add(state, nc);
-            stateList.add(state, nst);
-            state = state + 1;
-            for (int k = 0; k < nc.length; k++) {
-                int selectedCount = 0;
-                boolean endStateFound = false;
-                boolean wildcardFound = false;
-                for (int l = 0; l < nexti.length; l++) {
-                    if (!(ns[l] = selected[l])) {
-                        continue;
-                    }
-                    ns[l] = nexti[l] == nc[k] || nexti[l] == END_STATE
-                            && nc[k] == '.';
-                    endStateFound = endStateFound || nc[k] == END_OF_STRING
-                                    && nexti[l] == END_STATE;
-                    wildcardFound = wildcardFound || nc[k] == '.'
-                                    && nexti[l] == END_STATE;
-                    if (ns[l]) {
-                        selectedCount++;
-                    }
-                }
-                nst[k] = (endStateFound ? END_STATE
-                         : wildcardFound ? WILDCARD_STATE : state);
-                if (selectedCount == 0 || wildcardFound) {
-                    continue;
-                }
-                state = compile(step + 1, state, pkgs, ns, charList, stateList);
-            }
-            return state;
-        }
-
-        /**
-         * Matches 'pkg' against the list of package names compiled in the
-         * state machine data.
-         *
-         * @param pkg The package name to match. Must not end with '.'.
-         * @return true if the package name matches, false otherwise.
-         */
-        public boolean matches(String pkg) {
-            int state = 0;
-            int i;
-            final int len = pkg.length();
-            next: for (i = 0; i <= len; i++) {
-                if (state == WILDCARD_STATE) {
-                    return true; // all characters will match.
-                }
-                if (state == END_STATE) {
-                    return i == len;
-                }
-                final char[] ch = chars[state];
-                final int[] st = states[state];
-                if (i == len) {
-                    // matches only if we have exhausted the string.
-                    return st[0] == END_STATE;
-                }
-                if (st[0] == END_STATE && st.length == 1) {
-                    // matches only if we have exhausted the string.
-                    return i == len;
-                }
-                final char c = pkg.charAt(i); // look at next char...
-                for (int j = st[0] == END_STATE ? 1 : 0; j < ch.length; j++) {
-                    final char n = ch[j];
-                    if (c == n) {      // found a match
-                        state = st[j]; // get the next state.
-                        continue next; // go to next state
-                    } else if (c < n) {
-                        break; // chars are sorted. we won't find it. no match.
-                    }
-                }
-                break; // no match
-            }
-            return false;
-        }
-    }
-
-    private static final class TestPackageMatcher extends PackageMatcher {
-        private final List<String> list;
-
-        TestPackageMatcher(String[] packages) {
-            super(packages);
-            this.list = Collections.unmodifiableList(Arrays.asList(packages));
-        }
-
-        @Override
-        public boolean matches(String pkg) {
-            final boolean match1 = super.matches(pkg);
-            boolean match2 = false;
-            String p2 = pkg + ".";
-            for (String p : list) {
-                if (pkg.startsWith(p) || p2.equals(p)) {
-                    match2 = true;
-                    break;
-                }
-            }
-            if (match1 != match2) {
-                System.err.println("Test Bug: PackageMatcher.matches(\"" +
-                                   pkg + "\") returned " + match1);
-                System.err.println("Package Access List is: " + list);
-                throw new Error("Test Bug: PackageMatcher.matches(\"" +
-                                pkg + "\") returned " + match1);
-            }
-            return match1;
-        }
-    }
-
-    private static void smokeTest() {
-        // these checks should pass.
-        System.getSecurityManager().checkPackageAccess("com.sun.blah");
-        System.getSecurityManager().checkPackageAccess("com.sun.jm");
-        System.getSecurityManager().checkPackageAccess("com.sun.jmxa");
-        System.getSecurityManager().checkPackageAccess("jmx");
-        List<String> actual = Arrays.asList(packages);
-        if (!actual.contains("sun.misc.")) {
-            throw new Error("package.access does not contain 'sun.misc.'");
-        }
-    }
-
-    // This is a sanity test for our own test code.
-    private static void testTheTest(String[] pkgs, char[][] chars,
-                                    int[][] states) {
-
-        PackageMatcher m = new TestPackageMatcher(pkgs);
-        String unexpected = "";
-        if (!Arrays.deepEquals(chars, m.chars)) {
-            System.err.println("Char arrays differ");
-            if (chars.length != m.chars.length) {
-                System.err.println("Char array lengths differ: expected="
-                        + chars.length + " actual=" + m.chars.length);
-            }
-            System.err.println(Arrays.deepToString(m.chars).replace((char)0,
-                                                   '0'));
-            unexpected = "chars[]";
-        }
-        if (!Arrays.deepEquals(states, m.states)) {
-            System.err.println("State arrays differ");
-            if (states.length != m.states.length) {
-                System.err.println("Char array lengths differ: expected="
-                        + states.length + " actual=" + m.states.length);
-            }
-            System.err.println(Arrays.deepToString(m.states));
-            if (unexpected.length() > 0) {
-                unexpected = unexpected + " and ";
-            }
-            unexpected = unexpected + "states[]";
-        }
-
-        if (unexpected.length() > 0) {
-            throw new Error("Unexpected "+unexpected+" in PackageMatcher");
-        }
-
-        testMatches(m, pkgs);
-    }
-
-    // This is a sanity test for our own test code.
-    private static void testTheTest() {
-        final String[] packages2 = { "sun.", "com.sun.jmx.",
-                                     "com.sun.proxy.", "apple." };
-
-        final int END_STATE = PackageMatcher.END_STATE;
-        final int WILDCARD_STATE = PackageMatcher.WILDCARD_STATE;
-
-        final char[][] chars2 = {
-            { 'a', 'c', 's' }, { 'p' }, { 'p' }, { 'l' }, { 'e' }, { 0, '.' },
-            { 'o' }, { 'm' }, { '.' }, { 's' }, { 'u' }, { 'n' }, { '.' },
-            { 'j', 'p'},
-            { 'm' }, { 'x' }, { 0, '.' },
-            { 'r' }, { 'o' }, { 'x' }, { 'y' }, { 0, '.' },
-            { 'u' }, { 'n' }, { 0, '.' }
-         };
-
-         final int[][] states2 = {
-            { 1, 6, 22 }, { 2 }, { 3 }, { 4 }, { 5 },
-            { END_STATE, WILDCARD_STATE },
-            { 7 }, { 8 }, { 9 }, { 10 }, { 11 }, { 12 }, { 13 }, { 14, 17 },
-            { 15 }, { 16 }, { END_STATE, WILDCARD_STATE },
-            { 18 }, { 19 }, { 20 }, { 21 }, { END_STATE, WILDCARD_STATE },
-            { 23 }, { 24 }, { END_STATE, WILDCARD_STATE }
-         };
-
-         testTheTest(packages2, chars2, states2);
-
-         final String[] packages3 = { "sun.", "com.sun.pro.",
-                                      "com.sun.proxy.", "apple." };
-
-         final char[][] chars3 = {
-            { 'a', 'c', 's' }, { 'p' }, { 'p' }, { 'l' }, { 'e' }, { 0, '.' },
-            { 'o' }, { 'm' }, { '.' }, { 's' }, { 'u' }, { 'n' }, { '.' },
-            { 'p' }, { 'r' }, { 'o' }, { 0, '.', 'x' },
-            { 'y' }, { 0, '.' },
-            { 'u' }, { 'n' }, { 0, '.' }
-         };
-
-         final int[][] states3 = {
-            { 1, 6, 19 }, { 2 }, { 3 }, { 4 }, { 5 },
-            { END_STATE, WILDCARD_STATE },
-            { 7 }, { 8 }, { 9 }, { 10 }, { 11 }, { 12 }, { 13 }, { 14 },
-            { 15 }, { 16 }, { END_STATE, WILDCARD_STATE, 17 },
-            { 18 }, { END_STATE, WILDCARD_STATE },
-            { 20 }, { 21 }, { END_STATE, WILDCARD_STATE }
-         };
-
-         testTheTest(packages3, chars3, states3);
-    }
-
-    private static volatile boolean sanityTesting = false;
-
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-
-        // Some smoke tests.
-        smokeTest();
-        System.out.println("Smoke tests passed.");
-
-        // Test our own pattern matching algorithm. Here we actually test
-        // the PackageMatcher class from our own test code.
-        sanityTesting = true;
-        try {
-            testTheTest();
-            System.out.println("Sanity tests passed.");
-        } finally {
-            sanityTesting = false;
-        }
-
-        // Now test the package matching in the security manager.
-        PackageMatcher matcher = new TestPackageMatcher(packages);
-
-        // These should not match.
-        for (String pkg : new String[] {"gloups.machin", "su",
-                                        "org.jcp.xml.dsig.inter",
-                                        "com.sun.jm", "com.sun.jmxa"}) {
-            testMatch(matcher, pkg, false, true);
-        }
-
-        // These should match.
-        for (String pkg : Arrays.asList(
-                new String[] {"sun.misc.gloups.machin", "sun.misc",
-                              "sun.reflect"})) {
-            testMatch(matcher, pkg, true, true);
-        }
-
-        // Derive a list of packages that should match or not match from
-        // the list in 'packages' - and check that the security manager
-        // throws the appropriate exception.
-        testMatches(matcher, packages);
-    }
-
-    private static void testMatches(PackageMatcher matcher, String[] pkgs) {
-        Collection<String> pkglist = Arrays.asList(pkgs);
-        PackageMatcher ref = new TestPackageMatcher(packages);
-
-        for (String pkg : pkgs) {
-            String candidate = pkg + "toto";
-            boolean expected = true;
-            testMatch(matcher, candidate, expected,
-                      ref.matches(candidate) == expected);
-        }
-
-        for (String pkg : pkgs) {
-            String candidate = pkg.substring(0, pkg.length() - 1);
-            boolean expected = pkglist.contains(candidate + ".");
-            testMatch(matcher, candidate, expected,
-                      ref.matches(candidate) == expected);
-        }
-
-        for (String pkg : pkgs) {
-            String candidate = pkg.substring(0, pkg.length() - 2);
-            boolean expected = pkglist.contains(candidate + ".");
-            testMatch(matcher, candidate, expected,
-                      ref.matches(candidate) == expected);
-        }
-    }
-
-    private static void testMatch(PackageMatcher matcher, String candidate,
-                                  boolean expected, boolean testSecurityManager)
-    {
-        final boolean m = matcher.matches(candidate);
-        if (m != expected) {
-            final String msg = "\"" + candidate + "\": " +
-                (m ? "matches" : "does not match");
-            throw new Error("PackageMatcher does not give expected results: "
-                            + msg);
-        }
-
-        if (sanityTesting) {
-            testSecurityManager = false;
-        }
-
-        if (testSecurityManager) {
-            System.out.println("Access to " + candidate + " should be " +
-                               (expected ? "rejected" : "granted"));
-            final String errormsg = "\"" + candidate + "\" : " +
-                (expected ? "granted" : "not granted");
-            try {
-                System.getSecurityManager().checkPackageAccess(candidate);
-                if (expected) {
-                    System.err.println(errormsg);
-                    throw new Error("Expected exception not thrown: " +
-                                    errormsg);
-                }
-            } catch (SecurityException x) {
-                if (!expected) {
-                    System.err.println(errormsg);
-                    throw new Error(errormsg + " - unexpected exception: " +
-                                    x, x);
-                } else {
-                    System.out.println("Got expected exception: " + x);
-                }
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java b/test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java
index 468cd4c57d5..4224f89c4b5 100644
--- a/test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java
+++ b/test/jdk/java/lang/SecurityManager/CheckSecurityProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6997010 7191662
  * @summary Consolidate java.security files into one file with modifications
- * @run main/othervm -Djava.security.manager=allow CheckSecurityProvider
+ * @run main/othervm CheckSecurityProvider
  */
 
 import java.security.Provider;
@@ -39,15 +39,12 @@
 /*
  * The main benefit of this test is to catch merge errors or other types
  * of issues where one or more of the security providers are accidentally
- * removed. With the security manager enabled, this test can also catch
- * scenarios where the default permission policy needs to be updated.
+ * removed.
  */
 public class CheckSecurityProvider {
     public static void main(String[] args) throws Exception {
         ModuleLayer layer = ModuleLayer.boot();
 
-        System.setSecurityManager(new SecurityManager());
-
         String os = System.getProperty("os.name");
         /*
          * This array should be updated whenever new security providers
diff --git a/test/jdk/java/lang/SecurityManager/PackageAccessTest.java b/test/jdk/java/lang/SecurityManager/PackageAccessTest.java
deleted file mode 100644
index 9a2798f4892..00000000000
--- a/test/jdk/java/lang/SecurityManager/PackageAccessTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4256530 4136245
- * @summary Check that restricted packages that are supposed to be restricted
- *          and explicit grants accessClassInPackage permission overridden in
- *          privileged block
- * @modules java.base/sun.security.x509
- * @run main/othervm PackageAccessTest
- * @run main/othervm/java.security.policy=test.policy PackageAccessTest access
- * @run main/othervm/java.security.policy=empty.policy PackageAccessTest deny
- */
-
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-
-public class PackageAccessTest {
-
-    public static void main(String[] args) {
-        boolean access = true;
-
-        if (args != null && args.length > 0) {
-            switch (args[0]) {
-                case "access":
-                    access = true;
-                    break;
-                case "deny":
-                    access = false;
-                    break;
-                default:
-                    throw new RuntimeException(
-                            "Invalid input parameter " + args[0]);
-            }
-        }
-
-        testPkgAccess(access);
-        testPkgAccessWithPrivileged(access);
-    }
-
-    private static void testPkgAccess(boolean access) {
-        try {
-            sun.security.x509.X509CertInfo x = new sun.security.x509.X509CertInfo();
-            if (!access) {
-                throw new RuntimeException(
-                        "application unexpectedly able to access the internal package");
-            }
-        } catch (SecurityException se) {
-            if (access) {
-                throw new RuntimeException("Unexpected security exception", se);
-            }
-        }
-    }
-
-    private static void testPkgAccessWithPrivileged(boolean access) {
-        sun.security.x509.X509CertInfo o = null;
-        try {
-            o = (sun.security.x509.X509CertInfo) AccessController.doPrivileged(
-                    (PrivilegedExceptionAction) () -> new sun.security.x509.X509CertInfo());
-            if (!access) {
-                throw new RuntimeException(
-                        "application unexpectedly able to access the internal package");
-            }
-        } catch (AccessControlException ace) {
-            if (access) {
-                throw new RuntimeException("Unexpected AccessControlException", ace);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Test failed with unexpected exception", ex);
-        }
-        if (access && o == null)
-            throw new RuntimeException(
-                    "Test failed: unable to instantiate object");
-    }
-
-}
diff --git a/test/jdk/java/lang/SecurityManager/empty.policy b/test/jdk/java/lang/SecurityManager/empty.policy
deleted file mode 100644
index 467b68bc942..00000000000
--- a/test/jdk/java/lang/SecurityManager/empty.policy
+++ /dev/null
@@ -1 +0,0 @@
-// This is an empty policy
diff --git a/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java b/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java
deleted file mode 100644
index cd9201a3c22..00000000000
--- a/test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import java.nio.file.Paths;
-import java.util.List;
-
-/*
- * @test
- * @summary Basic test of -Djava.security.manager to a class in named module.
- * @library /test/lib
- * @build jdk.test.lib.process.*
- *        m/*
- * @run testng/othervm CustomSecurityManagerTest
- */
-public class CustomSecurityManagerTest {
-
-    private static final String MODULE_PATH = Paths.get(Utils.TEST_CLASSES).resolve("modules").toString();
-    private static final String POLICY_PATH = Paths.get(Utils.TEST_SRC).resolve("test.policy").toString();
-
-    @DataProvider
-    public Object[][] testCases() {
-        return new Object[][]{
-            new Object[] { List.of(
-                    "--module-path", MODULE_PATH,
-                    "--add-modules", "m",
-                    "-Djava.security.manager",
-                    String.format("-Djava.security.policy=%s", POLICY_PATH),
-                    "RunTest"
-            ) },
-            new Object[] { List.of(
-                    "--module-path", MODULE_PATH,
-                    "--add-modules", "m",
-                    "-Djava.security.manager=p.CustomSecurityManager",
-                    String.format("-Djava.security.policy=%s", POLICY_PATH),
-                    "RunTest"
-            ) }
-        };
-    }
-
-    @Test(dataProvider = "testCases")
-    public void testProvider(List<String> args) throws Throwable {
-        ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(args);
-        OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder);
-        outputAnalyzer.shouldHaveExitValue(0);
-    }
-
-}
-
-class RunTest {
-    public static void main(String... args) {
-        SecurityManager sm = System.getSecurityManager();
-        Module module = sm.getClass().getModule();
-        String s = System.getProperty("java.security.manager");
-        String expected = s.isEmpty() ? "java.base" : "m";
-        if (!module.isNamed() || !module.getName().equals(expected)) {
-            throw new RuntimeException(module + " expected module m instead");
-        }
-    }
-}
diff --git a/test/jdk/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java b/test/jdk/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java
deleted file mode 100644
index bc6e22ddbca..00000000000
--- a/test/jdk/java/lang/SecurityManager/modules/m/p/CustomSecurityManager.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p;
-
-public class CustomSecurityManager extends SecurityManager {
-    public CustomSecurityManager() {
-    }
-}
diff --git a/test/jdk/java/lang/SecurityManager/modules/test.policy b/test/jdk/java/lang/SecurityManager/modules/test.policy
deleted file mode 100644
index a3929e36b54..00000000000
--- a/test/jdk/java/lang/SecurityManager/modules/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-        permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/java/lang/SecurityManager/test.policy b/test/jdk/java/lang/SecurityManager/test.policy
deleted file mode 100644
index fe201266abf..00000000000
--- a/test/jdk/java/lang/SecurityManager/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant  {
- permission java.lang.RuntimePermission "accessClassInPackage.sun.security.x509";
-};
diff --git a/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java
index dc3fc15f7cf..cb9d4d061da 100644
--- a/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java
+++ b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @build java.base/java.util.CSM csm/*
  * @run main/othervm csm/jdk.test.CallerSensitiveTest
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames csm/jdk.test.CallerSensitiveTest
- * @run main/othervm -Djava.security.manager=allow csm/jdk.test.CallerSensitiveTest sm
  */
 public class Main {
 }
diff --git a/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java
index 9ab8904f3e6..27bebfc2ee6 100644
--- a/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java
+++ b/test/jdk/java/lang/StackWalker/CallerSensitiveMethod/csm/jdk/test/CallerSensitiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,6 @@
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.CSM.Result;
 import java.util.function.Supplier;
 
@@ -42,29 +37,11 @@
  * StackWalker::getCallerClass can't be called from @CallerSensitive method.
  */
 public class CallerSensitiveTest {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
     private static final String NON_CSM_CALLER_METHOD = "getCallerClass";
     private static final String REFLECTIVE_GET_CALLER_METHOD = "getCallerClassReflectively";
     private static final String CSM_CALLER_METHOD = "caller";
 
     public static void main(String... args) throws Throwable {
-        boolean sm = false;
-        if (args.length > 0 && args[0].equals("sm")) {
-            sm = true;
-            PermissionCollection perms = new Permissions();
-            perms.add(new RuntimePermission("getStackWalkerWithClassReference"));
-            Policy.setPolicy(new Policy() {
-                @Override
-                public boolean implies(ProtectionDomain domain, Permission p) {
-                    return perms.implies(p) ||
-                        DEFAULT_POLICY.implies(domain, p);
-                }
-            });
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        System.err.format("Test %s security manager.%n",
-                          sm ? "with" : "without");
 
         CallerSensitiveTest cstest = new CallerSensitiveTest();
         // test static call to java.util.CSM::caller and CSM::getCallerClass
diff --git a/test/jdk/java/lang/StackWalker/GetCallerClassTest.java b/test/jdk/java/lang/StackWalker/GetCallerClassTest.java
index 7ada937711a..b2b93789102 100644
--- a/test/jdk/java/lang/StackWalker/GetCallerClassTest.java
+++ b/test/jdk/java/lang/StackWalker/GetCallerClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Basic test for StackWalker.getCallerClass()
  * @run main/othervm GetCallerClassTest
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames GetCallerClassTest
- * @run main/othervm -Djava.security.manager=allow GetCallerClassTest sm
  */
 
 import static java.lang.StackWalker.Option.*;
@@ -36,17 +35,11 @@
 import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
 public class GetCallerClassTest {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
     private final StackWalker walker;
     private final boolean expectUOE;
 
@@ -55,18 +48,6 @@ public GetCallerClassTest(StackWalker sw, boolean expect) {
         this.expectUOE = expect;
     }
     public static void main(String... args) throws Exception {
-        if (args.length > 0 && args[0].equals("sm")) {
-            PermissionCollection perms = new Permissions();
-            perms.add(new RuntimePermission("getStackWalkerWithClassReference"));
-            Policy.setPolicy(new Policy() {
-                @Override
-                public boolean implies(ProtectionDomain domain, Permission p) {
-                    return perms.implies(p) ||
-                        DEFAULT_POLICY.implies(domain, p);
-                }
-            });
-            System.setSecurityManager(new SecurityManager());
-        }
         new GetCallerClassTest(StackWalker.getInstance(), true).test();
         new GetCallerClassTest(StackWalker.getInstance(RETAIN_CLASS_REFERENCE), false).test();
         new GetCallerClassTest(StackWalker.getInstance(EnumSet.of(RETAIN_CLASS_REFERENCE,
diff --git a/test/jdk/java/lang/StackWalker/SecurityExceptions.java b/test/jdk/java/lang/StackWalker/SecurityExceptions.java
deleted file mode 100644
index 16f068cb2ea..00000000000
--- a/test/jdk/java/lang/StackWalker/SecurityExceptions.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8020968
- * @summary Test security permission check
- * @run main/othervm/java.security.policy=noperms.policy SecurityExceptions true
- * @run main/othervm/java.security.policy=stackwalk.policy SecurityExceptions false
- */
-public class SecurityExceptions {
-    public static void main(String[] args) {
-        boolean expectException = Boolean.parseBoolean(args[0]);
-
-        StackWalker sw = StackWalker.getInstance();
-
-        try {
-            sw = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
-            if (expectException) {
-                throw new RuntimeException("Expected SecurityException, but none thrown");
-            }
-        } catch (SecurityException e) {
-            if (!expectException) {
-                System.err.println("Unexpected security exception:");
-                throw e;
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/StackWalker/StackWalkTest.java b/test/jdk/java/lang/StackWalker/StackWalkTest.java
index e3287b1e73f..80e934d477c 100644
--- a/test/jdk/java/lang/StackWalker/StackWalkTest.java
+++ b/test/jdk/java/lang/StackWalker/StackWalkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,7 @@
  * @build jdk.test.lib.RandomFactory
  * @compile StackRecorderUtil.java
  * @run main/othervm StackWalkTest
- * @run main/othervm/java.security.policy=stackwalktest.policy StackWalkTest
  * @run main/othervm StackWalkTest -random:50
- * @run main/othervm/java.security.policy=stackwalktest.policy StackWalkTest -random:50
  * @author danielfuchs, bchristi
  * @key randomness
  */
diff --git a/test/jdk/java/lang/StackWalker/VerifyStackTrace.java b/test/jdk/java/lang/StackWalker/VerifyStackTrace.java
index 6fb4bd6c8f0..bb59db5dda0 100644
--- a/test/jdk/java/lang/StackWalker/VerifyStackTrace.java
+++ b/test/jdk/java/lang/StackWalker/VerifyStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
  *          options, when the stack contains lambdas, method handle invoke
  *          virtual calls, and reflection.
  * @run main/othervm VerifyStackTrace
- * @run main/othervm/java.security.policy=stackwalk.policy VerifyStackTrace
  * @author danielfuchs
  */
 public class VerifyStackTrace {
@@ -141,10 +140,9 @@ static class TestCase3 implements TestCase {
             "12: java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:122)\n" +
             "13: java.base/java.lang.reflect.Method.invoke(Method.java:573)\n" +
             "14: VerifyStackTrace$1.run(VerifyStackTrace.java:292)\n" +
-            "15: java.base/java.security.AccessController.executePrivileged(AccessController.java:753)\n" +
-            "16: java.base/java.security.AccessController.doPrivileged(AccessController.java:312)\n" +
-            "17: VerifyStackTrace.test(VerifyStackTrace.java:301)\n" +
-            "18: VerifyStackTrace.main(VerifyStackTrace.java:254)\n";
+            "15: java.base/java.security.AccessController.doPrivileged(AccessController.java:312)\n" +
+            "16: VerifyStackTrace.test(VerifyStackTrace.java:301)\n" +
+            "17: VerifyStackTrace.main(VerifyStackTrace.java:254)\n";
 
         @Override public StackWalker walker() { return walker;}
         @Override public String description() { return description;}
diff --git a/test/jdk/java/lang/StackWalker/noperms.policy b/test/jdk/java/lang/StackWalker/noperms.policy
deleted file mode 100644
index 56a91dc4996..00000000000
--- a/test/jdk/java/lang/StackWalker/noperms.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * grant nothing
- */
-grant {};
-
diff --git a/test/jdk/java/lang/StackWalker/stackwalk.policy b/test/jdk/java/lang/StackWalker/stackwalk.policy
deleted file mode 100644
index fbcb6b358e1..00000000000
--- a/test/jdk/java/lang/StackWalker/stackwalk.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "getStackWalkerWithClassReference";
-};
-
diff --git a/test/jdk/java/lang/StackWalker/stackwalktest.policy b/test/jdk/java/lang/StackWalker/stackwalktest.policy
deleted file mode 100644
index 3f019364604..00000000000
--- a/test/jdk/java/lang/StackWalker/stackwalktest.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "getStackWalkerWithClassReference";
-  permission java.util.PropertyPermission "seed", "read";
-};
-
diff --git a/test/jdk/java/lang/String/concat/WithSecurityManager.java b/test/jdk/java/lang/String/concat/WithSecurityManager.java
deleted file mode 100644
index a6edd73faa9..00000000000
--- a/test/jdk/java/lang/String/concat/WithSecurityManager.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.Permission;
-
-/**
- * @test
- * @summary String concatenation fails with a custom SecurityManager that uses concatenation
- * @bug 8155090 8158851 8222895
- * @requires !vm.graal.enabled
- *
- * @compile WithSecurityManager.java
- *
- * @run main/othervm -Xverify:all -Djava.security.manager=allow WithSecurityManager
- * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.security.manager=allow WithSecurityManager
-*/
-public class WithSecurityManager {
-    public static void main(String[] args) throws Throwable {
-        // First time should succeed to bootstrap everything
-        {
-            SecurityManager sm = new SecurityManager() {
-                @Override
-                public void checkPermission(Permission perm) {
-                    String abc = "abc";
-                    int ival = perm.hashCode();
-                    String full = abc + "abc";
-                    // Contorted to avoid sweeping cases where we've
-                    // pre-generated commonly used species under the rug
-                    full = "abc" + ival + "def" + abc + "def" + abc + "def" +
-                           abc + "def" + ival + "def" + abc + "def" +
-                           abc + "def" + abc + "def" + abc + "def";
-                }
-            };
-            System.setSecurityManager(sm);
-            ClassLoader cl = new ClassLoader() {};
-        }
-
-        // Second time should succeed to run after bootstrapping
-        {
-            SecurityManager sm = new SecurityManager() {
-                @Override
-                public void checkPermission(Permission perm) {
-                    String abc = "abc";
-                    int ival = perm.hashCode();
-                    String full = abc + "abc";
-                    // Contorted variant to avoid sweeping cases where we've
-                    // pre-generated commonly used species under the rug
-                    full = "abc" + ival + "def" + abc + "def" + abc + "def" +
-                            abc + "def" + ival + "def" + abc + "def" +
-                            abc + "def" + abc + "def" + abc + "def";
-                }
-            };
-
-            // Provoke checkPermission invocation
-            System.setSecurityManager(sm);
-            ClassLoader cl = new ClassLoader() {};
-        }
-    }
-}
diff --git a/test/jdk/java/lang/System/AllowSecurityManager.java b/test/jdk/java/lang/System/AllowSecurityManager.java
index 78f46fb7760..b5009456946 100644
--- a/test/jdk/java/lang/System/AllowSecurityManager.java
+++ b/test/jdk/java/lang/System/AllowSecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,29 +24,35 @@
 /*
  * @test
  * @bug 8191053 8270380
- * @summary Test that the allow/disallow options of the java.security.manager
- *          system property work correctly
+ * @summary Test that the allow/disallow options are ignored
+ * @library /test/lib
  * @run main/othervm AllowSecurityManager
  * @run main/othervm -Djava.security.manager=disallow AllowSecurityManager
- * @run main/othervm -Djava.security.manager=allow AllowSecurityManager
+ * @run main/othervm AllowSecurityManager extra
  */
 
+import jdk.test.lib.process.ProcessTools;
+
 public class AllowSecurityManager {
 
     public static void main(String args[]) throws Exception {
-        String prop = System.getProperty("java.security.manager");
-        boolean disallow = !"allow".equals(prop);
-        try {
-            System.setSecurityManager(new SecurityManager());
-            if (disallow) {
-                throw new Exception("System.setSecurityManager did not " +
-                                    "throw UnsupportedOperationException");
+        if (args.length > 0) {
+            // Any other system property value would fail
+            if (args[0].equals("extra")) {
+                ProcessTools.executeTestJava("-Djava.security.manager=other",
+                                "AllowSecurityManager", "test")
+                        .shouldHaveExitValue(1)
+                        .shouldContain("Enabling a Security Manager is not supported.");
+            } else {
+                // The sub-process is here
             }
-        } catch (UnsupportedOperationException uoe) {
-            if (!disallow) {
-                throw new Exception("UnsupportedOperationException " +
-                                    "unexpectedly thrown by " +
-                                    "System.setSecurityManager");
+        } else {
+            try {
+                System.setSecurityManager(new SecurityManager());
+                throw new Exception("System.setSecurityManager did not " +
+                        "throw UnsupportedOperationException");
+            } catch (UnsupportedOperationException uoe) {
+                // Will always happen
             }
         }
     }
diff --git a/test/jdk/java/lang/System/IgnoreNullSecurityManager.java b/test/jdk/java/lang/System/IgnoreNullSecurityManager.java
deleted file mode 100644
index 705b40d92d0..00000000000
--- a/test/jdk/java/lang/System/IgnoreNullSecurityManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4213876
- * @summary Make sure "null" security manager is ignored, as specified in the
- * javadocs
- * @run main/othervm IgnoreNullSecurityManager
- */
-
-public class IgnoreNullSecurityManager {
-
-    public static void main(String argv[]) throws Exception {
-        System.setSecurityManager(null);
-    }
-}
diff --git a/test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java b/test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java
index c9eac5f9106..e7ef580d06f 100644
--- a/test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java
+++ b/test/jdk/java/lang/System/Logger/custom/CustomLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,15 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -39,14 +30,11 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.util.stream.Stream;
-import java.security.AllPermission;
 
 /**
  * @test
@@ -56,27 +44,13 @@
  *          System.Logger methods.
  * @build CustomLoggerTest AccessSystemLogger
  * @run driver AccessSystemLogger
- * @run main/othervm -Xbootclasspath/a:boot CustomLoggerTest NOSECURITY
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow CustomLoggerTest NOPERMISSIONS
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow CustomLoggerTest WITHPERMISSIONS
+ * @run main/othervm -Xbootclasspath/a:boot CustomLoggerTest
  * @author danielfuchs
  */
 public class CustomLoggerTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static class MyBundle extends ResourceBundle {
 
@@ -249,22 +223,9 @@ void log(LogEvent event) {
 
         @Override
         public Logger getLogger(String name, Module caller) {
-            // We should check the permission to obey the API contract, but
-            // what happens if we don't?
-            // This is the main difference compared with what we test in
-            // java/lang/System/LoggerFinder/BaseLoggerFinderTest
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null && doChecks) {
-                sm.checkPermission(SimplePolicy.LOGGERFINDER_PERMISSION);
-            }
 
-            final boolean before = allowAll.get().getAndSet(true);
-            final ClassLoader callerLoader;
-            try {
-                callerLoader = caller.getClassLoader();
-            } finally {
-                allowAll.get().set(before);
-            }
+            final ClassLoader callerLoader = caller.getClassLoader();
+
             if (callerLoader == null) {
                 return system.computeIfAbsent(name, (n) -> new LoggerImpl(n));
             } else {
@@ -275,21 +236,7 @@ public Logger getLogger(String name, Module caller) {
 
     static final AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
 
         // 1. Obtain destination loggers directly from the LoggerFinder
         //   - LoggerFinder.getLogger("foo", type)
@@ -299,36 +246,7 @@ public static void main(String[] args) {
                 BaseLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", CustomLoggerTest.class.getModule()));
         BaseLoggerFinder.LoggerImpl sysSink =
                 BaseLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", Thread.class.getModule()));
-
-
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    test(provider, true, appSink, sysSink);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    test(provider, false, appSink, sysSink);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        test(provider, true, appSink, sysSink);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        test(provider, true, appSink, sysSink);
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
@@ -346,18 +264,8 @@ public static void test(BaseLoggerFinder provider, boolean hasRequiredPermission
         loggerDescMap.put(appLogger1, "System.getLogger(\"foo\");");
 
         Logger sysLogger1 = null;
-        try {
-            sysLogger1 = accessSystemLogger.getLogger("foo");
-            loggerDescMap.put(sysLogger1, "AccessSystemLogger.getLogger(\"foo\")");
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            throw new RuntimeException("unexpected exception: " + acx, acx);
-        }
+        sysLogger1 = accessSystemLogger.getLogger("foo");
+        loggerDescMap.put(sysLogger1, "AccessSystemLogger.getLogger(\"foo\")");
 
         if (appLogger1 == sysLogger1) {
             throw new RuntimeException("identical loggers");
@@ -383,18 +291,9 @@ public static void test(BaseLoggerFinder provider, boolean hasRequiredPermission
         loggerDescMap.put(appLogger2, "System.getLogger(\"foo\", loggerBundle)");
 
         Logger sysLogger2 = null;
-        try {
-            sysLogger2 = accessSystemLogger.getLogger("foo", loggerBundle);
-            loggerDescMap.put(sysLogger2, "AccessSystemLogger.getLogger(\"foo\", loggerBundle)");
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            throw new RuntimeException("unexpected exception: " + acx, acx);
-        }
+        sysLogger2 = accessSystemLogger.getLogger("foo", loggerBundle);
+        loggerDescMap.put(sysLogger2, "AccessSystemLogger.getLogger(\"foo\", loggerBundle)");
+
         if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
@@ -675,80 +574,4 @@ public String get() {
         }
     }
 
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
-        final Permissions permissions;
-        final Permissions controlPermissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-
-            // these are used for configuring the test itself...
-            controlPermissions = new Permissions();
-            controlPermissions.add(LOGGERFINDER_PERMISSION);
-
-            // these are used for simulating a doPrivileged call from
-            // a class in the BCL
-            allPermissions = new Permissions();
-            allPermissions.add(new AllPermission());
-
-        }
-
-        Permissions permissions() {
-            if (allowAll.get().get()) return allPermissions;
-            if (allowControl.get().get()) return controlPermissions;
-            return permissions;
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return permissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(permissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(permissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java b/test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java
index 72f08bb8e32..dd0fd50e1f2 100644
--- a/test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java
+++ b/test/jdk/java/lang/System/Logger/default/DefaultLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -59,29 +52,14 @@
  * @modules java.logging
  * @build DefaultLoggerTest AccessSystemLogger
  * @run driver AccessSystemLogger
- * @run main/othervm -Xbootclasspath/a:boot DefaultLoggerTest NOSECURITY
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerTest NOPERMISSIONS
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerTest WITHPERMISSIONS
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerTest WITHCUSTOMWRAPPERS
- * @run main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerTest WITHREFLECTION
- * @author danielfuchs
+ * @run main/othervm -Xbootclasspath/a:boot DefaultLoggerTest DEFAULTS
+ * @run main/othervm -Xbootclasspath/a:boot DefaultLoggerTest WITHCUSTOMWRAPPERS
+ * @run main/othervm -Xbootclasspath/a:boot DefaultLoggerTest WITHREFLECTION
  */
 public class DefaultLoggerTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static final Queue<LogEvent> eventQueue = new ArrayBlockingQueue<>(128);
 
@@ -179,13 +157,7 @@ static java.util.logging.Level mapToJul(Level level) {
     }
 
     static void setLevel(java.util.logging.Logger sink, java.util.logging.Level loggerLevel) {
-        boolean before = allowAll.get().get();
-        try {
-            allowAll.get().set(true);
-            sink.setLevel(loggerLevel);
-        } finally {
-            allowAll.get().set(before);
-        }
+        sink.setLevel(loggerLevel);
     }
 
     public static class MyHandler extends Handler {
@@ -237,15 +209,7 @@ public static class MyLoggerBundle extends MyBundle {
 
     static final AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS,
-            WITHCUSTOMWRAPPERS, WITHREFLECTION};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
+    static enum TestCases {DEFAULTS, WITHCUSTOMWRAPPERS, WITHREFLECTION};
 
     /**
      * The CustomLoggerWrapper makes it possible to verify that classes
@@ -414,9 +378,7 @@ public String toString() {
     public static void main(String[] args) {
         if (args.length == 0)
             args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS",
+                "DEFAULTS",
                 "WITHCUSTOMWRAPPERS",
                 "WITHREFLECTION"
             };
@@ -427,53 +389,21 @@ public static void main(String[] args) {
 
         Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
             switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    test(true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    test(false);
+                case DEFAULTS:
+                    System.out.println("\n*** Using defaults\n");
+                    test();
                     System.out.println("Tetscase count: " + sequencer.get());
                     break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        test(true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
                 case WITHCUSTOMWRAPPERS:
-                    System.out.println("\n*** With Security Manager, with control permission, using custom Wrappers\n");
-                    setSecurityManager();
-                    final boolean previous = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        test(CustomLoggerWrapper::new, true);
-                    } finally {
-                        allowControl.get().set(previous);
-                    }
+                    System.out.println("\n*** Using custom Wrappers\n");
+                    test(CustomLoggerWrapper::new);
+                    System.out.println("Tetscase count: " + sequencer.get());
                     break;
                 case WITHREFLECTION:
-                    System.out.println("\n*** With Security Manager,"
-                            + " with control permission,"
-                            + " using reflection while logging\n");
-                    setSecurityManager();
-                    final boolean before = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        test(ReflectionLoggerWrapper::new, true);
-                    } finally {
-                        allowControl.get().set(before);
-                    }
+                    System.out.println("\n*** Using reflection while logging\n");
+                    test(ReflectionLoggerWrapper::new);
+                    System.out.println("Tetscase count: " + sequencer.get());
                     break;
-
                 default:
                     throw new RuntimeException("Unknown test case: " + testCase);
             }
@@ -481,11 +411,11 @@ public static void main(String[] args) {
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(boolean hasRequiredPermissions) {
-        test(Function.identity(), hasRequiredPermissions);
+    public static void test() {
+        test(Function.identity());
     }
 
-    public static void test(Function<Logger, Logger> wrapper, boolean hasRequiredPermissions) {
+    public static void test(Function<Logger, Logger> wrapper) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Logger, String> loggerDescMap = new HashMap<>();
@@ -495,18 +425,8 @@ public static void test(Function<Logger, Logger> wrapper, boolean hasRequiredPer
         //   - System.getLogger("foo")
         //   - and AccessSystemLogger.getLogger("foo")
         Logger sysLogger1 = null;
-        try {
-            sysLogger1 = wrapper.apply(accessSystemLogger.getLogger("foo"));
-            loggerDescMap.put(sysLogger1, "AccessSystemLogger.getLogger(\"foo\")");
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            throw new RuntimeException("unexpected exception: " + acx, acx);
-        }
+        sysLogger1 = wrapper.apply(accessSystemLogger.getLogger("foo"));
+        loggerDescMap.put(sysLogger1, "AccessSystemLogger.getLogger(\"foo\")");
 
         Logger appLogger1 = wrapper.apply(System.getLogger("foo"));
         loggerDescMap.put(appLogger1, "System.getLogger(\"foo\");");
@@ -523,18 +443,9 @@ public static void test(Function<Logger, Logger> wrapper, boolean hasRequiredPer
         loggerDescMap.put(appLogger2, "System.getLogger(\"foo\", loggerBundle)");
 
         Logger sysLogger2 = null;
-        try {
-            sysLogger2 = wrapper.apply(accessSystemLogger.getLogger("foo", loggerBundle));
-            loggerDescMap.put(sysLogger2, "AccessSystemLogger.getLogger(\"foo\", loggerBundle)");
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            throw new RuntimeException("unexpected exception: " + acx, acx);
-        }
+        sysLogger2 = wrapper.apply(accessSystemLogger.getLogger("foo", loggerBundle));
+        loggerDescMap.put(sysLogger2, "AccessSystemLogger.getLogger(\"foo\", loggerBundle)");
+
         if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
@@ -545,32 +456,24 @@ public static void test(Function<Logger, Logger> wrapper, boolean hasRequiredPer
         final java.util.logging.Handler appHandler;
         final java.util.logging.Handler sysHandler;
         final  LoggerFinder provider;
-        allowAll.get().set(true);
-        try {
-            appSink = java.util.logging.Logger.getLogger("foo");
-            sysSink = accessSystemLogger.demandSystemLogger("foo");
-            sink = java.util.logging.Logger.getLogger("foo");
-            sink.addHandler(appHandler = sysHandler = new MyHandler());
-            sink.setUseParentHandlers(false);
-            provider = LoggerFinder.getLoggerFinder();
-        } finally {
-            allowAll.get().set(false);
-        }
+
+        appSink = java.util.logging.Logger.getLogger("foo");
+        sysSink = accessSystemLogger.demandSystemLogger("foo");
+        sink = java.util.logging.Logger.getLogger("foo");
+        sink.addHandler(appHandler = sysHandler = new MyHandler());
+        sink.setUseParentHandlers(false);
+        provider = LoggerFinder.getLoggerFinder();
+
         try {
             testLogger(provider, loggerDescMap, "foo", null, sysLogger1, sysSink);
             testLogger(provider, loggerDescMap, "foo", null, appLogger1, appSink);
             testLogger(provider, loggerDescMap, "foo", loggerBundle, sysLogger2, sysSink);
             testLogger(provider, loggerDescMap, "foo", loggerBundle, appLogger2, appSink);
         } finally {
-            allowAll.get().set(true);
-            try {
-                appSink.removeHandler(appHandler);
-                sysSink.removeHandler(sysHandler);
-                sysSink.setLevel(null);
-                appSink.setLevel(null);
-            } finally {
-                allowAll.get().set(false);
-            }
+            appSink.removeHandler(appHandler);
+            sysSink.removeHandler(sysHandler);
+            sysSink.setLevel(null);
+            appSink.setLevel(null);
         }
     }
 
@@ -856,76 +759,4 @@ name, mapToJul(messageLevel), bundle,
         }
     }
 
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final Permissions controlPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-
-            // these are used for configuring the test itself...
-            controlPermissions = new Permissions();
-            controlPermissions.add(LOGGERFINDER_PERMISSION);
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            if (allowControl.get().get()) return controlPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : allowControl.get().get()
-                    ? controlPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : allowControl.get().get()
-                    ? controlPermissions : permissions).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java
index 8e94dc8d9ae..0364d6944d6 100644
--- a/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,21 +20,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ResourceBundle;
-import java.util.stream.Stream;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.lang.System.LoggerFinder;
@@ -43,34 +34,16 @@
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary Tests a naive implementation of LoggerFinder, and in particular
  *   the default body of System.Logger methods.
  * @build AccessSystemLogger BaseLoggerFinderTest CustomSystemClassLoader BaseLoggerFinder TestLoggerFinder
- * @run  driver AccessSystemLogger
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerFinderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerFinderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerFinderTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run driver AccessSystemLogger
+ * @run main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerFinderTest
  */
 public class BaseLoggerFinderTest {
 
-    static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-
     final static AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
     static final Class<?> providerClass;
     static {
@@ -103,75 +76,20 @@ public static class MyLoggerBundle extends MyBundle {
 
     }
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
 
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                //"NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
 
         System.out.println("Using provider class: " + providerClass + "[" + providerClass.getClassLoader() + "]");
 
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            TestLoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        TestLoggerFinder provider;
+        System.out.println("\n*** Without Security Manager\n");
+        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
+        test(provider);
+        System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
         System.out.println("\nPASSED: Tested " + TestLoggerFinder.sequencer.get() + " cases.");
     }
 
-    public static void test(TestLoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(TestLoggerFinder provider) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Logger, String> loggerDescMap = new HashMap<>();
@@ -180,56 +98,14 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
         // 1. Test loggers returned by LoggerFinder, both for system callers
         //    and not system callers.
         TestLoggerFinder.LoggerImpl appLogger1 = null;
-        try {
-            appLogger1 =
+        appLogger1 =
                 TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", BaseLoggerFinderTest.class.getModule()));
-            loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", BaseLoggerFinderTest.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for logger: " + acx);
-            final boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                appLogger1 =
-                    TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", BaseLoggerFinderTest.class.getModule()));
-                    loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", BaseLoggerFinderTest.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", BaseLoggerFinderTest.class.getModule())");
+
+        TestLoggerFinder.LoggerImpl sysLogger1 =
+                TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", Thread.class.getModule()));
+        loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
 
-        TestLoggerFinder.LoggerImpl sysLogger1 = null;
-        try {
-            sysLogger1 = TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", Thread.class.getModule()));
-            loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-            final boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                sysLogger1 = TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", Thread.class.getModule()));
-                loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
         if (appLogger1 == sysLogger1) {
             throw new RuntimeException("identical loggers");
         }
@@ -252,55 +128,13 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
 
         // 2. Test localized loggers returned LoggerFinder, both for system
         //   callers and non system callers
-        Logger appLogger2 = null;
-        try {
-            appLogger2 = provider.getLocalizedLogger("foo", loggerBundle, BaseLoggerFinderTest.class.getModule());
-            loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, BaseLoggerFinderTest.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for logger: " + acx);
-            final boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                appLogger2 = provider.getLocalizedLogger("foo", loggerBundle, BaseLoggerFinderTest.class.getModule());
-                loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, BaseLoggerFinderTest.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        Logger appLogger2 =
+                provider.getLocalizedLogger("foo", loggerBundle, BaseLoggerFinderTest.class.getModule());
+        loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, BaseLoggerFinderTest.class.getModule())");
 
-        Logger sysLogger2 = null;
-        try {
-            sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-            loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for localized system logger: " + acx);
-            final boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-                loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule()))");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        Logger sysLogger2 =
+                provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
+        loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
         if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
@@ -621,76 +455,4 @@ public String get() {
         }
     }
 
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl, ThreadLocal<AtomicBoolean> allowAccess) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            permissions = new Permissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
index d1f09dedd3e..77306ad49cf 100644
--- a/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -37,7 +30,6 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.util.logging.Handler;
@@ -45,39 +37,21 @@
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.util.stream.Stream;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary Tests the default implementation of System.Logger, when
  *          JUL is the default backend.
  * @modules java.logging
  * @build AccessSystemLogger DefaultLoggerFinderTest
- * @run  driver AccessSystemLogger
- * @run  main/othervm -Xbootclasspath/a:boot DefaultLoggerFinderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerFinderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow DefaultLoggerFinderTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run driver AccessSystemLogger
+ * @run main/othervm -Xbootclasspath/a:boot DefaultLoggerFinderTest
  */
 public class DefaultLoggerFinderTest {
 
-    static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     static final AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
 
@@ -160,7 +134,6 @@ public static LogEvent of(long sequenceNumber,
             evt.methodName = methodName;
             return evt;
         }
-
     }
 
     static java.util.logging.Level mapToJul(Level level) {
@@ -280,22 +253,7 @@ public static class MyLoggerBundle extends MyBundle {
     }
 
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowAll, allowControl));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
-
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
 
         final java.util.logging.Logger appSink = java.util.logging.Logger.getLogger("foo");
         final java.util.logging.Logger sysSink = accessSystemLogger.demandSystemLogger("foo");
@@ -303,57 +261,14 @@ public static void main(String[] args) {
         sink.addHandler(new MyHandler());
         sink.setUseParentHandlers(VERBOSE);
 
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            LoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = LoggerFinder.getLoggerFinder();
-                    test(provider, true, appSink, sysSink);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = LoggerFinder.getLoggerFinder();
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = LoggerFinder.getLoggerFinder();
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false, appSink, sysSink);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = LoggerFinder.getLoggerFinder();
-                        test(provider, true, appSink, sysSink);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Running test\n");
+        LoggerFinder provider = LoggerFinder.getLoggerFinder();
+        test(provider, appSink, sysSink);
+
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
     public static void test(LoggerFinder provider,
-            boolean hasRequiredPermissions,
             java.util.logging.Logger appSink,
             java.util.logging.Logger sysSink) {
 
@@ -361,108 +276,21 @@ public static void test(LoggerFinder provider,
         final Map<Logger, String> loggerDescMap = new HashMap<>();
 
 
-        Logger appLogger1 = null;
-        try {
-            appLogger1 = provider.getLogger("foo", DefaultLoggerFinderTest.class.getModule());
-            loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", DefaultLoggerFinderTest.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for logger: " + acx);
-            boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                appLogger1 =provider.getLogger("foo", DefaultLoggerFinderTest.class.getModule());
-                loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", DefaultLoggerFinderTest.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        Logger appLogger1 = provider.getLogger("foo", DefaultLoggerFinderTest.class.getModule());
+        loggerDescMap.put(appLogger1, "provider.getLogger(\"foo\", DefaultLoggerFinderTest.class.getModule())");
+
+        Logger sysLogger1 = provider.getLogger("foo", Thread.class.getModule());
+        loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
 
-        Logger sysLogger1 = null;
-        try {
-            sysLogger1 = provider.getLogger("foo", Thread.class.getModule());
-            loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-            boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                sysLogger1 = provider.getLogger("foo", Thread.class.getModule());
-                loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
         if (appLogger1 == sysLogger1) {
             throw new RuntimeException("identical loggers");
         }
 
-        Logger appLogger2 = null;
-        try {
-            appLogger2 = provider.getLocalizedLogger("foo", loggerBundle, DefaultLoggerFinderTest.class.getModule());
-            loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, DefaultLoggerFinderTest.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for logger: " + acx);
-            boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                appLogger2 = provider.getLocalizedLogger("foo", loggerBundle, DefaultLoggerFinderTest.class.getModule());
-                loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, DefaultLoggerFinderTest.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        Logger appLogger2 = provider.getLocalizedLogger("foo", loggerBundle, DefaultLoggerFinderTest.class.getModule());
+        loggerDescMap.put(appLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, DefaultLoggerFinderTest.class.getModule())");
 
-        Logger sysLogger2 = null;
-        try {
-            sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-            loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for localized system logger: " + acx);
-            boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-                loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
+        Logger sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
+        loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
         if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
@@ -523,13 +351,7 @@ static void verbose(String msg) {
     }
 
     static void setLevel(java.util.logging.Logger sink, java.util.logging.Level loggerLevel) {
-        boolean before = allowAll.get().get();
-        try {
-            allowAll.get().set(true);
-            sink.setLevel(loggerLevel);
-        } finally {
-            allowAll.get().set(before);
-        }
+        sink.setLevel(loggerLevel);
     }
 
 
@@ -812,78 +634,4 @@ public String get() {
             }
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions withControlPermissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowAll,
-                ThreadLocal<AtomicBoolean> allowControl) {
-            this.allowAll = allowAll;
-            this.allowControl = allowControl;
-            permissions = new Permissions();
-
-            withControlPermissions = new Permissions();
-            withControlPermissions.add(LOGGERFINDER_PERMISSION);
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            if (allowControl.get().get()) return withControlPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(
-                    allowAll.get().get() ? allPermissions :
-                    allowControl.get().get()
-                    ? withControlPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(
-                    allowAll.get().get() ? allPermissions :
-                    allowControl.get().get()
-                    ? withControlPermissions : permissions).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java
index 5b37d398af5..a6bd83fb4a2 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -46,8 +39,6 @@
 import java.lang.System.Logger.Level;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
@@ -58,7 +49,7 @@
 
 /**
  * @test
- * @bug     8140364 8145686 8189291
+ * @bug 8140364 8145686 8189291
  * @summary JDK implementation specific unit test for the base DefaultLoggerFinder.
  *          Tests the behavior of DefaultLoggerFinder and SimpleConsoleLogger
  *          implementation.
@@ -66,31 +57,14 @@
  *          java.base/jdk.internal.logger
  * @build AccessSystemLogger BaseDefaultLoggerFinderTest CustomSystemClassLoader BaseLoggerFinder
  * @run  driver AccessSystemLogger
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHCUSTOMWRAPPERS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHREFLECTION
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest DEFAULTS
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHCUSTOMWRAPPERS
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHREFLECTION
  * @author danielfuchs
  */
 public class BaseDefaultLoggerFinderTest {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-    static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     final static AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
     static final Class<?>[] providerClass;
@@ -142,24 +116,11 @@ public static class MyLoggerBundle extends MyBundle {
 
     }
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS,
-                           WITHCUSTOMWRAPPERS, WITHREFLECTION};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
+    static enum TestCases {DEFAULTS, WITHCUSTOMWRAPPERS, WITHREFLECTION};
 
     static TestLoggerFinder getLoggerFinder(Class<?> expectedClass) {
-        LoggerFinder provider = null;
-        try {
-            TestLoggerFinder.sequencer.incrementAndGet();
-            provider = LoggerFinder.getLoggerFinder();
-        } catch(AccessControlException a) {
-            throw a;
-        }
+        TestLoggerFinder.sequencer.incrementAndGet();
+        LoggerFinder provider = LoggerFinder.getLoggerFinder();
         ErrorStream.errorStream.store();
         System.out.println("*** Actual LoggerFinder class is: " + provider.getClass().getName());
         expectedClass.cast(provider);
@@ -394,9 +355,7 @@ public String toString() {
     public static void main(String[] args) {
         if (args.length == 0) {
             args = new String[] {
-                //"NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS",
+                "DEFAULTS",
                 "WITHCUSTOMWRAPPERS",
                 "WITHREFLECTION"
             };
@@ -436,90 +395,33 @@ public static void test(String[] args) {
             TestLoggerFinder provider;
             ErrorStream.errorStream.restore();
             switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
+                case DEFAULTS:
+                    System.out.println("\n*** Defaults\n");
                     System.out.println(TestLoggerFinder.conf.get());
                     provider = getLoggerFinder(expectedClass);
                     if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                         throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                     }
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    try {
-                        provider = getLoggerFinder(expectedClass);
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = getLoggerFinder(expectedClass);
-                            if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
-                                throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
-                            }
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
+                    test(provider);
                     System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
                     break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
-                            throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
-                        }
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
                 case WITHCUSTOMWRAPPERS:
-                    System.out.println("\n*** With Security Manager, with control permission and custom Wrapper\n");
+                    System.out.println("\n*** With custom Wrapper\n");
                     System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    final boolean previous = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
-                            throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
-                        }
-                        test(provider, CustomLoggerWrapper::new, true);
-                    } finally {
-                        allowControl.get().set(previous);
+                    provider = getLoggerFinder(expectedClass);
+                    if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
+                        throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                     }
+                    test(provider, CustomLoggerWrapper::new);
                     break;
                 case WITHREFLECTION:
-                    System.out.println("\n*** With Security Manager,"
-                            + " with control permission,"
-                            + " using reflection while logging\n");
+                    System.out.println("\n*** Using reflection while logging\n");
                     System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    final boolean before = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
-                            throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
-                        }
-                        test(provider, ReflectionLoggerWrapper::new, true);
-                    } finally {
-                        allowControl.get().set(before);
+                    provider = getLoggerFinder(expectedClass);
+                    if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
+                        throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                     }
+                    test(provider, ReflectionLoggerWrapper::new);
                     break;
                 default:
                     throw new RuntimeException("Unknown test case: " + testCase);
@@ -528,11 +430,11 @@ public static void test(String[] args) {
         System.out.println("\nPASSED: Tested " + TestLoggerFinder.sequencer.get() + " cases.");
     }
 
-    public static void test(TestLoggerFinder provider, boolean hasRequiredPermissions) {
-        test(provider, Function.identity(), hasRequiredPermissions);
+    public static void test(TestLoggerFinder provider) {
+        test(provider, Function.identity());
     }
 
-    public static void test(TestLoggerFinder provider, Function<Logger, Logger> wrapper, boolean hasRequiredPermissions) {
+    public static void test(TestLoggerFinder provider, Function<Logger, Logger> wrapper) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Logger, String> loggerDescMap = new HashMap<>();
@@ -862,79 +764,5 @@ public String get() {
                 }
             }
         }
-
-    }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-
-        final Permissions permissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl, ThreadLocal<AtomicBoolean> allowAccess) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            permissions = new Permissions();
-            permissions.add(new RuntimePermission("setIO"));
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) ||
-                    DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
     }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java
index 9e5357f848d..f8d226359d5 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/BaseLoggerBridgeTest/BaseLoggerBridgeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,15 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -39,27 +30,22 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import sun.util.logging.PlatformLogger;
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.util.stream.Stream;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary JDK implementation specific unit test for JDK internal artifacts.
  *   Tests a naive implementation of System.Logger, and in particular
  *   the default mapping provided by PlatformLogger.Bridge.
  * @modules java.base/sun.util.logging java.base/jdk.internal.logger
  * @build CustomSystemClassLoader BaseLoggerFinder BaseLoggerBridgeTest
- * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerBridgeTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerBridgeTest NOPERMISSIONS
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerBridgeTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run main/othervm -Djava.system.class.loader=CustomSystemClassLoader BaseLoggerBridgeTest
  */
 public class BaseLoggerBridgeTest {
 
@@ -72,24 +58,6 @@ public class BaseLoggerBridgeTest {
     // support logp, and thus the logp() implementation comes from
     // LoggerWrapper - which does a best effort.
     static final boolean BEST_EFFORT_FOR_LOGP = true;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     static final Class<?> providerClass;
     static {
@@ -343,145 +311,32 @@ public void log(Level level, Supplier<String> msgSupplier, Throwable thrown) {
     }
 
     static PlatformLogger.Bridge convert(Logger logger) {
-        boolean old = allowAll.get().get();
-        allowAccess.get().set(true);
-        try {
-            return PlatformLogger.Bridge.convert(logger);
-        } finally {
-            allowAccess.get().set(old);
-        }
+        return PlatformLogger.Bridge.convert(logger);
     }
 
     static Logger getLogger(String name, Module caller) {
-        boolean old = allowAll.get().get();
-        allowAccess.get().set(true);
-        try {
-            return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
-        } finally {
-            allowAccess.get().set(old);
-        }
-    }
-
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            // Ugly test hack: preload the resources needed by String.format
-            //   We need to do that before setting the security manager
-            //   because our implementation of CustomSystemClassLoader
-            //   doesn't have the required permission.
-            System.out.println(String.format("debug: %s", "Setting security manager"));
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
+        return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
     }
 
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
-
-
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            TestLoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Starting test\n");
+        TestLoggerFinder provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
+        test(provider);
+        System.out.println("Tetscase count: " + sequencer.get());
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(TestLoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(TestLoggerFinder provider) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Object, String> loggerDescMap = new HashMap<>();
 
 
-        TestLoggerFinder.LoggerImpl appSink = null;
-        try {
-            appSink = TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", BaseLoggerBridgeTest.class.getModule()));
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for logger: " + acx);
-            boolean old = allowControl.get().get();
-            allowControl.get().set(true);
-            try {
-                appSink = TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", BaseLoggerBridgeTest.class.getModule()));
-            } finally {
-                allowControl.get().set(old);
-            }
-        }
-
+        TestLoggerFinder.LoggerImpl appSink = TestLoggerFinder.LoggerImpl.class.cast(
+                provider.getLogger("foo", BaseLoggerBridgeTest.class.getModule()));
 
-        TestLoggerFinder.LoggerImpl sysSink = null;
-        try {
-            sysSink = TestLoggerFinder.LoggerImpl.class.cast(provider.getLogger("foo", Thread.class.getModule()));
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-        }
-        if (hasRequiredPermissions && appSink == sysSink) {
-            throw new RuntimeException("identical loggers");
-        }
+        TestLoggerFinder.LoggerImpl sysSink = TestLoggerFinder.LoggerImpl.class.cast(
+                provider.getLogger("foo", Thread.class.getModule()));
 
         if (provider.system.contains(appSink)) {
             throw new RuntimeException("app logger in system map");
@@ -489,10 +344,10 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
         if (!provider.user.contains(appSink)) {
             throw new RuntimeException("app logger not in appplication map");
         }
-        if (hasRequiredPermissions && provider.user.contains(sysSink)) {
+        if (provider.user.contains(sysSink)) {
             throw new RuntimeException("sys logger in appplication map");
         }
-        if (hasRequiredPermissions && !provider.system.contains(sysSink)) {
+        if (!provider.system.contains(sysSink)) {
             throw new RuntimeException("sys logger not in system map");
         }
 
@@ -502,32 +357,12 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
         loggerDescMap.putIfAbsent(bridge, "PlatformLogger.Bridge.convert(System.getLogger(\"foo\"))");
         testLogger(provider, loggerDescMap, "foo", null, bridge, appSink);
 
-        Logger sysLogger1 = null;
-        try {
-            sysLogger1 = getLogger("foo", Thread.class.getModule());
-            loggerDescMap.put(sysLogger1,
+        Logger sysLogger1 = getLogger("foo", Thread.class.getModule());
+        loggerDescMap.put(sysLogger1,
                     "jdk.internal.logger.LazyLoggers.getLogger(\"foo\", Thread.class.getModule())");
 
-            if (!hasRequiredPermissions) {
-                // check that the provider would have thrown an exception
-                provider.getLogger("foo", Thread.class.getModule());
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-        }
-
-        if (hasRequiredPermissions) {
-            // if we don't have permissions sysSink will be null.
-            testLogger(provider, loggerDescMap, "foo", null,
+        testLogger(provider, loggerDescMap, "foo", null,
                 PlatformLogger.Bridge.convert(sysLogger1), sysSink);
-        }
 
         Logger appLogger2 =
                 System.getLogger("foo", loggerBundle);
@@ -547,41 +382,23 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
         testLogger(provider, loggerDescMap, "foo", loggerBundle,
                 PlatformLogger.Bridge.convert(appLogger2), appSink);
 
-        Logger sysLogger2 = null;
-        try {
-            sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-            loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for localized system logger: " + acx);
-        }
-        if (hasRequiredPermissions && appLogger2 == sysLogger2) {
+        Logger sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
+        loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
+        if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
-        if (hasRequiredPermissions && sysLogger2 == sysLogger1) {
+        if (sysLogger2 == sysLogger1) {
             throw new RuntimeException("identical loggers");
         }
-        if (hasRequiredPermissions && provider.user.contains(sysLogger2)) {
+        if (provider.user.contains(sysLogger2)) {
             throw new RuntimeException("localized sys logger in appplication map");
         }
-        if (hasRequiredPermissions && provider.system.contains(sysLogger2)) {
+        if (provider.system.contains(sysLogger2)) {
             throw new RuntimeException("localized sys logger not in system map");
         }
 
-        if (hasRequiredPermissions) {
-            // if we don't have permissions sysSink will be null.
-            testLogger(provider, loggerDescMap, "foo", loggerBundle,
+        testLogger(provider, loggerDescMap, "foo", loggerBundle,
                 PlatformLogger.Bridge.convert(sysLogger2), sysSink);
-        }
-
     }
 
     public static class Foo {
@@ -625,29 +442,29 @@ static void checkLogEvent(TestLoggerFinder provider, String desc,
         }
     }
 
-        static Supplier<String> logpMessage(ResourceBundle bundle,
-                String className, String methodName, Supplier<String> msg) {
-            if (BEST_EFFORT_FOR_LOGP && bundle == null
-                    && (className != null || methodName != null)) {
-                final String cName = className == null ? "" :  className;
-                final String mName = methodName == null ? "" : methodName;
-                return () -> String.format("[%s %s] %s", cName, mName, msg.get());
-            } else {
-                return msg;
-            }
+    static Supplier<String> logpMessage(ResourceBundle bundle,
+            String className, String methodName, Supplier<String> msg) {
+        if (BEST_EFFORT_FOR_LOGP && bundle == null
+                && (className != null || methodName != null)) {
+            final String cName = className == null ? "" :  className;
+            final String mName = methodName == null ? "" : methodName;
+            return () -> String.format("[%s %s] %s", cName, mName, msg.get());
+        } else {
+            return msg;
         }
+    }
 
-        static String logpMessage(ResourceBundle bundle,
-                String className, String methodName, String msg) {
-            if (BEST_EFFORT_FOR_LOGP && bundle == null
-                    && (className != null || methodName != null)) {
-                final String cName = className == null ? "" :  className;
-                final String mName = methodName == null ? "" : methodName;
-                return String.format("[%s %s] %s", cName, mName, msg == null ? "" : msg);
-            } else {
-                return msg;
-            }
+    static String logpMessage(ResourceBundle bundle,
+            String className, String methodName, String msg) {
+        if (BEST_EFFORT_FOR_LOGP && bundle == null
+                && (className != null || methodName != null)) {
+            final String cName = className == null ? "" :  className;
+            final String mName = methodName == null ? "" : methodName;
+            return String.format("[%s %s] %s", cName, mName, msg == null ? "" : msg);
+        } else {
+            return msg;
         }
+    }
 
     // Calls the methods defined on LogProducer and verify the
     // parameters received by the underlying TestLoggerFinder.LoggerImpl
@@ -948,90 +765,4 @@ public String get() {
             }
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS_LOGGER = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-        final static RuntimePermission ACCESS_LOGGING = new RuntimePermission("accessClassInPackage.sun.util.logging");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl,
-                ThreadLocal<AtomicBoolean> allowAccess,
-                ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            allPermissions = new PermissionsBuilder()
-                    .add(new java.security.AllPermission())
-                    .toPermissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get() || allowAll.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS_LOGGER);
-                    builder.add(ACCESS_LOGGING);
-                }
-                if (allowAll.get().get()) {
-                    builder.addAll(allPermissions);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java
index 8e98e5ce3c7..b4f89725707 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/BasePlatformLoggerTest/BasePlatformLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,14 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -38,28 +30,22 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.security.AccessControlException;
-import java.util.stream.Stream;
 import sun.util.logging.PlatformLogger;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary JDK implementation specific unit test for JDK internal API.
  *   Tests a naive implementation of System.Logger, and in particular
  *   the default mapping provided by PlatformLogger.
  * @modules java.base/sun.util.logging
  * @build CustomSystemClassLoader BaseLoggerFinder BasePlatformLoggerTest
- * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader BasePlatformLoggerTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BasePlatformLoggerTest NOPERMISSIONS
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader BasePlatformLoggerTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run main/othervm -Djava.system.class.loader=CustomSystemClassLoader BasePlatformLoggerTest
  */
 public class BasePlatformLoggerTest {
 
@@ -68,25 +54,6 @@ public class BasePlatformLoggerTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-
     static final Class<?> providerClass;
     static {
         try {
@@ -331,107 +298,27 @@ public void log(Level level,  Supplier<String> msgSupplier, Throwable thrown) {
     }
 
     static PlatformLogger getPlatformLogger(String name) {
-        boolean old = allowAccess.get().get();
-        allowAccess.get().set(true);
-        try {
-            return PlatformLogger.getLogger(name);
-        } finally {
-            allowAccess.get().set(old);
-        }
-    }
-
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
+        return PlatformLogger.getLogger(name);
     }
 
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
-
-
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            TestLoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Running test\n");
+        TestLoggerFinder provider = TestLoggerFinder.class.cast(LoggerFinder.getLoggerFinder());
+        test(provider);
+        System.out.println("Tetscase count: " + sequencer.get());
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(TestLoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(TestLoggerFinder provider) {
 
         final Map<PlatformLogger, String> loggerDescMap = new HashMap<>();
 
-        TestLoggerFinder.LoggerImpl appSink;
-        boolean before = allowControl.get().get();
-        try {
-            allowControl.get().set(true);
-            appSink = TestLoggerFinder.LoggerImpl.class.cast(
+        TestLoggerFinder.LoggerImpl appSink = TestLoggerFinder.LoggerImpl.class.cast(
                         provider.getLogger("foo", BasePlatformLoggerTest.class.getModule()));
-        } finally {
-            allowControl.get().set(before);
-        }
 
-        TestLoggerFinder.LoggerImpl sysSink = null;
-        before = allowControl.get().get();
-        try {
-            allowControl.get().set(true);
-            sysSink = TestLoggerFinder.LoggerImpl.class.cast(
+        TestLoggerFinder.LoggerImpl sysSink = TestLoggerFinder.LoggerImpl.class.cast(
                         provider.getLogger("foo", Thread.class.getModule()));
-        } finally {
-            allowControl.get().set(before);
-        }
-
-        if (hasRequiredPermissions && appSink == sysSink) {
+        if (appSink == sysSink) {
             throw new RuntimeException("identical loggers");
         }
 
@@ -441,10 +328,10 @@ public static void test(TestLoggerFinder provider, boolean hasRequiredPermission
         if (!provider.user.contains(appSink)) {
             throw new RuntimeException("app logger not in appplication map");
         }
-        if (hasRequiredPermissions && provider.user.contains(sysSink)) {
+        if (provider.user.contains(sysSink)) {
             throw new RuntimeException("sys logger in appplication map");
         }
-        if (hasRequiredPermissions && !provider.system.contains(sysSink)) {
+        if (!provider.system.contains(sysSink)) {
             throw new RuntimeException("sys logger not in system map");
         }
 
@@ -629,90 +516,5 @@ private static void testLogger(TestLoggerFinder provider,
                 }
             }
         }
-
-    }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS_LOGGING = new RuntimePermission("accessClassInPackage.sun.util.logging");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl,
-                ThreadLocal<AtomicBoolean> allowAccess,
-                ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            allPermissions = new PermissionsBuilder()
-                    .add(new java.security.AllPermission())
-                    .toPermissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get() || allowAll.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS_LOGGING);
-                }
-                if (allowAll.get().get()) {
-                    builder.addAll(allPermissions);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
     }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
index 9f17478f35f..a59cfefcdb2 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,13 +30,6 @@
 import java.lang.reflect.Method;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.List;
 import java.util.Optional;
@@ -48,8 +41,7 @@
 
 /*
  * @test
- * @bug     8140364 8189291
- * @author  danielfuchs
+ * @bug 8140364 8189291
  * @summary JDK implementation specific unit test for JDK internal artifacts.
             Tests the behavior of bootstrap loggers (and SimpleConsoleLoggers
  *          too).
@@ -57,13 +49,11 @@ Tests the behavior of bootstrap loggers (and SimpleConsoleLoggers
  * @modules java.base/jdk.internal.logger:+open
  *          java.logging
  * @build LogStream
- * @run main/othervm BootstrapLoggerTest NO_SECURITY
- * @run main/othervm -Djava.security.manager=allow BootstrapLoggerTest SECURE
- * @run main/othervm/timeout=120 -Djava.security.manager=allow BootstrapLoggerTest SECURE_AND_WAIT
+ * @run main/othervm BootstrapLoggerTest
+ * @run main/othervm/timeout=120 BootstrapLoggerTest RUN_AND_WAIT
  */
 public class BootstrapLoggerTest {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
     static final Method isAlive;
     static final Field logManagerInitialized;
     static {
@@ -84,12 +74,12 @@ public class BootstrapLoggerTest {
     }
 
     static enum TestCase {
-        NO_SECURITY, SECURE, SECURE_AND_WAIT
+        DEFAULTS, RUN_AND_WAIT
     }
 
     public static void main(String[] args) throws Exception {
         if (args == null || args.length == 0) {
-            args = new String[] { TestCase.SECURE_AND_WAIT.name() };
+            args = new String[] { TestCase.RUN_AND_WAIT.name() };
         }
         if (args.length > 1) throw new RuntimeException("Only one argument allowed");
         TestCase test = TestCase.valueOf(args[0]);
@@ -111,12 +101,6 @@ public static void main(String[] args) throws Exception {
         }
         Logger logger = LazyLoggers.getLogger("foo.bar", Thread.class.getModule());
 
-        if (test != TestCase.NO_SECURITY) {
-            LogStream.err.println("Setting security manager");
-            Policy.setPolicy(new SimplePolicy());
-            System.setSecurityManager(new SecurityManager());
-        }
-
         Level[] levels = {Level.INFO, Level.WARNING, Level.INFO};
         int index = 0;
         logger.log(levels[index], "Early message #" + (index+1)); index++;
@@ -150,24 +134,25 @@ public static void main(String[] args) throws Exception {
         // initialized yet, this should be a SimpleConsoleLogger...
         logger.log(Level.INFO, "LOG#4: VM now booted: {0}", vmBooted.get());
         logger.log(Level.DEBUG, "LOG#5: hi!");
-        SimplePolicy.allowAll.set(Boolean.TRUE);
         WeakReference<Thread> threadRef = null;
         ReferenceQueue<Thread> queue = new ReferenceQueue<>();
+        Set<Thread> set = Thread.getAllStackTraces().keySet().stream()
+                .filter((t) -> t.getName().startsWith("BootstrapMessageLoggerTask-"))
+                .collect(Collectors.toSet());
         try {
-            Set<Thread> set = Thread.getAllStackTraces().keySet().stream()
-                    .filter((t) -> t.getName().startsWith("BootstrapMessageLoggerTask-"))
-                    .collect(Collectors.toSet());
             set.stream().forEach(t -> LogStream.err.println("Found: " + t));
             if (set.size() > 1) {
                 throw new RuntimeException("Too many bootstrap threads found");
             }
-            Optional<Thread> t = set.stream().findFirst();
-            if (t.isPresent()) {
-                threadRef = new WeakReference<>(t.get(), queue);
+            Optional<Thread> firstThread = set.stream().findFirst();
+            if (firstThread.isPresent()) {
+                threadRef = new WeakReference<>(firstThread.get(), queue);
             }
-        } finally{
-            SimplePolicy.allowAll.set(Boolean.FALSE);
+        } finally {
+            set.clear();
+            set = null;
         }
+
         if (!BootstrapLogger.isBooted()) {
             throw new RuntimeException("VM should still be booted!");
         }
@@ -207,7 +192,6 @@ public static void main(String[] args) throws Exception {
         // We're using reflection so that the test can also run in
         // configurations where java.util.logging is not present.
         boolean hasJUL = false;
-        SimplePolicy.allowAll.set(Boolean.TRUE);
         try {
             Class<?> loggerClass = Class.forName("java.util.logging.Logger");
             Class<?> levelClass  = Class.forName("java.util.logging.Level");
@@ -235,8 +219,6 @@ public static void main(String[] args) throws Exception {
             LogStream.err.println("JUL is not present: class " + x.getMessage()
                     + " not found");
             hasJUL = false;
-        } finally {
-            SimplePolicy.allowAll.set(Boolean.FALSE);
         }
 
         logger.log(Level.DEBUG, "hi now!");
@@ -261,17 +243,14 @@ public static void main(String[] args) throws Exception {
                 throw new RuntimeException("LogManager shouldn't be initialized yet!");
             }
         }
-        Logger bazbaz = null;
-        SimplePolicy.allowAll.set(Boolean.TRUE);
-        try {
-            bazbaz = java.lang.System.LoggerFinder
+
+        Logger bazbaz = java.lang.System.LoggerFinder
                     .getLoggerFinder().getLogger("foo.bar.baz.baz", BootstrapLoggerTest.class.getModule());
-        } finally {
-            SimplePolicy.allowAll.set(Boolean.FALSE);
-        }
+
         if (!((Boolean)logManagerInitialized.get(null)).booleanValue()) {
             throw new RuntimeException("LogManager should be initialized now!");
         }
+
         Logger bazbaz2 = System.getLogger("foo.bar.baz.baz");
         if (bazbaz2.getClass() != bazbaz.getClass()) {
             throw new RuntimeException("bazbaz2.class != bazbaz.class ["
@@ -293,122 +272,85 @@ public static void main(String[] args) throws Exception {
         // If this test fails in timeout - we could envisage skipping this part,
         // or adding some System property to configure the keep alive delay
         // of the executor.
-        SimplePolicy.allowAll.set(Boolean.TRUE);
-        try {
-            // Though unlikely, it is not impossible that the bootstrap logger
-            // executor may have released its first thread and spawned a new one.
-            // If that happened then the executor itself might have been GC'ed
-            // as well and a new one might have been created.
-            // The code below will lookup the executor threads again and
-            // join them.
-            // Only one may be active at a given time, but that might not
-            // be the one referenced by threadRef.
-            // We're just making sure all of them have stopped running
-            // before verifying that the executor is eventually GC'ed.
-            final WeakReference<Thread> previous = threadRef;
-            Stream<WeakReference<Thread>> stream = Thread.getAllStackTraces().keySet().stream()
-               .filter((t) -> t.getName().startsWith("BootstrapMessageLoggerTask-"))
-               .filter((t) -> previous == null ? true : t != previous.get())
-               .map((t) -> new WeakReference<>(t, queue));
-            List<WeakReference<Thread>> threads = stream.collect(Collectors.toList());
-            if (previous != null) threads.add(previous);
-            threads.forEach(t -> LogStream.err.println(t.get()));
-            stream = null;
+        //
+        // Though unlikely, it is not impossible that the bootstrap logger
+        // executor may have released its first thread and spawned a new one.
+        // If that happened then the executor itself might have been GC'ed
+        // as well and a new one might have been created.
+        // The code below will lookup the executor threads again and
+        // join them.
+        // Only one may be active at a given time, but that might not
+        // be the one referenced by threadRef.
+        // We're just making sure all of them have stopped running
+        // before verifying that the executor is eventually GC'ed.
+        final WeakReference<Thread> previous = threadRef;
+        Stream<WeakReference<Thread>> stream = Thread.getAllStackTraces().keySet().stream()
+           .filter((t) -> t.getName().startsWith("BootstrapMessageLoggerTask-"))
+           .filter((t) -> previous == null ? true : t != previous.get())
+           .map((t) -> new WeakReference<>(t, queue));
+        List<WeakReference<Thread>> threads = stream.collect(Collectors.toList());
+        if (previous != null) threads.add(previous);
+        threads.forEach(t -> LogStream.err.println(t.get()));
+        stream = null;
 
-            if (test == TestCase.SECURE_AND_WAIT) {
-                // First wait for all executor threads to terminate
-                for (var ref : threads) {
-                    Thread t = ref.get();
-                    if (t != null) {
-                        if (!(Boolean)isAlive.invoke(null) && t.isAlive()) {
-                            throw new RuntimeException("Executor already terminated");
-                        } else {
-                            LogStream.err.println("Executor still alive as expected: " + t.getName());
-                        }
-                        LogStream.err.println("Waiting for " + t.getName() + " to terminate (join)");
-                        t.join(60_000);
-                        t = null;
+        if (test == TestCase.RUN_AND_WAIT) {
+            // First wait for all executor threads to terminate
+            for (var ref : threads) {
+                Thread t = ref.get();
+                if (t != null) {
+                    if (!(Boolean)isAlive.invoke(null) && t.isAlive()) {
+                        throw new RuntimeException("Executor already terminated");
                     } else {
-                        LogStream.err.println("WeakReference<Thread> is already cleared.");
-                        long count = Thread.getAllStackTraces().keySet().stream()
-                            .filter((tr) -> tr.getName().startsWith("BootstrapMessageLoggerTask-"))
-                            .count();
-                        if (count != 0) {
-                            LogStream.err.println("There are " + count + " threads still lingering.");
-                        }
+                        LogStream.err.println("Executor still alive as expected: " + t.getName());
                     }
-                }
-                // Then wait until all the executor threads are GC'ed
-                while (!threads.isEmpty()) {
-                    LogStream.err.println("Calling System.gc()");
-                    System.gc();
-                    LogStream.err.println("Waiting for BootstrapMessageLoggerTask to be gc'ed");
-                    Reference<?> tref;
-                    while ((tref = queue.remove(1000)) == null) {
-                        LogStream.err.println("Calling System.gc()");
-                        System.gc();
+                    LogStream.err.println("Waiting for " + t.getName() + " to terminate (join)");
+                    t.join(60_000);
+                    t = null;
+                } else {
+                    LogStream.err.println("WeakReference<Thread> is already cleared.");
+                    long count = Thread.getAllStackTraces().keySet().stream()
+                        .filter((tr) -> tr.getName().startsWith("BootstrapMessageLoggerTask-"))
+                        .count();
+                    if (count != 0) {
+                        LogStream.err.println("There are " + count + " threads still lingering.");
                     }
-
-                    threads.remove(tref);
-                    LogStream.err.println("BootstrapMessageLoggerTask has been gc'ed: "
-                                          + threads.size() + " remaining...");
                 }
-                // Then wait for the executor to be gc'ed...
-                LogStream.err.println("Waiting for the executor to be gc'ed: Calling System.gc()");
+            }
+            // Then wait until all the executor threads are GC'ed
+            while (!threads.isEmpty()) {
+                LogStream.err.println("Calling System.gc()");
                 System.gc();
-                for (int i=0; i<10; i++) {
-                    if (!(Boolean)isAlive.invoke(null)) break;
-                    // It would be unexpected that we reach here...
-                    Thread.sleep(1000);
+                LogStream.err.println("Waiting for BootstrapMessageLoggerTask to be gc'ed");
+                Reference<?> tref;
+                while ((tref = queue.remove(1000)) == null) {
                     LogStream.err.println("Calling System.gc()");
                     System.gc();
                 }
 
-                if ((Boolean)isAlive.invoke(null)) {
-                    throw new RuntimeException("Executor still alive");
-                } else {
-                    LogStream.err.println("Executor terminated as expected.");
-                }
-            } else {
-                LogStream.err.println("Not checking executor termination for " + test);
+                threads.remove(tref);
+                LogStream.err.println("BootstrapMessageLoggerTask has been gc'ed: "
+                                      + threads.size() + " remaining...");
             }
-        } finally {
-            SimplePolicy.allowAll.set(Boolean.FALSE);
-        }
-        LogStream.err.println(test.name() + ": PASSED");
-    }
-
-    final static class SimplePolicy extends Policy {
-        static final ThreadLocal<Boolean> allowAll = new ThreadLocal<Boolean>() {
-            @Override
-            protected Boolean initialValue() {
-                return Boolean.FALSE;
+            // Then wait for the executor to be gc'ed...
+            LogStream.err.println("Waiting for the executor to be gc'ed: Calling System.gc()");
+            System.gc();
+            for (int i=0; i<10; i++) {
+                if (!(Boolean)isAlive.invoke(null)) break;
+                // It would be unexpected that we reach here...
+                Thread.sleep(1000);
+                LogStream.err.println("Calling System.gc()");
+                System.gc();
             }
-        };
 
-        Permissions getPermissions() {
-            Permissions perms = new Permissions();
-            if (allowAll.get()) {
-                perms.add(new AllPermission());
+            if ((Boolean)isAlive.invoke(null)) {
+                throw new RuntimeException("Executor still alive");
+            } else {
+                LogStream.err.println("Executor terminated as expected.");
             }
-            return perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions(domain).implies(permission) ||
-                   DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return getPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return getPermissions();
+        } else {
+            LogStream.err.println("Not checking executor termination for " + test);
         }
-
+        LogStream.err.println(test.name() + ": PASSED");
     }
+
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java
index 6904b147e23..85c8b98f4bd 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerBridgeTest/LoggerBridgeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,6 @@
  */
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -39,19 +32,17 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
-import java.util.stream.Stream;
 import sun.util.logging.PlatformLogger;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary JDK implementation specific unit test for JDK internal artifacts.
  *          Tests all bridge methods with a custom backend whose
  *          loggers implement PlatformLogger.Bridge.
@@ -59,10 +50,7 @@
  *          java.base/jdk.internal.logger
  *          java.logging
  * @build CustomSystemClassLoader LogProducerFinder LoggerBridgeTest
- * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader LoggerBridgeTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader LoggerBridgeTest NOPERMISSIONS
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader LoggerBridgeTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader LoggerBridgeTest
  */
 public class LoggerBridgeTest {
 
@@ -71,24 +59,6 @@ public class LoggerBridgeTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static final Queue<LogEvent> eventQueue = new ArrayBlockingQueue<>(128);
 
@@ -413,12 +383,7 @@ public boolean isEnabled() {
     }
 
     static ClassLoader getClassLoader(Module m) {
-        final boolean before = allowAll.get().getAndSet(true);
-        try {
-            return m.getClassLoader();
-        } finally {
-            allowAll.get().set(before);
-        }
+        return m.getClassLoader();
     }
 
     static final sun.util.logging.PlatformLogger.Level[] julLevels = {
@@ -531,74 +496,16 @@ static PlatformLogger.Bridge convert(Logger logger) {
         return PlatformLogger.Bridge.convert(logger);
     }
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
 
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                //"NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
-
-
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            LoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = LoggerFinder.getLoggerFinder();
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = LoggerFinder.getLoggerFinder();
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = LoggerFinder.getLoggerFinder();
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = LoggerFinder.getLoggerFinder();
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Running test\n");
+        LoggerFinder provider = LoggerFinder.getLoggerFinder();
+        test(provider);
+        System.out.println("Tetscase count: " + sequencer.get());
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(LoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(LoggerFinder provider) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Object, String> loggerDescMap = new HashMap<>();
@@ -607,76 +514,34 @@ public static void test(LoggerFinder provider, boolean hasRequiredPermissions) {
         Logger appLogger1 = System.getLogger("foo");
         loggerDescMap.put(appLogger1, "System.getLogger(\"foo\")");
 
-        Logger sysLogger1 = null;
-        try {
-            sysLogger1 = getLogger(provider, "foo", Thread.class.getModule());
-            loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-        }
-
+        Logger sysLogger1 = getLogger(provider, "foo", Thread.class.getModule());
+        loggerDescMap.put(sysLogger1, "provider.getLogger(\"foo\", Thread.class.getModule())");
 
-        Logger appLogger2 =
-                System.getLogger("foo", loggerBundle);
+        Logger appLogger2 = System.getLogger("foo", loggerBundle);
         loggerDescMap.put(appLogger2, "System.getLogger(\"foo\", loggerBundle)");
 
-        Logger sysLogger2 = null;
-        try {
-            sysLogger2 = getLogger(provider, "foo", loggerBundle, Thread.class.getModule());
-            loggerDescMap.put(sysLogger2, "provider.getLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for localized system logger: " + acx);
-        }
-        if (hasRequiredPermissions && appLogger2 == sysLogger2) {
+        Logger sysLogger2 = getLogger(provider, "foo", loggerBundle, Thread.class.getModule());
+        loggerDescMap.put(sysLogger2, "provider.getLogger(\"foo\", loggerBundle, Thread.class.getModule())");
+        if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
         if (appLogger2 == appLogger1) {
             throw new RuntimeException("identical loggers");
         }
-        if (hasRequiredPermissions && sysLogger2 == sysLogger1) {
+        if (sysLogger2 == sysLogger1) {
             throw new RuntimeException("identical loggers");
         }
 
 
-        final LoggerImpl appSink;
-        final LoggerImpl sysSink;
-        boolean old = allowControl.get().get();
-        allowControl.get().set(true);
-        try {
-           appSink = LoggerImpl.class.cast(
+        final LoggerImpl appSink = LoggerImpl.class.cast(
                    provider.getLogger("foo",  LoggerBridgeTest.class.getModule()));
-           sysSink = LoggerImpl.class.cast(
+        final LoggerImpl sysSink = LoggerImpl.class.cast(
                         provider.getLogger("foo", Thread.class.getModule()));
-        } finally {
-            allowControl.get().set(old);
-        }
 
         testLogger(provider, loggerDescMap, "foo", null, convert(appLogger1), appSink);
-        if (hasRequiredPermissions) {
-            testLogger(provider, loggerDescMap, "foo", null, convert(sysLogger1), sysSink);
-        }
+        testLogger(provider, loggerDescMap, "foo", null, convert(sysLogger1), sysSink);
         testLogger(provider, loggerDescMap, "foo", loggerBundle, convert(appLogger2), appSink);
-        if (hasRequiredPermissions) {
-            testLogger(provider, loggerDescMap, "foo", loggerBundle, convert(sysLogger2), sysSink);
-        }
+        testLogger(provider, loggerDescMap, "foo", loggerBundle, convert(sysLogger2), sysSink);
     }
 
     public static class Foo {
@@ -993,90 +858,4 @@ public String get() {
             }
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS_LOGGER = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-        final static RuntimePermission ACCESS_LOGGING = new RuntimePermission("accessClassInPackage.sun.util.logging");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl,
-                ThreadLocal<AtomicBoolean> allowAccess,
-                ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            allPermissions = new PermissionsBuilder()
-                    .add(new java.security.AllPermission())
-                    .toPermissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get() || allowAll.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS_LOGGER);
-                    builder.add(ACCESS_LOGGING);
-                }
-                if (allowAll.get().get()) {
-                    builder.addAll(allPermissions);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
index d7ac2286678..f15b4d5315b 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,12 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -53,7 +45,7 @@
 
 /**
  * @test
- * @bug     8140364 8189291 8283049
+ * @bug 8140364 8189291 8283049
  * @summary JDK implementation specific unit test for LoggerFinderLoader.
  *          Tests the behavior of LoggerFinderLoader with respect to the
  *          value of the internal diagnosability switches. Also test the
@@ -62,54 +54,19 @@
  *          java.base/jdk.internal.logger
  * @build AccessSystemLogger LoggerFinderLoaderTest CustomSystemClassLoader BaseLoggerFinder BaseLoggerFinder2
  * @run  driver AccessSystemLogger
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest WITHPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest NOSECURITY
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest NOPERMISSIONS
- * @run  main/othervm -Xbootclasspath/a:boot -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Dtest.fails=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=ERROR LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=DEBUG LoggerFinderLoaderTest
+ * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader -Djdk.logger.finder.singleton=true -Djdk.logger.finder.error=QUIET LoggerFinderLoaderTest
  */
 public class LoggerFinderLoaderTest {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-    static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-
     final static AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
     static final Class<?>[] providerClass;
     static {
@@ -190,15 +147,6 @@ public static class MyLoggerBundle extends MyBundle {
 
     }
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
-
     private static String withoutWarning(String in) {
         return in.lines().filter(s -> !s.startsWith("WARNING:")).collect(Collectors.joining());
     }
@@ -243,8 +191,6 @@ static LoggerFinder getLoggerFinder(Class<?> expectedClass,
                     }
                 }
             }
-        } catch(AccessControlException a) {
-            throw a;
         } catch(Throwable t) {
             if (TestLoggerFinder.fails.get() || singleton) {
                 // must check System.err
@@ -391,60 +337,17 @@ public static void test(String[] args) {
             }
         }
 
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            LoggerFinder provider;
-            ErrorStream.errorStream.restore();
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    System.out.println(TestLoggerFinder.conf.get());
-                    provider = getLoggerFinder(expectedClass, errorPolicy, ensureSingleton);
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    try {
-                        provider = getLoggerFinder(expectedClass, errorPolicy, ensureSingleton);
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = getLoggerFinder(expectedClass, errorPolicy, ensureSingleton);
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    System.out.println(TestLoggerFinder.conf.get());
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = getLoggerFinder(expectedClass, errorPolicy, ensureSingleton);
-                        test(provider, true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        LoggerFinder provider;
+        ErrorStream.errorStream.restore();
+        System.out.println("\n*** Test starting\n");
+        System.out.println(TestLoggerFinder.conf.get());
+        provider = getLoggerFinder(expectedClass, errorPolicy, ensureSingleton);
+        test(provider);
+        System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
         System.out.println("\nPASSED: Tested " + TestLoggerFinder.sequencer.get() + " cases.");
     }
 
-    public static void test(LoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(LoggerFinder provider) {
 
         ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map<Logger, String> loggerDescMap = new HashMap<>();
@@ -764,79 +667,5 @@ public String get() {
                 }
             }
         }
-
-    }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-
-        final Permissions permissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl, ThreadLocal<AtomicBoolean> allowAccess) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            permissions = new Permissions();
-            permissions.add(new RuntimePermission("setIO"));
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) ||
-                   DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
     }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java
index 2bd656d39a2..3d515795a05 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,15 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -39,7 +30,6 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.util.logging.Handler;
@@ -47,47 +37,23 @@
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.util.stream.Stream;
 import sun.util.logging.PlatformLogger;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary JDK implementation specific unit test for JDK internal artifacts.
  *          Tests all bridge methods from PlatformLogger with a custom
  *          backend whose loggers implement PlatformLogger.Bridge.
  * @modules java.base/sun.util.logging
  *          java.logging
  * @build CustomSystemClassLoader LogProducerFinder PlatformLoggerBridgeTest
- * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader PlatformLoggerBridgeTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader PlatformLoggerBridgeTest NOPERMISSIONS
- * @run  main/othervm -Djava.security.manager=allow -Djava.system.class.loader=CustomSystemClassLoader PlatformLoggerBridgeTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run  main/othervm -Djava.system.class.loader=CustomSystemClassLoader PlatformLoggerBridgeTest
  */
 public class PlatformLoggerBridgeTest {
 
-    static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static final Queue<LogEvent> eventQueue = new ArrayBlockingQueue<>(128);
 
@@ -473,117 +439,24 @@ public static class MyLoggerBundle extends MyBundle {
 
     }
 
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
-
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                //"NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
-
 
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            LoggerFinder provider;
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    provider = LoggerFinder.getLoggerFinder();
-                    test(provider, true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    try {
-                        provider = LoggerFinder.getLoggerFinder();
-                        throw new RuntimeException("Expected exception not raised");
-                    } catch (AccessControlException x) {
-                        if (!LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                            throw new RuntimeException("Unexpected permission check", x);
-                        }
-                        final boolean control = allowControl.get().get();
-                        try {
-                            allowControl.get().set(true);
-                            provider = LoggerFinder.getLoggerFinder();
-                        } finally {
-                            allowControl.get().set(control);
-                        }
-                    }
-                    test(provider, false);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with access permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        provider = LoggerFinder.getLoggerFinder();
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    final boolean access = allowAccess.get().get();
-                    try {
-                        allowAccess.get().set(true);
-                        test(provider, true);
-                    } finally {
-                        allowAccess.get().set(access);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Without Security Manager\n");
+        LoggerFinder provider = LoggerFinder.getLoggerFinder();
+        test(provider);
+        System.out.println("Tetscase count: " + sequencer.get());
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(LoggerFinder provider, boolean hasRequiredPermissions) {
+    public static void test(LoggerFinder provider) {
 
         final Map<PlatformLogger, String> loggerDescMap = new HashMap<>();
 
-        PlatformLogger sysLogger1 = null;
-        try {
-            sysLogger1 = PlatformLogger.getLogger("foo");
-            loggerDescMap.put(sysLogger1, "PlatformLogger.getLogger(\"foo\")");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.ACCESS_LOGGING)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            final boolean old = allowAccess.get().get();
-            allowAccess.get().set(true);
-            try {
-                sysLogger1 = PlatformLogger.getLogger("foo");
-                loggerDescMap.put(sysLogger1, "PlatformLogger.getLogger(\"foo\")");
-            } finally {
-                allowAccess.get().set(old);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
-        }
+        PlatformLogger sysLogger1 = PlatformLogger.getLogger("foo");
+        loggerDescMap.put(sysLogger1, "PlatformLogger.getLogger(\"foo\")");
 
-        final LoggerImpl sysSink;
-        boolean old = allowControl.get().get();
-        allowControl.get().set(true);
-        try {
-           sysSink = LoggerImpl.class.cast(
-                        provider.getLogger("foo", Thread.class.getModule()));
-        } finally {
-            allowControl.get().set(old);
-        }
+        final LoggerImpl sysSink = LoggerImpl.class.cast(
+                provider.getLogger("foo", Thread.class.getModule()));
 
         testLogger(provider, loggerDescMap, "foo", null, sysLogger1, sysSink);
     }
@@ -772,90 +645,4 @@ private static void testLogger(LoggerFinder provider,
             }
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        final static RuntimePermission CONTROL = LOGGERFINDER_PERMISSION;
-        final static RuntimePermission ACCESS_LOGGER = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-        final static RuntimePermission ACCESS_LOGGING = new RuntimePermission("accessClassInPackage.sun.util.logging");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl,
-                ThreadLocal<AtomicBoolean> allowAccess,
-                ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            allPermissions = new PermissionsBuilder()
-                    .add(new java.security.AllPermission())
-                    .toPermissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get() || allowAll.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(CONTROL);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS_LOGGER);
-                    builder.add(ACCESS_LOGGING);
-                }
-                if (allowAll.get().get()) {
-                    builder.addAll(allPermissions);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
index b051931a553..bc587197a98 100644
--- a/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -37,7 +30,6 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.util.logging.Handler;
@@ -46,45 +38,23 @@
 import java.util.logging.LogRecord;
 import java.lang.System.LoggerFinder;
 import java.lang.System.Logger;
-import java.util.stream.Stream;
 import sun.util.logging.internal.LoggingProviderImpl;
 
 /**
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary JDK implementation specific unit test for JDK internal artifacts.
  *          Tests all internal bridge methods with the default LoggerFinder
  *          JUL backend.
  * @modules java.base/sun.util.logging
  *          java.base/jdk.internal.logger
  *          java.logging/sun.util.logging.internal
- * @run  main/othervm DefaultLoggerBridgeTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow DefaultLoggerBridgeTest NOPERMISSIONS
- * @run  main/othervm -Djava.security.manager=allow DefaultLoggerBridgeTest WITHPERMISSIONS
- * @author danielfuchs
+ * @run main/othervm DefaultLoggerBridgeTest NOSECURITY
  */
 public class DefaultLoggerBridgeTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAccess = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static final Queue<LogEvent> eventQueue = new ArrayBlockingQueue<>(128);
 
@@ -239,74 +209,21 @@ public static class MyLoggerBundle extends MyBundle {
     }
 
     static PlatformLogger.Bridge convert(Logger logger) {
-        boolean old = allowAccess.get().get();
-        allowAccess.get().set(true);
-        try {
-            return PlatformLogger.Bridge.convert(logger);
-        } finally {
-            allowAccess.get().set(old);
-        }
+        return PlatformLogger.Bridge.convert(logger);
     }
 
     static Logger getLogger(String name, Module caller) {
-        boolean old = allowAccess.get().get();
-        allowAccess.get().set(true);
-        try {
-            return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
-        } finally {
-            allowAccess.get().set(old);
-        }
-    }
-
-    static enum TestCases {NOSECURITY, NOPERMISSIONS, WITHPERMISSIONS};
-
-    static void setSecurityManager() {
-        if (System.getSecurityManager() == null) {
-            Policy.setPolicy(new SimplePolicy(allowControl, allowAccess, allowAll));
-            System.setSecurityManager(new SecurityManager());
-        }
+        return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
     }
 
     public static void main(String[] args) {
-        if (args.length == 0)
-            args = new String[] {
-                "NOSECURITY",
-                "NOPERMISSIONS",
-                "WITHPERMISSIONS"
-            };
-
-        Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
-            switch (testCase) {
-                case NOSECURITY:
-                    System.out.println("\n*** Without Security Manager\n");
-                    test(true);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case NOPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, without permissions\n");
-                    setSecurityManager();
-                    test(false);
-                    System.out.println("Tetscase count: " + sequencer.get());
-                    break;
-                case WITHPERMISSIONS:
-                    System.out.println("\n*** With Security Manager, with control permission\n");
-                    setSecurityManager();
-                    final boolean control = allowControl.get().get();
-                    try {
-                        allowControl.get().set(true);
-                        test(true);
-                    } finally {
-                        allowControl.get().set(control);
-                    }
-                    break;
-                default:
-                    throw new RuntimeException("Unknown test case: " + testCase);
-            }
-        });
+        System.out.println("\n*** Starting test\n");
+        test();
+        System.out.println("Tetscase count: " + sequencer.get());
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
     }
 
-    public static void test(boolean hasRequiredPermissions) {
+    public static void test() {
 
         ResourceBundle loggerBundle =
                 ResourceBundle.getBundle(MyLoggerBundle.class.getName());
@@ -318,45 +235,11 @@ public static void test(boolean hasRequiredPermissions) {
         Logger appLogger1 = System.getLogger("foo");
         loggerDescMap.put(appLogger1, "System.getLogger(\"foo\")");
 
-        LoggerFinder provider;
-        try {
-            provider = LoggerFinder.getLoggerFinder();
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Expected exception not raised");
-            }
-        } catch (AccessControlException x) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected permission check", x);
-            }
-            if (!SimplePolicy.LOGGERFINDER_PERMISSION.equals(x.getPermission())) {
-                throw new RuntimeException("Unexpected permission in exception: " + x, x);
-            }
-            final boolean control = allowControl.get().get();
-            try {
-                allowControl.get().set(true);
-                provider = LoggerFinder.getLoggerFinder();
-            } finally {
-                allowControl.get().set(control);
-            }
-        }
+        LoggerFinder provider = LoggerFinder.getLoggerFinder();
 
-        Logger sysLogger1b = null;
-        try {
-            sysLogger1b = provider.getLogger("foo", Thread.class.getModule());
-            if (sysLogger1b != sysLogger1a) {
-                loggerDescMap.put(sysLogger1b, "provider.getLogger(\"foo\", Thread.class.getModule())");
-            }
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for system logger: " + acx);
+        Logger sysLogger1b =  provider.getLogger("foo", Thread.class.getModule());
+        if (sysLogger1b != sysLogger1a) {
+            loggerDescMap.put(sysLogger1b, "provider.getLogger(\"foo\", Thread.class.getModule())");
         }
 
         Logger appLogger2 = System.getLogger("foo", loggerBundle);
@@ -366,55 +249,33 @@ public static void test(boolean hasRequiredPermissions) {
             throw new RuntimeException("identical loggers");
         }
 
-        Logger sysLogger2 = null;
-        try {
-            sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
-            loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
-            if (!hasRequiredPermissions) {
-                throw new RuntimeException("Managed to obtain a system logger without permission");
-            }
-        } catch (AccessControlException acx) {
-            if (hasRequiredPermissions) {
-                throw new RuntimeException("Unexpected security exception: ", acx);
-            }
-            if (!acx.getPermission().equals(SimplePolicy.LOGGERFINDER_PERMISSION)) {
-                throw new RuntimeException("Unexpected permission in exception: " + acx, acx);
-            }
-            System.out.println("Got expected exception for localized system logger: " + acx);
-        }
-        if (hasRequiredPermissions && appLogger2 == sysLogger2) {
+        Logger sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
+        loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
+        if (appLogger2 == sysLogger2) {
             throw new RuntimeException("identical loggers");
         }
-        if (hasRequiredPermissions && sysLogger2 == sysLogger1a) {
+        if (sysLogger2 == sysLogger1a) {
             throw new RuntimeException("identical loggers");
         }
 
-        final java.util.logging.Logger sink;
-        final java.util.logging.Logger appSink;
-        final java.util.logging.Logger sysSink;
         final MyHandler appHandler;
         final MyHandler sysHandler;
-        final boolean old = allowAll.get().get();
-        allowAll.get().set(true);
-        try {
-            appSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
+        final java.util.logging.Logger appSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
                     LogManager.getLogManager(), "foo", DefaultLoggerBridgeTest.class.getModule());
-            sysSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
+        final java.util.logging.Logger sysSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
                     LogManager.getLogManager(), "foo", Thread.class.getModule());
-            if (appSink == sysSink) {
-                throw new RuntimeException("identical backend loggers");
-            }
-            sink = java.util.logging.Logger.getLogger("foo");
-            if (appSink != sink) {
-                throw new RuntimeException("expected same application logger");
-            }
+        if (appSink == sysSink) {
+            throw new RuntimeException("identical backend loggers");
+        }
 
-            sink.addHandler(appHandler = sysHandler = new MyHandler());
-            sink.setUseParentHandlers(VERBOSE);
-        } finally {
-            allowAll.get().set(old);
+        final java.util.logging.Logger sink = java.util.logging.Logger.getLogger("foo");
+        if (appSink != sink) {
+            throw new RuntimeException("expected same application logger");
         }
 
+        sink.addHandler(appHandler = sysHandler = new MyHandler());
+        sink.setUseParentHandlers(VERBOSE);
+
         try {
             testLogger(provider, loggerDescMap, "foo", null, convert(sysLogger1a), sysSink);
             testLogger(provider, loggerDescMap, "foo", null, convert(appLogger1), appSink);
@@ -426,13 +287,8 @@ public static void test(boolean hasRequiredPermissions) {
                 testLogger(provider, loggerDescMap, "foo", loggerBundle, convert(sysLogger2), sysSink);
             }
         } finally {
-            allowAll.get().set(true);
-            try {
-                appSink.removeHandler(appHandler);
-                sysSink.removeHandler(sysHandler);
-            } finally {
-                allowAll.get().set(old);
-            }
+            appSink.removeHandler(appHandler);
+            sysSink.removeHandler(sysHandler);
         }
     }
 
@@ -478,23 +334,11 @@ static void checkLogEvent(LoggerFinder provider, String desc,
     }
 
     static void setLevel(java.util.logging.Logger sink, java.util.logging.Level loggerLevel) {
-        boolean before = allowAll.get().get();
-        try {
-            allowAll.get().set(true);
-            sink.setLevel(loggerLevel);
-        } finally {
-            allowAll.get().set(before);
-        }
+        sink.setLevel(loggerLevel);
     }
 
     static sun.util.logging.PlatformLogger.Level toPlatformLevel(java.util.logging.Level level) {
-        boolean old = allowAccess.get().get();
-        allowAccess.get().set(true);
-        try {
-            return sun.util.logging.PlatformLogger.Level.valueOf(level.getName());
-        } finally {
-            allowAccess.get().set(old);
-        }
+        return sun.util.logging.PlatformLogger.Level.valueOf(level.getName());
     }
 
     // Calls the methods defined on LogProducer and verify the
@@ -767,91 +611,4 @@ public String get() {
             }
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        public static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
-        final static RuntimePermission ACCESS_LOGGER = new RuntimePermission("accessClassInPackage.jdk.internal.logger");
-        final static RuntimePermission ACCESS_LOGGING = new RuntimePermission("accessClassInPackage.sun.util.logging");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        final ThreadLocal<AtomicBoolean> allowAccess;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowControl,
-                ThreadLocal<AtomicBoolean> allowAccess,
-                ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowControl = allowControl;
-            this.allowAccess = allowAccess;
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            allPermissions = new PermissionsBuilder()
-                    .add(new java.security.AllPermission())
-                    .toPermissions();
-        }
-
-        Permissions getPermissions() {
-            if (allowControl.get().get() || allowAccess.get().get() || allowAll.get().get()) {
-                PermissionsBuilder builder =  new PermissionsBuilder()
-                        .addAll(permissions);
-                if (allowControl.get().get()) {
-                    builder.add(LOGGERFINDER_PERMISSION);
-                }
-                if (allowAccess.get().get()) {
-                    builder.add(ACCESS_LOGGER);
-                    builder.add(ACCESS_LOGGING);
-                }
-                if (allowAll.get().get()) {
-                    builder.addAll(allPermissions);
-                }
-                return builder.toPermissions();
-            }
-            return permissions;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions().implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(getPermissions()).toPermissions();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
index 91a0324f11e..d23ebe17372 100644
--- a/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -36,7 +30,6 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
@@ -46,30 +39,17 @@
 import sun.util.logging.PlatformLogger;
 import sun.util.logging.internal.LoggingProviderImpl;
 
-/**
+/*
  * @test
- * @bug     8140364
+ * @bug 8140364
  * @summary Tests all PlatformLogger methods with the default LoggerFinder JUL backend.
  * @modules java.base/sun.util.logging java.logging/sun.util.logging.internal
- * @run  main/othervm -Djava.security.manager=allow DefaultPlatformLoggerTest
- * @author danielfuchs
+ * @run  main/othervm DefaultPlatformLoggerTest
  */
 public class DefaultPlatformLoggerTest {
 
     final static AtomicLong sequencer = new AtomicLong();
     final static boolean VERBOSE = false;
-    static final ThreadLocal<AtomicBoolean> allowControl = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
-    static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-        @Override
-        protected AtomicBoolean initialValue() {
-            return  new AtomicBoolean(false);
-        }
-    };
 
     public static final Queue<LogEvent> eventQueue = new ArrayBlockingQueue<>(128);
 
@@ -256,15 +236,11 @@ public static void main(String[] args) throws Exception {
         test(provider, true, appSink, sysSink);
         System.out.println("Tetscase count: " + sequencer.get());
 
-        Policy.setPolicy(new SimplePolicy(allowAll, allowControl));
-        System.setSecurityManager(new SecurityManager());
-
         System.out.println("\n*** With Security Manager, without permissions\n");
         test(provider, false, appSink, sysSink);
         System.out.println("Tetscase count: " + sequencer.get());
 
         System.out.println("\n*** With Security Manager, with control permission\n");
-        allowControl.get().set(true);
         test(provider, true, appSink, sysSink);
 
         System.out.println("\nPASSED: Tested " + sequencer.get() + " cases.");
@@ -325,13 +301,7 @@ static void checkLogEvent(LoggerFinder provider, String desc,
     }
 
     static void setLevel(java.util.logging.Logger sink, java.util.logging.Level loggerLevel) {
-        boolean before = allowAll.get().get();
-        try {
-            allowAll.get().set(true);
-            sink.setLevel(loggerLevel);
-        } finally {
-            allowAll.get().set(before);
-        }
+        sink.setLevel(loggerLevel);
     }
 
     // Calls the methods defined on LogProducer and verify the
@@ -465,82 +435,5 @@ private static void testLogger(LoggerFinder provider,
                 }
             }
         }
-
-    }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-        public static final RuntimePermission LOGGERFINDER_PERMISSION =
-                new RuntimePermission("loggerFinder");
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions withControlPermissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll;
-        final ThreadLocal<AtomicBoolean> allowControl;
-        public SimplePolicy(ThreadLocal<AtomicBoolean> allowAll,
-                ThreadLocal<AtomicBoolean> allowControl) {
-            this.allowAll = allowAll;
-            this.allowControl = allowControl;
-            permissions = new Permissions();
-
-            withControlPermissions = new Permissions();
-            withControlPermissions.add(LOGGERFINDER_PERMISSION);
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            if (allowControl.get().get()) return withControlPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(
-                    allowAll.get().get() ? allPermissions :
-                    allowControl.get().get()
-                    ? withControlPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(
-                    allowAll.get().get() ? allPermissions :
-                    allowControl.get().get()
-                    ? withControlPermissions : permissions).toPermissions();
-        }
     }
 }
diff --git a/test/jdk/java/lang/System/SecurityManagerWarnings.java b/test/jdk/java/lang/System/SecurityManagerWarnings.java
index 6456f69c2f3..5ae94ef824e 100644
--- a/test/jdk/java/lang/System/SecurityManagerWarnings.java
+++ b/test/jdk/java/lang/System/SecurityManagerWarnings.java
@@ -33,53 +33,37 @@
 import jdk.test.lib.util.JarUtils;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.PrintStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class SecurityManagerWarnings {
 
     public static void main(String args[]) throws Exception {
         if (args.length == 0) {
-            Files.writeString(Path.of("policy"), """
-                    grant {
-                        permission java.lang.RuntimePermission "setIO";
-                        permission java.lang.RuntimePermission "createSecurityManager";
-                        permission java.lang.RuntimePermission "setSecurityManager";
-                    };
-                    """);
 
             System.setProperty("test.noclasspath", "true");
             String testClasses = System.getProperty("test.classes");
 
-            disallowTest(null, testClasses);
-            allowTest("allow", testClasses);
-            disallowTest("disallow", testClasses);
-            enableTest("", testClasses);
-            enableTest("default", testClasses);
-            enableTest("java.lang.SecurityManager", testClasses);
+            failLateTest(null, testClasses);
+            failLateTest("disallow", testClasses);
+            failEarlyTest("allow", testClasses);
+            failEarlyTest("", testClasses);
+            failEarlyTest("default", testClasses);
+            failEarlyTest("java.lang.SecurityManager", testClasses);
 
             JarUtils.createJarFile(Path.of("a.jar"),
                     Path.of(testClasses),
                     Path.of("SecurityManagerWarnings.class"),
-                    Path.of("A.class"),
-                    Path.of("B.class"));
+                    Path.of("A.class"));
 
-            disallowTest(null, "a.jar");
+            failLateTest(null, "a.jar");
         } else {
-            System.out.println("SM is enabled: " + (System.getSecurityManager() != null));
             PrintStream oldErr = System.err;
             // Modify System.err, thus make sure warnings are always printed
             // to the original System.err and will not be swallowed.
             System.setErr(new PrintStream(new ByteArrayOutputStream()));
             try {
-                // Run A.run() twice will show only one warning
-                // (setSecurityManager(null) to ensure the next set is permitted)
-                // Run B.run() and a new warning will appear
                 A.run();    // System.setSecurityManager(null);
-                A.run();    // System.setSecurityManager(null);
-                B.run();    // System.setSecurityManager(new SecurityManager());
             } catch (Exception e) {
                 // Exception messages must show in original stderr
                 e.printStackTrace(oldErr);
@@ -88,44 +72,23 @@ public static void main(String args[]) throws Exception {
         }
     }
 
-    // When SM is allowed, no startup warning, has setSM warning
-    static void allowTest(String prop, String cp) throws Exception {
-        checkInstallMessage(run(prop, cp), cp)
-                .shouldHaveExitValue(0)
-                .stdoutShouldContain("SM is enabled: false")
-                .shouldNotContain("A command line option");
-    }
-
-    // When SM is disallowed, no startup warning, setSM fails
-    static void disallowTest(String prop, String cp) throws Exception {
+    // When -Djava.security.manager is not set, or set to "allow",
+    // or "disallow", JVM starts but setSecurityManager will fail.
+    static void failLateTest(String prop, String cp) throws Exception {
         run(prop, cp)
                 .shouldNotHaveExitValue(0)
-                .stdoutShouldContain("SM is enabled: false")
-                .shouldNotContain("A command line option")
-                .shouldNotContain("A terminally deprecated method")
-                .stderrShouldContain("UnsupportedOperationException: The Security Manager is deprecated and will be removed in a future release");
+                .stderrShouldContain("at SecurityManagerWarnings.main")
+                .stderrShouldContain("UnsupportedOperationException: Setting a Security Manager is not supported");
     }
 
-    // When SM is allowed, has startup warning, has setSM warning
-    static void enableTest(String prop, String cp) throws Exception {
-        checkInstallMessage(run(prop, cp), cp)
-                .shouldHaveExitValue(0)
-                .stdoutShouldContain("SM is enabled: true")
-                .stderrShouldContain("WARNING: A command line option has enabled the Security Manager")
-                .stderrShouldContain("WARNING: The Security Manager is deprecated and will be removed in a future release");
-    }
-
-    // Check the setSM warning
-    static OutputAnalyzer checkInstallMessage(OutputAnalyzer oa, String cp) {
-        String uri = new File(cp).toURI().toString();
-        return oa
-                .stderrShouldContain("WARNING: A terminally deprecated method in java.lang.System has been called")
-                .stderrShouldContain("WARNING: System::setSecurityManager has been called by A (" + uri + ")")
-                .stderrShouldContain("WARNING: System::setSecurityManager has been called by B (" + uri + ")")
-                .stderrShouldContain("WARNING: Please consider reporting this to the maintainers of A")
-                .stderrShouldContain("WARNING: Please consider reporting this to the maintainers of B")
-                .stderrShouldContain("WARNING: System::setSecurityManager will be removed in a future release")
-                .stderrShouldNotMatch("(?s)by A.*by A");    // "by A" appears only once
+    // When -Djava.security.manager is set to any other values,
+    // JVM will not start.
+    static void failEarlyTest(String prop, String cp) throws Exception {
+        run(prop, cp)
+                .shouldNotHaveExitValue(0)
+                .shouldNotContain("SecurityManagerWarnings.main")
+                .shouldContain("at java.lang.System.initPhase3")
+                .shouldContain("Error: A command line option has attempted to allow or enable the Security Manager.");
     }
 
     static OutputAnalyzer run(String prop, String cp) throws Exception {
@@ -138,7 +101,6 @@ static OutputAnalyzer run(String prop, String cp) throws Exception {
             pb = ProcessTools.createTestJavaProcessBuilder(
                     "-cp", cp,
                     "-Djava.security.manager=" + prop,
-                    "-Djava.security.policy=policy",
                     "SecurityManagerWarnings", "run");
         }
         return ProcessTools.executeProcess(pb)
@@ -151,9 +113,3 @@ static void run() {
         System.setSecurityManager(null);
     }
 }
-
-class B {
-    static void run() {
-        System.setSecurityManager(new SecurityManager());
-    }
-}
diff --git a/test/jdk/java/lang/System/SecurityRace.java b/test/jdk/java/lang/System/SecurityRace.java
deleted file mode 100644
index 592af671e98..00000000000
--- a/test/jdk/java/lang/System/SecurityRace.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6302839
- * @summary SecurityRace System field accesses in two threads
- * @author Pete Soper
- * @build SecurityRace
- * @run main/othervm/policy=System.policy SecurityRace
- */
-
-/*
- * By default the test runs for a very short time.  Use main arg "stress"
- * to have a real chance of exposing races. Use main arg "time" to report
- * the average nanoseconds per invocation of System.setSecurityManager and
- * System.getSecurityManager. No testing for access races is performed with
- * argument "time."
- *
- * Requires security permissions "setSecurityManager" and
- * "createSecurityManager."
- */
-
-
-
-public class SecurityRace implements Runnable {
-
-    // Number of iterations to "warm up" and get methods compiled/inlined.
-    // (this is conservative)
-    static final int WARMUP_LOOPS = 100000;
-
-    // Number of timing trials
-    static final int TIMING_TRIALS = 10;
-
-    // Seconds to run this in "stress" mode. This is double the average
-    // time to expose the races of bug 6302839 on a Blade 1000. Invoke
-    // the program with the "stress" option multiple times for more
-    // confidence.
-    static final int STRESS_MILLISECONDS = 300000;
-    static final int SET_TIMING_LOOPS    = 10000;
-
-    // Max seconds to run before terminating the test ("declaring victory").
-    static int MAX_MILLISECONDS = 100;
-
-    // Number of iterations to time
-    static final int GET_TIMING_LOOPS = 10000000;
-
-    // Set true by main thread when NPE caught or time to terminate.
-    // Set true by other thread when NPE caught. It makes
-    // no difference where the NPE is thrown.
-    static volatile boolean stopthreads = false;
-
-    // Number of getProperty invocations between main loop checks
-    static final int       GETPROPERTY_LOOPS = 30000;
-
-    // Used by race and timing tests. Must get set non-null at lease once.
-    static SecurityManager sm = new SecurityManager();
-
-    public static void main(String[] argv) throws Exception {
-        String s;
-
-        if (argv.length > 0) {
-            if (argv[0].equals("time")) {
-
-                // Run the timing method
-                // First warm up the method to make sure it gets compiled
-                for (int i = 0; i < WARMUP_LOOPS; i++) {
-                    timeit(1, 1, 1);
-                }
-
-                System.out.println("boo");
-
-                // Now do the actual timing
-                timeit(TIMING_TRIALS, GET_TIMING_LOOPS, SET_TIMING_LOOPS);
-            } else if (argv[0].equals("stress")) {
-
-                // For stress test the test duration is boosted
-                MAX_MILLISECONDS = STRESS_MILLISECONDS;
-            } else {
-                throw new RuntimeException(
-                    "SecurityRace: " + argv[0]
-                    + " argument to main not recognized");
-            }    // if argv
-        }        // if length
-
-        long start = System.currentTimeMillis(),
-             end   = start + MAX_MILLISECONDS;
-
-        // Create and start racing thread
-        (new Thread(new SecurityRace())).start();
-
-        // main thread alternates batches of getProperty() with time checks
-        try {
-            do {
-                if (stopthreads) {
-
-                    // other thread suffered an NPE
-                    throw new RuntimeException("SecurityRace failed with NPE");
-                }
-
-                for (int i = 0; i < GETPROPERTY_LOOPS; i++) {
-                    s = System.getProperty("java.version");
-                }
-            } while (System.currentTimeMillis() < end);
-        } catch (NullPointerException e) {
-            throw new RuntimeException("SecurityRace failed with NPE");
-        } finally {
-
-            // make sure other thread terminates
-            stopthreads = true;
-        }
-    }    // main
-
-    // System.security mutator.
-    public void run() {
-        try {
-            while (true) {
-                if (stopthreads) {
-                    return;
-                }
-
-                System.setSecurityManager(sm);
-
-                // The goal is to catch another thread testing the
-                // value set above and trying to use it after it's
-                // nulled below.
-                System.setSecurityManager(null);
-            }
-        } catch (NullPointerException e) {
-            stopthreads = true;
-
-            return;
-        }
-    }
-
-    // Time method execution. Collects trials number of timings
-    // for the number of accessor and mutator invocation loops
-    // specified.
-    public static void timeit(int timing_trials, int get_timing_loops,
-                              int set_timing_loops) {
-        try {
-            long start;
-
-            // Time the methods and report average.
-            // Time multiple trials so noise is apparent and a
-            // T test can be used to establish significance.
-            for (int j = 0; j < timing_trials; j++) {
-                start = System.nanoTime();
-
-                for (int i = 0; i < get_timing_loops; i++) {
-                    sm = System.getSecurityManager();
-                }
-
-                // Don't print for "warmup" case. This might mean that
-                // the compiler fails to compile the println (setting it
-                // up to execute via interpretation using an "uncommon trap")
-                // but we don't care if this println runs slowly!
-                if (timing_trials > 1) {
-                    System.out.println((float) (System.nanoTime() - start)
-                                       / (float) get_timing_loops);
-                }
-            }
-
-            for (int j = 0; j < timing_trials; j++) {
-                start = System.nanoTime();
-
-                for (int i = 0; i < set_timing_loops; i++) {
-                    System.setSecurityManager(sm);
-                }
-
-                if (timing_trials > 1) {
-                    System.out.println((float) (System.nanoTime() - start)
-                                       / (float) set_timing_loops);
-                }
-            }
-
-            return;
-        } catch (Exception e) {
-            throw new RuntimeException("SecurityRace got unexpected: " + e);
-        }
-    }    // timeit
-}    // SecurityRace
diff --git a/test/jdk/java/lang/System/System.policy b/test/jdk/java/lang/System/System.policy
deleted file mode 100644
index a5d6524d062..00000000000
--- a/test/jdk/java/lang/System/System.policy
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Used by SecurityRace.java 
-
-// default permissions granted to all domains
-
-grant { 
-	// These two added for SecurityRace test
-
-	permission java.lang.RuntimePermission "setSecurityManager";
-	permission java.lang.RuntimePermission "createSecurityManager";
-
-	// allows anyone to listen on un-privileged ports
-	permission java.net.SocketPermission "localhost:1024-", "listen";
-
-	// "standard" properies that can be read by anyone
-
-	permission java.util.PropertyPermission "java.version", "read";
-	permission java.util.PropertyPermission "java.vendor", "read";
-	permission java.util.PropertyPermission "java.vendor.url", "read";
-	permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "os.name", "read";
-	permission java.util.PropertyPermission "os.version", "read";
-	permission java.util.PropertyPermission "os.arch", "read";
-	permission java.util.PropertyPermission "file.separator", "read";
-	permission java.util.PropertyPermission "path.separator", "read";
-	permission java.util.PropertyPermission "line.separator", "read";
-
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-};
-
diff --git a/test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java b/test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java
deleted file mode 100644
index 3ffda23082c..00000000000
--- a/test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8292240
- * @summary Test the scenario where a blocking operation pins a virtual thread to its
- *   carrier thread (cT1) and doesn't activate a spare. Subsequent blocking operations
- *   that pin a virtual thread to cT1 should attempt to activate a spare.
- * @requires vm.continuations
- * @run main/othervm
- *     -Djdk.virtualThreadScheduler.parallelism=1
- *     -Djdk.virtualThreadScheduler.maxPoolSize=2 ActivateSpareCarrier 100
- */
-
-import java.time.Duration;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.stream.Collectors;
-
-public class ActivateSpareCarrier {
-
-    private static final int DEFAULT_ITERTAIONS = 10_000;
-
-    private static final Object LOCK = new Object();
-
-    public static void main(String[] args) throws Exception {
-        int iterations;
-        if (args.length == 0) {
-            iterations = DEFAULT_ITERTAIONS;
-        } else {
-            iterations = Integer.parseInt(args[0]);
-        }
-        for (int i = 0; i < iterations; i++) {
-            test(i);
-        }
-    }
-
-    /**
-     * This method creates 3 virtual threads:
-     * - thread1 blocks in Object.wait, activating a spare carrier thread
-     * - thread2 is started and runs on the spare carrier thread
-     * - thread1 is notified causing it to re-adjust the release count and terminate
-     * - thread3 is started and should run on the one active thread
-     *
-     * This method need invoked at least twice in the same VM.
-     */
-    private static void test(int i) throws Exception {
-        System.out.printf("---- %d ----%n", i);
-
-        // thread1 blocks in wait, this triggers a tryCompensate to activate a spare thread
-        Thread thread1 = Thread.ofVirtual().unstarted(() -> {
-            System.out.println(Thread.currentThread());
-            synchronized (LOCK) {
-                try {
-                    LOCK.wait();
-                } catch (InterruptedException e) { }
-            }
-        });
-        System.out.printf("starting waiter thread #%d%n", thread1.threadId());
-        thread1.start();
-
-        // wait for thread1 to block in Object.wait
-        while (thread1.getState() != Thread.State.WAITING) {
-            Thread.sleep(10);
-        }
-
-        // start another virtual thread, it should run on the spare carrier thread
-        startAndJoinVirtualThread();
-
-        // notify thread1, this releases the blocker
-        synchronized (LOCK) {
-            LOCK.notifyAll();
-        }
-        joinThread(thread1);
-
-        // start another virtual thread after counts have been re-adjusted
-        startAndJoinVirtualThread();
-    }
-
-    /**
-     * Start a virtual thread and wait for it to terminate.
-     */
-    private static void startAndJoinVirtualThread() throws InterruptedException {
-        Thread thread = Thread.ofVirtual().unstarted(() -> {
-            System.out.println(Thread.currentThread());
-        });
-        System.out.format("starting #%d%n", thread.threadId());
-        thread.start();
-        joinThread(thread);
-    }
-
-    /**
-     * Wait for the give thread to terminate with diagnostic output if the thread does
-     * not terminate quickly.
-     */
-    private static void joinThread(Thread thread) throws InterruptedException {
-        long tid = thread.threadId();
-        System.out.printf("Waiting for #%d to terminate%n", tid);
-        boolean terminated = thread.join(Duration.ofSeconds(2));
-        if (!terminated) {
-            System.out.printf("#%d did not terminate quickly, continue to wait...%n", tid);
-            printForkJoinWorkerThreads();
-            thread.join();
-        }
-        System.out.printf("#%d terminated%n", tid);
-    }
-
-    /**
-     * Print the list of ForkJoinWorkerThreads and their stack traces.
-     */
-    private static void printForkJoinWorkerThreads() {
-        List<Thread> threads = Thread.getAllStackTraces().keySet().stream()
-                .filter(t -> t instanceof ForkJoinWorkerThread)
-                .sorted(Comparator.comparingLong(Thread::threadId))
-                .collect(Collectors.toList());
-        System.out.println("ForkJoinWorkerThreads:");
-        for (Thread t : threads) {
-            System.out.printf("    %s%n", t);
-            StackTraceElement[] stack = t.getStackTrace();
-            for (StackTraceElement e : stack) {
-                System.out.printf("      %s%n", e);
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java b/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java
new file mode 100644
index 00000000000..840e40453c6
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test cancelling a timeout task for Object.wait(millis) when there is
+ *     contention on the timer queue
+ * @requires vm.continuations
+ * @key randomness
+ * @run main/othervm
+ *     -Djdk.virtualThreadScheduler.parallelism=2
+ *     -Djdk.virtualThreadScheduler.timerQueues=1
+ *     CancelTimerWithContention
+ */
+
+import java.time.Instant;
+import java.util.Random;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class CancelTimerWithContention {
+
+    // number of threads
+    private static final int MIN_THREADS = 100;
+    private static final int MAX_THREADS = 10_000;
+
+    // number of monitors to enter
+    private static final int MIN_MONITORS = 2;
+    private static final int MAX_MONITORS = 8;
+
+    private static final Random RAND = new Random();
+
+    public static void main(String[] args) {
+        for (int threadCount = MIN_THREADS; threadCount <= MAX_THREADS; threadCount += 100) {
+            System.out.format("%s #threads = %d%n", Instant.now(), threadCount);
+            for (int lockCount = MIN_MONITORS; lockCount <= MAX_MONITORS;  lockCount += 2) {
+                test(threadCount, lockCount);
+            }
+        }
+    }
+
+    /**
+     * Test threads entering monitors and using Object.wait(millis) to wait. This
+     * testing scenario leads to a mix of contention (with responsible threads using
+     * short timeouts), timed-wait, and cancellation of timer tasks. This scenario
+     * can result in contention of the timer queue.
+     */
+    static void test(int threadCount, int monitorCount) {
+        var locks = new Object[monitorCount];
+        for (int i = 0; i < monitorCount; i++) {
+            locks[i] = new Object();
+        }
+
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+            var finished = new AtomicInteger();
+
+            for (int i = 0; i < threadCount; i++) {
+                Object lock = locks[RAND.nextInt(monitorCount)];    // random lock
+
+                executor.submit(() -> {
+                    synchronized (lock) {
+                        lock.wait(Long.MAX_VALUE);
+                    }
+                    finished.incrementAndGet();
+                    return null;
+                });
+
+                synchronized (lock) {
+                    lock.notify();
+                }
+            }
+
+            // notify at most one thread until all threads are finished
+            while (finished.get() < threadCount) {
+                for (Object lock : locks) {
+                    synchronized (lock) {
+                        lock.notify();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/JfrEvents.java b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
index bc952331f64..a1671fe3cc5 100644
--- a/test/jdk/java/lang/Thread/virtual/JfrEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
@@ -62,11 +62,8 @@ class JfrEvents {
 
     @BeforeAll
     static void setup() {
-        int minParallelism = 2;
-        if (Thread.currentThread().isVirtual()) {
-            minParallelism++;
-        }
-        VThreadRunner.ensureParallelism(minParallelism);
+        // need at least two carriers to test pinning
+        VThreadRunner.ensureParallelism(2);
     }
 
     /**
@@ -140,6 +137,223 @@ void testParkWhenPinned(boolean timed) throws Exception {
         }
     }
 
+    /**
+     * Test jdk.VirtualThreadPinned event when blocking on monitor while pinned.
+     */
+    @Test
+    void testBlockWhenPinned() throws Exception {
+        try (Recording recording = new Recording()) {
+            recording.enable("jdk.VirtualThreadPinned");
+            recording.start();
+
+            Object lock = new Object();
+
+            var started = new AtomicBoolean();
+            var vthread = Thread.ofVirtual().unstarted(() -> {
+                VThreadPinner.runPinned(() -> {
+                    started.set(true);
+                    synchronized (lock) { }
+                });
+            });
+
+            try {
+                synchronized (lock) {
+                    vthread.start();
+                    // wait for thread to start and block
+                    awaitTrue(started);
+                    await(vthread, Thread.State.BLOCKED);
+                }
+            } finally {
+                vthread.join();
+                recording.stop();
+            }
+
+            assertContainsPinnedEvent(recording, vthread);
+        }
+    }
+
+    /**
+     * Test jdk.VirtualThreadPinned event when waiting with Object.wait while pinned.
+     */
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testObjectWaitWhenPinned(boolean timed) throws Exception {
+        try (Recording recording = new Recording()) {
+            recording.enable("jdk.VirtualThreadPinned");
+            recording.start();
+
+            Object lock = new Object();
+
+            var started = new AtomicBoolean();
+            var vthread = Thread.startVirtualThread(() -> {
+                VThreadPinner.runPinned(() -> {
+                    started.set(true);
+                    synchronized (lock) {
+                        try {
+                            if (timed) {
+                                lock.wait(Long.MAX_VALUE);
+                            } else {
+                                lock.wait();
+                            }
+                        } catch (InterruptedException e) {
+                            fail();
+                        }
+                    }
+                });
+            });
+
+            try {
+                // wait for thread to start and wait
+                awaitTrue(started);
+                await(vthread, timed ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
+            } finally {
+                synchronized (lock) {
+                    lock.notifyAll();
+                }
+                vthread.join();
+                recording.stop();
+            }
+
+            assertContainsPinnedEvent(recording, vthread);
+        }
+    }
+
+    /**
+     * Test jdk.VirtualThreadPinned event when parking in a class initializer.
+     */
+    @Test
+    void testParkInClassInitializer() throws Exception {
+        class TestClass {
+            static {
+                LockSupport.park();
+            }
+            static void m() {
+                // do nothing
+            }
+        }
+
+        try (Recording recording = new Recording()) {
+            recording.enable("jdk.VirtualThreadPinned");
+            recording.start();
+
+            var started = new AtomicBoolean();
+            Thread vthread = Thread.startVirtualThread(() -> {
+                started.set(true);
+                TestClass.m();
+            });
+
+            try {
+                // wait for it to start and park
+                awaitTrue(started);
+                await(vthread, Thread.State.WAITING);
+            } finally {
+                LockSupport.unpark(vthread);
+                vthread.join();
+                recording.stop();
+            }
+
+            assertContainsPinnedEvent(recording, vthread);
+        }
+    }
+
+    /**
+     * Test jdk.VirtualThreadPinned event when blocking on monitor in a class initializer.
+     */
+    @Test
+    void testBlockInClassInitializer() throws Exception {
+        class LockHolder {
+            static final Object lock = new Object();
+        }
+        class TestClass {
+            static {
+                synchronized (LockHolder.lock) { }
+            }
+            static void m() {
+                // no nothing
+            }
+        }
+
+        try (Recording recording = new Recording()) {
+            recording.enable("jdk.VirtualThreadPinned");
+            recording.start();
+
+            var started = new AtomicBoolean();
+            Thread vthread = Thread.ofVirtual().unstarted(() -> {
+                started.set(true);
+                TestClass.m();
+            });
+
+            try {
+                synchronized (LockHolder.lock) {
+                    vthread.start();
+                    // wait for thread to start and block
+                    awaitTrue(started);
+                    await(vthread, Thread.State.BLOCKED);
+                }
+            } finally {
+                vthread.join();
+                recording.stop();
+            }
+
+            assertContainsPinnedEvent(recording, vthread);
+        }
+    }
+
+    /**
+     * Test jdk.VirtualThreadPinned event when waiting for a class initializer.
+     */
+    @Test
+    void testWaitingForClassInitializer() throws Exception {
+        class TestClass {
+            static {
+                LockSupport.park();
+            }
+            static void m() {
+                // do nothing
+            }
+        }
+
+        try (Recording recording = new Recording()) {
+            recording.enable("jdk.VirtualThreadPinned");
+            recording.start();
+
+            var started1 = new AtomicBoolean();
+            var started2 = new AtomicBoolean();
+
+            Thread vthread1 = Thread.ofVirtual().unstarted(() -> {
+                started1.set(true);
+                TestClass.m();
+            });
+            Thread vthread2 = Thread.ofVirtual().unstarted(() -> {
+                started2.set(true);
+                TestClass.m();
+            });
+
+            try {
+                // start first virtual thread and wait for it to start + park
+                vthread1.start();
+                awaitTrue(started1);
+                await(vthread1, Thread.State.WAITING);
+
+                // start second virtual thread and wait for it to start
+                vthread2.start();
+                awaitTrue(started2);
+
+                // give time for second virtual thread to wait on the MutexLocker
+                Thread.sleep(3000);
+
+            } finally {
+                LockSupport.unpark(vthread1);
+                vthread1.join();
+                vthread2.join();
+                recording.stop();
+            }
+
+            // the recording should have a pinned event for vthread2
+            assertContainsPinnedEvent(recording, vthread2);
+        }
+    }
+
     /**
      * Test jdk.VirtualThreadSubmitFailed event.
      */
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/TestClassLoader.java b/test/jdk/java/lang/Thread/virtual/LockingMode.java
similarity index 67%
rename from test/jdk/java/lang/ClassLoader/securityManager/TestClassLoader.java
rename to test/jdk/java/lang/Thread/virtual/LockingMode.java
index 64892ae0638..59fde4a5f49 100644
--- a/test/jdk/java/lang/ClassLoader/securityManager/TestClassLoader.java
+++ b/test/jdk/java/lang/Thread/virtual/LockingMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,15 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package cl;
 
-public class TestClassLoader extends ClassLoader {
+import java.lang.management.ManagementFactory;
+import com.sun.management.HotSpotDiagnosticMXBean;
+
+class LockingMode {
+    private LockingMode() { }
 
     /**
-     * This constructor is used to set the parent ClassLoader
+     * Returns true if using legacy locking mode.
      */
-    public TestClassLoader(ClassLoader parent) {
-        super(parent);
+    static boolean isLegacy() {
+        return ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                .getVMOption("LockingMode")
+                .getValue()
+                .equals("1");
     }
-
-}
+}
\ No newline at end of file
diff --git a/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java b/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java
new file mode 100644
index 00000000000..1f909b214c2
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java
@@ -0,0 +1,509 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @summary Tests for object monitors that have been useful to find bugs
+ * @library /test/lib
+ * @requires vm.continuations & vm.opt.LockingMode != 1
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm MiscMonitorTests
+ */
+
+/*
+ * @test id=Xint
+ * @library /test/lib
+ * @requires vm.continuations & vm.opt.LockingMode != 1
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm -Xint MiscMonitorTests
+ */
+
+/*
+ * @test id=Xcomp
+ * @library /test/lib
+ * @requires vm.continuations & vm.opt.LockingMode != 1
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm -Xcomp MiscMonitorTests
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel3
+ * @library /test/lib
+ * @requires vm.continuations & vm.opt.LockingMode != 1
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=3 MiscMonitorTests
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation
+ * @summary Test virtual threads using synchronized
+ * @library /test/lib
+ * @requires vm.continuations & vm.opt.LockingMode != 1
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation MiscMonitorTests
+ */
+
+/*
+ * @test id=gc
+ * @requires vm.debug == true & vm.continuations & vm.opt.LockingMode != 1
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:+FullGCALot -XX:FullGCALotInterval=1000 MiscMonitorTests
+ */
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.test.lib.thread.VThreadScheduler;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MiscMonitorTests {
+    static final int CARRIER_COUNT = Runtime.getRuntime().availableProcessors();
+
+    /**
+     * Test that yielding while holding monitors releases carrier.
+     */
+    @Test
+    void testReleaseOnYield() throws Exception {
+        try (var test = new TestReleaseOnYield()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestReleaseOnYield extends TestBase {
+        final Object lock = new Object();
+        volatile boolean finish;
+        volatile int counter;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT;
+
+            startVThreads(() -> foo(), vthreadCount, "Batch1");
+            sleep(500);  // Give time for threads to reach Thread.yield
+            startVThreads(() -> bar(), vthreadCount, "Batch2");
+
+            while (counter != vthreadCount) {
+                Thread.onSpinWait();
+            }
+            finish = true;
+            joinVThreads();
+        }
+
+        void foo() {
+            Object lock = new Object();
+            synchronized (lock) {
+                while (!finish) {
+                    Thread.yield();
+                }
+            }
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        }
+
+        void bar() {
+            synchronized (lock) {
+                counter++;
+            }
+            System.err.println("Exiting bar from thread " + Thread.currentThread().getName());
+        }
+    }
+
+    /**
+     * Test yielding while holding monitors with recursive locking releases carrier.
+     */
+    @Test
+    void testReleaseOnYieldRecursive() throws Exception {
+        try (var test = new TestReleaseOnYieldRecursive()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestReleaseOnYieldRecursive extends TestBase {
+        final Object lock = new Object();
+        volatile boolean finish;
+        volatile int counter;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT;
+
+            startVThreads(() -> foo(), vthreadCount, "Batch1");
+            sleep(500);  // Give time for threads to reach Thread.yield
+            startVThreads(() -> bar(), vthreadCount, "Batch2");
+
+            while (counter != 2 * vthreadCount) {
+                Thread.onSpinWait();
+            }
+            finish = true;
+            joinVThreads();
+        }
+
+        void foo() {
+           Object lock = new Object();
+            synchronized (lock) {
+                while (!finish) {
+                    Thread.yield();
+                }
+            }
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        }
+
+        void bar() {
+            synchronized (lock) {
+                counter++;
+            }
+            recursive(10);
+            System.err.println("Exiting bar from thread " + Thread.currentThread().getName());
+        };
+
+        void recursive(int count) {
+            synchronized (Thread.currentThread()) {
+                if (count > 0) {
+                    recursive(count - 1);
+                } else {
+                    synchronized (lock) {
+                        counter++;
+                        Thread.yield();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Test that contention on monitorenter releases carrier.
+     */
+    @Test
+    void testReleaseOnContention() throws Exception {
+        try (var test = new TestReleaseOnContention()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestReleaseOnContention extends TestBase {
+        final Object lock = new Object();
+        volatile boolean finish;
+        volatile int counter;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT * 8;
+
+            startVThreads(() -> foo(), vthreadCount, "VThread");
+            sleep(500);  // Give time for threads to reach synchronized (lock)
+
+            finish = true;
+            joinVThreads();
+        }
+
+        void foo() {
+            synchronized (lock) {
+                while (!finish) {
+                    Thread.yield();
+                }
+            }
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        }
+    }
+
+    /**
+     * Test contention on monitorenter with extra monitors on stack shared by all threads.
+     */
+    @Test
+    void testContentionMultipleMonitors() throws Exception {
+        try (var test = new TestContentionMultipleMonitors()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestContentionMultipleMonitors extends TestBase {
+        static int MONITOR_COUNT = 12;
+        final Object[] lockArray = new Object[MONITOR_COUNT];
+        final AtomicInteger workerCount = new AtomicInteger(0);
+        volatile boolean finish;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT * 8;
+            for (int i = 0; i < MONITOR_COUNT; i++) {
+                lockArray[i] = new Object();
+            }
+
+            startVThreads(() -> foo(), vthreadCount, "VThread");
+
+            sleep(5000);
+            finish = true;
+            joinVThreads();
+            assertEquals(vthreadCount, workerCount.get());
+        }
+
+        void foo() {
+            while (!finish) {
+                int lockNumber = ThreadLocalRandom.current().nextInt(0, MONITOR_COUNT - 1);
+                synchronized (lockArray[lockNumber]) {
+                    recursive1(lockNumber, lockNumber);
+                }
+            }
+            workerCount.getAndIncrement();
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        }
+
+        public void recursive1(int depth, int lockNumber) {
+            if (depth > 0) {
+                recursive1(depth - 1, lockNumber);
+            } else {
+                if (Math.random() < 0.5) {
+                    Thread.yield();
+                }
+                recursive2(lockNumber);
+            }
+        }
+
+        public void recursive2(int lockNumber) {
+            if (lockNumber + 2 <= MONITOR_COUNT - 1) {
+                lockNumber += 2;
+                synchronized (lockArray[lockNumber]) {
+                    Thread.yield();
+                    recursive2(lockNumber);
+                }
+            }
+        }
+    }
+
+    /**
+     * Test contention on monitorenter with extra monitors on stack both local only and shared by all threads.
+     */
+    @Test
+    void testContentionMultipleMonitors2() throws Exception {
+        try (var test = new TestContentionMultipleMonitors2()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestContentionMultipleMonitors2 extends TestBase {
+        int MONITOR_COUNT = 12;
+        final Object[] lockArray = new Object[MONITOR_COUNT];
+        final AtomicInteger workerCount = new AtomicInteger(0);
+        volatile boolean finish;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT * 8;
+            for (int i = 0; i < MONITOR_COUNT; i++) {
+                lockArray[i] = new Object();
+            }
+
+            startVThreads(() -> foo(), vthreadCount, "VThread");
+
+            sleep(5000);
+            finish = true;
+            joinVThreads();
+            assertEquals(vthreadCount, workerCount.get());
+        }
+
+        void foo() {
+            Object[] myLockArray = new Object[MONITOR_COUNT];
+            for (int i = 0; i < MONITOR_COUNT; i++) {
+                myLockArray[i] = new Object();
+            }
+
+            while (!finish) {
+                int lockNumber = ThreadLocalRandom.current().nextInt(0, MONITOR_COUNT - 1);
+                synchronized (myLockArray[lockNumber]) {
+                    synchronized (lockArray[lockNumber]) {
+                        recursive1(lockNumber, lockNumber, myLockArray);
+                    }
+                }
+            }
+            workerCount.getAndIncrement();
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        }
+
+        public void recursive1(int depth, int lockNumber, Object[] myLockArray) {
+            if (depth > 0) {
+                recursive1(depth - 1, lockNumber, myLockArray);
+            } else {
+                if (Math.random() < 0.5) {
+                    Thread.yield();
+                }
+                recursive2(lockNumber, myLockArray);
+            }
+        }
+
+        public void recursive2(int lockNumber, Object[] myLockArray) {
+            if (lockNumber + 2 <= MONITOR_COUNT - 1) {
+                lockNumber += 2;
+                synchronized (myLockArray[lockNumber]) {
+                    if (Math.random() < 0.5) {
+                        Thread.yield();
+                    }
+                    synchronized (lockArray[lockNumber]) {
+                        Thread.yield();
+                        recursive2(lockNumber, myLockArray);
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Test contention on monitorenter with synchronized methods.
+     */
+    @Test
+    void testContentionWithSyncMethods() throws Exception {
+        try (var test = new TestContentionWithSyncMethods()) {
+            test.runTest();
+        }
+    }
+
+    private static class TestContentionWithSyncMethods extends TestBase {
+        static final int MONITOR_COUNT = 12;
+        final Object[] lockArray = new Object[MONITOR_COUNT];
+        final AtomicInteger workerCount = new AtomicInteger(0);
+        volatile boolean finish;
+
+        @Override
+        void runTest() throws Exception {
+            int vthreadCount = CARRIER_COUNT * 8;
+            for (int i = 0; i < MONITOR_COUNT; i++) {
+                lockArray[i] = new Object();
+            }
+
+            startVThreads(() -> foo(), vthreadCount, "VThread");
+
+            sleep(5000);
+            finish = true;
+            joinVThreads();
+            assertEquals(vthreadCount, workerCount.get());
+        }
+
+        void foo() {
+            Object myLock = new Object();
+
+            while (!finish) {
+                int lockNumber = ThreadLocalRandom.current().nextInt(0, MONITOR_COUNT - 1);
+                synchronized (myLock) {
+                    synchronized (lockArray[lockNumber]) {
+                        recursive(lockNumber, myLock);
+                    }
+                }
+            }
+            workerCount.getAndIncrement();
+            System.err.println("Exiting foo from thread " + Thread.currentThread().getName());
+        };
+
+        synchronized void recursive(int depth, Object myLock) {
+            if (depth > 0) {
+                recursive(depth - 1, myLock);
+            } else {
+                if (Math.random() < 0.5) {
+                    Thread.yield();
+                } else {
+                    synchronized (myLock) {
+                        Thread.yield();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Test wait/notify mechanism.
+     */
+    @Test
+    void waitNotifyTest() throws Exception {
+        int threadCount = 1000;
+        int waitTime = 50;
+        Thread[] vthread = new Thread[threadCount];
+        long start = System.currentTimeMillis();
+
+        while (System.currentTimeMillis() - start < 5000) {
+            CountDownLatch latchStart = new CountDownLatch(threadCount);
+            CountDownLatch latchFinish = new CountDownLatch(threadCount);
+            Object object = new Object();
+
+            for (int i = 0; i < threadCount; i++) {
+                vthread[i] = Thread.ofVirtual().start(() -> {
+                    synchronized (object) {
+                        try {
+                            latchStart.countDown();
+                            object.wait(waitTime);
+                        } catch (InterruptedException e) {
+                            //do nothing;
+                        }
+                    }
+                    latchFinish.countDown();
+                });
+            }
+
+            try {
+                latchStart.await();
+                synchronized (object) {
+                    object.notifyAll();
+                }
+                latchFinish.await();
+                for (int i = 0; i < threadCount; i++) {
+                    vthread[i].join();
+                }
+            } catch (InterruptedException e) {
+                //do nothing;
+            }
+        }
+    }
+
+    private static abstract class TestBase implements AutoCloseable {
+        final ExecutorService scheduler = Executors.newFixedThreadPool(CARRIER_COUNT);
+        final List<Thread[]> vthreadList = new ArrayList<>();
+
+        abstract void runTest() throws Exception;
+
+        void startVThreads(Runnable r, int count, String name) {
+            Thread vthreads[] = new Thread[count];
+            for (int i = 0; i < count; i++) {
+                vthreads[i] = VThreadScheduler.virtualThreadBuilder(scheduler).name(name + "-" + i).start(r);
+            }
+            vthreadList.add(vthreads);
+        }
+
+        void joinVThreads() throws Exception {
+            for (Thread[] vthreads : vthreadList) {
+                for (Thread vthread : vthreads) {
+                    vthread.join();
+                }
+            }
+        }
+
+        void sleep(long ms) throws Exception {
+            Thread.sleep(ms);
+        }
+
+        @Override
+        public void close() {
+            scheduler.close();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
index c2389ab7ddd..f095fb2cf98 100644
--- a/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
+++ b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
@@ -26,9 +26,90 @@
  * @summary Test virtual thread with monitor enter/exit
  * @modules java.base/java.lang:+open jdk.management
  * @library /test/lib
+ * @build LockingMode
  * @run junit/othervm --enable-native-access=ALL-UNNAMED MonitorEnterExit
  */
 
+/*
+ * @test id=LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xint-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xint -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xint-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xint -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=1 -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=1 -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,23 +129,22 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.api.condition.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.*;
 
 class MonitorEnterExit {
+    static final int MAX_VTHREAD_COUNT = 4 * Runtime.getRuntime().availableProcessors();
     static final int MAX_ENTER_DEPTH = 256;
 
     @BeforeAll
     static void setup() {
-        // need >=2 carriers for testing pinning when main thread is a virtual thread
-        if (Thread.currentThread().isVirtual()) {
-            VThreadRunner.ensureParallelism(2);
-        }
+        // need >=2 carriers for tests that pin
+        VThreadRunner.ensureParallelism(2);
     }
 
     /**
@@ -150,6 +230,53 @@ private void testReenter(Object lock, int depth) {
         }
     }
 
+    /**
+     * Test monitor reenter when there are other threads blocked trying to enter.
+     */
+    @Test
+    @DisabledIf("LockingMode#isLegacy")
+    void testReenterWithContention() throws Exception {
+        var lock = new Object();
+        VThreadRunner.run(() -> {
+            List<Thread> threads = new ArrayList<>();
+            testReenter(lock, 0, threads);
+
+            // wait for threads to terminate
+            for (Thread vthread : threads) {
+                vthread.join();
+            }
+        });
+    }
+
+    private void testReenter(Object lock, int depth, List<Thread> threads) throws Exception {
+        if (depth < MAX_ENTER_DEPTH) {
+            synchronized (lock) {
+                assertTrue(Thread.holdsLock(lock));
+
+                // start platform or virtual thread that blocks waiting to enter
+                var started = new CountDownLatch(1);
+                ThreadFactory factory = ThreadLocalRandom.current().nextBoolean()
+                        ? Thread.ofPlatform().factory()
+                        : Thread.ofVirtual().factory();
+                var thread = factory.newThread(() -> {
+                    started.countDown();
+                    synchronized (lock) {
+                        /* do nothing */
+                    }
+                });
+                thread.start();
+
+                // wait for thread to start and block
+                started.await();
+                await(thread, Thread.State.BLOCKED);
+                threads.add(thread);
+
+                // test reenter
+                testReenter(lock, depth + 1, threads);
+            }
+        }
+    }
+
     /**
      * Test monitor enter when pinned.
      */
@@ -197,13 +324,7 @@ void testContendedEnterWhenPinnedHeldByPlatformThread() throws Exception {
      */
     @Test
     void testContendedEnterWhenPinnedHeldByVirtualThread() throws Exception {
-        // need at least two carrier threads
-        int previousParallelism = VThreadRunner.ensureParallelism(2);
-        try {
-            VThreadRunner.run(this::testEnterWithContentionWhenPinned);
-        } finally {
-            VThreadRunner.setParallelism(previousParallelism);
-        }
+        VThreadRunner.run(this::testEnterWithContentionWhenPinned);
     }
 
     /**
@@ -234,6 +355,79 @@ private void testEnterWithContentionWhenPinned() throws Exception {
         assertTrue(entered.get());
     }
 
+    /**
+     * Test that blocking waiting to enter a monitor releases the carrier.
+     */
+    @Test
+    @DisabledIf("LockingMode#isLegacy")
+    void testReleaseWhenBlocked() throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            var lock = new Object();
+
+            // thread enters monitor
+            var started = new CountDownLatch(1);
+            var vthread1 = factory.newThread(() -> {
+                started.countDown();
+                synchronized (lock) {
+                }
+            });
+
+            try {
+                synchronized (lock) {
+                    // start thread and wait for it to block
+                    vthread1.start();
+                    started.await();
+                    await(vthread1, Thread.State.BLOCKED);
+
+                    // carrier should be released, use it for another thread
+                    var executed = new AtomicBoolean();
+                    var vthread2 = factory.newThread(() -> {
+                        executed.set(true);
+                    });
+                    vthread2.start();
+                    vthread2.join();
+                    assertTrue(executed.get());
+                }
+            } finally {
+                vthread1.join();
+            }
+        }
+    }
+
+    /**
+     * Test lots of virtual threads blocked waiting to enter a monitor. If the number
+     * of virtual threads exceeds the number of carrier threads this test will hang if
+     * carriers aren't released.
+     */
+    @Test
+    @DisabledIf("LockingMode#isLegacy")
+    void testManyBlockedThreads() throws Exception {
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        var lock = new Object();
+        synchronized (lock) {
+            for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+                var started = new CountDownLatch(1);
+                var vthread = Thread.ofVirtual().start(() -> {
+                    started.countDown();
+                    synchronized (lock) {
+                    }
+                });
+                // wait for thread to start and block
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+                vthreads[i] = vthread;
+            }
+        }
+
+        // cleanup
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+    }
+
     /**
      * Returns a stream of elements that are ordered pairs of platform and virtual thread
      * counts. 0,2,4,..16 platform threads. 2,4,6,..32 virtual threads.
diff --git a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
index 81f1c1ea97f..98bdc7fdedd 100644
--- a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
+++ b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
@@ -26,9 +26,90 @@
  * @summary Test virtual threads using Object.wait/notifyAll
  * @modules java.base/java.lang:+open jdk.management
  * @library /test/lib
+ * @build LockingMode
  * @run junit/othervm --enable-native-access=ALL-UNNAMED MonitorWaitNotify
  */
 
+/*
+ * @test id=LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xint-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xint -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xint-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xint -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=1 -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=1 -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation-LM_LEGACY
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation -XX:LockingMode=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation-LM_LIGHTWEIGHT
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation -XX:LockingMode=2 --enable-native-access=ALL-UNNAMED MonitorWaitNotify
+ */
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -50,7 +131,10 @@
 import jdk.test.lib.thread.VThreadPinner;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.*;
@@ -203,6 +287,129 @@ void testNotifyBeforeWait(int timeout) throws Exception {
             thread.join();
         }
     }
+
+    /**
+     * Returns a stream of elements that are ordered pairs of platform and virtual thread
+     * counts. 0,2,4,..8 platform threads. 2,4,6,..16 virtual threads.
+     */
+    static Stream<Arguments> threadCounts() {
+        return IntStream.range(0, 9)
+                .filter(i -> i % 2 == 0)
+                .mapToObj(i -> i)
+                .flatMap(np -> IntStream.range(2, 17)
+                        .filter(i -> i % 2 == 0)
+                        .mapToObj(vp -> Arguments.of(np, vp)));
+    }
+
+    /**
+     * Test notify wakes only one thread when platform and virtual threads are waiting.
+     */
+    @ParameterizedTest
+    @MethodSource("threadCounts")
+    @DisabledIf("LockingMode#isLegacy")
+    void testNotifyOneThread(int nPlatformThreads, int nVirtualThreads) throws Exception {
+        int nThreads = nPlatformThreads + nVirtualThreads;
+
+        var lock = new Object();
+        var ready = new CountDownLatch(nThreads);
+        var notified = new AtomicInteger();
+
+        Runnable waitTask = () -> {
+            synchronized (lock) {
+                try {
+                    ready.countDown();
+                    lock.wait();
+                    notified.incrementAndGet();
+                } catch (InterruptedException e) { }
+            }
+        };
+
+        var threads = new ArrayList<Thread>();
+        try {
+            for (int i = 0; i < nPlatformThreads; i++) {
+                threads.add(Thread.ofPlatform().start(waitTask));
+            }
+            for (int i = 0; i < nVirtualThreads; i++) {
+                threads.add(Thread.ofVirtual().start(waitTask));
+            }
+
+            // wait for all threads to wait
+            ready.await();
+
+            // wake threads, one by one
+            for (int i = 0; i < threads.size(); i++) {
+
+                // wake one thread
+                synchronized (lock) {
+                    lock.notify();
+                }
+
+                // one thread should have awoken
+                int expectedWakeups = i + 1;
+                while (notified.get() < expectedWakeups) {
+                    Thread.sleep(10);
+                }
+                assertEquals(expectedWakeups, notified.get());
+            }
+        } finally {
+            for (Thread t : threads) {
+                t.interrupt();
+                t.join();
+            }
+        }
+    }
+
+    /**
+     * Test notifyAll wakes all threads.
+     */
+    @ParameterizedTest
+    @MethodSource("threadCounts")
+    @DisabledIf("LockingMode#isLegacy")
+    void testNotifyAllThreads(int nPlatformThreads, int nVirtualThreads) throws Exception {
+        int nThreads = nPlatformThreads + nVirtualThreads;
+
+        var lock = new Object();
+        var ready = new CountDownLatch(nThreads);
+        var notified = new CountDownLatch(nThreads);
+
+        Runnable waitTask = () -> {
+            synchronized (lock) {
+                try {
+                    ready.countDown();
+                    lock.wait();
+                    notified.countDown();
+                } catch (InterruptedException e) { }
+            }
+        };
+
+        var threads = new ArrayList<Thread>();
+        try {
+            for (int i = 0; i < nPlatformThreads; i++) {
+                threads.add(Thread.ofPlatform().start(waitTask));
+            }
+            for (int i = 0; i < nVirtualThreads; i++) {
+                threads.add(Thread.ofVirtual().start(waitTask));
+            }
+
+            // wait for all threads to wait
+            ready.await();
+
+            // wakeup all threads
+            synchronized (lock) {
+                lock.notifyAll();
+            }
+
+            // wait for all threads to have awoken
+            notified.await();
+
+        } finally {
+            for (Thread t : threads) {
+                t.interrupt();
+                t.join();
+            }
+        }
+    }
+
     /**
      * Test duration of timed Object.wait.
      */
@@ -489,6 +696,97 @@ void testParkingPermitNotOffered() throws Exception {
         assertTrue(completed.get());
     }
 
+    /**
+     * Test that Object.wait releases the carrier. This test uses a custom scheduler
+     * with one carrier thread.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    @DisabledIf("LockingMode#isLegacy")
+    void testReleaseWhenWaiting1(int timeout) throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            var lock = new Object();
+            var ready = new AtomicBoolean();
+            var completed = new AtomicBoolean();
+
+            var vthread1 = factory.newThread(() -> {
+                synchronized (lock) {
+                    try {
+                        ready.set(true);
+                        if (timeout > 0) {
+                            lock.wait(timeout);
+                        } else {
+                            lock.wait();
+                        }
+                    } catch (InterruptedException e) {
+                        fail("wait interrupted");
+                    }
+                }
+                completed.set(true);
+            });
+            vthread1.start();
+
+            // wait for vthread1 to start and wait
+            awaitTrue(ready);
+            await(vthread1, timeout > 0 ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
+
+            // carrier should be released, use it for another thread
+            var executed = new AtomicBoolean();
+            var vthread2 = factory.newThread(() -> {
+                executed.set(true);
+            });
+            vthread2.start();
+            vthread2.join();
+            assertTrue(executed.get());
+
+            // wakeup vthread1
+            synchronized (lock) {
+                lock.notifyAll();
+            }
+
+            vthread1.join();
+            assertTrue(completed.get());
+        }
+    }
+
+    /**
+     * Test that Object.wait releases the carrier. This test arranges for 4*ncores - 1
+     * virtual threads to wait. For long timeout and no timeout cases, all virtual threads
+     * will wait until they are notified.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 10, 20, 100, 500, 30000, Integer.MAX_VALUE })
+    @DisabledIf("LockingMode#isLegacy")
+    void testReleaseWhenWaiting2(int timeout) throws Exception {
+        int VTHREAD_COUNT = 4 * Runtime.getRuntime().availableProcessors();
+        CountDownLatch latch = new CountDownLatch(VTHREAD_COUNT);
+        Object lock = new Object();
+        AtomicInteger counter = new AtomicInteger(0);
+
+        for (int i = 0; i < VTHREAD_COUNT; i++) {
+            Thread.ofVirtual().name("vthread-" + i).start(() -> {
+                synchronized (lock) {
+                    if (counter.incrementAndGet() == VTHREAD_COUNT) {
+                        lock.notifyAll();
+                    } else {
+                        try {
+                            if (timeout > 0) {
+                                lock.wait(timeout);
+                            } else {
+                                lock.wait();
+                            }
+                        } catch (InterruptedException e) {}
+                    }
+                }
+                latch.countDown();
+            });
+        }
+        latch.await();
+    }
+
     /**
      * Test that wait(long) throws IAE when timeout is negative.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/Parking.java b/test/jdk/java/lang/Thread/virtual/Parking.java
index 674f14744a6..41f7f283bdd 100644
--- a/test/jdk/java/lang/Thread/virtual/Parking.java
+++ b/test/jdk/java/lang/Thread/virtual/Parking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,23 +21,60 @@
  * questions.
  */
 
-/**
- * @test
+/*
+ * @test id=default
  * @summary Test virtual threads using park/unpark
+ * @modules java.base/java.lang:+open jdk.management
  * @library /test/lib
+ * @build LockingMode
  * @run junit Parking
  */
 
+/*
+ * @test id=Xint
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xint Parking
+ */
+
+/*
+ * @test id=Xcomp
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp Parking
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @build LockingMode
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation Parking
+ */
+
 import java.time.Duration;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
 
 import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 class Parking {
-    private static final Object lock = new Object();
+    static final int MAX_VTHREAD_COUNT = 4 * Runtime.getRuntime().availableProcessors();
+    static final Object lock = new Object();
 
     /**
      * Park, unparked by platform thread.
@@ -343,6 +380,91 @@ void testParkNanos11() throws Exception {
         });
     }
 
+    /**
+     * Test that parking while holding a monitor releases the carrier.
+     */
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    @DisabledIf("LockingMode#isLegacy")
+    void testParkWhenHoldingMonitor(boolean reenter) throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            var lock = new Object();
+
+            // thread enters (and maybe reenters) a monitor and parks
+            var started = new CountDownLatch(1);
+            var vthread1 = factory.newThread(() -> {
+                started.countDown();
+                synchronized (lock) {
+                    if (reenter) {
+                        synchronized (lock) {
+                            LockSupport.park();
+                        }
+                    } else {
+                        LockSupport.park();
+                    }
+                }
+            });
+
+            vthread1.start();
+            try {
+                // wait for thread to start and park
+                started.await();
+                await(vthread1, Thread.State.WAITING);
+
+                // carrier should be released, use it for another thread
+                var executed = new AtomicBoolean();
+                var vthread2 = factory.newThread(() -> {
+                    executed.set(true);
+                });
+                vthread2.start();
+                vthread2.join();
+                assertTrue(executed.get());
+            } finally {
+                LockSupport.unpark(vthread1);
+                vthread1.join();
+            }
+        }
+    }
+
+    /**
+     * Test lots of virtual threads parked while holding a monitor. If the number of
+     * virtual threads exceeds the number of carrier threads then this test will hang if
+     * parking doesn't release the carrier.
+     */
+    @Test
+    @DisabledIf("LockingMode#isLegacy")
+    void testManyParkedWhenHoldingMonitor() throws Exception {
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        var done = new AtomicBoolean();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            var lock = new Object();
+            var started = new CountDownLatch(1);
+            var vthread = Thread.ofVirtual().start(() -> {
+                started.countDown();
+                synchronized (lock) {
+                    while (!done.get()) {
+                        LockSupport.park();
+                    }
+                }
+            });
+            // wait for thread to start and park
+            started.await();
+            await(vthread, Thread.State.WAITING);
+            vthreads[i] = vthread;
+        }
+
+        // cleanup
+        done.set(true);
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            var vthread = vthreads[i];
+            LockSupport.unpark(vthread);
+            vthread.join();
+        }
+    }
+
     /**
      * Schedule a thread to be interrupted after a delay.
      */
@@ -357,4 +479,16 @@ private static void scheduleInterrupt(Thread thread, long delay) {
         };
         new Thread(interruptTask).start();
     }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java b/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java
new file mode 100644
index 00000000000..1d889b72369
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test that a virtual thread waiting to enter a monitor, while pinning its
+ *   carrier, will retry until it enters the monitor. This avoids starvation when the
+ *   monitor is exited, an unmounted thread is the chosen successor, and the successor
+ *   can't continue because there are no carriers available.
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @requires vm.opt.LockingMode != 1
+ * @run main/othervm --enable-native-access=ALL-UNNAMED RetryMonitorEnterWhenPinned
+ */
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import jdk.test.lib.thread.VThreadPinner;
+
+public class RetryMonitorEnterWhenPinned {
+    public static void main(String[] args) throws Exception {
+        int iterations = (args.length > 0) ? Integer.parseInt(args[0]) : 10;
+        for (int i = 1; i <= iterations; i++) {
+            System.out.printf("%s -- iteration %d --%n", Instant.now(), i);
+            run();
+            System.out.println();
+        }
+    }
+
+    static void run() throws Exception {
+        var threads = new ArrayList<Thread>();
+
+        Object lock = new Object();
+        synchronized (lock) {
+
+            // start virtual threads that block on monitorenter
+            for (int i = 0; i < 100; i++) {
+                var started = new CountDownLatch(1);
+                Thread thread = Thread.startVirtualThread(() -> {
+                    started.countDown();
+                    synchronized (lock) {
+                        spin(20);
+                    }
+                });
+
+                // wait for thread to start and block
+                started.await();
+                await(thread, Thread.State.BLOCKED);
+                threads.add(thread);
+            }
+
+            // start virtual threads that block on monitorenter while pinned
+            int carriersAvailable = Runtime.getRuntime().availableProcessors();
+            if (Thread.currentThread().isVirtual()) {
+                carriersAvailable--;
+            }
+            for (int i = 0; i < 100; i++) {
+                var started = new CountDownLatch(1);
+                Thread thread = Thread.startVirtualThread(() -> {
+                    started.countDown();
+                    VThreadPinner.runPinned(() -> {
+                        synchronized (lock) {
+                            spin(20);
+                        }
+                    });
+                });
+
+                // if there are carriers available when wait until the thread blocks.
+                if (carriersAvailable > 0) {
+                    System.out.printf("%s waiting for thread #%d to block%n",
+                            Instant.now(), thread.threadId());
+                    started.await();
+                    await(thread, Thread.State.BLOCKED);
+                    carriersAvailable--;
+                }
+                threads.add(thread);
+            }
+
+        } // exit monitor
+
+        // wait for all threads to terminate
+        int threadsRemaining = threads.size();
+        while (threadsRemaining > 0) {
+            System.out.printf("%s waiting for %d threads to terminate%n",
+                    Instant.now(), threadsRemaining);
+            int terminated = 0;
+            for (Thread t : threads) {
+                if (t.join(Duration.ofSeconds(1))) {
+                    terminated++;
+                }
+            }
+            threadsRemaining = threads.size() - terminated;
+        }
+        System.out.printf("%s done%n", Instant.now());
+    }
+
+    /**
+     * Spin for the given number of milliseconds.
+     */
+    static void spin(long millis) {
+        long nanos = TimeUnit.MILLISECONDS.toNanos(millis);
+        long start = System.nanoTime();
+        while ((System.nanoTime() - start) < nanos) {
+            Thread.onSpinWait();
+        }
+    }
+
+    /**
+     * Wait for a thread to reach the expected state.
+     */
+    static void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assert state != Thread.State.TERMINATED : "Thread has terminated";
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java b/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java
new file mode 100644
index 00000000000..578aefe6a30
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java
@@ -0,0 +1,511 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @summary Test virtual threads with a synchronized native method and a native method
+ *      that enter/exits a monitor with JNI MonitorEnter/MonitorExit
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED SynchronizedNative
+ */
+
+/*
+ * @test id=Xint
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @run junit/othervm -Xint --enable-native-access=ALL-UNNAMED SynchronizedNative
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED SynchronizedNative
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open jdk.management
+ * @library /test/lib
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED SynchronizedNative
+ */
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import jdk.test.lib.thread.VThreadPinner;
+import jdk.test.lib.thread.VThreadRunner;   // ensureParallelism requires jdk.management
+import jdk.test.lib.thread.VThreadScheduler;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+class SynchronizedNative {
+
+    @BeforeAll
+    static void setup() throws Exception {
+        // need at least two carriers to test pinning
+        VThreadRunner.ensureParallelism(2);
+        System.loadLibrary("SynchronizedNative");
+    }
+
+    /**
+     * Test entering a monitor with a synchronized native method, no contention.
+     */
+    @Test
+    void testEnter() throws Exception {
+        Object lock = this;
+        VThreadRunner.run(() -> {
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test reentering a monitor with synchronized native method, no contention.
+     */
+    @Test
+    void testReenter() throws Exception {
+        Object lock = this;
+        VThreadRunner.run(() -> {
+
+            // enter, reenter with a synchronized native method
+            synchronized (lock) {
+                runWithSynchronizedNative(() -> {
+                    assertTrue(Thread.holdsLock(lock));
+                });
+                assertTrue(Thread.holdsLock(lock));
+            }
+            assertFalse(Thread.holdsLock(lock));
+
+            // enter with synchronized native method, renter with synchronized statement
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+                synchronized (lock) {
+                    assertTrue(Thread.holdsLock(lock));
+                }
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+
+            // enter with synchronized native method, reenter with synchronized native method
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+                runWithSynchronizedNative(() -> {
+                    assertTrue(Thread.holdsLock(lock));
+                });
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test entering a monitor with a synchronized native method and with contention.
+     */
+    @Test
+    void testEnterWithContention() throws Exception {
+        var lock = this;
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+                entered.set(true);
+            });
+        });
+        try {
+            synchronized (lock) {
+                vthread.start();
+
+                // wait for thread to start and block
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+
+                assertFalse(entered.get());
+            }
+        } finally {
+            vthread.join();
+        }
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Returns a stream of elements that are ordered pairs of platform and virtual thread
+     * counts. 0,2,4 platform threads. 2,4,6,8 virtual threads.
+     */
+    static Stream<Arguments> threadCounts() {
+        return IntStream.range(0, 5)
+                .filter(i -> i % 2 == 0)
+                .mapToObj(i -> i)
+                .flatMap(np -> IntStream.range(2, 9)
+                        .filter(i -> i % 2 == 0)
+                        .mapToObj(vp -> Arguments.of(np, vp)));
+    }
+
+    /**
+     * Execute a task concurrently from both platform and virtual threads.
+     */
+    private void executeConcurrently(int nPlatformThreads,
+                                     int nVirtualThreads,
+                                     Runnable task) throws Exception {
+        int parallism = nVirtualThreads;
+        if (Thread.currentThread().isVirtual()) {
+            parallism++;
+        }
+        int previousParallelism = VThreadRunner.ensureParallelism(parallism);
+        try {
+            int nthreads = nPlatformThreads + nVirtualThreads;
+            var phaser = new Phaser(nthreads + 1);
+
+            // start all threads
+            var threads = new Thread[nthreads];
+            int index = 0;
+            for (int i = 0; i < nPlatformThreads; i++) {
+                threads[index++] = Thread.ofPlatform().start(() -> {
+                    phaser.arriveAndAwaitAdvance();
+                    task.run();
+                });
+            }
+            for (int i = 0; i < nVirtualThreads; i++) {
+                threads[index++] = Thread.ofVirtual().start(() -> {
+                    phaser.arriveAndAwaitAdvance();
+                    task.run();
+                });
+            }
+
+            // wait for all threads to start
+            phaser.arriveAndAwaitAdvance();
+            System.err.printf("  %d threads started%n", nthreads);
+
+            // wait for all threads to terminate
+            for (Thread thread : threads) {
+                if (thread != null) {
+                    System.err.printf("  join %s ...%n", thread);
+                    thread.join();
+                }
+            }
+        } finally {
+            // reset parallelism
+            VThreadRunner.setParallelism(previousParallelism);
+        }
+    }
+
+
+    /**
+     * Test entering a monitor with a synchronized native method from many threads
+     * at the same time.
+     */
+    @ParameterizedTest
+    @MethodSource("threadCounts")
+    void testEnterConcurrently(int nPlatformThreads, int nVirtualThreads) throws Exception {
+        var counter = new Object() {
+            int value;
+            int value() { return value; }
+            void increment() { value++; }
+        };
+        var lock = this;
+        executeConcurrently(nPlatformThreads, nVirtualThreads, () -> {
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+                counter.increment();
+                LockSupport.parkNanos(100_000_000);  // 100ms
+            });
+        });
+        synchronized (lock) {
+            assertEquals(nPlatformThreads + nVirtualThreads, counter.value());
+        }
+    }
+
+    /**
+     * Test entering a monitor with JNI MonitorEnter.
+     */
+    @Test
+    void testEnterInNative() throws Exception {
+        Object lock = new Object();
+        VThreadRunner.run(() -> {
+            runWithMonitorEnteredInNative(lock, () -> {
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test reentering a monitor with JNI MonitorEnter.
+     */
+    @Test
+    void testReenterInNative() throws Exception {
+        Object lock = new Object();
+        VThreadRunner.run(() -> {
+
+            // enter, reenter with JNI MonitorEnter
+            synchronized (lock) {
+                runWithMonitorEnteredInNative(lock, () -> {
+                    assertTrue(Thread.holdsLock(lock));
+                });
+                assertTrue(Thread.holdsLock(lock));
+            }
+            assertFalse(Thread.holdsLock(lock));
+
+            // enter with JNI MonitorEnter, renter with synchronized statement
+            runWithMonitorEnteredInNative(lock, () -> {
+                assertTrue(Thread.holdsLock(lock));
+                synchronized (lock) {
+                    assertTrue(Thread.holdsLock(lock));
+                }
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+
+            // enter with JNI MonitorEnter, renter with JNI MonitorEnter
+            runWithMonitorEnteredInNative(lock, () -> {
+                assertTrue(Thread.holdsLock(lock));
+                runWithMonitorEnteredInNative(lock, () -> {
+                    assertTrue(Thread.holdsLock(lock));
+                });
+                assertTrue(Thread.holdsLock(lock));
+            });
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test entering a monitor with JNI MonitorEnter and with contention.
+     */
+    @Test
+    void testEnterInNativeWithContention() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            runWithMonitorEnteredInNative(lock, () -> {
+                assertTrue(Thread.holdsLock(lock));
+                entered.set(true);
+            });
+        });
+        try {
+            synchronized (lock) {
+                vthread.start();
+
+                // wait for thread to start and block
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+
+                assertFalse(entered.get());
+            }
+        } finally {
+            vthread.join();
+        }
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Test entering a monitor with JNI MonitorEnter from many threads at the same time.
+     */
+    @ParameterizedTest
+    @MethodSource("threadCounts")
+    void testEnterInNativeConcurrently(int nPlatformThreads, int nVirtualThreads) throws Exception {
+        var counter = new Object() {
+            int value;
+            int value() { return value; }
+            void increment() { value++; }
+        };
+        var lock = counter;
+        executeConcurrently(nPlatformThreads, nVirtualThreads, () -> {
+            runWithMonitorEnteredInNative(lock, () -> {
+                assertTrue(Thread.holdsLock(lock));
+                counter.increment();
+                LockSupport.parkNanos(100_000_000);  // 100ms
+            });
+        });
+        synchronized (lock) {
+            assertEquals(nPlatformThreads + nVirtualThreads, counter.value());
+        }
+    }
+
+    /**
+     * Test parking with synchronized native method on stack.
+     */
+    @Test
+    void testParkingWhenPinned() throws Exception {
+        var lock = this;
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        var done = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            started.countDown();
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock));
+                entered.set(true);
+                while (!done.get()) {
+                    LockSupport.park();
+                }
+            });
+        });
+        try {
+            // wait for thread to start and block
+            started.await();
+            await(vthread, Thread.State.WAITING);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(vthread);
+            vthread.join();
+        }
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Test blocking with synchronized native method on stack.
+     */
+    @Test
+    void testBlockingWhenPinned() throws Exception {
+        var lock1 = this;
+        var lock2 = new Object();
+
+        var started = new CountDownLatch(1);
+        var entered1 = new AtomicBoolean();   // set to true when vthread enters lock1
+        var entered2 = new AtomicBoolean();   // set to true when vthread enters lock2
+
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            runWithSynchronizedNative(() -> {
+                assertTrue(Thread.holdsLock(lock1));
+                entered1.set(true);
+                synchronized (lock2) {   // should block
+                    assertTrue(Thread.holdsLock(lock2));
+                    entered2.set(true);
+                }
+            });
+        });
+        try {
+            synchronized (lock2) {
+                // start thread and wait for it to block trying to enter lock2
+                vthread.start();
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+
+                assertTrue(entered1.get());
+                assertFalse(entered2.get());
+            }
+        } finally {
+            vthread.join();
+        }
+        assertTrue(entered2.get());
+    }
+
+    /**
+     * Test that blocking on synchronized native method releases the carrier.
+     */
+    //@Test
+    void testReleaseWhenBlocked() throws Exception {
+        assertTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            var lock = this;
+            var started = new CountDownLatch(1);
+            var entered = new AtomicBoolean();   // set to true when vthread enters lock
+
+            var vthread1 = factory.newThread(() -> {
+                started.countDown();
+                runWithSynchronizedNative(() -> {
+                    assertTrue(Thread.holdsLock(lock));
+                    entered.set(true);
+                });
+                assertFalse(Thread.holdsLock(lock));
+            });
+
+            vthread1.start();
+            try {
+                synchronized (this) {
+                    // start thread and wait for it to block
+                    vthread1.start();
+                    started.await();
+                    await(vthread1, Thread.State.BLOCKED);
+
+                    // carrier should be released, use it for another thread
+                    var executed = new AtomicBoolean();
+                    var vthread2 = factory.newThread(() -> {
+                        executed.set(true);
+                    });
+                    vthread2.start();
+                    vthread2.join();
+                    assertTrue(executed.get());
+                }
+            } finally {
+                vthread1.join();
+            }
+        }
+    }
+
+    /**
+     * Invokes the given task's run method while holding the monitor for "this".
+     */
+    private synchronized native void runWithSynchronizedNative(Runnable task);
+
+    /**
+     * Invokes the given task's run method while holding the monitor for the given
+     * object. The monitor is entered with JNI MonitorEnter, and exited with JNI MonitorExit.
+     */
+    private native void runWithMonitorEnteredInNative(Object lock, Runnable task);
+
+    /**
+     * Called from native methods to run the given task.
+     */
+    private void run(Runnable task) {
+        task.run();
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
index cda302f391f..d40fafc67bf 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
@@ -27,6 +27,7 @@
  * @summary Test Thread API with virtual threads
  * @modules java.base/java.lang:+open jdk.management
  * @library /test/lib
+ * @build LockingMode
  * @run junit/othervm --enable-native-access=ALL-UNNAMED ThreadAPI
  */
 
@@ -35,6 +36,7 @@
  * @requires vm.continuations
  * @modules java.base/java.lang:+open jdk.management
  * @library /test/lib
+ * @build LockingMode
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *     --enable-native-access=ALL-UNNAMED ThreadAPI
  */
@@ -68,6 +70,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -1082,7 +1085,7 @@ void testSetDaemon2() throws Exception {
      * Test Thread.yield releases carrier thread.
      */
     @Test
-    void testYield1() throws Exception {
+    void testYieldReleasesCarrier() throws Exception {
         assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
@@ -1106,10 +1109,41 @@ void testYield1() throws Exception {
     }
 
     /**
-     * Test Thread.yield when thread is pinned by native frame.
+     * Test Thread.yield releases carrier thread when virtual thread holds a monitor.
      */
     @Test
-    void testYield2() throws Exception {
+    @DisabledIf("LockingMode#isLegacy")
+    void testYieldReleasesCarrierWhenHoldingMonitor() throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+        var list = new CopyOnWriteArrayList<String>();
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+            var lock = new Object();
+            var thread = factory.newThread(() -> {
+                list.add("A");
+                var child = factory.newThread(() -> {
+                    list.add("B");
+                    synchronized (lock) {
+                        Thread.yield();
+                    }
+                    list.add("B");
+                });
+                child.start();
+                Thread.yield();
+                list.add("A");
+                try { child.join(); } catch (InterruptedException e) { }
+            });
+            thread.start();
+            thread.join();
+        }
+        assertEquals(List.of("A", "B", "A", "B"), list);
+    }
+
+    /**
+     * Test Thread.yield when thread is pinned.
+     */
+    @Test
+    void testYieldWhenPinned() throws Exception {
         assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
@@ -1136,7 +1170,7 @@ void testYield2() throws Exception {
      * Test Thread.yield does not consume the thread's parking permit.
      */
     @Test
-    void testYield3() throws Exception {
+    void testYieldDoesNotConsumParkingPermit() throws Exception {
         var thread = Thread.ofVirtual().start(() -> {
             LockSupport.unpark(Thread.currentThread());
             Thread.yield();
@@ -1149,7 +1183,7 @@ void testYield3() throws Exception {
      * Test Thread.yield does not make available the thread's parking permit.
      */
     @Test
-    void testYield4() throws Exception {
+    void testYieldDoesNotOfferParkingPermit() throws Exception {
         var thread = Thread.ofVirtual().start(() -> {
             Thread.yield();
             LockSupport.park();  // should park
@@ -1971,6 +2005,38 @@ void testHoldsLock2() throws Exception {
         });
     }
 
+    /**
+     * Test Thread.holdsLock when lock held by carrier thread.
+     */
+    @Disabled
+    @Test
+    void testHoldsLock3() throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
+
+        Object lock = new Object();
+
+        // carrier thread runs all tasks while holding the lock
+        ThreadFactory carrierThreadFactory = task -> Thread.ofPlatform().unstarted(() -> {
+            synchronized (lock) {
+                task.run();
+            }
+        });
+        try (ExecutorService pool = Executors.newSingleThreadExecutor(carrierThreadFactory)) {
+            Executor scheduler = task -> pool.submit(task::run);
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            // start virtual that tests if it holds the lock
+            var result = new AtomicReference<Boolean>();
+            Thread vthread = factory.newThread(() -> {
+                result.set(Thread.holdsLock(lock));
+            });
+            vthread.start();
+            vthread.join();
+            boolean holdsLock = result.get();
+            assertFalse(holdsLock, "Thread.holdsLock should return false");
+        }
+    }
+
     /**
      * Test Thread::getStackTrace on unstarted thread.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java b/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java
deleted file mode 100644
index 5db29c631a3..00000000000
--- a/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8284161 8289284 8322846
- * @summary Basic test of debugging option to trace pinned threads
- * @requires vm.continuations
- * @library /test/lib
- * @run junit/othervm -Djdk.tracePinnedThreads=full TracePinnedThreads
- * @run junit/othervm -Djdk.tracePinnedThreads=short TracePinnedThreads
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.time.Duration;
-import java.util.concurrent.Executors;
-import java.util.concurrent.locks.LockSupport;
-
-import jdk.test.lib.thread.VThreadRunner;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class TracePinnedThreads {
-    static final Object lock = new Object();
-
-    /**
-     * Parks current thread for 1 second.
-     */
-    private static void park() {
-        long nanos = Duration.ofSeconds(1).toNanos();
-        LockSupport.parkNanos(nanos);
-    }
-
-    /**
-     * Invokes the park method through a native frame to park the current
-     * thread for 1 second.
-     */
-    private static native void invokePark();
-
-    /**
-     * Test parking inside synchronized block.
-     */
-    @Test
-    void testPinnedCausedBySynchronizedBlock() throws Exception {
-        String output = run(() -> {
-            synchronized (lock) {
-                park();
-            }
-        });
-        assertContains(output, "reason:MONITOR");
-        assertContains(output, "<== monitors:1");
-    }
-
-    /**
-     * Test parking with native frame on stack.
-     */
-    @Test
-    void testPinnedCausedByNativeMethod() throws Exception {
-        System.loadLibrary("TracePinnedThreads");
-        String output = run(() -> invokePark());
-        assertContains(output, "reason:NATIVE");
-        assertContains(output, "(Native Method)");
-    }
-
-    /**
-     * Test parking in class initializer.
-     */
-    @Test
-    void testPinnedCausedByClassInitializer() throws Exception {
-        class C {
-            static {
-                park();
-            }
-        }
-        String output = run(C::new);
-        assertContains(output, "reason:NATIVE");
-        assertContains(output, "<clinit>");
-    }
-
-    /**
-     * Test contention writing to System.out when pinned. The test creates four threads
-     * that write to System.out when pinned, this is enough to potentially deadlock
-     * without the changes in JDK-8322846.
-     */
-    @Test
-    void testContention() throws Exception {
-        // use several classes to avoid duplicate stack traces
-        class C1 {
-            synchronized void print() {
-                System.out.println("hello");
-            }
-        }
-        class C2 {
-            synchronized void print() {
-                System.out.println("hello");
-            }
-        }
-        class C3 {
-            synchronized void print() {
-                System.out.println("hello");
-            }
-        }
-        class C4 {
-            synchronized void print() {
-                System.out.println("hello");
-            }
-        }
-
-        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
-            executor.submit(() -> {
-                new C1().print();
-            });
-            executor.submit(() -> {
-                new C2().print();
-            });
-            executor.submit(() -> {
-                new C3().print();
-            });
-            executor.submit(() -> {
-                new C4().print();
-            });
-        }
-    }
-
-    /**
-     * Run a task in a virtual thread, returning a String with any output printed
-     * to standard output.
-     */
-    private static String run(Runnable task) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        PrintStream original = System.out;
-        System.setOut(new PrintStream(baos, true));
-        try {
-            VThreadRunner.run(task::run);
-        } finally {
-            System.setOut(original);
-        }
-        String output = new String(baos.toByteArray());
-        System.out.println(output);
-        return output;
-    }
-
-    /**
-     * Tests that s1 contains s2.
-     */
-    private static void assertContains(String s1, String s2) {
-        assertTrue(s1.contains(s2), s2 + " not found!!!");
-    }
-
-    /**
-     * Tests that s1 does not contain s2.
-     */
-    private static void assertDoesNotContain(String s1, String s2) {
-        assertFalse(s1.contains(s2), s2 + " found!!");
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java b/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
deleted file mode 100644
index 2d822655428..00000000000
--- a/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Test parking when pinned and emitting the JFR VirtualThreadPinnedEvent throws
- * @modules java.base/java.lang:+open java.base/jdk.internal.event jdk.management
- * @library /test/lib
- * @compile/module=java.base jdk/internal/event/VirtualThreadPinnedEvent.java
- * @run junit/othervm --enable-native-access=ALL-UNNAMED VirtualThreadPinnedEventThrows
- */
-
-import java.lang.ref.Reference;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.LockSupport;
-import jdk.internal.event.VirtualThreadPinnedEvent;
-
-import jdk.test.lib.thread.VThreadRunner;   // ensureParallelism requires jdk.management
-import jdk.test.lib.thread.VThreadPinner;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.BeforeAll;
-import static org.junit.jupiter.api.Assertions.*;
-
-class VirtualThreadPinnedEventThrows {
-
-    @BeforeAll
-    static void setup() {
-        // need >=2 carriers for testing pinning when main thread is a virtual thread
-        if (Thread.currentThread().isVirtual()) {
-            VThreadRunner.ensureParallelism(2);
-        }
-    }
-
-    /**
-     * Test parking when pinned and creating the VirtualThreadPinnedEvent fails with OOME.
-     */
-    @Test
-    void testVirtualThreadPinnedEventCreateThrows() throws Exception {
-        VirtualThreadPinnedEvent.setCreateThrows(true);
-        try {
-            testParkWhenPinned();
-        } finally {
-            VirtualThreadPinnedEvent.setCreateThrows(false);
-        }
-    }
-
-    /**
-     * Test parking when pinned and VirtualThreadPinnedEvent.begin fails with OOME.
-     */
-    @Test
-    void testVirtualThreadPinnedEventBeginThrows() throws Exception {
-        VirtualThreadPinnedEvent.setBeginThrows(true);
-        try {
-            testParkWhenPinned();
-        } finally {
-            VirtualThreadPinnedEvent.setBeginThrows(false);
-        }
-    }
-
-    /**
-     * Test parking when pinned and VirtualThreadPinnedEvent.commit fails with OOME.
-     */
-    @Test
-    void testVirtualThreadPinnedEventCommitThrows() throws Exception {
-        VirtualThreadPinnedEvent.setCommitThrows(true);
-        try {
-            testParkWhenPinned();
-        } finally {
-            VirtualThreadPinnedEvent.setCommitThrows(false);
-        }
-    }
-
-    /**
-     * Test parking a virtual thread when pinned.
-     */
-    private void testParkWhenPinned() throws Exception {
-        var exception = new AtomicReference<Throwable>();
-        var done = new AtomicBoolean();
-        Thread thread = Thread.startVirtualThread(() -> {
-            try {
-                VThreadPinner.runPinned(() -> {
-                    while (!done.get()) {
-                        LockSupport.park();
-                    }
-                });
-            } catch (Throwable e) {
-                exception.set(e);
-            }
-        });
-        try {
-            // wait for thread to park
-            Thread.State state;
-            while ((state = thread.getState()) != Thread.State.WAITING) {
-                assertTrue(state != Thread.State.TERMINATED);
-                Thread.sleep(10);
-            }
-        } finally {
-            done.set(true);
-            LockSupport.unpark(thread);
-            thread.join();
-        }
-        assertNull(exception.get());
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java b/test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java
deleted file mode 100644
index f267191b307..00000000000
--- a/test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.event;
-
-/**
- * VirtualThreadPinnedEvent to optionally throw OOME at create, begin or commit time.
- */
-public class VirtualThreadPinnedEvent extends Event {
-    private static boolean throwOnCreate;
-    private static boolean throwOnBegin;
-    private static boolean throwOnCommit;
-
-    public static void setCreateThrows(boolean value) {
-        throwOnCreate = value;
-    }
-
-    public static void setBeginThrows(boolean value) {
-        throwOnBegin = value;
-    }
-
-    public static void setCommitThrows(boolean value) {
-        throwOnCommit = value;
-    }
-
-    public VirtualThreadPinnedEvent() {
-        if (throwOnCreate) {
-            throw new OutOfMemoryError();
-        }
-    }
-
-    @Override
-    public void begin() {
-        if (throwOnBegin) {
-            throw new OutOfMemoryError();
-        }
-    }
-
-    @Override
-    public void commit() {
-        if (throwOnCommit) {
-            throw new OutOfMemoryError();
-        }
-    }
-}
diff --git a/test/jdk/java/beans/PropertyEditor/TestEnumSubclass.java b/test/jdk/java/lang/Thread/virtual/libSynchronizedNative.c
similarity index 53%
rename from test/jdk/java/beans/PropertyEditor/TestEnumSubclass.java
rename to test/jdk/java/lang/Thread/virtual/libSynchronizedNative.c
index 811f3d2fc14..16e5c61d384 100644
--- a/test/jdk/java/beans/PropertyEditor/TestEnumSubclass.java
+++ b/test/jdk/java/lang/Thread/virtual/libSynchronizedNative.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,34 +21,23 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 6736248
- * @summary Tests PropertyEditor for value of subtype Enum with security manager
- * @run main/othervm -Djava.security.manager=allow TestEnumSubclass
- * @author Sergey Malenkov
- * @modules java.compiler
- *          java.desktop
- *          jdk.compiler
- */
+#include "jni.h"
 
-public class TestEnumSubclass {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new TestEditor(Operation.class);
+JNIEXPORT void JNICALL
+Java_SynchronizedNative_runWithSynchronizedNative(JNIEnv *env, jobject obj, jobject task) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jmethodID mid = (*env)->GetMethodID(env, clazz, "run", "(Ljava/lang/Runnable;)V");
+    if (mid != NULL) {
+        (*env)->CallVoidMethod(env, obj, mid, task);
     }
+}
 
-    public enum Operation {
-        PLUS {
-            public int run(int i, int j) {
-                return i + j;
-            }
-        },
-        MINUS {
-            public int run(int i, int j) {
-                return i - j;
-            }
-        };
-        public abstract int run(int i, int j);
+JNIEXPORT void JNICALL
+Java_SynchronizedNative_runWithMonitorEnteredInNative(JNIEnv *env, jobject obj, jobject lock, jobject task) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jmethodID mid = (*env)->GetMethodID(env, clazz, "run", "(Ljava/lang/Runnable;)V");
+    if (mid != NULL && (*env)->MonitorEnter(env, lock) == 0) {
+        (*env)->CallVoidMethod(env, obj, mid, task);
+        (*env)->MonitorExit(env, lock);  // can be called with pending exception
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java
new file mode 100644
index 00000000000..3f8f1c464a6
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Stress test Thread.getStackTrace on a virtual thread in timed-Object.wait
+ * @requires vm.debug != true
+ * @run main/othervm GetStackTraceALotWithTimedWait 100000
+ */
+
+/*
+ * @test
+ * @requires vm.debug == true
+ * @run main/othervm GetStackTraceALotWithTimedWait 50000
+ */
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class GetStackTraceALotWithTimedWait {
+
+    public static void main(String[] args) throws Exception {
+        int iterations = args.length > 0 ? Integer.parseInt(args[0]) : 100_000;
+
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+            var done = new AtomicBoolean();
+            var threads = new ArrayList<Thread>();
+
+            // start threads that invoke Object.wait with a short timeout
+            int nthreads = Runtime.getRuntime().availableProcessors();
+            for (int i = 0; i < nthreads; i++) {
+                var ref = new AtomicReference<Thread>();
+                var lock = new Object();
+                executor.submit(() -> {
+                    ref.set(Thread.currentThread());
+                    while (!done.get()) {
+                        synchronized (lock) {
+                            int delay = 1 + ThreadLocalRandom.current().nextInt(20);
+                            lock.wait(delay);
+                        }
+                    }
+                    return null;
+                });
+                Thread thread;
+                while ((thread = ref.get()) == null) {
+                    Thread.sleep(20);
+                }
+                threads.add(thread);
+            }
+
+            // hammer on Thread.getStackTrace
+            try {
+                for (int i = 1; i <= iterations; i++) {
+                    if ((i % 1000) == 0) {
+                        System.out.println(Instant.now() + " => " + i + " of " + iterations);
+                    }
+                    for (Thread thread : threads) {
+                        thread.getStackTrace();
+                    }
+                }
+            } finally {
+                done.set(true);
+            }
+        }
+    }
+}
+
diff --git a/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java b/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java
new file mode 100644
index 00000000000..86096156b91
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @summary Test virtual threads entering a lot of monitors with contention
+ * @requires vm.opt.LockingMode != 1
+ * @library /test/lib
+ * @run main/othervm LotsOfContendedMonitorEnter
+ */
+
+/*
+ * @test id=LM_LIGHTWEIGHT
+ * @requires vm.opt.LockingMode != 1
+ * @library /test/lib
+ * @run main/othervm -XX:LockingMode=2 LotsOfContendedMonitorEnter
+ */
+
+import java.util.concurrent.CountDownLatch;
+import jdk.test.lib.thread.VThreadRunner;
+
+public class LotsOfContendedMonitorEnter {
+
+    public static void main(String[] args) throws Exception {
+        int depth;
+        if (args.length > 0) {
+            depth = Integer.parseInt(args[0]);
+        } else {
+            depth = 1024;
+        }
+        VThreadRunner.run(() -> testContendedEnter(depth));
+    }
+
+    /**
+     * Enter the monitor for a new object, racing with another virtual thread that
+     * attempts to enter around the same time, then repeat to the given depth.
+     */
+    private static void testContendedEnter(int depthRemaining) throws Exception {
+        if (depthRemaining > 0) {
+            var lock = new Object();
+
+            // start thread to enter monitor for brief period, then enters again when signalled
+            var started = new CountDownLatch(1);
+            var signal = new CountDownLatch(1);
+            var thread = Thread.ofVirtual().start(() -> {
+                started.countDown();
+
+                // enter, may be contended
+                synchronized (lock) {
+                    Thread.onSpinWait();
+                }
+
+                // wait to be signalled
+                try {
+                    signal.await();
+                } catch (InterruptedException e) { }
+
+                // enter again, this will block until the main thread releases
+                synchronized (lock) {
+                    // do nothing
+                }
+            });
+            try {
+                // wait for thread to start
+                started.await();
+
+                // enter, may be contended
+                synchronized (lock) {
+                    // signal thread to enter monitor again, it should block
+                    signal.countDown();
+                    await(thread, Thread.State.BLOCKED);
+                    testContendedEnter(depthRemaining - 1);
+                }
+            } finally {
+                thread.join();
+            }
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private static void await(Thread thread, Thread.State expectedState) {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assert state != Thread.State.TERMINATED : "Thread has terminated";
+            Thread.yield();
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/LotsOfUncontendedMonitorEnter.java b/test/jdk/java/lang/Thread/virtual/stress/LotsOfUncontendedMonitorEnter.java
new file mode 100644
index 00000000000..e72fc12eb88
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/LotsOfUncontendedMonitorEnter.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @summary Test virtual thread entering (and reentering) a lot of monitors with no contention
+ * @library /test/lib
+ * @run main/othervm LotsOfUncontendedMonitorEnter
+ */
+
+/*
+ * @test id=LM_LEGACY
+ * @library /test/lib
+ * @run main/othervm -XX:LockingMode=1 LotsOfUncontendedMonitorEnter
+ */
+
+/*
+ * @test id=LM_LIGHTWEIGHT
+ * @library /test/lib
+ * @run main/othervm -XX:LockingMode=2 LotsOfUncontendedMonitorEnter
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import jdk.test.lib.thread.VThreadRunner;
+
+public class LotsOfUncontendedMonitorEnter {
+
+    public static void main(String[] args) throws Exception {
+        int depth;
+        if (args.length > 0) {
+            depth = Integer.parseInt(args[0]);
+        } else {
+            depth = 24; // 33554430 enters
+        }
+        VThreadRunner.run(() -> {
+            testEnter(List.of(), depth);
+        });
+    }
+
+    /**
+     * Enter the monitor for a new object, reenter a monitor that is already held, and
+     * repeat to the given depth.
+     */
+    private static void testEnter(List<Object> ownedMonitors, int depthRemaining) {
+        if (depthRemaining > 0) {
+            var lock = new Object();
+            synchronized (lock) {
+                // new list of owned monitors
+                var monitors = concat(ownedMonitors, lock);
+                testEnter(monitors, depthRemaining - 1);
+
+                // reenter a monitor that is already owned
+                int index = ThreadLocalRandom.current().nextInt(monitors.size());
+                var otherLock = monitors.get(index);
+
+                synchronized (otherLock) {
+                    testEnter(monitors, depthRemaining - 1);
+                }
+            }
+        }
+    }
+
+    /**
+     * Adds an element to a list, returning a new list.
+     */
+    private static <T> List<T> concat(List<T> list, T object) {
+        var newList = new ArrayList<>(list);
+        newList.add(object);
+        return newList;
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java
new file mode 100644
index 00000000000..9487de6b862
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Stress test virtual threads with a variation of the Skynet 1M benchmark that uses
+ *   a channel implementation based on object monitors. This variant uses a reduced number of
+ *   100k virtual threads at the final level.
+ * @requires vm.debug != true & vm.continuations & vm.opt.LockingMode != 1
+ * @run main/othervm/timeout=300 Skynet100kWithMonitors 50
+ */
+
+/*
+ * @test
+ * @requires vm.debug == true & vm.continuations & vm.opt.LockingMode != 1
+ * @run main/othervm/timeout=300 Skynet100kWithMonitors 10
+ */
+
+public class Skynet100kWithMonitors {
+
+    public static void main(String[] args) {
+        int iterations = (args.length) > 0 ? Integer.parseInt(args[0]) : 10;
+        for (int i = 0; i < iterations; i++) {
+            skynet(100_000, 4999950000L);
+        }
+    }
+
+    static void skynet(int num, long expected) {
+        long start = System.currentTimeMillis();
+        var chan = new Channel<Long>();
+
+        Thread.startVirtualThread(() -> skynet(chan, 0, num, 10));
+
+        long sum = chan.receive();
+        long end = System.currentTimeMillis();
+        System.out.format("Result: %d in %s ms%n", sum, (end-start));
+        if (sum != expected)
+            throw new RuntimeException("Expected " + expected);
+    }
+
+    static void skynet(Channel<Long> result, int num, int size, int div) {
+        if (size == 1) {
+            result.send((long)num);
+        } else {
+            var chan = new Channel<Long>();
+            for (int i = 0; i < div; i++) {
+                int subNum = num + i * (size / div);
+                Thread.startVirtualThread(() -> skynet(chan, subNum, size / div, div));
+            }
+            long sum = 0;
+            for (int i = 0; i < div; i++) {
+                sum += chan.receive();
+            }
+            result.send(sum);
+        }
+    }
+
+    static class Channel<T> {
+        private final Object lock = new Object();
+        private T element;
+
+        Channel() {
+        }
+
+        void send(T e) {
+            boolean interrupted = false;
+            synchronized (lock) {
+                while (element != null) {
+                    try {
+                        lock.wait();
+                    } catch (InterruptedException x) {
+                        interrupted = true;
+                    }
+                }
+                element = e;
+                lock.notifyAll();
+            }
+            if (interrupted)
+                Thread.currentThread().interrupt();
+        }
+
+        T receive() {
+            T e;
+            boolean interrupted = false;
+            synchronized (lock) {
+                while ((e = element) == null) {
+                    try {
+                        lock.wait();
+                    } catch (InterruptedException x) {
+                        interrupted = true;
+                    }
+                }
+                element = null;
+                lock.notifyAll();
+            }
+            if (interrupted)
+                Thread.currentThread().interrupt();
+            return e;
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/TEST.properties b/test/jdk/java/lang/Thread/virtual/stress/TEST.properties
deleted file mode 100644
index d721b4f7d4b..00000000000
--- a/test/jdk/java/lang/Thread/virtual/stress/TEST.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-exclusiveAccess.dirs=.
diff --git a/test/jdk/java/lang/annotation/ParameterAnnotations.java b/test/jdk/java/lang/annotation/ParameterAnnotations.java
index b5c657629cb..f7fcf0078a6 100644
--- a/test/jdk/java/lang/annotation/ParameterAnnotations.java
+++ b/test/jdk/java/lang/annotation/ParameterAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,8 @@
 /*
  * @test
  * @bug 6761678 8162817
- * @summary Check properties of Annotations returned from
- * getParameterAnnotations, including freedom from security
- * exceptions.
- * @run main/othervm -Djava.security.manager=allow ParameterAnnotations
+ * @summary Check properties of Annotations returned from getParameterAnnotations
+ * @run main ParameterAnnotations
  * @author Martin Buchholz
  */
 
@@ -37,9 +35,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.FIELD, ElementType.PARAMETER })
@@ -49,40 +44,11 @@
 
 public class ParameterAnnotations {
 
-    // A security policy that differs from the default only in that it
-    // allows a security manager to be uninstalled.
-    static class MyPolicy extends Policy {
-        final Policy defaultPolicy;
-        MyPolicy(Policy defaultPolicy) {
-            this.defaultPolicy = defaultPolicy;
-        }
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return p.getName().equals("setSecurityManager") ||
-                defaultPolicy.implies(pd, p);
-        }
-    }
-
     public void nop(@Named("foo") Object foo,
                     @Named("bar") Object bar) {
     }
 
     void test(String[] args) throws Throwable {
-        // Test without a security manager
-        test1();
-
-        // Test with a security manager
-        Policy defaultPolicy = Policy.getPolicy();
-        Policy.setPolicy(new MyPolicy(defaultPolicy));
-        System.setSecurityManager(new SecurityManager());
-        try {
-            test1();
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    void test1() throws Throwable {
         for (Method m : thisClass.getMethods()) {
             if (m.getName().equals("nop")) {
                 Annotation[][] ann = m.getParameterAnnotations();
diff --git a/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java
deleted file mode 100644
index c0663850646..00000000000
--- a/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug     8073056
- * @summary Repeating annotations throws java.security.AccessControlException with a SecurityManager
- *
- * @library /test/lib
- * @build jdk.test.lib.Asserts
- * @run main CustomRepeatingWithSecurityManager
- * @run main/othervm -Djava.security.manager=allow CustomRepeatingWithSecurityManager "withSM"
- */
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-
-import jdk.test.lib.Asserts;
-
-public class CustomRepeatingWithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        if (args.length == 1) {
-            SecurityManager sm = new SecurityManager();
-            System.setSecurityManager(sm);
-        }
-
-        Asserts.assertTrue(new CustomAnnotations().getAnnotationsByType(MyAnnotation.class).length == 2,
-                "Array should contain 2 annotations");
-        Asserts.assertEquals(new CustomAnnotations().getAnnotationsByType(MyAnnotation.class)[1].name(),
-                "Bar", "Should be 'Bar'");
-    }
-
-    static class CustomAnnotations implements AnnotatedElement {
-        @Override
-        public Annotation[] getDeclaredAnnotations() {
-            Annotation[] res = new Annotation[1];
-            res[0] = new MyAnnotationsImpl();
-            return res;
-        }
-
-        @Override
-        public Annotation[] getAnnotations() {
-            return getDeclaredAnnotations();
-        }
-
-        @Override
-        public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-            return null;
-        }
-    }
-
-    static class MyAnnotationsImpl implements MyAnnotations {
-        public MyAnnotation[] value() {
-            MyAnnotation[] res = new MyAnnotation[2];
-            res[0] = new MyAnnotationImpl("Foo");
-            res[1] = new MyAnnotationImpl("Bar");
-            return res;
-        }
-
-        @Override
-        public Class<? extends Annotation> annotationType() {
-            return MyAnnotations.class;
-        }
-    }
-
-    static class MyAnnotationImpl implements MyAnnotation {
-        private String val;
-        MyAnnotationImpl(String val) {
-            this.val = val;
-        }
-
-        public String name() { return val; }
-
-        @Override
-        public Class<? extends Annotation> annotationType() {
-            return MyAnnotations.class;
-        }
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface MyAnnotations {
-        MyAnnotation[] value();
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Repeatable(MyAnnotations.class)
-    @interface MyAnnotation {
-        String name();
-    }
-}
diff --git a/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java
deleted file mode 100644
index 3e4305dd4a7..00000000000
--- a/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug     8073056
- * @summary Repeating annotations throws java.security.AccessControlException with a SecurityManager
- *
- * @library /test/lib
- * @build jdk.test.lib.Asserts
- * @run main RepeatingWithSecurityManager
- * @run main/othervm -Djava.security.manager=allow RepeatingWithSecurityManager "withSM"
- */
-
-import java.lang.annotation.*;
-import java.util.*;
-
-import jdk.test.lib.Asserts;
-
-public class RepeatingWithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        if (args.length == 1) {
-            SecurityManager sm = new SecurityManager();
-            System.setSecurityManager(sm);
-        }
-
-        Asserts.assertTrue(TwoAnnotations.class.getAnnotationsByType(MyAnnotation.class).length == 2,
-                "Array should contain 2 annotations: " +
-                Arrays.toString(TwoAnnotations.class.getAnnotationsByType(MyAnnotation.class)));
-    }
-
-    @MyAnnotation(name = "foo")
-    @MyAnnotation(name = "bar")
-    private static class TwoAnnotations {
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface MyAnnotations {
-        MyAnnotation[] value();
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Repeatable(MyAnnotations.class)
-    @interface MyAnnotation {
-        String name();
-    }
-}
diff --git a/test/jdk/java/lang/constant/methodTypeDesc/ResolveConstantDesc.java b/test/jdk/java/lang/constant/methodTypeDesc/ResolveConstantDesc.java
deleted file mode 100644
index e02ba995c16..00000000000
--- a/test/jdk/java/lang/constant/methodTypeDesc/ResolveConstantDesc.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8229785
- * @library /test/lib
- * @build jdk.unsupported/*
- * @summary MethodTypeDesc::resolveConstantDesc with security manager
- * @run main/othervm/policy=test.policy ResolveConstantDesc
- */
-
-import java.lang.constant.MethodTypeDesc;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.invoke.MethodType;
-import java.security.AccessControlException;
-import java.security.Permission;
-
-import static jdk.test.lib.Asserts.*;
-
-/*
- * MethodTypeDesc::resolveConstantDec may get security exception depending
- * on the access of Lookup object
- */
-public class ResolveConstantDesc {
-    private static final String DESCRIPTOR = "()Ljdk/internal/misc/VM;";
-
-    public static void main(String... args) throws Exception {
-        // private Lookup object has access to classes exported from another module
-        Lookup lookup = sun.misc.Test.LOOKUP;
-        Module m = lookup.lookupClass().getModule();
-
-        MethodType mtype = MethodType.fromMethodDescriptorString(DESCRIPTOR, ClassLoader.getPlatformClassLoader());
-        Class<?> target = mtype.returnType();
-        Module javaBase = target.getModule();
-        assertTrue(javaBase.isExported(target.getPackageName(), m));
-
-        // MethodType that references java.base internal class
-        MethodTypeDesc mtd = MethodTypeDesc.ofDescriptor(DESCRIPTOR);
-        testInaccessibleClass(mtd);
-
-        // Lookup has no access to JDK internal API; IAE
-        throwIAE(MethodHandles.lookup(), mtd);
-
-        // resolve successfully if Lookup has access to sun.misc and security permission
-        MethodTypeDesc.ofDescriptor("()Lsun/misc/Unsafe;")
-                      .resolveConstantDesc(MethodHandles.lookup());
-    }
-
-    /*
-     * Test Lookup with different access
-     */
-    private static void testInaccessibleClass(MethodTypeDesc mtd) throws Exception {
-        Lookup lookup = sun.misc.Test.LOOKUP;
-        // full power lookup can resolve MethodTypeDesc of java.base internal types
-        mtd.resolveConstantDesc(lookup);
-
-        // drop PRIVATE access; fail package access check
-        throwACC(lookup.dropLookupMode(Lookup.PRIVATE), mtd);
-
-        // jdk.internal.access is not accessible by jdk.unsupported
-        MethodTypeDesc mtd1 = MethodTypeDesc.ofDescriptor("()Ljdk/internal/access/SharedSecrets;");
-        throwIAE(lookup, mtd1);
-    }
-
-    // IAE thrown when resolving MethodType using the given Lookup object
-    private static void throwIAE(Lookup lookup, MethodTypeDesc mtd) throws Exception {
-        try {
-            MethodType mtype = mtd.resolveConstantDesc(lookup);
-            throw new RuntimeException("unexpected IAE not thrown");
-        } catch (IllegalAccessException e) { }
-    }
-
-    private static void throwACC(Lookup lookup, MethodTypeDesc mtd) throws Exception {
-        try {
-            MethodType mtype = mtd.resolveConstantDesc(lookup);
-            throw new RuntimeException("unexpected IAE not thrown");
-        } catch (AccessControlException e) {
-            Permission perm = e.getPermission();
-            if (!(perm instanceof RuntimePermission &&
-                  "accessClassInPackage.jdk.internal.misc".equals(perm.getName()))) {
-                throw e;
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/constant/methodTypeDesc/jdk.unsupported/sun/misc/Test.java b/test/jdk/java/lang/constant/methodTypeDesc/jdk.unsupported/sun/misc/Test.java
deleted file mode 100644
index c2b97e3b2d9..00000000000
--- a/test/jdk/java/lang/constant/methodTypeDesc/jdk.unsupported/sun/misc/Test.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
-
-public class Test {
-     public static final Lookup LOOKUP = MethodHandles.lookup();
-}
diff --git a/test/jdk/java/lang/constant/methodTypeDesc/test.policy b/test/jdk/java/lang/constant/methodTypeDesc/test.policy
deleted file mode 100644
index 611987535b7..00000000000
--- a/test/jdk/java/lang/constant/methodTypeDesc/test.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-// security policy for ResolveConstantDesc test
-grant {
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission "java.lang.RuntimePermission" "accessClassInPackage.sun.misc";
-};
-
diff --git a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
index 22c5069f3e7..1e473ccd974 100644
--- a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
+++ b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
@@ -301,6 +301,7 @@
 
 public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase {
 
+    private static final boolean COMPACT_HEADERS = Platform.is64bit() && WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompactObjectHeaders");
     static final Boolean COMPRESSED_OOPS = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedOops");
     static final long REF_SIZE = (COMPRESSED_OOPS == null || COMPRESSED_OOPS == true) ? 4 : 8;
 
@@ -374,15 +375,25 @@ private static long roundUp(long v, long a) {
         return (v + a - 1) / a * a;
     }
 
+    private static long expectedSmallObjSize() {
+        long size;
+        if (!Platform.is64bit() || COMPACT_HEADERS) {
+            size = 8;
+        } else {
+            size = 16;
+        }
+        return roundUp(size, OBJ_ALIGN);
+    }
+
     private void testSize_newObject() {
-        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = expectedSmallObjSize();
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(new Object()));
         }
     }
 
     private void testSize_localObject() {
-        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = expectedSmallObjSize();
         Object o = new Object();
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(o));
@@ -392,7 +403,7 @@ private void testSize_localObject() {
     static Object staticO = new Object();
 
     private void testSize_fieldObject() {
-        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = expectedSmallObjSize();
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(staticO));
         }
diff --git a/test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh
index eb7abe71edc..49a03379855 100644
--- a/test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh
+++ b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh
@@ -88,10 +88,6 @@ cp "${TESTSRC}"/Application.java .
 sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . -javaagent:Agent.jar DynamicTest" 2>&1
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
-# Repeat test with security manager
-sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . -javaagent:Agent.jar -Djava.security.manager DynamicTest" 2>&1
-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-
 #
 # Results
 #
diff --git a/test/jdk/java/lang/invoke/7196190/GetUnsafeTest.java b/test/jdk/java/lang/invoke/7196190/GetUnsafeTest.java
deleted file mode 100644
index 57a06d16b05..00000000000
--- a/test/jdk/java/lang/invoke/7196190/GetUnsafeTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 7196190
- * @summary Improve method of handling MethodHandles
- *
- * @run main/othervm/policy=jtreg.security.policy/secure=java.lang.SecurityManager GetUnsafeTest
- */
-
-import java.lang.invoke.*;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-public class GetUnsafeTest {
-    static final String NAME = "sun.misc.Unsafe";
-
-    private static boolean isTestFailed = false;
-
-    private static void fail() {
-        isTestFailed = true;
-        try { throw new Exception(); } catch (Throwable e) {
-            StackTraceElement frame = e.getStackTrace()[1];
-            System.out.printf("Failed at %s:%d\n", frame.getFileName(), frame.getLineNumber());
-        }
-    }
-
-    public static void main(String[] args) throws Throwable {
-        {
-            final MethodType mt = MethodType.methodType(Class.class, String.class);
-            final MethodHandle mh = MethodHandles.lookup()
-                    .findStatic(Class.class, "forName", mt);
-
-            try { Class.forName(NAME);                         fail(); } catch (Throwable e) {}
-
-            try { mh.invoke(NAME);                             fail(); } catch (Throwable e) {}
-            try { mh.bindTo(NAME).invoke();                    fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(NAME);                fail(); } catch (Throwable e) {}
-            try { Class cls = (Class) mh.invokeExact(NAME);    fail(); } catch (Throwable e) {}
-        }
-
-        {
-            final Method fnMethod = Class.class.getMethod("forName", String.class);
-            final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
-            final MethodHandle mh = MethodHandles.lookup()
-                    .findVirtual(Method.class, "invoke", mt)
-                    .bindTo(fnMethod);
-
-            try { fnMethod.invoke(null, NAME); fail(); } catch (Throwable e) {}
-
-            try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();             fail(); } catch (Throwable e) {}
-            try { mh.invoke(null, new Object[]{NAME});                             fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(null, new Object[]{NAME});                fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(Arrays.asList(null, new Object[]{NAME})); fail(); } catch (Throwable e) {}
-            try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME});  fail(); } catch (Throwable e) {}
-        }
-
-        {
-            final Method fnMethod = Class.class.getMethod("forName", String.class);
-            final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
-
-            final MethodHandle mh = MethodHandles.lookup().bind(fnMethod, "invoke", mt);
-
-            try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();            fail(); } catch (Throwable e) {}
-            try { mh.invoke(null, new Object[]{NAME});                            fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(null, NAME);                             fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(Arrays.asList(null, NAME));              fail(); } catch (Throwable e) {}
-            try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
-        }
-
-        {
-            final Method fnMethod = Class.class.getMethod("forName", String.class);
-            final MethodHandle mh = MethodHandles.lookup().unreflect(fnMethod);
-
-            try { mh.bindTo(NAME).invoke();                    fail(); } catch (Throwable e) {}
-            try { mh.invoke(NAME);                             fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(NAME);                fail(); } catch (Throwable e) {}
-            try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
-            try { Class cls = (Class) mh.invokeExact(NAME);    fail(); } catch (Throwable e) {}
-        }
-
-        if (!isTestFailed) {
-            System.out.println("TEST PASSED");
-        } else {
-            System.out.println("TEST FAILED");
-            System.exit(1);
-        }
-    }
-}
diff --git a/test/jdk/java/lang/invoke/7196190/jtreg.security.policy b/test/jdk/java/lang/invoke/7196190/jtreg.security.policy
deleted file mode 100644
index d32c7af9b3f..00000000000
--- a/test/jdk/java/lang/invoke/7196190/jtreg.security.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * security policy used by the test process
- * must allow file reads so that jtreg itself can run
- */
-
-grant {
-  // standard test activation permissions
-  permission java.io.FilePermission "*", "read";
-};
diff --git a/test/jdk/java/lang/invoke/8076596/Test8076596.java b/test/jdk/java/lang/invoke/8076596/Test8076596.java
deleted file mode 100644
index 46751e2f87c..00000000000
--- a/test/jdk/java/lang/invoke/8076596/Test8076596.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8076596
- * @run main/othervm/policy=Test8076596.security.policy/secure=Test8076596 -ea -esa Test8076596
- */
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class Test8076596 extends SecurityManager {
-    public Test8076596() {
-        // 1. Using lambda
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> null);
-        // 2. Using inner class
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-            @Override
-            public Void run() {
-                return null;
-            }
-        });
-    }
-
-    public static void main(String[] args) {
-        // empty
-    }
-}
diff --git a/test/jdk/java/lang/invoke/8076596/Test8076596.security.policy b/test/jdk/java/lang/invoke/8076596/Test8076596.security.policy
deleted file mode 100644
index a7cd67a94c5..00000000000
--- a/test/jdk/java/lang/invoke/8076596/Test8076596.security.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Security policy used by the Test8076596.
- * Must allow file reads so that jtreg itself can run.
- */
-
-grant {
-  permission java.io.FilePermission "*", "read";
-};
diff --git a/test/jdk/java/lang/invoke/FindClassSecurityManager.java b/test/jdk/java/lang/invoke/FindClassSecurityManager.java
deleted file mode 100644
index 2c6a317176c..00000000000
--- a/test/jdk/java/lang/invoke/FindClassSecurityManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8139885
- * @run main/othervm/policy=getclassloader.policy/secure=java.lang.SecurityManager -ea -esa test.java.lang.invoke.FindClassSecurityManager
- */
-
-package test.java.lang.invoke;
-
-import java.lang.invoke.MethodHandles;
-
-public class FindClassSecurityManager {
-    public static void main(String[] args) throws Throwable {
-        assert null != System.getSecurityManager();
-        Class<?> thisClass = FindClassSecurityManager.class;
-        MethodHandles.Lookup lookup = MethodHandles.lookup();
-        Class<?> lookedUp = lookup.findClass(thisClass.getName());
-        assert thisClass == lookedUp;
-        Class<?> accessed = lookup.accessClass(thisClass);
-        assert thisClass == accessed;
-    }
-}
diff --git a/test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java b/test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java
index 76c24a99cdc..aec89c5d4d8 100644
--- a/test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java
+++ b/test/jdk/java/lang/invoke/InvokeDynamicPrintArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,7 @@
  *      indify.Indify
  *      --verify-specifier-count=8
  *      --expand-properties --classpath ${test.classes}
- *      --java test.java.lang.invoke.InvokeDynamicPrintArgs --check-output
- * @run main/othervm
- *      -Djava.security.manager=allow
- *      indify.Indify
- *      --expand-properties --classpath ${test.classes}
- *      --java test.java.lang.invoke.InvokeDynamicPrintArgs --security-manager
+ *      --java test.java.lang.invoke.InvokeDynamicPrintArgs
  */
 
 package test.java.lang.invoke;
@@ -44,14 +39,12 @@
 import java.io.*;
 
 import java.lang.invoke.*;
-import java.security.*;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
 
 public class InvokeDynamicPrintArgs {
     public static void main(String... av) throws Throwable {
-        if (av.length > 0 && av[0].equals("--check-output"))  openBuf();
-        if (av.length > 0 && av[0].equals("--security-manager"))  setSM();
+        openBuf();
         System.out.println("Printing some argument lists, starting with a empty one:");
         INDY_nothing().invokeExact();                 // BSM specifier #0 = {bsm}
         INDY_bar().invokeExact("bar arg", 1);         // BSM specifier #1 = {bsm2, Void.class, "void type"}
@@ -75,11 +68,6 @@ private static void assertEquals(Object exp, Object act) {
         throw new AssertionError("not equal: "+exp+", "+act);
     }
 
-    private static void setSM() {
-        Policy.setPolicy(new TestPolicy());
-        System.setSecurityManager(new SecurityManager());
-    }
-
     private static PrintStream oldOut;
     private static ByteArrayOutputStream buf;
     private static void openBuf() {
@@ -233,24 +221,4 @@ private static void shouldNotCallThis() {
         if (System.getProperty("InvokeDynamicPrintArgs.allow-untransformed") != null)  return;
         throw new AssertionError("this code should be statically transformed away by Indify");
     }
-
-    static class TestPolicy extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final PermissionCollection permissions = new Permissions();
-        TestPolicy() {
-            permissions.add(new java.io.FilePermission("<<ALL FILES>>", "read"));
-        }
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return permissions;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return permissions;
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return permissions.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
-        }
-    }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandleConstants.java b/test/jdk/java/lang/invoke/MethodHandleConstants.java
index db631915455..10bb08cfc9d 100644
--- a/test/jdk/java/lang/invoke/MethodHandleConstants.java
+++ b/test/jdk/java/lang/invoke/MethodHandleConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,9 @@
  *      --expand-properties --classpath ${test.classes}
  *      --java test.java.lang.invoke.MethodHandleConstants --check-output
  * @run main/othervm
- *      -Djava.security.manager=allow
  *      indify.Indify
  *      --expand-properties --classpath ${test.classes}
- *      --java test.java.lang.invoke.MethodHandleConstants --security-manager
+ *      --java test.java.lang.invoke.MethodHandleConstants
  */
 
 package test.java.lang.invoke;
@@ -51,7 +50,6 @@
 public class MethodHandleConstants {
     public static void main(String... av) throws Throwable {
         if (av.length > 0 && av[0].equals("--check-output"))  openBuf();
-        if (av.length > 0 && av[0].equals("--security-manager"))  setSM();
         System.out.println("Obtaining method handle constants:");
         testCase(MH_String_replace_C2(), String.class, "replace", String.class, String.class, char.class, char.class);
         testCase(MH_MethodHandle_invokeExact_SC2(), MethodHandle.class, "invokeExact", String.class, MethodHandle.class, String.class, char.class, char.class);
@@ -74,11 +72,6 @@ private static void assertEquals(Object exp, Object act) {
         throw new AssertionError("not equal: "+exp+", "+act);
     }
 
-    private static void setSM() {
-        Policy.setPolicy(new TestPolicy());
-        System.setSecurityManager(new SecurityManager());
-    }
-
     private static PrintStream oldOut;
     private static ByteArrayOutputStream buf;
     private static void openBuf() {
@@ -168,24 +161,4 @@ private static void shouldNotCallThis() {
         if (System.getProperty("MethodHandleConstants.allow-untransformed") != null)  return;
         throw new AssertionError("this code should be statically transformed away by Indify");
     }
-
-    static class TestPolicy extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final PermissionCollection permissions = new Permissions();
-        TestPolicy() {
-            permissions.add(new java.io.FilePermission("<<ALL FILES>>", "read"));
-        }
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return permissions;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return permissions;
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return permissions.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
-        }
-    }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/WithSecurityManagerTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/WithSecurityManagerTest.java
deleted file mode 100644
index 7e1882237c4..00000000000
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/WithSecurityManagerTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandleProxies;
-import java.lang.invoke.MethodHandles;
-import java.util.List;
-
-import static jdk.test.lib.Asserts.assertSame;
-
-/*
- * @test
- * @bug 6983726
- * @library /test/lib
- * @build jdk.test.lib.Asserts Client
- * @run main/othervm/policy=jtreg.security.policy WithSecurityManagerTest
- * @summary Checks MethodHandleProxies behavior with security manager present
- */
-public class WithSecurityManagerTest {
-    public interface NestedInterface {
-        void task();
-    }
-
-    public static void main(String... args) {
-        var originalMh = MethodHandles.zero(void.class);
-
-        // Test system and user interfaces
-        for (Class<?> cl : List.of(Runnable.class, Client.class, NestedInterface.class)) {
-            try {
-                Object o = MethodHandleProxies.asInterfaceInstance(cl, originalMh);
-                testWrapperInstanceTarget(o, originalMh);
-                testWrapperInstanceType(o, cl);
-            } catch (Throwable ex) {
-                throw new AssertionError("Test failed for " + cl, ex);
-            }
-        }
-    }
-
-    private static void testWrapperInstanceTarget(Object wrapper, MethodHandle originalMh) {
-        var recoveredTarget = MethodHandleProxies.wrapperInstanceTarget(wrapper);
-        assertSame(originalMh, recoveredTarget, "wrapperInstanceTarget recovery");
-    }
-
-    private static void testWrapperInstanceType(Object wrapper, Class<?> type) {
-        var recoveredType = MethodHandleProxies.wrapperInstanceType(wrapper);
-        assertSame(type, recoveredType, "wrapperInstanceType recovery");
-    }
-}
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/jtreg.security.policy b/test/jdk/java/lang/invoke/MethodHandleProxies/jtreg.security.policy
deleted file mode 100644
index d32c7af9b3f..00000000000
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/jtreg.security.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * security policy used by the test process
- * must allow file reads so that jtreg itself can run
- */
-
-grant {
-  // standard test activation permissions
-  permission java.io.FilePermission "*", "read";
-};
diff --git a/test/jdk/java/lang/invoke/MethodTypeSecurityManager.java b/test/jdk/java/lang/invoke/MethodTypeSecurityManager.java
deleted file mode 100644
index 9db88aacb29..00000000000
--- a/test/jdk/java/lang/invoke/MethodTypeSecurityManager.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8229785
- * @summary Test MethodType.fromMethodDescriptorString with security manager
- * @run main/othervm -Djava.security.manager=allow test.java.lang.invoke.MethodTypeSecurityManager
- * @run main/othervm/policy=getclassloader.policy test.java.lang.invoke.MethodTypeSecurityManager access
- */
-
-package test.java.lang.invoke;
-
-import java.lang.invoke.MethodType;
-import java.security.AccessControlException;
-import java.security.Permission;
-
-public class MethodTypeSecurityManager {
-    private static boolean hasClassLoaderAccess;
-    public static void main(String... args) throws Throwable {
-        ClassLoader platformLoader = ClassLoader.getPlatformClassLoader();
-        ClassLoader appLoader = ClassLoader.getSystemClassLoader();
-        hasClassLoaderAccess = args.length == 1 && "access".equals(args[0]);
-
-        assert hasClassLoaderAccess || System.getSecurityManager() == null;
-        if (!hasClassLoaderAccess) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        // require getClassLoader permission
-        throwACC("()Ljdk/internal/misc/VM;", null);
-        // package access check when app class loader loads the class
-        throwACC("()Ljdk/internal/misc/VM;", appLoader);
-
-        // if using the platform class loader, no package access check
-        MethodType.fromMethodDescriptorString("()Ljdk/internal/misc/VM;", platformLoader);
-    }
-
-    private static void throwACC(String desc, ClassLoader loader) {
-        try {
-            MethodType.fromMethodDescriptorString(desc, loader);
-            throw new RuntimeException("should never leak JDK internal class");
-        } catch (AccessControlException e) {
-            System.out.println(e.getMessage());
-            Permission perm = e.getPermission();
-            if (!(perm instanceof RuntimePermission)) throw e;
-            // ACC thrown either no "getClassLoader" permission or no package access
-            switch (perm.getName()) {
-                case "getClassLoader":
-                    if (!hasClassLoaderAccess) break;
-                case "accessClassInPackage.jdk.internal.misc":
-                    break;
-                default:
-                    throw e;
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/lang/invoke/RevealDirectTest.java b/test/jdk/java/lang/invoke/RevealDirectTest.java
index 5e28db536c4..ca1e555c02c 100644
--- a/test/jdk/java/lang/invoke/RevealDirectTest.java
+++ b/test/jdk/java/lang/invoke/RevealDirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,11 @@
  * @compile -XDignore.symbol.file RevealDirectTest.java
  * @run junit/othervm -ea -esa test.java.lang.invoke.RevealDirectTest
  *
- * @test
- * @summary verify Lookup.revealDirect on a variety of input handles, with security manager
- * @run main/othervm/policy=jtreg.security.policy/secure=java.lang.SecurityManager -ea -esa test.java.lang.invoke.RevealDirectTest
  */
 
 /* To run manually:
  * $ $JAVA8X_HOME/bin/javac -cp $JUNIT4_JAR -d ../../../.. -XDignore.symbol.file RevealDirectTest.java
  * $ $JAVA8X_HOME/bin/java  -cp $JUNIT4_JAR:../../../.. -ea -esa org.junit.runner.JUnitCore test.java.lang.invoke.RevealDirectTest
- * $ $JAVA8X_HOME/bin/java  -cp $JUNIT4_JAR:../../../.. -ea -esa    -Djava.security.manager test.java.lang.invoke.RevealDirectTest
  */
 
 package test.java.lang.invoke;
@@ -242,22 +238,9 @@ static List<Class<?>> getSupers(Class<?> cls) {
         //System.out.println("getSupers => "+res);
         return res;
     }
-    static boolean hasSM() {
-        return (System.getSecurityManager() != null);
-    }
     static List<Member> getDeclaredMembers(Class<?> cls, String accessor) {
         Member[] mems = {};
         Method getter = getMethod(Class.class, accessor);
-        if (hasSM()) {
-            try {
-                mems = (Member[]) invokeMethod(getter, cls);
-            } catch (SecurityException ex) {
-                //if (VERBOSE)  ex.printStackTrace();
-                accessor = accessor.replace("Declared", "");
-                getter = getMethod(Class.class, accessor);
-                if (VERBOSE)  System.out.println("replaced accessor: "+getter);
-            }
-        }
         if (mems.length == 0) {
             try {
                 mems = (Member[]) invokeMethod(getter, cls);
@@ -743,20 +726,8 @@ void testWithMember(Member mem,
             MethodHandleInfo info2 = lookup.revealDirect(mh2);
             assert(consistent(info, info2));
             assert(consistent(res, info2));
-            Member mem3;
-            if (hasSM())
-                mem3 = info2.reflectAs(Member.class, lookup);
-            else
-                mem3 = MethodHandles.reflectAs(Member.class, mh2);
+            Member mem3 = MethodHandles.reflectAs(Member.class, mh2);
             assert(consistent(mem2, mem3));
-            if (hasSM()) {
-                try {
-                    MethodHandles.reflectAs(Member.class, mh2);
-                    throw new AssertionError("failed to throw on "+mem3);
-                } catch (SecurityException ex3) {
-                    // OK...
-                }
-            }
         }
     }
 }
diff --git a/test/jdk/java/lang/invoke/TestPrivateMember.java b/test/jdk/java/lang/invoke/TestPrivateMember.java
deleted file mode 100644
index 3f4da568641..00000000000
--- a/test/jdk/java/lang/invoke/TestPrivateMember.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-
-/**
- * @test
- * @bug 8007035
- * @summary Test MethodHandle of a private member
- *
- * @run main/othervm -Djava.security.manager=allow TestPrivateMember
- */
-
-public class TestPrivateMember {
-    public static void main(String... args) throws Throwable {
-        System.setSecurityManager(new SecurityManager());
-        TestPrivateMember t = new TestPrivateMember();
-        t.test();
-    }
-
-    public TestPrivateMember() {
-    }
-
-    public void test() throws Throwable {
-        MethodHandles.Lookup lookup = MethodHandles.lookup();
-        MethodType mt = MethodType.methodType(void.class);
-        try {
-            Class<?> checkInittedHolder = TestPrivateMemberPackageSibling.class;
-            // Original model:  checkInittedHolder = Class.class;
-            // Not using Class.checkInitted because it could change without notice.
-            MethodHandle mh = lookup.findStatic(checkInittedHolder, "checkInitted", mt);
-            throw new RuntimeException("IllegalAccessException not thrown");
-        } catch (IllegalAccessException e) {
-            // okay
-            System.out.println("Expected exception: " + e.getMessage());
-        }
-    }
-}
-
-class TestPrivateMemberPackageSibling {
-    private static void checkInitted() { }
-}
diff --git a/test/jdk/java/lang/invoke/callerSensitive/Main.java b/test/jdk/java/lang/invoke/callerSensitive/Main.java
index 437b26896b3..087ce347d23 100644
--- a/test/jdk/java/lang/invoke/callerSensitive/Main.java
+++ b/test/jdk/java/lang/invoke/callerSensitive/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @library src
  * @modules java.base/jdk.internal.reflect
  * @build java.base/java.util.CSM csm/*
- * @run main/othervm -Djava.security.manager=allow csm/jdk.test.MethodInvokeTest
- * @run main/othervm -Djava.security.manager=allow csm/jdk.test.MethodInvokeTest sm
+ * @run main/othervm csm/jdk.test.MethodInvokeTest
  * @summary Test proper caller class is bound to method handle for caller-sensitive method
  */
 public class Main {
diff --git a/test/jdk/java/lang/invoke/callerSensitive/csm/jdk/test/MethodInvokeTest.java b/test/jdk/java/lang/invoke/callerSensitive/csm/jdk/test/MethodInvokeTest.java
index d3ced089644..3746e00b5d9 100644
--- a/test/jdk/java/lang/invoke/callerSensitive/csm/jdk/test/MethodInvokeTest.java
+++ b/test/jdk/java/lang/invoke/callerSensitive/csm/jdk/test/MethodInvokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,6 @@
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.util.CSM;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.function.Supplier;
 
 /**
@@ -45,7 +40,6 @@
  * package, and protection domain as the lookup class.
  */
 public class MethodInvokeTest {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
     private static final String CALLER_METHOD = "caller";
     private static final String CALLER_NO_ALT_METHOD = "callerNoAlternateImpl";
 
@@ -53,9 +47,6 @@ public static void main(String... args) throws Throwable {
         boolean sm = args.length > 0 && args[0].equals("sm");
         System.err.format("Test %s security manager.%n",
                           sm ? "with" : "without");
-        if (sm) {
-            setupSecurityManager();
-        }
 
         MethodInvokeTest test = new MethodInvokeTest();
         // test static call to java.util.CSM::caller
@@ -68,18 +59,6 @@ public static void main(String... args) throws Throwable {
         test.lambda();
     }
 
-    static void setupSecurityManager() {
-        PermissionCollection perms = new Permissions();
-        perms.add(new RuntimePermission("getStackWalkerWithClassReference"));
-        Policy.setPolicy(new Policy() {
-            @Override
-            public boolean implies(ProtectionDomain domain, Permission p) {
-                return perms.implies(p) || DEFAULT_POLICY.implies(domain, p);
-            }
-        });
-        System.setSecurityManager(new SecurityManager());
-    }
-
     void staticMethodCall() {
         checkCaller(java.util.CSM.caller(), MethodInvokeTest.class, true);
         checkCaller(java.util.CSM.callerNoAlternateImpl(), MethodInvokeTest.class, false);
diff --git a/test/jdk/java/lang/invoke/getclassloader.policy b/test/jdk/java/lang/invoke/getclassloader.policy
deleted file mode 100644
index 123bcf6a7f2..00000000000
--- a/test/jdk/java/lang/invoke/getclassloader.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Security policy used by the FindClassSecurityManager and 
- * MethodTypeSecurityManager test.
- * Must allow file reads so that jtreg itself can run, and getting class loaders.
- */
-
-grant {
-  permission java.io.FilePermission "*", "read";
-  permission java.lang.RuntimePermission "getClassLoader";
-};
diff --git a/test/jdk/java/lang/invoke/jtreg.security.policy b/test/jdk/java/lang/invoke/jtreg.security.policy
deleted file mode 100644
index d32c7af9b3f..00000000000
--- a/test/jdk/java/lang/invoke/jtreg.security.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * security policy used by the test process
- * must allow file reads so that jtreg itself can run
- */
-
-grant {
-  // standard test activation permissions
-  permission java.io.FilePermission "*", "read";
-};
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java b/test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
index fc6fd91e5ac..cf69aa5e79b 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @modules jdk.compiler
  *          jdk.zipfs
  * @compile LambdaAccessControlDoPrivilegedTest.java
- * @run main/othervm -Djava.security.manager=allow LambdaAccessControlDoPrivilegedTest
+ * @run main/othervm LambdaAccessControlDoPrivilegedTest
  * @summary tests DoPrivileged action (implemented as lambda expressions) by
  * inserting them into the BootClassPath.
  */
@@ -63,7 +63,6 @@ public static void main(String... args) throws Exception {
         scratch.clear();
         scratch.add("public class Bar {");
         scratch.add("public static void main(String... args) {");
-        scratch.add("System.setSecurityManager(new SecurityManager());");
         scratch.add("DoPriv.main();");
         scratch.add("}");
         scratch.add("}");
@@ -81,7 +80,6 @@ public static void main(String... args) throws Exception {
         ProcessBuilder pb = createTestJavaProcessBuilder(
                                 "-Xbootclasspath/a:foo.jar",
                                 "-cp", ".",
-                                "-Djava.security.manager=allow",
                                 "Bar");
         executeProcess(pb).shouldHaveExitValue(0);
 
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaAccessControlTest.java b/test/jdk/java/lang/invoke/lambda/LambdaAccessControlTest.java
deleted file mode 100644
index 2588d30be23..00000000000
--- a/test/jdk/java/lang/invoke/lambda/LambdaAccessControlTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8003881
- * @modules jdk.compiler
- * @run main/othervm -Djava.security.manager=allow LambdaAccessControlTest
- * @summary tests Lambda expression with a security manager at top level
- */
-
-public class LambdaAccessControlTest {
-    public static void main(String... args) {
-        System.setSecurityManager(new SecurityManager());
-        JJ<Integer> iii = (new CC())::impl;
-        System.out.printf(">>> %s\n", iii.foo(44));
-        iii = DD::impl;
-        System.out.printf(">>> %s\n", iii.foo(44));
-        return;
-    }
-}
-/*
- * support classes for the test
- */
-interface II<T> {  Object foo(T x); }
-interface JJ<R extends Number> extends II<R> { }
-class CC {  String impl(int i) { return "impl:"+i; }}
-class DD {  static String impl(int i) { return "impl:"+i; }}
diff --git a/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java b/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
index 06aa479717b..60c85753d72 100644
--- a/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
+++ b/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
@@ -71,7 +71,6 @@ public void setup() throws IOException {
         scratch.add("        int foo();");
         scratch.add("    }");
         scratch.add("    public static void main(String[] args) {");
-        scratch.add("        System.setSecurityManager(new SecurityManager());");
         scratch.add("        I lam = () -> 10;");
         scratch.add("        Runnable r = () -> {");
         scratch.add("            System.out.println(\"Runnable\");");
@@ -117,7 +116,6 @@ public void cleanup() throws IOException {
     public void testNotLogging() throws Exception {
         ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                "-cp", CLASSES.toString(),
-                               "-Djava.security.manager=allow",
                                "com.example.TestLambda");
         executeProcess(pb).shouldHaveExitValue(0);
     }
@@ -129,7 +127,6 @@ public void testLogging() throws Exception {
         Files.createDirectory(testDir);
         ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                "-cp", CLASSES.toString(),
-                               "-Djava.security.manager=allow",
                                "-Djdk.invoke.LambdaMetafactory.dumpProxyClassFiles",
                                "com.example.TestLambda").directory(testDir.toFile());
         executeProcess(pb).shouldHaveExitValue(0);
@@ -153,7 +150,6 @@ public void testDumpDirNotExist() throws Exception {
 
         ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                 "-cp", CLASSES.toString(),
-                                "-Djava.security.manager=allow",
                                 "-Djdk.invoke.LambdaMetafactory.dumpProxyClassFiles",
                                 "com.example.TestLambda").directory(testDir.toFile());
         executeProcess(pb).shouldHaveExitValue(0);
@@ -176,7 +172,6 @@ public void testDumpDirIsFile() throws Exception {
         assertTrue(Files.isRegularFile(dumpFile));
         ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                 "-cp", CLASSES.toString(),
-                                "-Djava.security.manager=allow",
                                 "-Djdk.invoke.LambdaMetafactory.dumpProxyClassFiles",
                                 "com.example.TestLambda").directory(testDir.toFile());
         executeProcess(pb)
@@ -234,7 +229,6 @@ public void testDumpDirNotWritable() throws Exception {
 
             ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                    "-cp", CLASSES.toString(),
-                                   "-Djava.security.manager=allow",
                                    "-Djdk.invoke.LambdaMetafactory.dumpProxyClassFiles",
                                    "com.example.TestLambda").directory(testDir.toFile());
             executeProcess(pb)
@@ -253,7 +247,6 @@ public void testLoggingException() throws Exception {
         Files.createFile(dumpDir.resolve("com/example/nonsense/nonsense"));
         ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                "-cp", CLASSES.toString(),
-                               "-Djava.security.manager=allow",
                                "-Djdk.invoke.LambdaMetafactory.dumpProxyClassFiles",
                                longFQCN).directory(testDir.toFile());
         OutputAnalyzer outputAnalyzer = executeProcess(pb);
diff --git a/test/jdk/java/lang/module/ModuleFinderWithSecurityManager.java b/test/jdk/java/lang/module/ModuleFinderWithSecurityManager.java
deleted file mode 100644
index 2a0d60ca20d..00000000000
--- a/test/jdk/java/lang/module/ModuleFinderWithSecurityManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @run main/othervm -Djava.security.manager=allow ModuleFinderWithSecurityManager allow
- * @run main/othervm -Djava.security.manager=allow ModuleFinderWithSecurityManager deny
- * @summary Basic test for ModuleFinder.ofSystem() with security manager
- */
-
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Set;
-
-public class ModuleFinderWithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        boolean allow = args[0].equals("allow");
-
-        // set security policy to allow access
-        if (allow) {
-            String testSrc = System.getProperty("test.src");
-            if (testSrc == null)
-                testSrc = ".";
-            Path policyFile = Paths.get(testSrc, "java.policy");
-            System.setProperty("java.security.policy", policyFile.toString());
-        }
-
-        System.setSecurityManager(new SecurityManager());
-
-        ModuleFinder finder = null;
-        try {
-            finder = ModuleFinder.ofSystem();
-            if (!allow) throw new RuntimeException("SecurityException expected");
-        } catch (SecurityException e) {
-            if (allow) throw new RuntimeException("SecurityException not expected");
-        }
-
-        // no additional permissions should be required to locate modules
-        if (finder != null) {
-            ModuleReference base = finder.find("java.base").orElse(null);
-            if (base == null)
-                throw new RuntimeException("java.base not found");
-            Set<ModuleReference> allModules = finder.findAll();
-            if (!allModules.contains(base))
-                throw new RuntimeException("java.base not in all modules");
-        }
-    }
-}
diff --git a/test/jdk/java/lang/module/java.policy b/test/jdk/java/lang/module/java.policy
deleted file mode 100644
index 179334bc98a..00000000000
--- a/test/jdk/java/lang/module/java.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    // ModuleFinder.ofSystem() needs this
-    permission java.lang.RuntimePermission "accessSystemModules";
-};
diff --git a/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java b/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java
index e2e07e74cb2..f2c8928a1fe 100644
--- a/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java
+++ b/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@
  *          HostWithDuplicateMembers.jcod
  *
  * @run main/othervm TestReflectionAPI
- * @run main/othervm/java.security.policy=empty.policy TestReflectionAPI
  */
 
 // We need a nest member class that is invalid for each of the possible reasons,
diff --git a/test/jdk/java/lang/reflect/Nestmates/TestSecurityManagerChecks.java b/test/jdk/java/lang/reflect/Nestmates/TestSecurityManagerChecks.java
deleted file mode 100644
index 9773b9e4e8d..00000000000
--- a/test/jdk/java/lang/reflect/Nestmates/TestSecurityManagerChecks.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8046171
- * @summary Test that security checks occur for getNestHost/getNestMembers
- *
- * @library /test/lib
- * @build TestSecurityManagerChecks testPkg.Host testPkg.Singleton
- * @run driver jdk.test.lib.helpers.ClassFileInstaller testPkg.Host testPkg.Host$Member testPkg.Singleton
- * @run main/othervm -Xbootclasspath/a:. -Djava.security.manager=allow TestSecurityManagerChecks
- */
-
-// ClassFileInstaller copies the testPkg files into the "current" directory
-// so we can add it to the bootclasspath. Then when we run the test the
-// loader for the testPkg files is the bootloader but the loader for the
-// test class is the system loader, hence a package access check will fail
-// because the system loader is not the same as, nor a parent of, the bootloader.
-import java.security.Security;
-
-public class TestSecurityManagerChecks {
-
-    public static void main(String[] args) throws Throwable {
-
-        // First get hold of the target classes before we enable security
-        Class<?> host = testPkg.Host.class;
-        Class<?> member = testPkg.Host.Member.class;
-        Class<?> memberArray = testPkg.Host.Member[].class;
-        Class<?> singleton = testPkg.Singleton.class;
-
-        // Next add testPkg to the set of packages for which package-access
-        // permission is required
-        Security.setProperty("package.access",
-                             Security.getProperty("package.access") + ",testPkg.");
-
-        // Finally install a default security manager
-        SecurityManager sm = new SecurityManager();
-        System.setSecurityManager(sm);
-
-        // These cases all succeed
-        getNestHost(int.class);   // primitive
-        getNestHost(int[].class); // primitive[]
-        getNestHost(host);        // host class
-        getNestHost(memberArray); // NestedT[]
-        getNestHost(singleton);   // Singleton nest
-
-        getNestMembers(int.class);   // primitive
-        getNestMembers(int[].class); // primitive[]
-        getNestMembers(memberArray); // NestedT[]
-        getNestMembers(singleton);   // Singleton nest
-
-        // these cases all fail
-        getNestHostThrows(member); // NestedT
-
-        getNestMembersThrows(member); // NestedT
-        getNestMembersThrows(host);   // host class
-    }
-
-    static void getNestHost(Class<?> c) {
-        Class<?> host = c.getNestHost();
-        System.out.println("OK - getNestHost succeeded for " + c.getName());
-    }
-
-    static void getNestHostThrows(Class<?> c) throws SecurityException {
-        try {
-            Class<?> host = c.getNestHost();
-            throw new Error("getNestHost succeeded for " + c.getName());
-        } catch (SecurityException e) {
-            System.out.println("OK - getNestHost for " + c.getName() +
-                               " got expected exception: " + e);
-        }
-    }
-
-    static void getNestMembers(Class<?> c) {
-        Class<?>[] members = c.getNestMembers();
-        System.out.println("OK - getNestMembers succeeded for " + c.getName());
-    }
-
-    static void getNestMembersThrows(Class<?> c) throws SecurityException {
-        try {
-            Class<?>[] members = c.getNestMembers();
-            throw new Error("getNestMembers succeeded for " + c.getName());
-        } catch (SecurityException e) {
-            System.out.println("OK - getNestMembers for " + c.getName() +
-                               " got expected exception: " + e);
-        }
-    }
-
-}
diff --git a/test/jdk/java/lang/reflect/Nestmates/empty.policy b/test/jdk/java/lang/reflect/Nestmates/empty.policy
deleted file mode 100644
index d2d90f6bc99..00000000000
--- a/test/jdk/java/lang/reflect/Nestmates/empty.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-// A deliberately empty policy file for use with jtreg.
-// Setting othervm/java.security.policy=empty.policy
-// causes jtreg to run under the default system policy
-// and default security manager, with the addition of
-// the permissions jtreg itself needs to run.
diff --git a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
index e9782854828..81630a688bd 100644
--- a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
+++ b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.lang.reflect.ReflectPermission;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.SecurityPermission;
 import java.util.*;
 
 /*
@@ -43,12 +34,9 @@
  * @summary Test proxy classes that implement non-public interface
  *
  * @build p.Foo
- * @run main/othervm -Djava.security.manager=allow NonPublicProxyClass grant
- * @run main/othervm -Djava.security.manager=allow NonPublicProxyClass deny
  * @run main/othervm NonPublicProxyClass
  */
 public class NonPublicProxyClass {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
 
     public interface PublicInterface {
         void foo();
@@ -69,22 +57,9 @@ public static void main(String[] args) throws Exception {
         NonPublicProxyClass test3 =
             new NonPublicProxyClass(null, zipConstantsClass);
 
-        if (args.length == 1) {
-            switch (args[0]) {
-                case "grant": Policy.setPolicy(new NewInstancePolicy(true));
-                              break;
-                case "deny" : Policy.setPolicy(new NewInstancePolicy(false));
-                              break;
-                default: throw new IllegalArgumentException(args[0]);
-            }
-            System.setSecurityManager(new SecurityManager());
-        }
-
         test1.run();
         test2.run();
         test3.run();
-        System.out.format("Test passed: security %s%n",
-            (args.length == 0 ? "manager not installed" : Policy.getPolicy()));
     }
 
     private final ClassLoader loader;
@@ -97,23 +72,7 @@ public NonPublicProxyClass(ClassLoader loader, Class<?> ... intfs) {
     }
 
     public void run() throws Exception {
-        boolean hasAccess = loader != null || hasAccess();
-        try {
-            proxyClass = Proxy.getProxyClass(loader, interfaces);
-            if (!hasAccess) {
-                throw new RuntimeException("should have no permission to create proxy class");
-            }
-        } catch (AccessControlException e) {
-            if (hasAccess) {
-                throw e;
-            }
-            if (e.getPermission().getClass() != RuntimePermission.class ||
-                    !e.getPermission().getName().equals("getClassLoader")) {
-                throw e;
-            }
-            return;
-        }
-
+        proxyClass = Proxy.getProxyClass(loader, interfaces);
         if (Modifier.isPublic(proxyClass.getModifiers())) {
             throw new RuntimeException(proxyClass + " must be non-public");
         }
@@ -121,34 +80,11 @@ public void run() throws Exception {
         newInstanceFromConstructor(proxyClass);
     }
 
-    private boolean hasAccess() {
-        if (System.getSecurityManager() == null) {
-            return true;
-        }
-        NewInstancePolicy policy = NewInstancePolicy.class.cast(Policy.getPolicy());
-        return policy.grant;
-    }
-
-    private static final String NEW_PROXY_IN_PKG = "newProxyInPackage.";
     private void newProxyInstance() {
         // expect newProxyInstance to succeed if it's in the same runtime package
         int i = proxyClass.getName().lastIndexOf('.');
         String pkg = (i != -1) ? proxyClass.getName().substring(0, i) : "";
-        boolean hasAccess = pkg.isEmpty() || hasAccess();
-        try {
-            Proxy.newProxyInstance(loader, interfaces, handler);
-            if (!hasAccess) {
-                throw new RuntimeException("ERROR: Proxy.newProxyInstance should fail " + proxyClass);
-            }
-        } catch (AccessControlException e) {
-            if (hasAccess) {
-                throw e;
-            }
-            if (e.getPermission().getClass() != ReflectPermission.class ||
-                    !e.getPermission().getName().equals(NEW_PROXY_IN_PKG + pkg)) {
-                throw e;
-            }
-        }
+        Proxy.newProxyInstance(loader, interfaces, handler);
     }
 
     private void newInstanceFromConstructor(Class<?> proxyClass)
@@ -180,39 +116,4 @@ public Object invoke(Object proxy, Method method, Object[] args)
             }
         };
     }
-
-    static class NewInstancePolicy extends Policy {
-        final PermissionCollection permissions = new Permissions();
-        final boolean grant;
-        NewInstancePolicy(boolean grant) {
-            this.grant = grant;
-            permissions.add(new SecurityPermission("getPolicy"));
-            if (grant) {
-                permissions.add(new RuntimePermission("getClassLoader"));
-                permissions.add(new ReflectPermission(NEW_PROXY_IN_PKG + "p"));
-                permissions.add(new ReflectPermission(NEW_PROXY_IN_PKG + "java.util.zip"));
-            }
-        }
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return permissions;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return permissions;
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return permissions.implies(perm) ||
-                    DEFAULT_POLICY.implies(domain, perm);
-        }
-
-        public String toString() {
-            StringBuilder sb = new StringBuilder("policy: ");
-            Enumeration<Permission> perms = permissions.elements();
-            while (perms.hasMoreElements()) {
-                sb.append("\n").append(perms.nextElement().toString());
-            }
-            return sb.toString();
-        }
-    }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java
index a2c6197080d..2f430cd056c 100644
--- a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java
+++ b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/SimpleProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,9 @@
 /*
  * @test
  * @bug 8004260
- * @summary Test making a proxy instance that implements a non-public
- *          interface with and without security manager installed
+ * @summary Test making a proxy instance that implements a non-public interface
  * @build p.Foo p.Bar
- * @run main/othervm -Djava.security.manager=allow SimpleProxy
+ * @run main/othervm SimpleProxy
  */
 public class SimpleProxy {
     public static void main(String[] args) throws Exception {
@@ -40,17 +39,6 @@ public static void main(String[] args) throws Exception {
         Class<?> barClass = Class.forName("p.Bar");
 
         makeProxy(loader, fooClass);
-
-        System.setSecurityManager(new SecurityManager());
-        try {
-            makeProxy(loader, barClass);
-            throw new RuntimeException("should fail to new proxy instance of a non-public interface");
-        } catch (AccessControlException e) {
-            if (e.getPermission().getClass() != ReflectPermission.class ||
-                    !e.getPermission().getName().equals("newProxyInPackage.p")) {
-                throw e;
-            }
-        }
     }
 
     private static void makeProxy(ClassLoader loader, Class<?> cls) {
diff --git a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
index 47dfa5a019d..b640a5e2150 100644
--- a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
+++ b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/reflect/records/IsRecordTest.java b/test/jdk/java/lang/reflect/records/IsRecordTest.java
index fcac5a9b40c..fc5f9e28364 100644
--- a/test/jdk/java/lang/reflect/records/IsRecordTest.java
+++ b/test/jdk/java/lang/reflect/records/IsRecordTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @enablePreview
  * @library /test/lib
  * @run testng/othervm IsRecordTest
- * @run testng/othervm/java.security.policy=allPermissions.policy IsRecordTest
  */
 
 import java.lang.classfile.ClassFile;
diff --git a/test/jdk/java/lang/reflect/records/RecordPermissionsTest.java b/test/jdk/java/lang/reflect/records/RecordPermissionsTest.java
deleted file mode 100644
index 46180ef1439..00000000000
--- a/test/jdk/java/lang/reflect/records/RecordPermissionsTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8235369
- * @summary Security manager checks for record related core reflection
- * @compile RecordPermissionsTest.java
- * @run testng/othervm/java.security.policy=allPermissions.policy RecordPermissionsTest
- */
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Path;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Stream;
-import org.testng.annotations.*;
-import org.testng.annotations.Test;
-import static java.lang.System.out;
-import static org.testng.Assert.*;
-
-public class RecordPermissionsTest {
-
-    class C { }
-    record R1() { }
-    record R2(int i, int j) { }
-    record R3(List<String> ls) { }
-    record R4(R1 r1, R2 r2, R3 r3) { }
-    record R5(String... args) { }
-    record R6(long l, String... args) implements java.io.Serializable { }
-
-    /** A list of classes loaded by a different loader to that of this class' loader. */
-    static final List<Class<?>> OTHER_LOADER_CLASSES = otherLoaderClasses();
-
-    /** A list of classes loaded by the same loader as this class' loader. */
-    static final List<Class<?>> SAME_LOADER_CLASSES = sameLoaderClasses();
-
-    static List<Class<?>> otherLoaderClasses() {
-        try {
-            ClassLoader cl = new URLClassLoader(
-                "other-classloader",
-                new URL[]{Path.of(System.getProperty("test.classes")).toUri().toURL()},
-                ClassLoader.getPlatformClassLoader()); // skip the system classloader
-
-            return List.of(cl.loadClass("RecordPermissionsTest$R1"),
-                           cl.loadClass("RecordPermissionsTest$R2"),
-                           Record.class,
-                           Record[].class,
-                           byte.class,
-                           byte[].class);
-        } catch (Exception e) {
-            throw new AssertionError("should not reach here", e);
-        }
-    }
-
-    static List<Class<?>> sameLoaderClasses() {
-        return List.of(C.class,
-                       R3.class,
-                       R4.class,
-                       R5.class,
-                       R6.class);
-    }
-
-    @BeforeTest
-    public void setup() throws Exception {
-        assertTrue(System.getSecurityManager() != null);
-    }
-
-    @DataProvider(name = "isRecordScenarios")
-    public Object[][] isRecordScenarios() {
-         return Stream.of(OTHER_LOADER_CLASSES, SAME_LOADER_CLASSES)
-                      .flatMap(Collection::stream)
-                      .map(cls -> new Object[]{"isRecord-" + cls.getName(),
-                                               (PrivilegedAction<?>)cls::isRecord })
-                      .toArray(Object[][]::new);
-     }
-
-     @DataProvider(name = "otherGetRecordComponentsScenarios")
-     public Object[][] otherGetRecordComponentsScenarios() {
-         return OTHER_LOADER_CLASSES.stream()
-                     .map(cls -> new Object[]{"getRecordComponents-other-" + cls.getName(),
-                                             (PrivilegedAction<?>)cls::getRecordComponents })
-                     .toArray(Object[][]::new);
-    }
-
-    @DataProvider(name = "sameGetRecordComponentsScenarios")
-    public Object[][] sameGetRecordComponentsScenarios() {
-        return SAME_LOADER_CLASSES.stream()
-                     .map(cls -> new Object[]{"getRecordComponents-same-" + cls.getName(),
-                                             (PrivilegedAction<?>)cls::getRecordComponents })
-                     .toArray(Object[][]::new);
-    }
-
-    @DataProvider(name = "allScenarios")
-    public Object[][] allScenarios() {
-        return Stream.of(isRecordScenarios(),
-                         sameGetRecordComponentsScenarios(),
-                         otherGetRecordComponentsScenarios())
-                     .flatMap(Arrays::stream)
-                     .toArray(Object[][]::new);
-    }
-
-    @DataProvider(name = "allNonThrowingScenarios")
-    public Object[][] allNonThrowingScenarios() {
-        return Stream.of(isRecordScenarios(),
-                         sameGetRecordComponentsScenarios())
-                     .flatMap(Arrays::stream)
-                     .toArray(Object[][]::new);
-    }
-
-    /** Tests all scenarios without any security manager - sanity. */
-    @Test(dataProvider = "allScenarios")
-    public void testWithNoSecurityManager(String description,
-                                          PrivilegedAction<?> action) {
-        System.setSecurityManager(null);
-        try {
-            AccessController.doPrivileged(action);
-        } finally {
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
-
-    /** Tests all scenarios with all permissions. */
-    @Test(dataProvider = "allScenarios")
-    public void testWithAllPermissions(String description,
-                                       PrivilegedAction<?> action) {
-        // Run with all permissions, i.e. no further restrictions than test's AllPermission
-        assert System.getSecurityManager() != null;
-        AccessController.doPrivileged(action);
-    }
-
-    /** Tests given scenarios with no permissions - expect should not require any. */
-    @Test(dataProvider = "allNonThrowingScenarios")
-    public void testWithNoPermissionsPass(String description,
-                                          PrivilegedAction<?> action) {
-        assert System.getSecurityManager() != null;
-        AccessController.doPrivileged(action, noPermissions());
-    }
-
-    static Class<SecurityException> SE = SecurityException.class;
-
-    /**
-     * Tests getRecordComponents with no permissions, and classes
-     * loaded by a loader other than the test class' loader - expects
-     * security exception.
-     */
-    @Test(dataProvider = "otherGetRecordComponentsScenarios")
-    public void testWithNoPermissionsFail(String description,
-                                          PrivilegedAction<?> action) {
-        // Run with NO permissions, i.e. expect SecurityException
-        assert System.getSecurityManager() != null;
-        SecurityException se = expectThrows(SE, () -> AccessController.doPrivileged(action, noPermissions()));
-        out.println("Got expected SecurityException: " + se);
-    }
-
-    /**
-     * Tests getRecordComponents with minimal permissions, and classes
-     * loaded by a loader other than the test class' loader.
-     */
-    @Test(dataProvider = "otherGetRecordComponentsScenarios")
-    public void testWithMinimalPermissions(String description,
-                                           PrivilegedAction<?> action) {
-        // Run with minimal permissions, i.e. just what is required
-        assert System.getSecurityManager() != null;
-        AccessControlContext minimalACC = withPermissions(
-                new RuntimePermission("accessDeclaredMembers"),
-                new RuntimePermission("accessClassInPackage.*")
-        );
-        AccessController.doPrivileged(action, minimalACC);
-    }
-
-    static AccessControlContext withPermissions(Permission... perms) {
-        Permissions p = new Permissions();
-        for (Permission perm : perms) {
-            p.add(perm);
-        }
-        ProtectionDomain pd = new ProtectionDomain(null, p);
-        return new AccessControlContext(new ProtectionDomain[]{ pd });
-    }
-
-    static AccessControlContext noPermissions() {
-        return withPermissions(/*empty*/);
-    }
-}
diff --git a/test/jdk/java/lang/reflect/records/RecordReflectionTest.java b/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
index 18a3b02f687..0598e88f0c1 100644
--- a/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
+++ b/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
@@ -28,7 +28,6 @@
  * @build R10
  * @compile RecordReflectionTest.java
  * @run testng/othervm RecordReflectionTest
- * @run testng/othervm/java.security.policy=allPermissions.policy RecordReflectionTest
  */
 
 import java.lang.annotation.*;
diff --git a/test/jdk/java/lang/reflect/records/allPermissions.policy b/test/jdk/java/lang/reflect/records/allPermissions.policy
deleted file mode 100644
index 80cc4397884..00000000000
--- a/test/jdk/java/lang/reflect/records/allPermissions.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// bootstrap to get the test going, it will do its own restrictions
-grant codeBase "file:${test.classes}/*" {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/lang/reflect/sealed_classes/TestSecurityManagerChecks.java b/test/jdk/java/lang/reflect/sealed_classes/TestSecurityManagerChecks.java
deleted file mode 100644
index a45a3f122d1..00000000000
--- a/test/jdk/java/lang/reflect/sealed_classes/TestSecurityManagerChecks.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8246778
- * @summary Test that security checks occur for getPermittedSubclasses
- * @library /test/lib
- * @modules java.compiler
- * @build jdk.test.lib.compiler.CompilerUtils jdk.test.lib.compiler.ModuleInfoMaker TestSecurityManagerChecks
- * @run main/othervm -Djava.security.manager=allow TestSecurityManagerChecks named
- * @run main/othervm -Djava.security.manager=allow TestSecurityManagerChecks unnamed
- */
-
-import java.io.IOException;
-import java.lang.module.Configuration;
-import java.lang.module.ModuleFinder;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import jdk.test.lib.compiler.*;
-
-public class TestSecurityManagerChecks {
-
-    private static final ClassLoader OBJECT_CL = null;
-
-    public static void main(String[] args) throws Throwable {
-        if ("named".equals(args[0])) {
-            runNamedModuleTest();
-        } else {
-            runUnnamedModuleTest();
-        }
-    }
-
-    private static void runNamedModuleTest() throws Throwable {
-        Path classes = compileNamedModuleTest();
-        URL[] testClassPath = getTestClassPath();
-
-        //need to use a different ClassLoader to run the test, so that the checks are performed:
-        ClassLoader testCL = new URLClassLoader(testClassPath, OBJECT_CL);
-        testCL.loadClass("TestSecurityManagerChecks")
-              .getDeclaredMethod("doRunNamedModuleTest", Path.class)
-              .invoke(null, classes);
-    }
-
-    public static void doRunNamedModuleTest(Path classes) throws Throwable {
-        Configuration testConfig = ModuleLayer.boot()
-                                              .configuration()
-                                              .resolve(ModuleFinder.of(),
-                                                       ModuleFinder.of(classes),
-                                                       List.of("test"));
-        ModuleLayer testLayer = ModuleLayer.boot()
-                                           .defineModulesWithOneLoader(testConfig,
-                                                                         OBJECT_CL);
-
-        // First get hold of the target classes before we enable security
-        Class<?> sealed = Class.forName(testLayer.findModule("test").get(), "test.Base");
-
-        //try without a SecurityManager:
-        checkPermittedSubclasses(sealed, "test.a.ImplA1",
-                                         "test.a.ImplA2",
-                                         "test.b.ImplB");
-
-        String[] denyPackageAccess = new String[1];
-        int[] checkPackageAccessCallCount = new int[1];
-
-        //try with a SecurityManager:
-        SecurityManager sm = new SecurityManager() {
-            @Override
-            public void checkPackageAccess(String pkg) {
-                if (pkg.startsWith("test.")) {
-                    checkPackageAccessCallCount[0]++;
-                }
-                if (Objects.equals(denyPackageAccess[0], pkg)) {
-                    throw new SecurityException();
-                }
-            }
-        };
-
-        System.setSecurityManager(sm);
-
-        denyPackageAccess[0] = "test";
-
-        //passes - does not return a class from package "test":
-        checkPermittedSubclasses(sealed, "test.a.ImplA1",
-                                         "test.a.ImplA2",
-                                         "test.b.ImplB");
-
-        if (checkPackageAccessCallCount[0] != 2) {
-            throw new AssertionError("Unexpected call count: " +
-                                      checkPackageAccessCallCount[0]);
-        }
-
-        denyPackageAccess[0] = "test.a";
-
-        try {
-            sealed.getPermittedSubclasses();
-            throw new Error("getPermittedSubclasses incorrectly succeeded for " +
-                             sealed.getName());
-        } catch (SecurityException e) {
-            System.out.println("OK - getPermittedSubclasses for " + sealed.getName() +
-                               " got expected exception: " + e);
-        }
-    }
-
-    private static Path compileNamedModuleTest() throws IOException {
-        Path base = Paths.get(".", "named");
-        Path src = base.resolve("src");
-        Path classes = base.resolve("classes");
-
-        ModuleInfoMaker maker = new ModuleInfoMaker(src);
-        maker.writeJavaFiles("test",
-                              "module test {}",
-                              "package test; public sealed interface Base permits test.a.ImplA1, test.a.ImplA2, test.b.ImplB, test.c.ImplC {}",
-                              "package test.a; public final class ImplA1 implements test.Base {}",
-                              "package test.a; public final class ImplA2 implements test.Base {}",
-                              "package test.b; public final class ImplB implements test.Base {}",
-                              "package test.c; public final class ImplC implements test.Base {}"
-                              );
-
-        if (!CompilerUtils.compile(src, classes.resolve("test"), "--enable-preview", "-source", System.getProperty("java.specification.version"))) {
-            throw new AssertionError("Compilation didn't succeed!");
-        }
-
-        Files.delete(classes.resolve("test").resolve("test").resolve("c").resolve("ImplC.class"));
-
-        return classes;
-    }
-
-    private static void runUnnamedModuleTest() throws Throwable {
-        Path classes = compileUnnamedModuleTest();
-        URL[] testClassPath = getTestClassPath();
-
-        //need to use a different ClassLoader to run the test, so that the checks are performed:
-        ClassLoader testCL = new URLClassLoader(testClassPath, OBJECT_CL);
-        testCL.loadClass("TestSecurityManagerChecks")
-              .getDeclaredMethod("doRunUnnamedModuleTest", Path.class)
-              .invoke(null, classes);
-    }
-
-    public static void doRunUnnamedModuleTest(Path classes) throws Throwable {
-        ClassLoader unnamedModuleCL =
-                new URLClassLoader(new URL[] {classes.toUri().toURL()}, OBJECT_CL);
-
-        // First get hold of the target classes before we enable security
-        Class<?> sealed = unnamedModuleCL.loadClass("test.Base");
-
-        //try without a SecurityManager:
-        checkPermittedSubclasses(sealed, "test.ImplA1",
-                                         "test.ImplA2",
-                                         "test.ImplB");
-
-        String[] denyPackageAccess = new String[1];
-        int[] checkPackageAccessCallCount = new int[1];
-
-        //try with a SecurityManager:
-        SecurityManager sm = new SecurityManager() {
-            @Override
-            public void checkPackageAccess(String pkg) {
-                if (pkg.equals("test")) {
-                    checkPackageAccessCallCount[0]++;
-                }
-                if (Objects.equals(denyPackageAccess[0], pkg)) {
-                    throw new SecurityException();
-                }
-            }
-        };
-
-        System.setSecurityManager(sm);
-
-        denyPackageAccess[0] = "test.unknown";
-
-        //passes - does not return a class from package "test.unknown":
-        checkPermittedSubclasses(sealed, "test.ImplA1",
-                                         "test.ImplA2",
-                                         "test.ImplB");
-
-        if (checkPackageAccessCallCount[0] != 1) {
-            throw new AssertionError("Unexpected call count: " +
-                                      checkPackageAccessCallCount[0]);
-        }
-
-        denyPackageAccess[0] = "test";
-
-        try {
-            sealed.getPermittedSubclasses();
-            throw new Error("getPermittedSubclasses incorrectly succeeded for " +
-                             sealed.getName());
-        } catch (SecurityException e) {
-            System.out.println("OK - getPermittedSubclasses for " + sealed.getName() +
-                               " got expected exception: " + e);
-        }
-    }
-
-    private static Path compileUnnamedModuleTest() throws IOException {
-        Path base = Paths.get(".", "unnamed");
-        Path src = base.resolve("src");
-        Path classes = base.resolve("classes");
-
-        ModuleInfoMaker maker = new ModuleInfoMaker(src);
-        maker.writeJavaFiles("test",
-                              "module test {}",
-                              "package test; public sealed interface Base permits ImplA1, ImplA2, ImplB, ImplC {}",
-                              "package test; public final class ImplA1 implements test.Base {}",
-                              "package test; public final class ImplA2 implements test.Base {}",
-                              "package test; public final class ImplB implements test.Base {}",
-                              "package test; public final class ImplC implements test.Base {}"
-                              );
-
-        Files.delete(src.resolve("test").resolve("module-info.java"));
-
-        if (!CompilerUtils.compile(src.resolve("test"), classes, "--enable-preview", "-source", System.getProperty("java.specification.version"))) {
-            throw new AssertionError("Compilation didn't succeed!");
-        }
-
-        Files.delete(classes.resolve("test").resolve("ImplC.class"));
-
-        return classes;
-    }
-
-    private static void checkPermittedSubclasses(Class<?> c, String... expected) {
-        Class<?>[] subclasses = c.getPermittedSubclasses();
-        List<String> subclassesNames = Arrays.stream(subclasses)
-                                             .map(Class::getName)
-                                             .collect(Collectors.toList());
-        if (!subclassesNames.equals(Arrays.asList(expected))) {
-            throw new AssertionError("Incorrect permitted subclasses: " +
-                                       subclassesNames);
-        }
-    }
-
-    private static URL[] getTestClassPath() {
-        return Arrays.stream(System.getProperty("test.class.path")
-                                    .split(System.getProperty("path.separator")))
-                     .map(TestSecurityManagerChecks::path2URL)
-                     .toArray(s -> new URL[s]);
-    }
-
-    private static URL path2URL(String p) {
-        try {
-            return Path.of(p).toUri().toURL();
-        } catch (MalformedURLException ex) {
-            throw new AssertionError(ex);
-        }
-    }
-
-}
diff --git a/test/jdk/java/lang/runtime/ObjectMethodsTest.java b/test/jdk/java/lang/runtime/ObjectMethodsTest.java
index 0a7741c02e1..62c8b034ed1 100644
--- a/test/jdk/java/lang/runtime/ObjectMethodsTest.java
+++ b/test/jdk/java/lang/runtime/ObjectMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8246774
  * @summary Basic tests for ObjectMethods
  * @run testng ObjectMethodsTest
- * @run testng/othervm/java.security.policy=empty.policy ObjectMethodsTest
  */
 
 import java.util.List;
diff --git a/test/jdk/java/lang/runtime/empty.policy b/test/jdk/java/lang/runtime/empty.policy
deleted file mode 100644
index 71477bb4503..00000000000
--- a/test/jdk/java/lang/runtime/empty.policy
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// This policy is used by tests not requiring permissions, to assert that the
-// JDK implementation has the correct privileged blocks.
-
diff --git a/test/jdk/java/math/BigDecimal/DoubleFloatValueTests.java b/test/jdk/java/math/BigDecimal/DoubleFloatValueTests.java
index d02c1a5bc7b..1d5010f84f6 100644
--- a/test/jdk/java/math/BigDecimal/DoubleFloatValueTests.java
+++ b/test/jdk/java/math/BigDecimal/DoubleFloatValueTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,9 @@
 
 /*
  * @test
- * @bug 8205592
- * @summary Verify {double, float}Value methods work
+ * @bug 8205592 8339252 8341260
+ * @summary Verify {double, float, float16}Value methods work
+ * @modules jdk.incubator.vector
  * @library /test/lib
  * @key randomness
  * @build jdk.test.lib.RandomFactory
@@ -35,6 +36,7 @@
 
 import java.math.BigDecimal;
 import java.util.Random;
+import jdk.incubator.vector.Float16;
 
 public class DoubleFloatValueTests {
     private static final BigDecimal HALF = BigDecimal.valueOf(5, 1);
@@ -64,6 +66,18 @@ private static BigDecimal nextHalfDown(float v) {
         return bv.subtract(ulp.multiply(HALF));
     }
 
+    private static BigDecimal nextHalfUp(Float16 v) {
+        BigDecimal bv = new BigDecimal(v.doubleValue());
+        BigDecimal ulp = new BigDecimal(Float16.ulp(v).doubleValue());
+        return bv.add(ulp.multiply(HALF));
+    }
+
+    private static BigDecimal nextHalfDown(Float16 v) {
+        BigDecimal bv = new BigDecimal(v.doubleValue());
+        BigDecimal ulp = new BigDecimal(v.doubleValue() - Float16.nextDown(v).doubleValue());
+        return bv.subtract(ulp.multiply(HALF));
+    }
+
     private static String toDecHexString(double v) {
         return v + " (" + Double.toHexString(v) + ")";
     }
@@ -72,6 +86,10 @@ private static String toDecHexString(float v) {
         return v + " (" + Float.toHexString(v) + ")";
     }
 
+    private static String toDecHexString(Float16 v) {
+        return v + " (" + Float16.toHexString(v) + ")";
+    }
+
     private static void checkDouble(BigDecimal bd, double exp) {
         double res = bd.doubleValue();
         if (exp != res ) {
@@ -90,6 +108,15 @@ private static void checkFloat(BigDecimal bv, float exp) {
         }
     }
 
+    private static void checkFloat16(BigDecimal bv, Float16 exp) {
+        Float16 res =  Float16.valueOf(bv); // bv.float16Value();
+        if (exp.floatValue() != res.floatValue()) {
+            String message = "Bad conversion: got " + toDecHexString(res) +
+                    ", expected " + toDecHexString(exp);
+            throw new RuntimeException(message);
+        }
+    }
+
     private static boolean isOdd(int n) {
         return (n & 0x1) != 0;
     }
@@ -112,6 +139,15 @@ private static void testFloatValueNearMinValue() {
         }
     }
 
+    private static void testFloat16ValueNearMinValue() {
+        for (int n = 0; n < 100; ++n) {
+            BigDecimal b = nextHalfUp(Float16.multiply(Float16.valueOf(n), Float16.MIN_VALUE));
+            checkFloat16(b, Float16.multiply(Float16.valueOf((n + 1) / 2 * 2), Float16.MIN_VALUE));
+            checkFloat16(b.subtract(EPS), Float16.multiply(Float16.valueOf(n), Float16.MIN_VALUE));
+            checkFloat16(b.add(EPS), Float16.multiply(Float16.valueOf(n + 1), Float16.MIN_VALUE));
+        }
+    }
+
     private static void testDoubleValueNearMinNormal() {
         double v = Double.MIN_NORMAL;
         for (int n = 0; n < 100; ++n) {
@@ -150,6 +186,25 @@ private static void testFloatValueNearMinNormal() {
         }
     }
 
+    private static void testFloat16ValueNearMinNormal() {
+        Float16 v = Float16.MIN_NORMAL;
+        for (int n = 0; n < 100; ++n) {
+            BigDecimal bv = nextHalfDown(v);
+            checkFloat16(bv, isOdd(n) ? Float16.nextDown(v) : v);
+            checkFloat16(bv.subtract(EPS), Float16.nextDown(v));
+            checkFloat16(bv.add(EPS), v);
+            v = Float16.nextDown(v);
+        }
+        v = Float16.MIN_NORMAL;
+        for (int n = 0; n < 100; ++n) {
+            BigDecimal bv = nextHalfUp(v);
+            checkFloat16(bv, isOdd(n) ? Float16.nextUp(v) : v);
+            checkFloat16(bv.subtract(EPS), v);
+            checkFloat16(bv.add(EPS), Float16.nextUp(v));
+            v = Float16.nextUp(v);
+        }
+    }
+
     private static void testDoubleValueNearMaxValue() {
         double v = Double.MAX_VALUE;
         for (int n = 0; n < 100; ++n) {
@@ -180,6 +235,21 @@ private static void testFloatValueNearMaxValue() {
         checkFloat(bv.add(EPS), Float.POSITIVE_INFINITY);
     }
 
+    private static void testFloat16ValueNearMaxValue() {
+        Float16 v = Float16.MAX_VALUE;
+        for (int n = 0; n < 100; ++n) {
+            BigDecimal bv = nextHalfDown(v);
+            checkFloat16(bv, isOdd(n) ? v : Float16.nextDown(v));
+            checkFloat16(bv.subtract(EPS), Float16.nextDown(v));
+            checkFloat16(bv.add(EPS), v);
+            v = Float16.nextDown(v);
+        }
+        BigDecimal bv = nextHalfUp(Float16.MAX_VALUE);
+        checkFloat16(bv, Float16.POSITIVE_INFINITY);
+        checkFloat16(bv.subtract(EPS), Float16.MAX_VALUE);
+        checkFloat16(bv.add(EPS), Float16.POSITIVE_INFINITY);
+    }
+
     private static void testDoubleValueRandom() {
         Random r = RandomFactory.getRandom();
         for (int i = 0; i < 10_000; ++i) {
@@ -228,18 +298,49 @@ private static void testFloatValueRandom() {
         }
     }
 
+    private static void testFloat16ValueRandom() {
+        Random r = RandomFactory.getRandom();
+        for (int i = 0; i < 10_000; ++i) {
+            Float16 v = Float16.valueOf(r.nextFloat(-Float16.MAX_VALUE.floatValue(), Float16.MAX_VALUE.floatValue()));
+            checkFloat16(new BigDecimal(v.floatValue()), v);
+        }
+        for (int i = 0; i < 10_000; ++i) {
+            Float16 v = Float16.valueOf(r.nextFloat(-1e4f, 1e4f));
+            checkFloat16(new BigDecimal(v.floatValue()), v);
+        }
+        for (int i = 0; i < 10_000; ++i) {
+            Float16 v = Float16.valueOf(r.nextFloat(-1e3f, 1e3f));
+            checkFloat16(new BigDecimal(v.floatValue()), v);
+        }
+        for (int i = 0; i < 10_000; ++i) {
+            Float16 v = Float16.valueOf(r.nextFloat(-1e-3f, 1e-3f));
+            checkFloat16(new BigDecimal(v.floatValue()), v);
+        }
+        for (int i = 0; i < 10_000; ++i) {
+            Float16 v = Float16.valueOf(r.nextFloat(-1e-4f, 1e-4f));
+            checkFloat16(new BigDecimal(v.floatValue()), v);
+        }
+    }
+
     private static void testDoubleValueExtremes() {
         checkDouble(BigDecimal.valueOf(1, 1000), 0.0);
         checkDouble(BigDecimal.valueOf(-1, 1000), -0.0);
         checkDouble(BigDecimal.valueOf(1, -1000), Double.POSITIVE_INFINITY);
-        checkDouble(BigDecimal.valueOf(-1, -1000), -Double.POSITIVE_INFINITY);
+        checkDouble(BigDecimal.valueOf(-1, -1000), Double.NEGATIVE_INFINITY);
     }
 
     private static void testFloatValueExtremes() {
         checkFloat(BigDecimal.valueOf(1, 1000), 0.0f);
         checkFloat(BigDecimal.valueOf(-1, 1000), -0.0f);
         checkFloat(BigDecimal.valueOf(1, -1000), Float.POSITIVE_INFINITY);
-        checkFloat(BigDecimal.valueOf(-1, -1000), -Float.POSITIVE_INFINITY);
+        checkFloat(BigDecimal.valueOf(-1, -1000), Float.NEGATIVE_INFINITY);
+    }
+
+    private static void testFloat16ValueExtremes() {
+        checkFloat16(BigDecimal.valueOf(1, 1000), Float16.valueOf(0.0f));
+        checkFloat16(BigDecimal.valueOf(-1, 1000), Float16.valueOf(-0.0f));
+        checkFloat16(BigDecimal.valueOf(1, -1000), Float16.POSITIVE_INFINITY);
+        checkFloat16(BigDecimal.valueOf(-1, -1000), Float16.NEGATIVE_INFINITY);
     }
 
     public static void main(String[] args) {
@@ -254,6 +355,12 @@ public static void main(String[] args) {
         testFloatValueNearMaxValue();
         testFloatValueRandom();
         testFloatValueExtremes();
+
+        testFloat16ValueNearMinValue();
+        testFloat16ValueNearMinNormal();
+        testFloat16ValueNearMaxValue();
+        testFloat16ValueRandom();
+        testFloat16ValueExtremes();
     }
 
 }
diff --git a/test/jdk/java/net/Authenticator/GetAuthenticatorTest.java b/test/jdk/java/net/Authenticator/GetAuthenticatorTest.java
index 9c4c421ba32..71c91bdbe33 100644
--- a/test/jdk/java/net/Authenticator/GetAuthenticatorTest.java
+++ b/test/jdk/java/net/Authenticator/GetAuthenticatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,13 @@
  */
 import java.lang.ref.Reference;
 import java.net.Authenticator;
-import java.net.NetPermission;
 import java.net.PasswordAuthentication;
-import java.security.AccessControlException;
 
 /**
  * @test
  * @bug 8169068
  * @summary  Basic test for Authenticator.getDefault()
- * @run main/othervm -Djava.security.manager=allow GetAuthenticatorTest
+ * @run main/othervm GetAuthenticatorTest
  */
 public class GetAuthenticatorTest {
 
@@ -60,16 +58,6 @@ public static void main (String args[]) throws Exception {
         if (defaultAuth != auth) {
             throw new RuntimeException("Unexpected authenticator: auth expected");
         }
-        System.setSecurityManager(new SecurityManager());
-        try {
-            defaultAuth = Authenticator.getDefault();
-            throw new RuntimeException("Expected security exception not raised");
-        } catch (AccessControlException s) {
-            System.out.println("Got expected exception: " + s);
-            if (!s.getPermission().equals(new NetPermission("requestPasswordAuthentication"))) {
-                throw new RuntimeException("Unexpected permission check: " + s.getPermission());
-            }
-        }
         System.out.println("Test passed with default authenticator "
                            + defaultAuth);
     }
diff --git a/test/jdk/java/net/DatagramSocket/ConnectPortZero.java b/test/jdk/java/net/DatagramSocket/ConnectPortZero.java
index 82544d0b558..7f61d146bc0 100644
--- a/test/jdk/java/net/DatagramSocket/ConnectPortZero.java
+++ b/test/jdk/java/net/DatagramSocket/ConnectPortZero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,7 @@
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.SocketException;
-import java.net.SocketPermission;
 import java.nio.channels.DatagramChannel;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
@@ -51,19 +44,16 @@
  * @bug 8240533
  * @summary Check that DatagramSocket, MulticastSocket and DatagramSocketAdaptor
  *          throw expected Exception when connecting to port 0
- * @run testng/othervm -Djava.security.manager=allow ConnectPortZero
+ * @run testng/othervm ConnectPortZero
  */
 
-public class ConnectPortZero{
+public class ConnectPortZero {
     private InetAddress loopbackAddr, wildcardAddr;
     private DatagramSocket datagramSocket, datagramSocketAdaptor;
     private MulticastSocket multicastSocket;
 
     private static final Class<SocketException> SE = SocketException.class;
-    private static final Class<UncheckedIOException> UCIOE =
-            UncheckedIOException.class;
-    private static final Class<AccessControlException> ACE =
-            AccessControlException.class;
+    private static final Class<UncheckedIOException> UCIOE = UncheckedIOException.class;
 
     @BeforeTest
     public void setUp() throws IOException {
@@ -96,34 +86,6 @@ public void testConnect(DatagramSocket ds, InetAddress addr) {
                 .connect(new InetSocketAddress(addr, 0)));
     }
 
-
-    // Check that 0 port check doesn't override security manager check
-    @Test(dataProvider = "data")
-    public void testConnectWithSecurityManager(DatagramSocket ds,
-                                               InetAddress addr) {
-        Policy defaultPolicy = Policy.getPolicy();
-        try {
-            Policy.setPolicy(new NoSendPolicy());
-            System.setSecurityManager(new SecurityManager());
-
-            assertThrows(ACE, () -> ds.connect(addr, 0));
-            assertThrows(ACE, () ->
-                    ds.connect(new InetSocketAddress(addr, 0)));
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    static class NoSendPolicy extends Policy {
-        final PermissionCollection perms = new Permissions();
-        { perms.add(new SocketPermission("*:0", "connect")); }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return !perms.implies(perm);
-        }
-    }
-
     @AfterTest
     public void tearDown() {
         datagramSocket.close();
diff --git a/test/jdk/java/net/DatagramSocket/SendPortZero.java b/test/jdk/java/net/DatagramSocket/SendPortZero.java
index f359ad35d11..03c78c3e54d 100644
--- a/test/jdk/java/net/DatagramSocket/SendPortZero.java
+++ b/test/jdk/java/net/DatagramSocket/SendPortZero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,7 @@
 import java.net.InetAddress;
 import java.net.MulticastSocket;
 import java.net.SocketException;
-import java.net.SocketPermission;
 import java.nio.channels.DatagramChannel;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 
 import static org.testng.Assert.assertThrows;
 
@@ -49,7 +42,7 @@
  * @bug 8236105 8240533
  * @summary Check that DatagramSocket throws expected
  *          Exception when sending a DatagramPacket with port 0
- * @run testng/othervm -Djava.security.manager=allow SendPortZero
+ * @run testng/othervm SendPortZero
  */
 
 public class SendPortZero {
@@ -58,8 +51,6 @@ public class SendPortZero {
     private DatagramPacket loopbackZeroPkt, wildcardZeroPkt, wildcardValidPkt;
 
     private static final Class<SocketException> SE = SocketException.class;
-    private static final Class<AccessControlException> ACE =
-            AccessControlException.class;
 
     @BeforeTest
     public void setUp() throws IOException {
@@ -110,32 +101,6 @@ public void testSend(DatagramSocket ds, DatagramPacket pkt) {
         assertThrows(SE, () -> ds.send(pkt));
     }
 
-    // Check that 0 port check doesn't override security manager check
-    @Test(dataProvider = "data")
-    public void testSendWithSecurityManager(DatagramSocket ds,
-                                            DatagramPacket pkt) {
-        Policy defaultPolicy = Policy.getPolicy();
-        try {
-            Policy.setPolicy(new NoSendPolicy());
-            System.setSecurityManager(new SecurityManager());
-
-            assertThrows(ACE, () -> ds.send(pkt));
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    static class NoSendPolicy extends Policy {
-        final PermissionCollection perms = new Permissions();
-        { perms.add(
-                new SocketPermission("*:0", "connect")); }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return !perms.implies(perm);
-        }
-    }
-
     @AfterTest
     public void tearDown() {
         datagramSocket.close();
diff --git a/test/jdk/java/net/DatagramSocket/TimeoutWithSM.java b/test/jdk/java/net/DatagramSocket/TimeoutWithSM.java
deleted file mode 100644
index c42fa151f70..00000000000
--- a/test/jdk/java/net/DatagramSocket/TimeoutWithSM.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Test a timed DatagramSocket.receive with a SecurityManager set
- * @run main/othervm -Djava.security.manager=allow TimeoutWithSM
- */
-
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-import java.security.Permission;
-import java.time.Duration;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class TimeoutWithSM {
-
-    private static final int TIMEOUT = 10_000;
-
-    public static void main(String[] args) throws Exception {
-        try (var socket = new DatagramSocket(null)) {
-            InetAddress lb = InetAddress.getLoopbackAddress();
-            socket.bind(new InetSocketAddress(lb, 0));
-
-            // start sender to send datagrams to us
-            var done = new AtomicBoolean();
-            startSender(socket.getLocalSocketAddress(), done);
-
-            // set a SecurityManager that blocks datagrams from sender
-            System.setSecurityManager(new SecurityManager() {
-                @Override
-                public void checkPermission(Permission p) {
-                }
-                @Override
-                public void checkAccept(String host, int port) {
-                    var isa = new InetSocketAddress(host, port);
-                    System.out.println("checkAccept " + isa);
-                    throw new SecurityException();
-                }
-            });
-
-            // timed receive, should throw SocketTimeoutException
-            try {
-                socket.setSoTimeout(TIMEOUT);
-                try {
-                    byte[] bytes = new byte[1024];
-                    DatagramPacket p = new DatagramPacket(bytes, bytes.length);
-                    socket.receive(p);
-                    throw new RuntimeException("Packet received, unexpected!!! "
-                            + " sender=" + p.getSocketAddress() + ", len=" + p.getLength());
-                } catch (SocketTimeoutException expected) {
-                    System.out.println(expected + ", expected!!!");
-                }
-            } finally {
-                done.set(true);
-            }
-        }
-    }
-
-    /**
-     * Start a thread to send datagrams to the given target address at intervals of
-     * one second. The sender stops when done is set to true.
-     */
-    static void startSender(SocketAddress target, AtomicBoolean done) throws Exception {
-        assert target instanceof InetSocketAddress isa && isa.getAddress().isLoopbackAddress();
-        var sender = new DatagramSocket(null);
-        boolean started = false;
-        try {
-            InetAddress lb = InetAddress.getLoopbackAddress();
-            sender.bind(new InetSocketAddress(lb, 0));
-            Thread.ofPlatform().start(() -> {
-                try {
-                    try (sender) {
-                        byte[] bytes = "hello".getBytes("UTF-8");
-                        DatagramPacket p = new DatagramPacket(bytes, bytes.length);
-                        p.setSocketAddress(target);
-                        while (!done.get()) {
-                            System.out.println("Send datagram to " + target + " ...");
-                            sender.send(p);
-                            Thread.sleep(Duration.ofSeconds(1));
-                        }
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-            started = true;
-        } finally {
-            if (!started) {
-                sender.close();
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpect100Test.java b/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpect100Test.java
index 2a858d32fc2..96bef099da2 100644
--- a/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpect100Test.java
+++ b/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpect100Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,9 +82,9 @@ public void expect100ContinueHitCountTest() throws Exception {
         conn.setRequestProperty("Expect", "100-continue");
         sendRequest(conn);
         getHeaderField(conn);
-        assertEquals(1, server.getServerHitCount());
         // Server rejects the expect 100-continue request with 417 response
         assertEquals(417, conn.getResponseCode());
+        assertEquals(1, server.getServerHitCount());
     }
 
     @Test
@@ -99,12 +99,12 @@ public void defaultRequestHitCountTest() throws Exception {
         conn.setRequestMethod("PUT");
         sendRequest(conn);
         getHeaderField(conn);
-        assertEquals(1, server.getServerHitCount());
         assertEquals(200, conn.getResponseCode());
         try ( InputStream in = conn.getInputStream()) {
             byte[] data = in.readAllBytes();
             assertEquals(RESPONSE.length(), data.length);
         }
+        assertEquals(1, server.getServerHitCount());
     }
 
     private void sendRequest(final HttpURLConnection conn) throws Exception {
@@ -116,6 +116,7 @@ private void sendRequest(final HttpURLConnection conn) throws Exception {
             os.flush();
         } catch (IOException e) {
             // intentional, server will reject the expect 100
+            System.err.println("Got expected exception: " + e);
         }
     }
 
@@ -179,7 +180,7 @@ void close() {
         @Override
         public void run() {
             Socket client;
-            try {
+            try (ss) {
                 while (isRunning) {
                     client = ss.accept();
                     System.out.println(client.getRemoteSocketAddress().toString());
@@ -191,29 +192,16 @@ public void run() {
                 if (isRunning) {
                     throw new RuntimeException(ex);
                 }
-            } finally {
-                if (ss != null && !ss.isClosed()) {
-                    try {
-                        ss.close();
-                    } catch (IOException ex) {
-                        //ignore
-                    }
-                }
             }
         }
 
         private void handleConnection(Socket client) throws IOException {
-            try ( BufferedReader in = new BufferedReader(
+            try (client; BufferedReader in = new BufferedReader(
                 new InputStreamReader(client.getInputStream()));
                 PrintStream out = new PrintStream(client.getOutputStream())) {
                 handle_connection(in, out);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-            } finally {
-                try {
-                    client.close();
-                } catch (IOException e) {
-                }
             }
         }
 
@@ -230,6 +218,10 @@ private void handle_connection(BufferedReader in, PrintStream out)
             } else {
                 defaultResponse(out);
             }
+            // wait until the client closes the socket
+            while (line != null) {
+                line = in.readLine();
+            }
         }
 
         private void rejectExpect100Continue(PrintStream out) {
diff --git a/test/jdk/java/net/IPSupport/MinimumPermissions.java b/test/jdk/java/net/IPSupport/MinimumPermissions.java
deleted file mode 100644
index f335934d81e..00000000000
--- a/test/jdk/java/net/IPSupport/MinimumPermissions.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8220673
- * @library /test/lib
- * @build jdk.test.lib.net.IPSupport
- * @summary Ensure IPSupport works under a security manager.
- * @run main/othervm/policy=MinimumPermissions.policy MinimumPermissions
- */
-
-import jdk.test.lib.net.IPSupport;
-
-public class MinimumPermissions {
-    public static void main(String[] args) {
-        IPSupport.throwSkippedExceptionIfNonOperational();
-    }
-}
-
diff --git a/test/jdk/java/net/IPSupport/MinimumPermissions.policy b/test/jdk/java/net/IPSupport/MinimumPermissions.policy
deleted file mode 100644
index 6e370ca8e37..00000000000
--- a/test/jdk/java/net/IPSupport/MinimumPermissions.policy
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.net.SocketPermission "localhost:0", "listen,resolve";
-    permission java.util.PropertyPermission "java.net.preferIPv4Stack", "read";
-    permission java.util.PropertyPermission "java.net.preferIPv6Addresses", "read";
-};
-
diff --git a/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java b/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java
deleted file mode 100644
index 2eda5f0494d..00000000000
--- a/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 4531817 8026245
- * @library /test/lib
- * @summary Inet[46]Address.localHost need doPrivileged
- * @run main/othervm -Djava.security.manager=allow GetLocalHostWithSM
- * @run main/othervm -Djava.security.manager=allow -Djava.net.preferIPv4Stack=true GetLocalHostWithSM
- * @run main/othervm -Djava.security.manager=allow -Djava.net.preferIPv6Addresses=true GetLocalHostWithSM
- * files needed: GetLocalHostWithSM.java, MyPrincipal.java, and policy.file
- */
-
-import java.net.*;
-
-import javax.security.auth.Subject;
-import java.security.Principal;
-import java.security.PrivilegedExceptionAction;
-import java.util.*;
-
-import jdk.test.lib.net.IPSupport;
-
-public class GetLocalHostWithSM {
-
-        public static void main(String[] args) throws Exception {
-            IPSupport.throwSkippedExceptionIfNonOperational();
-
-            // try setting the local hostname
-            InetAddress localHost = InetAddress.getLocalHost();
-            if (localHost.isLoopbackAddress()) {
-                System.err.println("Local host name is resolved into a loopback address. Quit now!");
-                return;
-            }
-            System.setProperty("host.name", localHost.
-                                            getHostName());
-            String policyFileName = System.getProperty("test.src", ".") +
-                          "/" + "policy.file";
-            System.setProperty("java.security.policy", policyFileName);
-            System.setSecurityManager(new SecurityManager());
-
-            InetAddress localHost1 = null;
-            InetAddress localHost2 = null;
-
-            localHost1 = InetAddress.getLocalHost();
-
-            Subject mySubject = new Subject();
-            MyPrincipal userPrincipal = new MyPrincipal("test");
-            mySubject.getPrincipals().add(userPrincipal);
-            localHost2 = (InetAddress)Subject.doAsPrivileged(mySubject,
-                                new MyAction(), null);
-
-            if (localHost1.equals(localHost2)) {
-                System.out.println("localHost1 = " + localHost1);
-                throw new RuntimeException("InetAddress.getLocalHost() test " +
-                                           " fails. localHost2 should be " +
-                                           " the real address instead of " +
-                                           " the loopback address."+localHost2);
-            }
-        }
-}
-
-
-class MyAction implements PrivilegedExceptionAction {
-
-    public Object run() throws Exception {
-        return InetAddress.getLocalHost();
-    }
-}
diff --git a/test/jdk/java/net/MulticastSocket/SendPortZero.java b/test/jdk/java/net/MulticastSocket/SendPortZero.java
index 2d277c0be99..2155cf4149f 100644
--- a/test/jdk/java/net/MulticastSocket/SendPortZero.java
+++ b/test/jdk/java/net/MulticastSocket/SendPortZero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,7 @@
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.SocketException;
-import java.net.SocketPermission;
 import java.nio.channels.DatagramChannel;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 
 import static org.testng.Assert.assertThrows;
 
@@ -49,7 +42,7 @@
  * @bug 8243408
  * @summary Check that MulticastSocket throws expected
  *          Exception when sending a DatagramPacket with port 0
- * @run testng/othervm -Djava.security.manager=allow SendPortZero
+ * @run testng/othervm SendPortZero
  */
 
 public class SendPortZero {
@@ -58,8 +51,6 @@ public class SendPortZero {
     private DatagramPacket loopbackZeroPkt, wildcardZeroPkt, wildcardValidPkt;
 
     private static final Class<SocketException> SE = SocketException.class;
-    private static final Class<AccessControlException> ACE =
-            AccessControlException.class;
 
     @BeforeTest
     public void setUp() throws IOException {
@@ -105,33 +96,6 @@ public void testSend(MulticastSocket ms, DatagramPacket pkt) {
         assertThrows(SE, () -> ms.send(pkt, (byte) 0));
     }
 
-    // Check that 0 port check doesn't override security manager check
-    @Test(dataProvider = "data")
-    public void testSendWithSecurityManager(MulticastSocket ms,
-                                            DatagramPacket pkt) {
-        Policy defaultPolicy = Policy.getPolicy();
-        try {
-            Policy.setPolicy(new NoSendPolicy());
-            System.setSecurityManager(new SecurityManager());
-
-            assertThrows(ACE, () -> ms.send(pkt));
-            assertThrows(ACE, () -> ms.send(pkt, (byte) 0));
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    static class NoSendPolicy extends Policy {
-        final PermissionCollection perms = new Permissions();
-        { perms.add(
-                new SocketPermission("*:0", "connect")); }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return !perms.implies(perm);
-        }
-    }
-
     @AfterTest
     public void tearDown() {
         multicastSocket.close();
diff --git a/test/jdk/java/net/NetworkInterface/Equals.java b/test/jdk/java/net/NetworkInterface/Equals.java
index 9e973e71de7..4823c201c73 100644
--- a/test/jdk/java/net/NetworkInterface/Equals.java
+++ b/test/jdk/java/net/NetworkInterface/Equals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 7003398
- * @run main/othervm -Djava.security.manager=allow Equals
+ * @run main/othervm Equals
  */
 
 import java.io.ByteArrayOutputStream;
@@ -56,8 +56,6 @@ public static void main(String args[]) throws Exception {
             bufferedOut.flush();
         }
 
-        System.setSecurityManager(new SecurityManager());
-
         Enumeration<NetworkInterface> nifs2 = NetworkInterface.getNetworkInterfaces();
         while (nifs2.hasMoreElements()) {
             NetworkInterface ni = nifs2.nextElement();
diff --git a/test/jdk/java/net/ServerSocket/TestLocalAddress.java b/test/jdk/java/net/ServerSocket/TestLocalAddress.java
deleted file mode 100644
index b87d21c9821..00000000000
--- a/test/jdk/java/net/ServerSocket/TestLocalAddress.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.SocketAddress;
-import java.net.SocketPermission;
-import java.nio.channels.ServerSocketChannel;
-import java.security.AccessControlContext;
-import java.security.AllPermission;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static java.lang.System.out;
-import static java.security.AccessController.*;
-import static org.testng.Assert.*;
-
-/*
- * @test
- * @bug 8224730
- * @summary Check local address access with a security manager
- * @run testng/othervm -Djava.security.manager=allow TestLocalAddress
- */
-
-public class TestLocalAddress {
-
-    InetAddress localHost;
-    ExposedSecurityManager exposedSecurityManager;
-
-    @BeforeTest
-    public void setup() throws Exception {
-        localHost = InetAddress.getLocalHost();
-        out.println("localHost: " + localHost);
-
-        Policy.setPolicy(new AllPermissionsPolicy());
-        exposedSecurityManager = new ExposedSecurityManager();
-        System.setSecurityManager(exposedSecurityManager);
-        out.println("Security manager set");
-    }
-
-    @Test
-    public void serverSocketNoSecurityManager() throws Exception {
-        out.println("\n\n--- serverSocketNoSecurityManager ---");
-        try (ServerSocket ss = new ServerSocket()) {
-            testWithNoSecurityManager(ss);
-        }
-    }
-
-    @Test
-    public void serverSocketAdapterNoSecurityManager() throws Exception {
-        out.println("\n\n--- serverSocketAdapterNoSecurityManager ---");
-        try (ServerSocket ss = ServerSocketChannel.open().socket()) {
-            testWithNoSecurityManager(ss);
-        }
-    }
-
-    void testWithNoSecurityManager(ServerSocket ss) throws Exception {
-        final SecurityManager sm = System.getSecurityManager();
-        System.setSecurityManager(null);
-        try {
-            ss.bind(new InetSocketAddress(localHost, 0));
-
-            var localSocketAddr = ((InetSocketAddress)ss.getLocalSocketAddress());
-            var localInetAddress = ss.getInetAddress();
-            assertEquals(localInetAddress, localSocketAddr.getAddress());
-            if (!(localHost.equals(InetAddress.getLoopbackAddress())))
-                assertNotEquals(localInetAddress, InetAddress.getLoopbackAddress());
-
-            // toString
-            String s = ss.toString();
-            out.println("toString returned:" + s);
-            assertTrue(s.contains(localInetAddress.toString()),
-                    "Expected [" + localInetAddress + "] in " + s);
-
-        } finally {
-            System.setSecurityManager(sm);
-        }
-    }
-
-    @Test
-    public void serverSocketNoPermissions() throws Exception {
-        out.println("\n\n--- serverSocketNoPermissions ---");
-        try (ServerSocket ss = new ServerSocket()) {
-            testWithNoPermissions(ss);
-        }
-    }
-
-    @Test
-    public void serverSocketAdapterNoPermissions() throws Exception {
-        out.println("\n\n--- serverSocketAdapterNoPermissions ---");
-        try (ServerSocket ss = ServerSocketChannel.open().socket()) {
-            testWithNoPermissions(ss);
-        }
-    }
-
-    void testWithNoPermissions(ServerSocket ss) throws Exception {
-        ss.bind(new InetSocketAddress(localHost, 0));
-
-        PrivilegedExceptionAction<SocketAddress> pa = ss::getLocalSocketAddress;
-        var localSocketAddr = (InetSocketAddress) doPrivileged(pa, noPermissions());
-        assertSecurityManagerCalled();
-        PrivilegedExceptionAction<InetAddress> pa1 = ss::getInetAddress;
-        var localInetAddress = doPrivileged(pa1, noPermissions());
-        assertSecurityManagerCalled();
-
-        assertEquals(localInetAddress, localSocketAddr.getAddress());
-        assertEquals(localInetAddress, InetAddress.getLoopbackAddress());
-
-        // toString
-        PrivilegedExceptionAction<String> pa2 = ss::toString;
-        String s = doPrivileged(pa2, noPermissions());
-        assertSecurityManagerCalled();
-        out.println("toString returned:" + s);
-        assertTrue(s.contains(localInetAddress.toString()),
-                "Expected [" + localInetAddress + "] in " + s);
-    }
-
-
-    @Test
-    public void serverSocketFineGrainPermissions() throws Exception {
-        out.println("\n\n--- serverSocketFineGrainPermissions ---");
-        try (ServerSocket ss = new ServerSocket()) {
-            testWithFineGrainPermissions(ss);
-        }
-    }
-
-    @Test
-    public void serverSocketAdapterFineGrainPermissions() throws Exception {
-        out.println("\n\n--- serverSocketAdapterFineGrainPermissions ---");
-        try (ServerSocket ss = ServerSocketChannel.open().socket()) {
-            testWithFineGrainPermissions(ss);
-        }
-    }
-
-    void testWithFineGrainPermissions(ServerSocket ss) throws Exception {
-        AccessControlContext connectPermission = withPermissions(
-                new SocketPermission(localHost.getHostName(), "connect")
-        );
-        ss.bind(new InetSocketAddress(localHost, 0));
-
-        PrivilegedExceptionAction<SocketAddress> pa = ss::getLocalSocketAddress;
-        var localSocketAddr = (InetSocketAddress) doPrivileged(pa, connectPermission);
-        assertSecurityManagerCalled();
-        PrivilegedExceptionAction<InetAddress> pa1 = ss::getInetAddress;
-        var localInetAddress = doPrivileged(pa1, connectPermission);
-        assertSecurityManagerCalled();
-
-        assertEquals(localInetAddress, localSocketAddr.getAddress());
-        assertEquals(localInetAddress, localHost);
-
-        // toString
-        PrivilegedExceptionAction<String> pa2 = ss::toString;
-        String s = doPrivileged(pa2, connectPermission);
-        assertSecurityManagerCalled();
-        out.println("toString returned:" + s);
-        assertTrue(s.contains(localInetAddress.toString()),
-                "Expected [" + localInetAddress + "] in " + s);
-    }
-
-
-    @Test
-    public void serverSocketUnbound() throws Exception {
-        out.println("\n\n--- serverSocketUnbound ---");
-        try (ServerSocket ss = new ServerSocket()) {
-            testUnbound(ss);
-        }
-    }
-
-    @Test
-    public void serverSocketAdapterUnbound() throws Exception {
-        out.println("\n\n--- serverSocketAdapterUnbound ---");
-        try (ServerSocket ss = ServerSocketChannel.open().socket()) {
-            testUnbound(ss);
-        }
-    }
-
-    void testUnbound(ServerSocket ss) {
-        assert !ss.isBound();
-        exposedSecurityManager.reset();
-        assertEquals(ss.getLocalSocketAddress(), null);
-        assertEquals(exposedSecurityManager.port, -999);
-        assertEquals(ss.getInetAddress(), null);
-        assertEquals(exposedSecurityManager.port, -999);
-        String s = ss.toString();
-        assertEquals(exposedSecurityManager.port, -999);
-        out.println("toString returned:" + s);
-        assertTrue(s.contains("unbound"), "Expected [unbound] in " + s);
-    }
-
-    // A security manager that allows inspection of checkConnect's host/port.
-    static class ExposedSecurityManager extends SecurityManager {
-        volatile String host;
-        volatile int port;
-        ExposedSecurityManager() {
-            reset();
-        }
-        @Override
-        public void checkConnect(String host, int port) {
-            this.host = host;
-            this.port = port;
-            super.checkConnect(host, port);
-        }
-        void reset() {
-            host = "reset";
-            port = -999;
-        }
-    }
-
-    void assertSecurityManagerCalled() {
-        assertEquals(exposedSecurityManager.port, -1);
-        assertEquals(exposedSecurityManager.host, localHost.getHostAddress());
-        exposedSecurityManager.reset();
-    }
-
-    @Test
-    // Ensures that the test machinery is operating as expected.
-    public void sanity() {
-        PrivilegedAction<?> connectAction = () -> {
-            System.getSecurityManager().checkConnect("example.com", 80);
-            return null;
-        };
-
-        try {
-            doPrivileged(connectAction, allPermissions());
-        } catch (SecurityException unexpected) {
-            throw unexpected;
-        }
-        try {
-            doPrivileged(connectAction, noPermissions());
-            fail("Expected exception not thrown");
-        } catch (SecurityException expected) { }
-        try {
-            doPrivileged(connectAction,
-                    withPermissions(new SocketPermission("example.com:80", "connect")));
-        } catch (SecurityException unexpected) {
-            throw unexpected;
-        }
-    }
-
-    static AccessControlContext withPermissions(Permission... perms) {
-        Permissions p = new Permissions();
-        for (Permission perm : perms) {
-            p.add(perm);
-        }
-        ProtectionDomain pd = new ProtectionDomain(null, p);
-        return new AccessControlContext(new ProtectionDomain[]{ pd });
-    }
-
-    static AccessControlContext allPermissions() {
-        return withPermissions(new AllPermission());
-    }
-
-    static AccessControlContext noPermissions() {
-        return withPermissions(/*empty*/);
-    }
-
-    // A Policy that implies all permissions.
-    static class AllPermissionsPolicy extends Policy {
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return true;
-        }
-    }
-}
diff --git a/test/jdk/java/net/SetFactoryPermission/SetFactoryPermission.java b/test/jdk/java/net/SetFactoryPermission/SetFactoryPermission.java
deleted file mode 100644
index 0b65c506a6f..00000000000
--- a/test/jdk/java/net/SetFactoryPermission/SetFactoryPermission.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- * @bug 8048052
- * @summary Test a series of methods which requires "setFactory" runtime permission
- * @modules java.rmi
- * @run main/othervm SetFactoryPermission success
- * @run main/othervm/policy=policy.fail SetFactoryPermission fail
- * @run main/othervm/policy=policy.success SetFactoryPermission success
- */
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URL;
-import java.net.URLConnection;
-import java.rmi.server.RMISocketFactory;
-import java.security.AccessControlException;
-
-public class SetFactoryPermission {
-    static boolean success = false;
-
-    interface Runner {
-        public void run() throws Exception;
-    }
-
-    public static void main (String[] args) throws Exception {
-        if (args.length > 0) {
-            success = System.getSecurityManager() == null || args[0].equals("success");
-        }
-
-        doTest(()->{
-            System.out.println("Verify URLConnection.setContentHandlerFactor()");
-            URLConnection.setContentHandlerFactory(null);
-        });
-        doTest(()->{
-            System.out.println("Verify URL.setURLStreamHandlerFactory()");
-            URL.setURLStreamHandlerFactory(null);
-        });
-        doTest(()->{
-            System.out.println("Verify ServerSocket.setSocketFactory()");
-            ServerSocket.setSocketFactory(null);
-        });
-        doTest(()->{
-            System.out.println("Verify Socket.setSocketImplFactory()");
-            Socket.setSocketImplFactory(null);
-        });
-        doTest(()->{
-            System.out.println("Verify RMISocketFactory.setSocketFactory()");
-            RMISocketFactory.setSocketFactory(null);
-        });
-    }
-
-    static void doTest(Runner func) throws Exception {
-        try {
-            func.run();
-            if (!success) {
-                throw new RuntimeException("AccessControlException is not thrown. Test failed");
-            }
-        } catch (SecurityException e) {
-            if (success) {
-                e.printStackTrace();
-                throw new RuntimeException("AccessControlException is thrown unexpectedly. Test failed");
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/net/Socket/UdpSocket.java b/test/jdk/java/net/Socket/UdpSocket.java
index 5d13c1f916a..add9077d435 100644
--- a/test/jdk/java/net/Socket/UdpSocket.java
+++ b/test/jdk/java/net/Socket/UdpSocket.java
@@ -23,23 +23,18 @@
 
 /**
  * @test
- * @run testng/othervm -Djava.security.manager=allow -Dsun.net.maxDatagramSockets=32 UdpSocket
+ * @run testng/othervm UdpSocket
  * @summary Basic test for a Socket to a UDP socket
  */
 
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
-import java.security.Permission;
 import java.util.Arrays;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.net.BindException;
 
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
@@ -83,79 +78,4 @@ public void testSendReceive() throws IOException {
             }
         }
     }
-
-    /**
-     * Test that the number of UDP sockets is limited when running with a
-     * security manager.
-     */
-    public void testMaxSockets() throws Exception {
-        int limit = Integer.getInteger("sun.net.maxDatagramSockets");
-
-        // security manager grants all permissions
-        var securityManager = new SecurityManager() {
-            @Override public void checkPermission(Permission perm) { }
-        };
-
-        System.setSecurityManager(securityManager);
-        Deque<Socket> sockets = new ArrayDeque<>();
-        try {
-            // create the maximum number of sockets
-            for (int i=0; i<limit; i++) {
-                sockets.offer(newUdpSocket());
-            }
-
-            // try to create another socket - should fail
-            try {
-                Socket s = newUdpSocket();
-                s.close();
-                assertTrue(false);
-            } catch (IOException expected) { }
-
-            // close one socket
-            sockets.pop().close();
-
-            // try to create another socket - should succeed
-            Socket s = newUdpSocket();
-
-            // unreference the socket and wait for it to be closed by the cleaner
-            var ref = new WeakReference<>(s);
-            s = null;
-            while (ref.get() != null) {
-                System.gc();
-                Thread.sleep(100);
-            }
-
-            // try to create another socket - should succeed
-            s = newUdpSocket();
-            s.close();
-        } finally {
-            closeAll(sockets);
-            System.setSecurityManager(null);
-        }
-    }
-
-
-    private Socket newUdpSocket() throws IOException, InterruptedException {
-        BindException unexpected = null;
-        for (int i=0; i < MAX_RETRIES; i++) {
-            try {
-                return new Socket(InetAddress.getLoopbackAddress(), 8000, false);
-            } catch (BindException be) {
-                unexpected = be;
-                if (i != MAX_RETRIES - 1) {
-                    System.out.printf("BindException caught: retry Socket creation [%s/%s]%n",
-                            i + 1, MAX_RETRIES);
-                    Thread.sleep(10 + 10 * i);
-                }
-            }
-        }
-        throw unexpected;
-    }
-
-    private void closeAll(Deque<Socket> sockets) throws IOException {
-        Socket s;
-        while ((s = sockets.poll()) != null) {
-            s.close();
-        }
-    }
 }
diff --git a/test/jdk/java/net/SocketOption/OptionsTest.java b/test/jdk/java/net/SocketOption/OptionsTest.java
index 71336acf1c6..e4f64ccfe3b 100644
--- a/test/jdk/java/net/SocketOption/OptionsTest.java
+++ b/test/jdk/java/net/SocketOption/OptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @run main/othervm -Xcheck:jni OptionsTest
  * @run main/othervm -Xcheck:jni -Djava.net.preferIPv4Stack=true OptionsTest
  * @run main/othervm --limit-modules=java.base OptionsTest
- * @run main/othervm/policy=options.policy OptionsTest
  */
 
 import java.lang.reflect.Method;
diff --git a/test/jdk/java/net/SocketOption/options.policy b/test/jdk/java/net/SocketOption/options.policy
deleted file mode 100644
index 629b8d81531..00000000000
--- a/test/jdk/java/net/SocketOption/options.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-grant {
-    permission java.net.SocketPermission "*:*", "connect, accept, listen, resolve";
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/java/net/SocketPermission/SocketPermissionTest.java b/test/jdk/java/net/SocketPermission/SocketPermissionTest.java
deleted file mode 100644
index 856454092da..00000000000
--- a/test/jdk/java/net/SocketPermission/SocketPermissionTest.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8047031
- * @key intermittent
- * @summary SocketPermission tests for legacy socket types.
- *          This test needs to bind its servers to the wildcard
- *          address and as such may fail intermittently.
- * @library /test/lib
- * @build jdk.test.lib.NetworkConfiguration
- *        jdk.test.lib.Platform
- * @run testng/othervm -Djava.security.manager=allow SocketPermissionTest
- */
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketPermission;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import java.util.Optional;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
-
-import static jdk.test.lib.NetworkConfiguration.probe;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-public class SocketPermissionTest {
-
-    @BeforeMethod
-    public void setupSecurityManager() throws Exception {
-        // All permissions, a specific ACC will be used to when testing
-        // with a reduced permission set.
-        Policy.setPolicy(new Policy() {
-             final PermissionCollection perms = new Permissions();
-             { perms.add(new java.security.AllPermission()); }
-             public PermissionCollection getPermissions(ProtectionDomain domain) {
-                 return perms;
-             }
-             public PermissionCollection getPermissions(CodeSource codesource) {
-                 return perms;
-             }
-             public boolean implies(ProtectionDomain domain, Permission perm) {
-                 return perms.implies(perm);
-             }
-        } );
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    static final AccessControlContext RESTRICTED_ACC = getAccessControlContext();
-
-    @Test
-    public void connectSocketTest() throws Exception {
-        try (ServerSocket ss = new ServerSocket(0)) {
-            int port = ss.getLocalPort();
-
-            String addr = "localhost:" + port;
-            AccessControlContext acc = getAccessControlContext(
-                    new SocketPermission(addr, "listen,connect,resolve"));
-
-            // Positive
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                try (Socket client = new Socket(InetAddress.getLocalHost(), port)) {
-                }
-                return null;
-            }, acc);
-
-            //Negative
-            try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    Socket client = new Socket(InetAddress.getLocalHost(), port);
-                    fail("Expected SecurityException");
-                    return null;
-                }, RESTRICTED_ACC);
-            } catch (SecurityException expected) { }
-        }
-    }
-
-    @Test
-    public void connectDatagramSocketTest() throws Exception {
-        byte[] msg = "Hello".getBytes(UTF_8);
-        InetAddress lh = InetAddress.getLocalHost();
-
-        try (DatagramSocket ds = new DatagramSocket(0)) {
-            int port = ds.getLocalPort();
-
-            String addr = lh.getHostAddress() + ":" + port;
-            AccessControlContext acc = getAccessControlContext(
-                    new SocketPermission(addr, "connect,resolve"));
-
-            // Positive
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                DatagramPacket dp = new DatagramPacket(msg, msg.length, lh, port);
-                ds.send(dp);
-                return null;
-            }, acc);
-
-            // Negative
-            try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    DatagramPacket dp = new DatagramPacket(msg, msg.length, lh, port);
-                    ds.send(dp);
-                    fail("Expected SecurityException");
-                    return null;
-                }, RESTRICTED_ACC);
-            } catch (SecurityException expected) { }
-        }
-    }
-
-    @Test
-    public void acceptServerSocketTest() throws Exception {
-        try (ServerSocket ss = new ServerSocket(0)) {
-            int port = ss.getLocalPort();
-
-            String addr = "localhost:" + port;
-            AccessControlContext acc = getAccessControlContext(
-                    new SocketPermission(addr, "listen,connect,resolve"),
-                    new SocketPermission("localhost:1024-", "accept"));
-
-            // Positive
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                InetAddress me = InetAddress.getLocalHost();
-                try (Socket client = new Socket(me, port)) {
-                    ss.accept();
-                }
-                return null;
-            }, acc);
-
-            // Negative
-            try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    InetAddress me = InetAddress.getLocalHost();
-                    try (Socket client = new Socket(me, port)) {
-                        ss.accept();
-                    }
-                    fail("Expected SecurityException");
-                    return null;
-                }, RESTRICTED_ACC);
-            } catch (SecurityException expected) { }
-        }
-    }
-
-    @Test
-    public void sendDatagramPacketTest() throws Exception {
-        byte[] msg = "Hello".getBytes(UTF_8);
-        InetAddress group = InetAddress.getByName("229.227.226.221");
-
-        try (DatagramSocket ds = new DatagramSocket(0)) {
-            int port = ds.getLocalPort();
-
-            String addr = "localhost:" + port;
-            //test for SocketPermission "229.227.226.221", "connect,accept"
-            AccessControlContext acc = getAccessControlContext(
-                    new SocketPermission(addr, "listen,resolve"),
-                    new SocketPermission("229.227.226.221", "connect,accept"));
-
-            // Positive
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                DatagramPacket hi = new DatagramPacket(msg, msg.length, group, port);
-                ds.send(hi);
-                return null;
-            }, acc);
-
-            // Negative
-            try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    DatagramPacket hi = new DatagramPacket(msg, msg.length, group, port);
-                    ds.send(hi);
-                    fail("Expected SecurityException");
-                    return null;
-                }, RESTRICTED_ACC);
-            } catch (SecurityException expected) { }
-        }
-    }
-
-    @Test
-    public void joinGroupMulticastTest() throws Exception {
-        InetAddress group = InetAddress.getByName("229.227.226.221");
-        try (MulticastSocket s = new MulticastSocket(0)) {
-            int port = s.getLocalPort();
-
-            String addr = "localhost:" + port;
-            AccessControlContext acc = getAccessControlContext(
-                    new SocketPermission(addr, "listen,resolve"),
-                    new SocketPermission("229.227.226.221", "connect,accept"));
-
-            // Positive ( requires a functional network interface )
-            Optional<NetworkInterface> onif = probe().ip4MulticastInterfaces().findFirst();
-            if (!onif.isPresent()) {
-                s.setNetworkInterface(onif.get());
-
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    s.joinGroup(group);
-                    s.leaveGroup(group);
-                    return null;
-                }, acc);
-            }
-
-            // Negative
-            try {
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    s.joinGroup(group);
-                    s.leaveGroup(group);
-                    fail("Expected SecurityException");
-                    return null;
-                }, RESTRICTED_ACC);
-            } catch (SecurityException expected) { }
-        }
-
-    }
-
-    @Test
-    public void listenDatagramSocketTest() throws Exception {
-        // the hardcoded port number doesn't really matter since we expect the
-        // security permission to be checked before the underlying operation.
-        int port = 8899;
-        String addr = "localhost:" + port;
-        AccessControlContext acc = getAccessControlContext(
-                new SocketPermission(addr, "listen"));
-
-        // Positive
-        AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-            try (DatagramSocket ds = new DatagramSocket(port)) { }
-            catch (IOException intermittentlyExpected) { /* ignore */ }
-            return null;
-        }, acc);
-
-        // Negative
-        try {
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                try (DatagramSocket ds = new DatagramSocket(port)) { }
-                catch (IOException intermittentlyExpected) { /* ignore */ }
-                fail("Expected SecurityException");
-                return null;
-            }, RESTRICTED_ACC);
-        } catch (SecurityException expected) { }
-    }
-
-    @Test
-    public void listenMulticastSocketTest() throws Exception {
-        // the hardcoded port number doesn't really matter since we expect the
-        // security permission to be checked before the underlying operation.
-        int port = 8899;
-        String addr = "localhost:" + port;
-        AccessControlContext acc = getAccessControlContext(
-                new SocketPermission(addr, "listen"));
-
-        // Positive
-        AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-            try (MulticastSocket ms = new MulticastSocket(port)) { }
-            catch (IOException intermittentlyExpected) { /* ignore */ }
-            return null;
-        }, acc);
-
-        // Negative
-        try {
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                try (MulticastSocket ms = new MulticastSocket(port)) { }
-                catch (IOException intermittentlyExpected) { /* ignore */ }
-                fail("Expected SecurityException");
-                return null;
-            }, RESTRICTED_ACC);
-        } catch (SecurityException expected) { }
-    }
-
-    @Test
-    public void listenServerSocketTest() throws Exception {
-        // the hardcoded port number doesn't really matter since we expect the
-        // security permission to be checked before the underlying operation.
-        int port = 8899;
-        String addr = "localhost:" + port;
-        AccessControlContext acc = getAccessControlContext(
-                new SocketPermission(addr, "listen"));
-
-        // Positive
-        AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-            try (ServerSocket ss = new ServerSocket(port)) { }
-            catch (IOException intermittentlyExpected) { /* ignore */ }
-            return null;
-        }, acc);
-
-        // Negative
-        try {
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                try (ServerSocket ss = new ServerSocket(port)) { }
-                catch (IOException intermittentlyExpected) { /* ignore */ }
-                fail("Expected SecurityException");
-                return null;
-            }, RESTRICTED_ACC);
-        } catch (SecurityException expected) { }
-
-    }
-
-    private static AccessControlContext getAccessControlContext(Permission... ps) {
-        Permissions perms = new Permissions();
-        for (Permission p : ps) {
-            perms.add(p);
-        }
-        /*
-         *Create an AccessControlContext that consist a single protection domain
-         * with only the permissions calculated above
-         */
-        ProtectionDomain pd = new ProtectionDomain(null, perms);
-        return new AccessControlContext(new ProtectionDomain[]{pd});
-    }
-
-    // Standalone entry point for running with, possibly older, JDKs.
-    public static void main(String[] args) throws Throwable {
-        SocketPermissionTest test = new SocketPermissionTest();
-        test.setupSecurityManager();
-        for (java.lang.reflect.Method m : SocketPermissionTest.class.getDeclaredMethods()) {
-            if (m.getAnnotation(Test.class) != null) {
-                System.out.println("Invoking " + m.getName());
-                m.invoke(test);
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/net/URL/OpenConnection.java b/test/jdk/java/net/URL/OpenConnection.java
index 31ac42f67ef..7c235756da5 100644
--- a/test/jdk/java/net/URL/OpenConnection.java
+++ b/test/jdk/java/net/URL/OpenConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 5086348
  * @summary URL.openConnection(Proxy.NO_PROXY) throws NULLPointerException
- * @run main/othervm -Djava.security.manager=allow OpenConnection
+ * @run main/othervm OpenConnection
  */
 
 import java.io.*;
@@ -32,7 +32,6 @@
 
 public class OpenConnection {
     public static void main(String[] args) throws IOException {
-        System.setSecurityManager( new SecurityManager() );
         URL u = new URL("http://foo.bar.baz/");
         try {
             // Will throw NullPointerException if not fixed
diff --git a/test/jdk/java/net/URL/TestIPv6Addresses.java b/test/jdk/java/net/URL/TestIPv6Addresses.java
index 69ae5f99fbf..42c948699e5 100644
--- a/test/jdk/java/net/URL/TestIPv6Addresses.java
+++ b/test/jdk/java/net/URL/TestIPv6Addresses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,11 @@
  */
 
 /* @test
- * @bug 4451522 4460484
- * @run main/othervm -Djava.security.manager=allow TestIPv6Addresses
+ * @bug 4451522
+ * @run main/othervm TestIPv6Addresses
  * @summary URI and URL getHost() methods don't comform to RFC 2732
  */
 
-// Run in othervm -Djava.security.manager=allow because the tests sets a SecurityManager
-
 import java.net.*;
 
 public class TestIPv6Addresses {
@@ -75,25 +73,13 @@ public static void main(String[] args) {
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage());
         }
-        // bug 4460484
 
-        SecurityManager sm = new SecurityManager();
         String strAddr = "::FFFF:127.0.0.1.2";
-
         try {
             InetAddress addr = InetAddress.getByName(strAddr);
         } catch (UnknownHostException e) {
             // expected
         }
-        System.setSecurityManager(sm);
-
-        try {
-            InetAddress addr = InetAddress.getByName(strAddr);
-        } catch (java.security.AccessControlException e) {
-            // expected
-        } catch (UnknownHostException e) {
-            // expected
-        }
 
     }
 }
diff --git a/test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java b/test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java
index a7cfae09c3e..3108880f6ed 100644
--- a/test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java
+++ b/test/jdk/java/net/URLClassLoader/getresourceasstream/TestDriver.java
@@ -47,7 +47,6 @@
 public class TestDriver {
     private static final String ARCHIVE_NAME = "test.jar";
     private static final String TEST_NAME = "Test";
-    private static final String POLICY_FILE = "policy";
     public static void main(String[] args)
             throws Throwable {
 
@@ -61,26 +60,14 @@ public static void main(String[] args)
                 ),
                 ProcessTools.createTestJavaProcessBuilder(
                         "-cp", ".",
-                        "-Djava.security.policy=file:./policy",
-                        "-Djava.security.manager",
-                        TEST_NAME, "./" + ARCHIVE_NAME
-                ),
-                ProcessTools.createTestJavaProcessBuilder(
-                        "-cp", ".",
-                        "-Djava.security.policy=file:./policy",
-                        "-Djava.security.manager",
                         TEST_NAME, "./" + ARCHIVE_NAME
                 ),
                 ProcessTools.createTestJavaProcessBuilder(
                         "-cp", "..",
-                        "-Djava.security.policy=file:../policy",
-                        "-Djava.security.manager",
                         TEST_NAME, "../" + ARCHIVE_NAME
                 ).directory(userDir.resolve("tmp").toFile()),
                 ProcessTools.createTestJavaProcessBuilder(
                         "-cp", basename,
-                        "-Djava.security.policy=file:" + basename + "/policy",
-                        "-Djava.security.manager",
                         TEST_NAME, basename + "/" + ARCHIVE_NAME
                 ).directory(userDir.resolve("..").toFile())};
         for (ProcessBuilder test : tests) {
@@ -91,11 +78,9 @@ public static void main(String[] args)
     private static void setup(Path userDir) throws IOException {
         Path src = Paths.get(System.getProperty("test.src"));
         Path testJar = src.resolve(ARCHIVE_NAME);
-        Path policy = src.resolve(POLICY_FILE);
         Path testClass = Paths.get(System.getProperty("test.classes"),
                                    TEST_NAME + ".class");
         Files.copy(testJar, userDir.resolve(ARCHIVE_NAME), REPLACE_EXISTING);
-        Files.copy(policy, userDir.resolve(POLICY_FILE), REPLACE_EXISTING);
         Files.copy(testClass, userDir.resolve(TEST_NAME + ".class"),
                    REPLACE_EXISTING);
         Files.createDirectories(userDir.resolve("tmp"));
diff --git a/test/jdk/java/net/URLClassLoader/getresourceasstream/policy b/test/jdk/java/net/URLClassLoader/getresourceasstream/policy
deleted file mode 100644
index 3a2f6b420a6..00000000000
--- a/test/jdk/java/net/URLClassLoader/getresourceasstream/policy
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-grant {
-    permission java.lang.RuntimePermission "createClassLoader";
-};
diff --git a/test/jdk/java/net/URLPermission/OpenURL.java b/test/jdk/java/net/URLPermission/OpenURL.java
index 85b5eef1be0..c21de4e728a 100644
--- a/test/jdk/java/net/URLPermission/OpenURL.java
+++ b/test/jdk/java/net/URLPermission/OpenURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,14 @@
  * @test
  * @bug 8029354
  * @library /test/lib
- * @run main/othervm -Djava.security.manager=allow OpenURL
+ * @run main/othervm OpenURL
  */
 
 import java.net.*;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import jdk.test.lib.net.URIBuilder;
 import static java.net.Proxy.NO_PROXY;
 
@@ -37,21 +40,61 @@ public class OpenURL {
 
     public static void main (String[] args) throws Exception {
 
-        System.setSecurityManager(new SecurityManager());
-
-        try {
-            URL url = URIBuilder.newBuilder()
-                .scheme("http")
-                .userInfo("joe")
-                .loopback()
-                .path("/a/b")
-                .toURL();
-            System.out.println("URL: " + url);
-            HttpURLConnection urlc = (HttpURLConnection)url.openConnection(NO_PROXY);
-            InputStream is = urlc.getInputStream();
-            // error will throw exception other than SecurityException
-        } catch (SecurityException e) {
-            System.out.println("OK");
+        // minimal HTTP/1.1 reply
+        final String reply = "HTTP/1.1 200 OK\r\n"+
+                "Connection: close\r\n" +
+                "Content-Length: 0\r\n\r\n";
+
+        try (ServerSocket serverSocket = new ServerSocket()) {
+            serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            final AtomicBoolean done = new AtomicBoolean();
+            final Thread serverThread = new Thread(() -> {
+                while (!done.get()) {
+                    try (Socket ss = serverSocket.accept()) {
+                        ss.getOutputStream().write(reply.getBytes(StandardCharsets.US_ASCII));
+                        ss.getOutputStream().close();
+                        // Give a chance to the peer to close the socket first...
+                        Thread.sleep(100);
+                        // Reads the request headers - avoids Connection reset
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(ss.getInputStream()));
+                        String line;
+                        do {
+                            System.out.println("Server: " + (line = reader.readLine()));
+                        } while (!line.isBlank());
+                    } catch (Exception x) {
+                        if (!done.get()) {
+                            // Something else than the expected client
+                            // might have connected...
+                            x.printStackTrace();
+                        }
+                    }
+                }
+            });
+            serverThread.start();
+            try {
+                URL url = URIBuilder.newBuilder()
+                        .scheme("http")
+                        .userInfo("joe")
+                        .loopback()
+                        .port(serverSocket.getLocalPort())
+                        .path("/a/b")
+                        .toURL();
+                System.out.println("URL: " + url);
+
+                // will throw if not fixed
+                URLPermission perm = new URLPermission(url.toString(), "listen,read,resolve");
+                System.out.println("Permission: " + perm);
+                // may throw if not fixed
+                HttpURLConnection urlc = (HttpURLConnection) url.openConnection(NO_PROXY);
+                InputStream is = urlc.getInputStream();
+            } finally {
+                // make sure the server thread eventually exit
+                done.set(true);
+                serverSocket.close();
+            }
+            serverThread.join();
+            System.out.println("OpenURL: OK");
         }
+
     }
 }
diff --git a/test/jdk/java/net/URLPermission/URLTest.java b/test/jdk/java/net/URLPermission/URLTest.java
index 7013ba83dee..907ba6072ec 100644
--- a/test/jdk/java/net/URLPermission/URLTest.java
+++ b/test/jdk/java/net/URLPermission/URLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,21 @@
  * questions.
  */
 
-import java.net.URLPermission;
 /*
  * @test
  * @bug 8010464
  * @modules jdk.httpserver
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run main/othervm -Djava.security.manager=allow URLTest
- * @run main/othervm -Djava.security.manager=allow -Djava.net.preferIPv6Addresses=true URLTest
+ * @run main/othervm URLTest
+ * @run main/othervm -Djava.net.preferIPv6Addresses=true URLTest
  * @summary check URLPermission with Http(s)URLConnection
  */
 
 import java.net.*;
 import java.io.*;
 import java.security.*;
+import java.util.List;
 import java.util.concurrent.*;
 import com.sun.net.httpserver.*;
 import javax.net.ssl.*;
@@ -49,16 +49,6 @@ public static void main (String[] args) throws Exception {
         createServers();
 
         try {
-            // Verify without a Security Manager
-            test1();
-            test2();
-            test3();
-
-            // Set the security manager. Each test will set its own policy.
-            Policy.setPolicy(new CustomPolicy());
-            System.setSecurityManager(new SecurityManager());
-            System.out.println("\n Security Manager has been set.");
-
             test1();
             test2();
             test3();
@@ -73,14 +63,9 @@ public static void main (String[] args) throws Exception {
     static void test1() throws IOException {
         System.out.println("\n--- Test 1 ---");
 
-        boolean expectException = false;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            expectException = true;
-            Policy.setPolicy(new CustomPolicy(
+        List<URLPermission> perms = List.of(
                 new URLPermission("http://" + httpAuth + "/foo.html", "GET:X-Foo,Z-Bar"),
-                new URLPermission("https://" + httpsAuth + "/foo.html", "POST:X-Fob,T-Bar")));
-        }
+                new URLPermission("https://" + httpsAuth + "/foo.html", "POST:X-Fob,T-Bar"));
 
         String url1 = "http://" + httpAuth + "/foo.html";
         String url2 = "https://" + httpsAuth + "/foo.html";
@@ -88,30 +73,27 @@ static void test1() throws IOException {
         String url4 = "https://" + httpsAuth + "/bar.html";
 
         // simple positive test. Should succeed
-        test(url1, "GET", "X-Foo");
-        test(url1, "GET", "Z-Bar", "X-Foo");
-        test(url1, "GET", "X-Foo", "Z-Bar");
-        test(url1, "GET", "Z-Bar");
-        test(url2, "POST", "X-Fob");
+        test(url1, "GET", "X-Foo", perms);
+        test(url1, "GET", "Z-Bar", "X-Foo", perms);
+        test(url1, "GET", "X-Foo", "Z-Bar", perms);
+        test(url1, "GET", "Z-Bar", perms);
+        test(url2, "POST", "X-Fob", perms);
 
         // reverse the methods, should fail
-        test(url1, "POST", "X-Foo", expectException);
-        test(url2, "GET", "X-Fob", expectException);
+        test(url1, "POST", "X-Foo", perms, true);
+        test(url2, "GET", "X-Fob", perms, true);
 
         // different URLs, should fail
-        test(url3, "GET", "X-Foo", expectException);
-        test(url4, "POST", "X-Fob", expectException);
+        test(url3, "GET", "X-Foo", perms, true);
+        test(url4, "POST", "X-Fob", perms, true);
     }
 
     static void test2() throws IOException {
         System.out.println("\n--- Test 2 ---");
 
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Policy.setPolicy(new CustomPolicy(
+        List<URLPermission> perms = List.of(
                 new URLPermission("http://" + httpAuth + "/*", "GET:X-Foo"),
-                new URLPermission("https://" + httpsAuth + "/*", "POST:X-Fob")));
-        }
+                new URLPermission("https://" + httpsAuth + "/*", "POST:X-Fob"));
 
         String url1 = "http://" + httpAuth + "/foo.html";
         String url2 = "https://" + httpsAuth + "/foo.html";
@@ -119,33 +101,29 @@ static void test2() throws IOException {
         String url4 = "https://" + httpsAuth + "/bar.html";
 
         // simple positive test. Should succeed
-        test(url1, "GET", "X-Foo");
-        test(url2, "POST", "X-Fob");
-        test(url3, "GET", "X-Foo");
-        test(url4, "POST", "X-Fob");
+        test(url1, "GET", "X-Foo", perms);
+        test(url2, "POST", "X-Fob", perms);
+        test(url3, "GET", "X-Foo", perms);
+        test(url4, "POST", "X-Fob", perms);
     }
 
     static void test3() throws IOException {
         System.out.println("\n--- Test 3 ---");
 
-        boolean expectException = false;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            expectException = true;
-            Policy.setPolicy(new CustomPolicy(
+        List<URLPermission> perms = List.of(
                 new URLPermission("http://" + httpAuth + "/a/b/-", "DELETE,GET:X-Foo,Y-Foo"),
-                new URLPermission("https://" + httpsAuth + "/a/c/-", "POST:*")));
-        }
+                new URLPermission("https://" + httpsAuth + "/a/c/-", "POST:*"));
+
 
         String url1 = "http://" + httpAuth + "/foo.html";
         String url2 = "https://" + httpsAuth + "/a/c/d/e/foo.html";
         String url3 = "http://" + httpAuth + "/a/b/c";
         String url4 = "https://" + httpsAuth + "/a/b/c";
 
-        test(url1, "GET", "X-Foo", expectException);
-        test(url2, "POST", "X-Zxc");
-        test(url3, "DELETE", "Y-Foo");
-        test(url4, "POST", "Y-Foo", expectException);
+        test(url1, "GET", "X-Foo", perms, true);
+        test(url2, "POST", "X-Zxc", perms);
+        test(url3, "DELETE", "Y-Foo", perms);
+        test(url4, "POST", "Y-Foo", perms,true);
     }
 
     static String authority(InetSocketAddress address) {
@@ -159,29 +137,32 @@ static String authority(InetSocketAddress address) {
     }
 
     // Convenience methods to simplify previous explicit test scenarios.
-    static void test(String u, String method, String header) throws IOException {
-        test(u, method, header, null, false);
+    static void test(String u, String method, String header, List<URLPermission> perms) throws IOException {
+        test(u, method, header, perms, false);
     }
 
-    static void test(String u, String method, String header, boolean expectException)
+    static void test(String u, String method, String header, List<URLPermission> perms, boolean expectException)
         throws IOException
     {
-        test(u, method, header, null, expectException);
+        test(u, method, header, null, perms, expectException);
     }
 
-    static void test(String u, String method, String header1, String header2)
+    static void test(String u, String method, String header1, String header2, List<URLPermission> perms)
         throws IOException
     {
-        test(u, method, header1, header2, false);
+        test(u, method, header1, header2, perms, false);
     }
 
     static void test(String u,
                      String method,
                      String header1,
                      String header2,
+                     List<URLPermission> perms,
                      boolean expectException)
         throws IOException
     {
+
+        // check that no SecurityException is thrown
         URL url = new URL(u);
         System.out.println("url=" + u + " method=" + method +
                            " header1=" + header1 + " header2=" + header2 +
@@ -193,24 +174,38 @@ static void test(String u,
             ssl.setSSLSocketFactory(ctx.getSocketFactory());
         }
         urlc.setRequestMethod(method);
-        if (header1 != null)
+        String action = method + ":";
+        if (header1 != null) {
             urlc.addRequestProperty(header1, "foo");
-        if (header2 != null)
+            action = action + header1;
+        }
+        if (header2 != null) {
             urlc.addRequestProperty(header2, "bar");
+            if (header1 != null) action = action + ",";
+            action = action + header2;
+        }
+
+        int code = urlc.getResponseCode();
+        if (code != 200)
+            throw new RuntimeException("Unexpected response " + code);
+
+        InputStream is = urlc.getInputStream();
+        is.readAllBytes();
+        is.close();
+
+        // all good - now check permissions still work
+        URLPermission perm = new URLPermission(url.toString(), action);
+        PermissionCollection allperms = new Permissions();
+        perms.forEach(allperms::add);
 
         try {
-            int code = urlc.getResponseCode();
+            if (!allperms.implies(perm)) {
+                throw new RuntimeException(new SecurityException(perms.toString()));
+            }
             if (expectException) {
+                System.out.println("Expected exception not thrown for " + perm);
                 failed = true;
-                System.out.println("FAIL");
-                return;
             }
-            if (code != 200)
-                throw new RuntimeException("Unexpected response " + code);
-
-            InputStream is = urlc.getInputStream();
-            is.readAllBytes();
-            is.close();
         } catch (RuntimeException e) {
             if (!expectException || !(e.getCause() instanceof SecurityException)) {
                 System.out.println ("FAIL. Unexpected: " + e.getMessage());
@@ -275,35 +270,4 @@ public void handle(HttpExchange x) throws IOException {
         }
     }
 
-    static class CustomPolicy extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-        final PermissionCollection perms = new Permissions();
-
-        CustomPolicy(Permission... permissions) {
-            java.util.Arrays.stream(permissions).forEach(perms::add);
-
-            // needed for the HTTP(S) server
-            InetAddress loopback = InetAddress.getLoopbackAddress();
-            InetSocketAddress serverBound = new InetSocketAddress(loopback,1024);
-            perms.add(new SocketPermission(authority(serverBound) + "-", "listen,resolve,accept"));
-            // needed by the test to reset the policy, per testX method
-            perms.add(new SecurityPermission("setPolicy"));
-            // needed to shutdown the ThreadPoolExecutor ( used by the servers )
-            perms.add(new RuntimePermission("modifyThread"));
-            // needed by the client code forHttpsURLConnection.setSSLSocketFactory
-            perms.add(new RuntimePermission("setFactory"));
-        }
-
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return perms;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return perms;
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return perms.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
-        }
-    }
 }
diff --git a/test/jdk/java/net/URLPermission/nstest/LookupTest.java b/test/jdk/java/net/URLPermission/nstest/LookupTest.java
index 6885486c499..2d6f39a4191 100644
--- a/test/jdk/java/net/URLPermission/nstest/LookupTest.java
+++ b/test/jdk/java/net/URLPermission/nstest/LookupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
 
 /**
  * @test
- * @summary A simple smoke test of the HttpURLPermission mechanism, which checks
- *          for either IOException (due to unknown host) or SecurityException
- *          due to lack of permission to connect
- * @run main/othervm -Djava.security.manager=allow -Djdk.net.hosts.file=LookupTestHosts LookupTest
+ * @summary A simple smoke test which checks URLPermission implies,
+ *          and verify that HttpURLConnection either succeeds or throws
+ *          IOException (due to unknown host).
+ * @run main/othervm -Djdk.net.hosts.file=LookupTestHosts LookupTest
  */
 
 import java.io.BufferedWriter;
@@ -46,18 +46,14 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLPermission;
-import java.security.CodeSource;
 import java.security.Permission;
 import java.security.PermissionCollection;
 import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
 public class LookupTest {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-    static int port;
+    static LookupTestPermisions permissions;
     static volatile ServerSocket serverSocket;
 
     static void test(String url,
@@ -69,8 +65,11 @@ static void test(String url,
         try {
             u = new URL(url);
             System.err.println("Connecting to " + u);
+            URLPermission permission = new URLPermission(url, "GET");
+            if (!permissions.implies(permission)) throw new SecurityException(permission.toString());
             URLConnection urlc = u.openConnection();
             is = urlc.getInputStream();
+            System.err.println("Connection sucessful");
         } catch (SecurityException e) {
             if (!throwsSecException) {
                 throw new RuntimeException("Unexpected SecurityException:", e);
@@ -80,6 +79,8 @@ static void test(String url,
             if (!throwsIOException) {
                 System.err.println("Unexpected IOException:" + e.getMessage());
                 throw new RuntimeException(e);
+            } else {
+                System.err.println("Got expected exception: " + e);
             }
             return;
         } finally {
@@ -93,9 +94,8 @@ static void test(String url,
             }
         }
 
-        if (throwsSecException || throwsIOException) {
-            System.err.printf("was expecting a %s\n", throwsSecException
-                    ? "security exception" : "IOException");
+        if (throwsIOException) {
+            System.err.printf("was expecting a %s\n", "IOException");
             throw new RuntimeException("was expecting an exception");
         }
     }
@@ -114,9 +114,9 @@ public static void main(String args[]) throws Exception {
         // name "notAllowedAndNotFound.com" is not in map
         // name "allowedButNotfound.com" is not in map
         Server server = new Server();
+        int port = server.getPort();
+        permissions = new LookupTestPermisions(port);
         try {
-            Policy.setPolicy(new LookupTestPolicy());
-            System.setSecurityManager(new SecurityManager());
             server.start();
             test("http://allowedAndFound.com:"       + port + "/foo", false, false);
             test("http://notAllowedButFound.com:"    + port + "/foo", true, false);
@@ -129,6 +129,7 @@ public static void main(String args[]) throws Exception {
 
     static class Server extends Thread {
         private volatile boolean done;
+        private final int port;
 
         public Server() throws IOException {
             InetAddress loopback = InetAddress.getLoopbackAddress();
@@ -137,6 +138,10 @@ public Server() throws IOException {
             port = serverSocket.getLocalPort();
         }
 
+        int getPort() {
+            return port;
+        }
+
         public void run() {
             try {
                 while (!done) {
@@ -192,28 +197,20 @@ private static void addMappingToHostsFile(String host,
         }
     }
 
-    static class LookupTestPolicy extends Policy {
+    static class LookupTestPermisions  {
         final PermissionCollection perms = new Permissions();
 
-        LookupTestPolicy() throws Exception {
+        LookupTestPermisions(int port) {
             perms.add(new NetPermission("setProxySelector"));
             perms.add(new SocketPermission("localhost:1024-", "resolve,accept"));
             perms.add(new URLPermission("http://allowedAndFound.com:" + port + "/-", "*:*"));
             perms.add(new URLPermission("http://allowedButNotfound.com:" + port + "/-", "*:*"));
             perms.add(new FilePermission("<<ALL FILES>>", "read,write,delete"));
-            //perms.add(new PropertyPermission("java.io.tmpdir", "read"));
         }
 
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return perms;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return perms;
-        }
 
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return perms.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
+        public boolean implies(Permission perm) {
+            return perms.implies(perm);
         }
     }
 }
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
index d191c8f4d4a..1ec26777696 100644
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,6 @@
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
  * @run testng/othervm AsFileDownloadTest
- * @run testng/othervm/java.security.policy=AsFileDownloadTest.policy AsFileDownloadTest
  */
 public class AsFileDownloadTest {
 
@@ -353,8 +352,8 @@ public void teardown() throws Exception {
         http2TestServer.stop();
         https2TestServer.stop();
 
-        if (System.getSecurityManager() == null && Files.exists(tempDir)) {
-            // clean up before next run with security manager
+        if (Files.exists(tempDir)) {
+            // clean up
             FileUtils.deleteFileTreeWithRetry(tempDir);
         }
     }
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.policy b/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
deleted file mode 100644
index dec2b8bb0a4..00000000000
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for classes in JTwork//classes/0/test/jdk/java/net/httpclient/lib/
-grant codeBase "file:${test.classes}/../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir", "read,write";
-    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir/-", "read,write";
-
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/afdt",   "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/afdt", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/afdt",   "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/afdt", "POST";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/afdt",   "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/afdt", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/afdt",   "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/afdt", "POST";
-
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
diff --git a/test/jdk/java/net/httpclient/ConnectExceptionTest.java b/test/jdk/java/net/httpclient/ConnectExceptionTest.java
index 3c5e97ee724..29ffeca7d5e 100644
--- a/test/jdk/java/net/httpclient/ConnectExceptionTest.java
+++ b/test/jdk/java/net/httpclient/ConnectExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @summary Expect ConnectException for all non-security related connect errors
  * @bug 8204864
  * @run testng/othervm -Djdk.net.hosts.file=HostFileDoesNotExist ConnectExceptionTest
- * @run testng/othervm/java.security.policy=noPermissions.policy ConnectExceptionTest
  */
 
 import java.io.IOException;
@@ -88,9 +87,6 @@ void testSynchronousGET(String uriString, ProxySelector proxy) throws Exception
         } catch (ConnectException ioe) {
             out.println("Caught expected: " + ioe);
             //ioe.printStackTrace(out);
-        } catch (SecurityException expectedIfSMIsSet) {
-            out.println("Caught expected: " + expectedIfSMIsSet);
-            assertTrue(System.getSecurityManager() != null);
         }
     }
 
@@ -109,9 +105,6 @@ void testSynchronousPOST(String uriString, ProxySelector proxy) throws Exception
         } catch (ConnectException ioe) {
             out.println("Caught expected: " + ioe);
             //ioe.printStackTrace(out);
-        } catch (SecurityException expectedIfSMIsSet) {
-            out.println("Caught expected: " + expectedIfSMIsSet);
-            assertTrue(System.getSecurityManager() != null);
         }
     }
 
@@ -129,9 +122,6 @@ void testAsynchronousGET(String uriString, ProxySelector proxy) throws Exception
             Throwable t = ee.getCause();
             if (t instanceof ConnectException) {
                 out.println("Caught expected: " + t);
-            } else if (t instanceof SecurityException) {
-                out.println("Caught expected: " + t);
-                assertTrue(System.getSecurityManager() != null);
             } else {
                 t.printStackTrace(out);
                 fail("Unexpected exception: " + t);
@@ -155,9 +145,6 @@ void testAsynchronousPOST(String uriString, ProxySelector proxy) throws Exceptio
             Throwable t = ee.getCause();
             if (t instanceof ConnectException) {
                 out.println("Caught expected: " + t);
-            } else if (t instanceof SecurityException) {
-                out.println("Caught expected: " + t);
-                assertTrue(System.getSecurityManager() != null);
             } else {
                 t.printStackTrace(out);
                 fail("Unexpected exception: " + t);
diff --git a/test/jdk/java/net/httpclient/DependentActionsTest.java b/test/jdk/java/net/httpclient/DependentActionsTest.java
index 61d6c5157a6..c1e9025fe4b 100644
--- a/test/jdk/java/net/httpclient/DependentActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,6 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DependentActionsTest
  * @run testng/othervm -Djdk.internal.httpclient.debug=true DependentActionsTest
- * @run testng/othervm/java.security.policy=dependent.policy
-  *        -Djdk.internal.httpclient.debug=true DependentActionsTest
  */
 
 import java.io.BufferedReader;
diff --git a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
index 32c594808a9..e47f4be46f7 100644
--- a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
@@ -30,8 +30,6 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DependentPromiseActionsTest
  * @run testng/othervm -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
- * @run testng/othervm/java.security.policy=dependent.policy
-  *           -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
  */
 
 import java.io.BufferedReader;
@@ -502,16 +500,8 @@ static <T> void checkThreadAndStack(Thread thread,
                 failed.set(new RuntimeException("Dependant action has unexpected frame in " +
                         Thread.currentThread() + ": " + httpStack.get(0)));
 
-            }            return;
-        } else if (System.getSecurityManager() != null) {
-            Optional<StackFrame> sf = WALKER.walk(s -> findFrame(s, "PrivilegedRunnable"));
-            if (!sf.isPresent()) {
-                failed.set(new RuntimeException("Dependant action does not have expected frame in "
-                        + Thread.currentThread()));
-                return;
-            } else {
-                System.out.println("Found expected frame: " + sf.get());
             }
+            return;
         } else {
             List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
                     .getModule().equals(HttpClient.class.getModule()))
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest.java b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest.java
index e75a87c8524..29976edec9a 100644
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest.java
+++ b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,13 @@
  * @test
  * @bug 8235459
  * @summary Confirm that HttpRequest.BodyPublishers#ofFile(Path)
- *          works with changing permissions
- *          policy 1: no custom permission
- *          policy 2: custom permission for test classes
- *          policy 3: custom permission for test classes and httpclient
+ *          works as expected
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        SecureZipFSProvider
- * @run testng/othervm/java.security.policy=FilePublisherPermsTest1.policy FilePublisherPermsTest
- * @run testng/othervm/java.security.policy=FilePublisherPermsTest2.policy FilePublisherPermsTest
- * @run testng/othervm/java.security.policy=FilePublisherPermsTest3.policy FilePublisherPermsTest
+ * @run testng/othervm FilePublisherPermsTest
  */
 
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsServer;
 import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -52,8 +44,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -67,7 +57,6 @@
 import java.security.*;
 import java.util.Map;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -126,26 +115,8 @@ public void testDefaultFs(String uriString, Path path)
             throws Exception {
         out.printf("\n\n--- testDefaultFs(%s, %s): starting\n",
                 uriString, path);
-
-        if (System.getSecurityManager() != null) {
-            changePerms(path.toString(), "read,write,delete");
-            // Should not throw
-            BodyPublisher bodyPublisher = BodyPublishers.ofFile(path);
-            // Restrict permissions
-            changePerms(path.toString(), "delete");
-            try {
-                BodyPublishers.ofFile(path);
-                fail();
-            } catch (SecurityException e) {
-                out.println("Caught expected: " + e);
-            }
-            try {
-                send(uriString, bodyPublisher);
-                fail();
-            } catch (SecurityException e) {
-                out.println("Caught expected: " + e);
-            }
-        }
+        BodyPublisher bodyPublisher = BodyPublishers.ofFile(path);
+        send(uriString, bodyPublisher);
     }
 
     // Zip File system set up
@@ -187,44 +158,14 @@ public Object[][] zipFsData() {
     @Test(dataProvider = "zipFsData")
     public void testZipFs(String uriString, Path path) throws Exception {
         out.printf("\n\n--- testZipFsCustomPerm(%s, %s): starting\n", uriString, path);
-        if (System.getSecurityManager() != null) {
-            changePerms(path.toString(), "read,write,delete");
-
-            // Custom permission not sufficiently granted, expected to fail
-            if (!policyFile.contains("FilePublisherPermsTest3")) {
-                try {
-                    BodyPublishers.ofFile(path);
-                    fail();
-                } catch (SecurityException e) {
-                    out.println("Caught expected: " + e);
-                    return;
-                }
-            } else {
-                BodyPublisher bodyPublisher = BodyPublishers.ofFile(path);
-                send(uriString, bodyPublisher);
-                // Restrict permissions
-                changePerms(path.toString(), "delete");
-                try {
-                    BodyPublishers.ofFile(path);
-                    fail();
-                } catch (SecurityException e) {
-                    out.println("Caught expected: " + e);
-                }
-                try {
-                    send(uriString, bodyPublisher);
-                    fail();
-                } catch (SecurityException e) {
-                    out.println("Caught expected: " + e);
-                }
-            }
-        }
+        BodyPublisher bodyPublisher = BodyPublishers.ofFile(path);
+        send(uriString, bodyPublisher);
     }
 
     @Test
     public void testFileNotFound() throws Exception {
         out.printf("\n\n--- testFileNotFound(): starting\n");
         var zipPath = Path.of("fileNotFound.zip");
-        changePerms(zipPath.toString(), "read,write,delete");
         try (FileSystem fs = newZipFs(zipPath)) {
             Path fileInZip = zipFsFile(fs);
             Files.deleteIfExists(fileInZip);
@@ -234,7 +175,6 @@ public void testFileNotFound() throws Exception {
             out.println("Caught expected: " + e);
         }
         var path = Path.of("fileNotFound.txt");
-        changePerms(path.toString(), "read,write,delete");
         try {
             Files.deleteIfExists(path);
             BodyPublishers.ofFile(path);
@@ -256,36 +196,6 @@ private void send(String uriString, BodyPublisher bodyPublisher)
         client.send(req, HttpResponse.BodyHandlers.discarding());
     }
 
-    private void changePerms(String path, String actions) {
-        Policy.setPolicy(new CustomPolicy(
-                new FilePermission(path, actions)
-        ));
-    }
-
-    static class CustomPolicy extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-        final PermissionCollection perms = new Permissions();
-
-        CustomPolicy(Permission... permissions) {
-            java.util.Arrays.stream(permissions).forEach(perms::add);
-        }
-
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return perms;
-        }
-
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return perms;
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            // Ignore any existing permissions for test files
-            return perm.getName().equals(defaultFsPath.toString())
-                    || perm.getName().equals(zipFsPath.toString())
-                    ? perms.implies(perm)
-                    : perms.implies(perm) || DEFAULT_POLICY.implies(domain, perm);
-        }
-    }
 
     static class HttpEchoHandler implements HttpServerAdapters.HttpTestHandler {
         @Override
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest1.policy b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest1.policy
deleted file mode 100644
index bbc3e359639..00000000000
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest1.policy
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write,delete";
-
-    // needed to access FileSystemProvider
-    permission java.lang.RuntimePermission "fileSystemProvider";
-
-    // for permission changes
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest2.policy b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest2.policy
deleted file mode 100644
index 0ff462568ba..00000000000
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest2.policy
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// same as FilePublisherPermsTest1.policy with custom permission for test classes
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write,delete";
-
-    // custom permission for testing
-    permission java.lang.RuntimePermission "customPermission";
-
-    // needed to access FileSystemProvider
-    permission java.lang.RuntimePermission "fileSystemProvider";
-
-    // for permission changes
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest3.policy b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest3.policy
deleted file mode 100644
index e55aec16ecd..00000000000
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherPermsTest3.policy
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// same as FilePublisherPermsTest1.policy with additional custom permission
-// for test classes and HttpClient (in java.net.http)
-
-grant codeBase "jrt:/java.net.http" {
-    permission java.lang.RuntimePermission "customPermission";
-};
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write,delete";
-    permission java.lang.RuntimePermission "customPermission";
-
-    // needed to access FileSystemProvider
-    permission java.lang.RuntimePermission "fileSystemProvider";
-
-    // for permission changes
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.java b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.java
index 1e07bca3a8f..8bb679a2e74 100644
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.java
+++ b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,8 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm FilePublisherTest
- * @run testng/othervm/java.security.policy=FilePublisherTest.policy FilePublisherTest
  */
 
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsServer;
 import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -59,7 +55,6 @@
 import java.nio.file.Path;
 import java.util.Map;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
diff --git a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.policy b/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.policy
deleted file mode 100644
index 6ee4f3abdbf..00000000000
--- a/test/jdk/java/net/httpclient/FilePublisher/FilePublisherTest.policy
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for JTwork/classes/0/java/net/httpclient/http2/server/*
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write,delete";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
diff --git a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
index 051a31dcb1b..a48614c3a48 100644
--- a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,13 +67,6 @@
  *      -Djdk.tracePinnedThreads=full
  *      HttpClientLocalAddrTest
  *
- * @run testng/othervm/java.security.policy=httpclient-localaddr-security.policy
- *      -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
- *      -Djdk.internal.httpclient.debug=true
- *      -Dsun.net.httpserver.idleInterval=50000
- *      -Djdk.tracePinnedThreads=full
- *      HttpClientLocalAddrTest
- *
  */
 public class HttpClientLocalAddrTest implements HttpServerAdapters {
 
@@ -179,7 +172,7 @@ private static Exception safeStop(HttpServerAdapters.HttpTestServer server, Exce
 
     @DataProvider(name = "params")
     private Object[][] paramsProvider() throws Exception {
-        final List<Object[]> testMethodParams = new ArrayList();
+        final List<Object[]> testMethodParams = new ArrayList<>();
         final URI[] requestURIs = new URI[]{httpURI, httpsURI, http2URI, https2URI};
         final Predicate<URI> requiresSSLContext = (uri) -> uri.getScheme().equals("https");
         for (var requestURI : requestURIs) {
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
index c2927987d4c..f3bf5521f4b 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@
  *        jdk.test.lib.Platform
  *        jdk.test.lib.util.FileUtils
  * @run testng/othervm BodyHandlerOfFileDownloadTest
- * @run testng/othervm/java.security.policy=ofFileDownload.policy BodyHandlerOfFileDownloadTest
  */
 
 import com.sun.net.httpserver.HttpServer;
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
index 4bb529aaf74..ee8a9c7dcbb 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8237470
  * @summary Confirm HttpResponse.BodyHandlers#ofFile(Path)
  *          works with default and non-default file systems
- *          when SecurityManager is enabled
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http2.Http2TestServer
@@ -38,7 +37,6 @@
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
  * @run testng/othervm BodyHandlerOfFileTest
- * @run testng/othervm/java.security.policy=ofFile.policy BodyHandlerOfFileTest
  */
 
 import com.sun.net.httpserver.HttpServer;
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
index 2868ca24796..f2adc89ec17 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8237470 8299015
  * @summary Confirm HttpResponse.BodySubscribers#ofFile(Path)
  *          works with default and non-default file systems
- *          when SecurityManager is enabled
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http2.Http2TestServer
@@ -37,7 +36,6 @@
  *        jdk.httpclient.test.lib.http2.Queue jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
  * @run testng/othervm BodySubscriberOfFileTest
- * @run testng/othervm/java.security.policy=ofFile.policy BodySubscriberOfFileTest
  */
 
 import com.sun.net.httpserver.HttpServer;
@@ -67,8 +65,6 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.concurrent.Flow;
 import java.util.stream.IntStream;
@@ -194,11 +190,7 @@ private void receive(String uriString,
                 .POST(BodyPublishers.noBody())
                 .build();
 
-            // Retrieve handler with caller's privileges enabled
-            PrivilegedAction<BodySubscriber<Path>> action = () ->
-                    BodySubscribers.ofFile(path);
-            BodyHandler<Path> handler = respInfo ->
-                    AccessController.doPrivileged(action);
+            BodyHandler<Path> handler = respInfo -> BodySubscribers.ofFile(path);
             var resp = client.send(req, handler);
             String msg = Files.readString(path, StandardCharsets.UTF_8);
             out.printf("Resp code: %s\n", resp.statusCode());
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/ofFile.policy b/test/jdk/java/net/httpclient/PathSubscriber/ofFile.policy
deleted file mode 100644
index cc6fe61814d..00000000000
--- a/test/jdk/java/net/httpclient/PathSubscriber/ofFile.policy
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for test/lib library classes
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "java.vm.info", "read";
-    permission java.util.PropertyPermission "jdk.debug", "read";
-    permission java.util.PropertyPermission "sun.arch.data.model", "read";
-    permission java.util.PropertyPermission "sun.management.compiler", "read";
-    permission java.util.PropertyPermission "test.jdk", "read";
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-
-    // file permissions for test files
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "delete";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir", "delete";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions for test files
-    permission java.io.FilePermission "${user.dir}${/}defaultFile.txt", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir", "read,write,delete";
-
-    // file permission required by ZipFileSystem for temporary file creation
-    permission java.io.FilePermission "${user.dir}${/}*", "read,write,delete";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
\ No newline at end of file
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/ofFileDownload.policy b/test/jdk/java/net/httpclient/PathSubscriber/ofFileDownload.policy
deleted file mode 100644
index e211981f78e..00000000000
--- a/test/jdk/java/net/httpclient/PathSubscriber/ofFileDownload.policy
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for test/lib library classes
-grant codeBase "file:${test.classes}/../../../../../test/lib/-" {
-    permission java.util.PropertyPermission "java.vm.info", "read";
-    permission java.util.PropertyPermission "jdk.debug", "read";
-    permission java.util.PropertyPermission "sun.arch.data.model", "read";
-    permission java.util.PropertyPermission "sun.management.compiler", "read";
-    permission java.util.PropertyPermission "test.jdk", "read";
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.io.FilePermission "${test.src}/../../../../../lib/jdk/test/lib/net/testkeys", "read";
-
-    // file permissions for test files
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "delete";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir", "read,delete";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir/*", "read,delete";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/echo", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "POST";
-    permission java.net.URLPermission "https://[::1]:*/http1/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https1/echo", "GET";
-    permission java.net.URLPermission "http://[::1]:*/http2/echo", "GET";
-    permission java.net.URLPermission "https://[::1]:*/https2/echo", "GET";
-
-    // file permissions for test files
-    permission java.io.FilePermission "${user.dir}${/}file.zip", "read,write";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir", "read,write,delete";
-    permission java.io.FilePermission "${user.dir}${/}defaultDir/*", "read,write,delete";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-};
\ No newline at end of file
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.java b/test/jdk/java/net/httpclient/RequestBodyTest.java
index 771192564b0..668e834e1f0 100644
--- a/test/jdk/java/net/httpclient/RequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -71,7 +68,6 @@
  * @build jdk.test.lib.Platform
  * @build jdk.test.lib.util.FileUtils
  * @run testng/othervm RequestBodyTest
- * @run testng/othervm/java.security.policy=RequestBodyTest.policy RequestBodyTest
  */
 public class RequestBodyTest {
 
@@ -331,11 +327,9 @@ static Supplier<FileInputStream> fileInputStreamSupplier(Path f) {
             @Override
             public FileInputStream get() {
                 try {
-                    PrivilegedExceptionAction<FileInputStream> pa =
-                            () -> new FileInputStream(file.toFile());
-                    return AccessController.doPrivileged(pa);
-                } catch (PrivilegedActionException x) {
-                    throw new UncheckedIOException((IOException)x.getCause());
+                    return new FileInputStream(file.toFile());
+                } catch (IOException x) {
+                    throw new UncheckedIOException(x);
                 }
             }
         };
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.policy b/test/jdk/java/net/httpclient/RequestBodyTest.policy
deleted file mode 100644
index d1ff89cbcd5..00000000000
--- a/test/jdk/java/net/httpclient/RequestBodyTest.policy
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork//classes/0/test/lib/jdk/test/lib/util/FileUtils.class
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "RequestBodyTest.tmp", "read,delete";
-};
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.io.FilePermission "${test.src}${/}docs${/}files${/}smallfile.txt", "read";
-    permission java.io.FilePermission "${test.src}${/}docs${/}files${/}notsobigfile.txt", "read";
-    permission java.io.FilePermission "RequestBodyTest.tmp", "read,write,delete";
-
-    permission java.net.URLPermission "http://127.0.0.1:*/echo/foo",   "POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/echo/foo",  "POST";
-    permission java.net.URLPermission "http://[::1]:*/echo/foo",   "POST";
-    permission java.net.URLPermission "https://[::1]:*/echo/foo",  "POST";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP server
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-};
diff --git a/test/jdk/java/net/httpclient/dependent.policy b/test/jdk/java/net/httpclient/dependent.policy
deleted file mode 100644
index 6cfbc1c1e3b..00000000000
--- a/test/jdk/java/net/httpclient/dependent.policy
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
-};
-
-// for jdk/httpclient/test/lib/* classes
-grant codeBase "file:${test.classes}/../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "listen,accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "listen,accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/*" {
-    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir", "read,write";
-    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir/-", "read,write";
-
-    permission java.net.URLPermission "http://127.0.0.1:*/http1/-",   "GET,POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https1/-", "GET,POST";
-    permission java.net.URLPermission "http://127.0.0.1:*/http2/-",   "GET,POST";
-    permission java.net.URLPermission "https://127.0.0.1:*/https2/-", "GET,POST";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/http1/-",   "GET,POST";
-    permission java.net.URLPermission "https://[::1]:*/https1/-", "GET,POST";
-    permission java.net.URLPermission "http://[::1]:*/http2/-",   "GET,POST";
-    permission java.net.URLPermission "https://[::1]:*/https2/-", "GET,POST";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "listen,accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "listen,accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-
-    // Permission for DependentActionsTest
-    permission java.lang.RuntimePermission "getStackWalkerWithClassReference";
-};
diff --git a/test/jdk/java/net/httpclient/httpclient-localaddr-security.policy b/test/jdk/java/net/httpclient/httpclient-localaddr-security.policy
deleted file mode 100644
index bbf83425682..00000000000
--- a/test/jdk/java/net/httpclient/httpclient-localaddr-security.policy
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class and
-// JTwork/classes/0/test/lib/jdk/test/lib/net/IPSupport.class
-grant codeBase "file:${test.classes}/../../../../test/lib/-" {
-    permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
-    permission java.util.PropertyPermission "java.net.preferIPv4Stack", "read";
-    permission java.util.PropertyPermission "java.net.preferIPv6Addresses", "read";
-};
-
-// for classes in JTwork//classes/0/test/jdk/java/net/httpclient/lib/
-grant codeBase "file:${test.classes}/../../../../test/jdk/java/net/httpclient/lib/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    permission java.net.SocketPermission "127.0.0.1:*", "listen,accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "listen,accept,resolve";
-    permission java.lang.RuntimePermission "modifyThread";
-};
-
-grant codeBase "file:${test.classes}/-" {
-
-    // test issues HTTP GET requests
-    permission java.net.URLPermission "http://127.0.0.1:*/-",   "GET";
-    permission java.net.URLPermission "https://127.0.0.1:*/-", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/-",   "GET";
-    permission java.net.URLPermission "https://[::1]:*/-", "GET";
-
-    // needed to grant permission to the HTTP/2 server
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-
-    // for HTTP/1.1 server logging
-    permission java.util.logging.LoggingPermission "control";
-
-    // needed to grant the HTTP servers
-    permission java.net.SocketPermission "127.0.0.1:*", "accept,resolve";
-    permission java.net.SocketPermission "[::1]:*", "accept,resolve";
-
-    permission java.util.PropertyPermission "*", "read";
-    permission java.lang.RuntimePermission "modifyThread";
-
-};
diff --git a/test/jdk/java/net/httpclient/noPermissions.policy b/test/jdk/java/net/httpclient/noPermissions.policy
deleted file mode 100644
index da09d685392..00000000000
--- a/test/jdk/java/net/httpclient/noPermissions.policy
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-grant codeBase "file:${test.classes}/*" { };
diff --git a/test/jdk/java/net/httpclient/security/0.policy b/test/jdk/java/net/httpclient/security/0.policy
deleted file mode 100644
index 2e2b4588168..00000000000
--- a/test/jdk/java/net/httpclient/security/0.policy
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy: 0
-
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
-
-
diff --git a/test/jdk/java/net/httpclient/security/1.policy b/test/jdk/java/net/httpclient/security/1.policy
deleted file mode 100644
index ee9e021c50e..00000000000
--- a/test/jdk/java/net/httpclient/security/1.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 1
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET";
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/10.policy b/test/jdk/java/net/httpclient/security/10.policy
deleted file mode 100644
index a83bf44153c..00000000000
--- a/test/jdk/java/net/httpclient/security/10.policy
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 10
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET:*";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/11.policy b/test/jdk/java/net/httpclient/security/11.policy
deleted file mode 100644
index f75fdcc7dfd..00000000000
--- a/test/jdk/java/net/httpclient/security/11.policy
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 11
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://127.0.0.1:${port.number1}", "CONNECT";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://[::1]:${port.number1}", "CONNECT";
-    // this specific test uses a proxy configured to loopback address. the httpclient implementation
-    // during permissions check uses the InetAddress.hostString() API which can return resolved
-    // hostname, so we use include a permission for "localhost" to cover that case too
-    permission java.net.URLPermission "socket://localhost:${port.number1}", "CONNECT";
-};
-
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/12.policy b/test/jdk/java/net/httpclient/security/12.policy
deleted file mode 100644
index f75fdcc7dfd..00000000000
--- a/test/jdk/java/net/httpclient/security/12.policy
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 11
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://127.0.0.1:${port.number1}", "CONNECT";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://[::1]:${port.number1}", "CONNECT";
-    // this specific test uses a proxy configured to loopback address. the httpclient implementation
-    // during permissions check uses the InetAddress.hostString() API which can return resolved
-    // hostname, so we use include a permission for "localhost" to cover that case too
-    permission java.net.URLPermission "socket://localhost:${port.number1}", "CONNECT";
-};
-
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/14.policy b/test/jdk/java/net/httpclient/security/14.policy
deleted file mode 100644
index 39bdbea6654..00000000000
--- a/test/jdk/java/net/httpclient/security/14.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 14
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/15.policy b/test/jdk/java/net/httpclient/security/15.policy
deleted file mode 100644
index ba6b9feb363..00000000000
--- a/test/jdk/java/net/httpclient/security/15.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 11
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "GET:*";
-
-    // Test checks for this explicitly
-    permission java.lang.RuntimePermission "foobar";
-};
-
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/16.policy b/test/jdk/java/net/httpclient/security/16.policy
deleted file mode 100644
index 7d755cfff94..00000000000
--- a/test/jdk/java/net/httpclient/security/16.policy
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 16: Test tries to set Host header to localhost:123 but there is no permission
-
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:Host";
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET:Host";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/17.policy b/test/jdk/java/net/httpclient/security/17.policy
deleted file mode 100644
index 92ee7f3d609..00000000000
--- a/test/jdk/java/net/httpclient/security/17.policy
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 17. Grant permission to port 123 (no connect attempt is actually made)
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:Host";
-    permission java.net.URLPermission "http://[::1]:${port.number}/files/foo.txt", "GET:Host";
-    permission java.net.URLPermission "http://foohost:123/files/foo.txt", "GET:Host";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/2.policy b/test/jdk/java/net/httpclient/security/2.policy
deleted file mode 100644
index b69c589ee68..00000000000
--- a/test/jdk/java/net/httpclient/security/2.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 2
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/*", "GET";
-    permission java.net.URLPermission "http://[::1]:*/files/*", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/3.policy b/test/jdk/java/net/httpclient/security/3.policy
deleted file mode 100644
index 32383fe88d3..00000000000
--- a/test/jdk/java/net/httpclient/security/3.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 3
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/foo.txt", "GET";
-    permission java.net.URLPermission "http://[::1]:*/redirect/foo.txt", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/4.policy b/test/jdk/java/net/httpclient/security/4.policy
deleted file mode 100644
index 7973c76d981..00000000000
--- a/test/jdk/java/net/httpclient/security/4.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 4
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/foo.txt", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/bar.txt", "GET";
-    // ipv6
-    permission java.net.URLPermission "http://[::1]:*/redirect/foo.txt", "GET";
-    permission java.net.URLPermission "http://[::1]:*/redirect/bar.txt", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/5.policy b/test/jdk/java/net/httpclient/security/5.policy
deleted file mode 100644
index 0b480f95234..00000000000
--- a/test/jdk/java/net/httpclient/security/5.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 5
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/bar.txt", "GET";
-    permission java.net.URLPermission "http://[::1]:*/redirect/bar.txt", "GET";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/6.policy b/test/jdk/java/net/httpclient/security/6.policy
deleted file mode 100644
index 80d2838bebe..00000000000
--- a/test/jdk/java/net/httpclient/security/6.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 6
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "POST";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "POST";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/7.policy b/test/jdk/java/net/httpclient/security/7.policy
deleted file mode 100644
index 8fddf36c66e..00000000000
--- a/test/jdk/java/net/httpclient/security/7.policy
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 7
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:X-Bar";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "GET:X-Bar";
-
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/8.policy b/test/jdk/java/net/httpclient/security/8.policy
deleted file mode 100644
index 4bc507b3e31..00000000000
--- a/test/jdk/java/net/httpclient/security/8.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 8
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:X-Foo1,X-Foo,X-Bar";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "GET:X-Foo1,X-Foo,X-Bar";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/9.policy b/test/jdk/java/net/httpclient/security/9.policy
deleted file mode 100644
index ce7336c2975..00000000000
--- a/test/jdk/java/net/httpclient/security/9.policy
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// Policy 9
-grant {
-    // permissions common to all tests
-    permission java.util.PropertyPermission "*", "read";
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.util.logging.LoggingPermission "control", "";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen";
-    permission java.io.FilePermission "${test.src}${/}docs${/}-", "read";
-    permission java.lang.RuntimePermission "createClassLoader";
-
-
-    // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "http://[::1]:*/files/foo.txt", "GET:*";
-};
-
-// For proxy only. Not being tested
-grant codebase "file:${test.classes}/proxydir/-" {
-    permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";
-    permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";
-};
diff --git a/test/jdk/java/net/httpclient/security/Driver.java b/test/jdk/java/net/httpclient/security/Driver.java
deleted file mode 100644
index fc3dc4346ff..00000000000
--- a/test/jdk/java/net/httpclient/security/Driver.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8087112
- * @library /test/lib
- * @modules java.net.http
- *          java.logging
- *          jdk.httpserver
- * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.Utils
- * @compile ../../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
- * @compile ../ProxyServer.java
- * @build Security
- *
- * @run main/othervm Driver
- */
-
-/**
- * driver required for allocating free portnumbers and putting this number
- * into security policy file used in some tests.
- *
- * The tests are in Security.java and port number supplied in -Dport.number
- * and -Dport.number1 for tests that require a second free port
- */
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.ProcessTools;
-
-/**
- * Driver for tests
- */
-public class Driver {
-    // change the default value to "true" to get the subprocess traces.
-    final static boolean DEBUG = Boolean.parseBoolean(System.getProperty("test.debug", "true"));
-
-    public static void main(String[] args) throws Throwable {
-        System.out.println("Starting Driver");
-        runtest("1.policy", "1");
-        runtest("10.policy", "10");
-        runtest("11.policy", "11");
-        runtest("12.policy", "12");
-        runtest("16.policy", "16", "-Djdk.httpclient.allowRestrictedHeaders=Host");
-        runtest("17.policy", "17", "-Djdk.httpclient.allowRestrictedHeaders=Host");
-        System.out.println("DONE");
-    }
-
-    static final Path CWD = Paths.get(".");
-
-    static class Logger extends Thread {
-        private final OutputStream ps;
-        private final InputStream stdout;
-
-        Logger(String cmdLine, Process p) throws IOException {
-            super();
-            setDaemon(true);
-            cmdLine = "Command line = [" + cmdLine + "]\n";
-            stdout = p.getInputStream();
-            File f = Files.createTempFile(CWD, "debug", ".txt").toFile();
-            ps = new FileOutputStream(f);
-            ps.write(cmdLine.getBytes());
-            ps.flush();
-            if (DEBUG) {
-                System.out.print(cmdLine);
-                System.out.flush();
-            }
-        }
-
-        public void run() {
-            try {
-                byte[] buf = new byte[128];
-                int c;
-                while ((c = stdout.read(buf)) != -1) {
-                    if (DEBUG) {
-                        System.out.write(buf, 0, c);
-                        System.out.flush();
-                    }
-                    ps.write(buf, 0, c);
-                    ps.flush();
-                }
-                ps.close();
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static void runtest(String policy, String testnum) throws Throwable {
-        runtest(policy, testnum, null);
-    }
-
-
-    public static void runtest(String policy, String testnum, String addProp) throws Throwable {
-        String testJdk = System.getProperty("test.jdk", "?");
-        String testSrc = System.getProperty("test.src", "?");
-        String testClassPath = System.getProperty("test.class.path", "?");
-        String testClasses = System.getProperty("test.classes", "?");
-        String sep = System.getProperty("file.separator", "?");
-        int retval = 10; // 10 is special exit code denoting a bind error
-                         // in which case, we retry
-        while (retval == 10) {
-            List<String> cmd = new ArrayList<>();
-            cmd.add("-ea");
-            cmd.add("-esa");
-            cmd.add("-Dtest.jdk=" + testJdk);
-            cmd.add("-Dtest.src=" + testSrc);
-            cmd.add("-Dtest.classes=" + testClasses);
-            cmd.add("-Djava.security.manager");
-            cmd.add("-Djava.security.policy=" + testSrc + sep + policy);
-            cmd.add("-Dport.number=" + Integer.toString(Utils.getFreePort()));
-            cmd.add("-Dport.number1=" + Integer.toString(Utils.getFreePort()));
-            cmd.add("-Djdk.httpclient.HttpClient.log=all,frames:all");
-            if (addProp != null) {
-                cmd.add(addProp);
-            }
-            cmd.add("-cp");
-            cmd.add(testClassPath);
-            cmd.add("Security");
-            cmd.add(testnum);
-
-            ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(cmd)
-                .redirectOutput(ProcessBuilder.Redirect.PIPE)
-                .redirectErrorStream(true);
-
-            String cmdLine = cmd.stream().collect(Collectors.joining(" "));
-            long start = System.currentTimeMillis();
-            Process child = processBuilder.start();
-            Logger log = new Logger(cmdLine, child);
-            log.start();
-            retval = child.waitFor();
-            long elapsed = System.currentTimeMillis() - start;
-            System.out.println("Security " + testnum
-                               + ": retval = " + retval
-                               + ", duration=" + elapsed+" ms");
-        }
-        if (retval != 0) {
-            Thread.sleep(2000);
-            throw new RuntimeException("Non zero return value");
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/security/Security.java b/test/jdk/java/net/httpclient/security/Security.java
deleted file mode 100644
index 5e6566dcd82..00000000000
--- a/test/jdk/java/net/httpclient/security/Security.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8087112
- * @modules java.net.http
- *          java.logging
- *          jdk.httpserver
- * @library /test/lib
- * @build jdk.test.lib.net.SimpleSSLContext
- * @compile ../../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
- * @compile ../ProxyServer.java
- *
- * @run main/othervm/secure=java.lang.SecurityManager/policy=0.policy Security 0
- * @run main/othervm/secure=java.lang.SecurityManager/policy=2.policy Security 2
- * @run main/othervm/secure=java.lang.SecurityManager/policy=3.policy Security 3
- * @run main/othervm/secure=java.lang.SecurityManager/policy=4.policy Security 4
- * @run main/othervm/secure=java.lang.SecurityManager/policy=5.policy Security 5
- * @run main/othervm/secure=java.lang.SecurityManager/policy=6.policy Security 6
- * @run main/othervm/secure=java.lang.SecurityManager/policy=7.policy Security 7
- * @run main/othervm/secure=java.lang.SecurityManager/policy=8.policy Security 8
- * @run main/othervm/secure=java.lang.SecurityManager/policy=9.policy Security 9
- * @run main/othervm/secure=java.lang.SecurityManager/policy=0.policy Security 13
- * @run main/othervm/secure=java.lang.SecurityManager/policy=14.policy Security 14
- * @run main/othervm/secure=java.lang.SecurityManager/policy=15.policy -Djava.security.debug=access:domain,failure Security 15
- */
-
-// Tests 1, 10, 11 and 12 executed from Driver
-
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsServer;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.File;
-import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.http.HttpHeaders;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.ByteBuffer;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Flow;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.lang.reflect.InvocationTargetException;
-import static java.net.http.HttpResponse.BodyHandlers.ofString;
-
-/**
- * Security checks test
- */
-public class Security {
-
-    static HttpServer s1;
-    static ExecutorService executor;
-    static int port, proxyPort;
-    static HttpClient client;
-    static String httproot, fileuri, fileroot, redirectroot;
-    static List<HttpClient> clients = new LinkedList<>();
-    static URI uri;
-    static String serverAuthority;
-
-    interface ThrowingRunnable { void run() throws Throwable; }
-
-    static class TestAndResult {
-        private final ThrowingRunnable runnable;
-        private final boolean expectSecurityException;
-
-        TestAndResult(boolean expectSecurityException, ThrowingRunnable runnable) {
-            this.expectSecurityException = expectSecurityException;
-            this.runnable = runnable;
-        }
-
-        static TestAndResult of(boolean expectSecurityException,
-                                ThrowingRunnable runnable) {
-            return new TestAndResult(expectSecurityException, runnable);
-        }
-
-        void runWithPolicy(String policy) {
-            System.out.println("Using policy file: " + policy);
-            try {
-                runnable.run();
-                if (expectSecurityException) {
-                    String msg = "FAILED: expected security exception not thrown";
-                    System.out.println(msg);
-                    throw new RuntimeException(msg);
-                }
-                System.out.println (policy + " succeeded as expected");
-            } catch (BindException e) {
-                System.exit(10);
-            } catch (SecurityException e) {
-                if (!expectSecurityException) {
-                    System.out.println("UNEXPECTED security Exception: " + e);
-                    throw new RuntimeException("UNEXPECTED security Exception", e);
-                }
-                System.out.println(policy + " threw SecurityException as expected: " + e);
-            } catch (Throwable t) {
-                throw new AssertionError(t);
-            }
-        }
-    }
-
-    static TestAndResult[] tests = createTests();
-    static String testclasses;
-    static File subdir;
-
-    /**
-     * The ProxyServer class is compiled by jtreg, but we want to
-     * move it so it is not on the application claspath. We want to
-     * load it through a separate classloader so that it has a separate
-     * protection domain and security permissions.
-     *
-     * Its permissions are in the second grant block in each policy file
-     */
-    static void setupProxy() throws IOException, ClassNotFoundException, NoSuchMethodException {
-        testclasses = System.getProperty("test.classes");
-        subdir = new File (testclasses, "proxydir");
-        subdir.mkdir();
-
-        movefile("ProxyServer.class");
-        movefile("ProxyServer$Connection.class");
-        movefile("ProxyServer$1.class");
-
-        URL url = subdir.toURI().toURL();
-        System.out.println("URL for class loader = " + url);
-        URLClassLoader urlc = new URLClassLoader(new URL[] {url});
-        proxyClass = Class.forName("ProxyServer", true, urlc);
-        proxyConstructor = proxyClass.getConstructor(Integer.class, Boolean.class);
-    }
-
-    static void movefile(String f) throws IOException {
-        Path src = Paths.get(testclasses, f);
-        Path dest = subdir.toPath().resolve(f);
-        if (!dest.toFile().exists()) {
-            System.out.printf("moving %s to %s\n", src.toString(), dest.toString());
-            Files.move(src, dest,  StandardCopyOption.REPLACE_EXISTING);
-        } else if (src.toFile().exists()) {
-            System.out.printf("%s exists, deleting %s\n", dest.toString(), src.toString());
-            Files.delete(src);
-        } else {
-            System.out.printf("NOT moving %s to %s\n", src.toString(), dest.toString());
-        }
-    }
-
-    static Object createProxy(int port, boolean b) throws Throwable {
-        try {
-            return proxyConstructor.newInstance(port, b);
-        } catch (InvocationTargetException e) {
-            throw e.getTargetException();
-        }
-    }
-
-    static Class<?> proxyClass;
-    static Constructor<?> proxyConstructor;
-
-    static TestAndResult[] createTests() {
-        return new TestAndResult[] {
-            // (0) policy does not have permission for file. Should fail
-            TestAndResult.of(true, () -> { // Policy 0
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (1) policy has permission for file URL
-            TestAndResult.of(false, () -> { //Policy 1
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (2) policy has permission for all file URLs under /files
-            TestAndResult.of(false, () -> { // Policy 2
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (3) policy has permission for first URL but not redirected URL
-            TestAndResult.of(true, () -> { // Policy 3
-                URI u = URI.create("http://" + serverAuthority + "/redirect/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (4) policy has permission for both first URL and redirected URL
-            TestAndResult.of(false, () -> { // Policy 4
-                URI u = URI.create("http://" + serverAuthority + "/redirect/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (5) policy has permission for redirected but not first URL
-            TestAndResult.of(true, () -> { // Policy 5
-                URI u = URI.create("http://" + serverAuthority + "/redirect/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (6) policy has permission for file URL, but not method
-            TestAndResult.of(true, () -> { //Policy 6
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (7) policy has permission for file URL, method, but not header
-            TestAndResult.of(true, () -> { //Policy 7
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u)
-                                                 .header("X-Foo", "bar")
-                                                 .GET()
-                                                 .build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (8) policy has permission for file URL, method and header
-            TestAndResult.of(false, () -> { //Policy 8
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u)
-                                                 .header("X-Foo", "bar")
-                                                 .GET()
-                                                 .build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (9) policy has permission for file URL, method and header
-            TestAndResult.of(false, () -> { //Policy 9
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u)
-                                                 .headers("X-Foo", "bar", "X-Bar", "foo")
-                                                 .GET()
-                                                 .build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (10) policy has permission for destination URL but not for proxy
-            TestAndResult.of(true, () -> { //Policy 10
-                directProxyTest(proxyPort, true);
-            }),
-            // (11) policy has permission for both destination URL and proxy
-            TestAndResult.of(false, () -> { //Policy 11
-                directProxyTest(proxyPort, true);
-            }),
-            // (12) policy has permission for both destination URL and proxy
-            TestAndResult.of(true, () -> { //Policy 12 ( 11 & 12 are the same )
-                directProxyTest(proxyPort, false);
-            }),
-            // (13) async version of test 0
-            TestAndResult.of(true, () -> { // Policy 0
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                try {
-                    HttpResponse<?> response = client.sendAsync(request, ofString()).get();
-                    System.out.println("Received response:" + response);
-                } catch (ExecutionException e) {
-                    if (e.getCause() instanceof SecurityException) {
-                        throw (SecurityException)e.getCause();
-                    } else {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }),
-            // (14) async version of test 1
-            TestAndResult.of(false, () -> { //Policy 1
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                try {
-                    HttpResponse<?> response = client.sendAsync(request, ofString()).get();
-                    System.out.println("Received response:" + response);
-                } catch (ExecutionException e) {
-                    if (e.getCause() instanceof SecurityException se) {
-                        throw se;
-                    } else {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }),
-            // (15) check that user provided unprivileged code running on a worker
-            //      thread does not gain ungranted privileges.
-            TestAndResult.of(true, () -> { //Policy 12
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse.BodyHandler<String> sth = ofString();
-
-                CompletableFuture<HttpResponse<String>> cf =
-                    client.sendAsync(request, new HttpResponse.BodyHandler<String>() {
-                        @Override
-                        public HttpResponse.BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
-                            final HttpResponse.BodySubscriber<String> stproc = sth.apply(rinfo);
-                            return new HttpResponse.BodySubscriber<String>() {
-                                @Override
-                                public CompletionStage<String> getBody() {
-                                    return stproc.getBody();
-                                }
-                                @Override
-                                public void onNext(List<ByteBuffer> item) {
-                                    SecurityManager sm = System.getSecurityManager();
-                                    // should succeed.
-                                    sm.checkPermission(new RuntimePermission("foobar"));
-                                    // do some mischief here
-                                    System.setSecurityManager(null);
-                                    System.setSecurityManager(sm);
-                                    // problem if we get this far
-                                    stproc.onNext(item);
-                                }
-                                @Override
-                                public void onSubscribe(Flow.Subscription subscription) {
-                                    stproc.onSubscribe(subscription);
-                                }
-                                @Override
-                                public void onError(Throwable throwable) {
-                                    stproc.onError(throwable);
-                                }
-                                @Override
-                                public void onComplete() {
-                                    stproc.onComplete();
-                                }
-                            };
-                        }
-                    }
-                );
-                try {
-                    HttpResponse<String> response = cf.join();
-                    System.out.println("Received response:" + response);
-                } catch (CompletionException e) {
-                    Throwable t = e.getCause();
-                    if (t instanceof SecurityException se)
-                        throw se;
-                    else if ((t instanceof IOException)
-                              && (t.getCause() instanceof SecurityException se))
-                        throw se;
-                    else
-                        throw new RuntimeException(t);
-                }
-            }),
-            // (16) allowed to set Host header but does not have permission
-            TestAndResult.of(true, () -> { //Policy 16
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u)
-                        .header("Host", "foohost:123")
-                        .GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            }),
-            // (17) allowed to set Host header and does have permission
-            TestAndResult.of(false, () -> { //Policy 17
-                URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-                HttpRequest request = HttpRequest.newBuilder(u)
-                        .header("Host", "foohost:123")
-                        .GET().build();
-                HttpResponse<?> response = client.send(request, ofString());
-                System.out.println("Received response:" + response);
-            })
-        };
-    }
-
-    private static void directProxyTest(int proxyPort, boolean samePort)
-        throws IOException, InterruptedException
-    {
-        System.out.println("proxyPort:" + proxyPort + ", samePort:" + samePort);
-
-        int p = proxyPort;
-        if (samePort) {
-            Object proxy;
-            try {
-                proxy = createProxy(p, true);
-            } catch (BindException e) {
-                System.out.println("Bind failed");
-                throw e;
-            } catch (Throwable ee) {
-                throw new RuntimeException(ee);
-            }
-        } else {
-            while (p == proxyPort || p == port) {
-                // avoid ports that may be granted permission
-                p++;
-                if (p > 65535) {
-                    p = 32000; // overflow
-                }
-            }
-        }
-        System.out.println("Proxy port, p:" + p);
-
-        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), p);
-        HttpClient cl = HttpClient.newBuilder()
-                                    .proxy(ProxySelector.of(addr))
-                                    .build();
-        clients.add(cl);
-
-        URI u = URI.create("http://" + serverAuthority + "/files/foo.txt");
-        HttpRequest request = HttpRequest.newBuilder(u)
-                                         .headers("X-Foo", "bar", "X-Bar", "foo")
-                                         .build();
-        HttpResponse<?> response = cl.send(request, ofString());
-        System.out.println("Received response:" + response);
-    }
-
-    public static void main(String[] args) throws Exception {
-        try {
-            initServer();
-            setupProxy();
-        } catch (BindException e) {
-            System.exit(10);
-        }
-        fileroot = System.getProperty("test.src")+ "/docs";
-        int testnum = Integer.parseInt(args[0]);
-        String policy = args[0];
-
-        client = HttpClient.newBuilder()
-                           .followRedirects(HttpClient.Redirect.ALWAYS)
-                           .build();
-
-        clients.add(client);
-
-        try {
-            TestAndResult tr = tests[testnum];
-            tr.runWithPolicy(policy);
-        } finally {
-            s1.stop(0);
-            executor.shutdownNow();
-        }
-    }
-
-    public static void initServer() throws Exception {
-        String portstring = System.getProperty("port.number");
-        port = portstring != null ? Integer.parseInt(portstring) : 0;
-        portstring = System.getProperty("port.number1");
-        proxyPort = portstring != null ? Integer.parseInt(portstring) : 0;
-
-        Logger logger = Logger.getLogger("com.sun.net.httpserver");
-        ConsoleHandler ch = new ConsoleHandler();
-        logger.setLevel(Level.ALL);
-        ch.setLevel(Level.ALL);
-        logger.addHandler(ch);
-        String root = System.getProperty("test.src")+ "/docs";
-        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), port);
-        s1 = HttpServer.create (addr, 0);
-        if (s1 instanceof HttpsServer) {
-            throw new RuntimeException("should not be httpsserver");
-        }
-        s1.createContext("/files", new FileServerHandler(root));
-        s1.createContext("/redirect", new RedirectHandler("/redirect"));
-
-        executor = Executors.newCachedThreadPool();
-        s1.setExecutor(executor);
-        s1.start();
-
-        if (port == 0)
-            port = s1.getAddress().getPort();
-        else {
-            if (s1.getAddress().getPort() != port)
-                throw new RuntimeException("Error wrong port");
-            System.out.println("Port was assigned by Driver");
-        }
-        serverAuthority = makeServerAuthority(addr.getAddress().getHostAddress(), port);
-        System.out.println("HTTP server started at " + serverAuthority);
-        httproot = "http://" + serverAuthority + "/files/";
-        redirectroot = "http://" + serverAuthority + "/redirect/";
-        uri = new URI(httproot);
-        fileuri = httproot + "foo.txt";
-    }
-
-    private static String makeServerAuthority(final String host, final int port) {
-        // escape for ipv6
-        final String h = host.contains(":") ? "[" + host + "]" : host;
-        return h + ":" + port;
-    }
-
-    static class RedirectHandler implements HttpHandler {
-
-        String root;
-        int count = 0;
-
-        RedirectHandler(String root) {
-            this.root = root;
-        }
-
-        synchronized int count() {
-            return count;
-        }
-
-        synchronized void increment() {
-            count++;
-        }
-
-        @Override
-        public synchronized void handle(HttpExchange t) throws IOException {
-            System.out.println("Server: " + t.getRequestURI());
-            try (InputStream is = t.getRequestBody()) {
-               is.readAllBytes();
-            }
-            increment();
-            if (count() == 1) {
-                Headers map = t.getResponseHeaders();
-                String redirect = "/redirect/bar.txt";
-                map.add("Location", redirect);
-                t.sendResponseHeaders(301, -1);
-                t.close();
-            } else {
-                String response = "Hello world";
-                t.sendResponseHeaders(200, response.length());
-                OutputStream os = t.getResponseBody();
-                os.write(response.getBytes(StandardCharsets.ISO_8859_1));
-                t.close();
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
index 351a676cc43..3c857ba1b48 100644
--- a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
+++ b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,25 +23,15 @@
 
 /*
  * @test
- * @summary Basic checks for SecurityException from body processors APIs
- * @run testng/othervm/java.security.policy=allpermissions.policy FileProcessorPermissionTest
+ * @summary Basic checks for File Processors
+ * @run testng/othervm FileProcessorPermissionTest
  */
 
-import java.io.File;
-import java.io.FilePermission;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
 import java.util.List;
 import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.BodyPublishers;
-import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import org.testng.annotations.Test;
 import static java.nio.file.StandardOpenOption.*;
@@ -55,19 +45,6 @@ public class FileProcessorPermissionTest {
     static final Path CWD = Paths.get(".");
     static final Class<SecurityException> SE = SecurityException.class;
 
-    static AccessControlContext withPermissions(Permission... perms) {
-        Permissions p = new Permissions();
-        for (Permission perm : perms) {
-            p.add(perm);
-        }
-        ProtectionDomain pd = new ProtectionDomain(null, p);
-        return new AccessControlContext(new ProtectionDomain[]{ pd });
-    }
-
-    static AccessControlContext noPermissions() {
-        return withPermissions(/*empty*/);
-    }
-
     @Test
     public void test() throws Exception {
         List<PrivilegedExceptionAction<?>> list = List.of(
@@ -82,68 +59,9 @@ public void test() throws Exception {
                 () -> BodyHandlers.ofFileDownload(CWD, CREATE, WRITE)
         );
 
-        // TEST 1 - sanity, just run ( no security manager )
-        System.setSecurityManager(null);
-        try {
-            for (PrivilegedExceptionAction pa : list) {
-                AccessController.doPrivileged(pa);
-            }
-        } finally {
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        // Run with all permissions, i.e. no further restrictions than test's AllPermission
         for (PrivilegedExceptionAction pa : list) {
-            try {
-                assert System.getSecurityManager() != null;
-                AccessController.doPrivileged(pa, null, new Permission[] { });
-            } catch (PrivilegedActionException pae) {
-                fail("UNEXPECTED Exception:" + pae);
-                pae.printStackTrace();
-            }
+            pa.run();
         }
 
-        // TEST 2 - with all file permissions
-        AccessControlContext allFilesACC = withPermissions(
-                new FilePermission("<<ALL FILES>>" , "read,write")
-        );
-        for (PrivilegedExceptionAction pa : list) {
-            try {
-                assert System.getSecurityManager() != null;
-                AccessController.doPrivileged(pa, allFilesACC);
-            } catch (PrivilegedActionException pae) {
-                fail("UNEXPECTED Exception:" + pae);
-                pae.printStackTrace();
-            }
-        }
-
-        // TEST 3 - with limited permissions, i.e. just what is required
-        AccessControlContext minimalACC = withPermissions(
-                new FilePermission(fromFilePath.toString() , "read"),
-                new FilePermission(asFilePath.toString(), "write"),
-                // ofFileDownload requires read and write to the dir
-                new FilePermission(CWD.toString(), "read,write"),
-                new FilePermission(CWD.toString() + File.separator + "*", "read,write")
-        );
-        for (PrivilegedExceptionAction pa : list) {
-            try {
-                assert System.getSecurityManager() != null;
-                AccessController.doPrivileged(pa, minimalACC);
-            } catch (PrivilegedActionException pae) {
-                fail("UNEXPECTED Exception:" + pae);
-                pae.printStackTrace();
-            }
-        }
-
-        // TEST 4 - with NO permissions, i.e. expect SecurityException
-        for (PrivilegedExceptionAction pa : list) {
-            try {
-                assert System.getSecurityManager() != null;
-                AccessController.doPrivileged(pa, noPermissions());
-                fail("EXPECTED SecurityException");
-            } catch (SecurityException expected) {
-                System.out.println("Caught expected SE:" + expected);
-            }
-        }
     }
 }
diff --git a/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
index 0b88961b155..d54e27b89ce 100644
--- a/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
+++ b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @summary Verifies security checks are performed before existence checks
  *          in pre-defined body processors APIs
  * @run testng/othervm SecurityBeforeFile
- * @run testng/othervm/java.security.policy=nopermissions.policy SecurityBeforeFile
  */
 
 import java.io.FileNotFoundException;
@@ -44,23 +43,16 @@
 
 public class SecurityBeforeFile {
 
-    static final boolean hasSecurityManager = System.getSecurityManager() != null;
-    static final boolean hasNoSecurityManager = !hasSecurityManager;
-
     @Test
     public void BodyPublishersOfFile() {
         Path p = Paths.get("doesNotExist.txt");
-        if (hasNoSecurityManager && Files.exists(p))
+        if (Files.exists(p))
             throw new AssertionError("Unexpected " + p);
 
         try {
             BodyPublishers.ofFile(p);
             fail("UNEXPECTED, file " + p.toString() + " exists?");
-        } catch (SecurityException se) {
-            assertTrue(hasSecurityManager);
-            out.println("caught expected security exception: " + se);
         } catch (FileNotFoundException fnfe) {
-            assertTrue(hasNoSecurityManager);
             out.println("caught expected file not found exception: " + fnfe);
         }
     }
@@ -77,17 +69,13 @@ public Object[][] handlerOpenOptions() {
     @Test(dataProvider = "handlerOpenOptions")
     public void BodyHandlersOfFileDownload(OpenOption[] openOptions) {
         Path p = Paths.get("doesNotExistDir");
-        if (hasNoSecurityManager && Files.exists(p))
+        if (Files.exists(p))
             throw new AssertionError("Unexpected " + p);
 
         try {
             BodyHandlers.ofFileDownload(p, openOptions);
             fail("UNEXPECTED, file " + p.toString() + " exists?");
-        } catch (SecurityException se) {
-            assertTrue(hasSecurityManager);
-            out.println("caught expected security exception: " + se);
         } catch (IllegalArgumentException iae) {
-            assertTrue(hasNoSecurityManager);
             out.println("caught expected illegal argument exception: " + iae);
         }
     }
diff --git a/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy b/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy
deleted file mode 100644
index 12c7c9cb28a..00000000000
--- a/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// bootstrap to get the test going, it will do its own restrictions
-grant codeBase "file:${test.classes}/*" {
-    permission java.security.AllPermission;
-};
-
diff --git a/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy b/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy
deleted file mode 100644
index 5c5ad766f77..00000000000
--- a/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-grant codeBase "file:${test.classes}/*" {
-};
-
diff --git a/test/jdk/java/net/httpclient/websocket/security/WSSanityTest.java b/test/jdk/java/net/httpclient/websocket/security/WSSanityTest.java
new file mode 100644
index 00000000000..787486dbd84
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/security/WSSanityTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Basic sanity checks for WebSocket URI from the Builder
+ * @compile ../DummyWebSocketServer.java ../../ProxyServer.java
+ * @run testng/othervm WSSanityTest
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.List;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class WSSanityTest {
+
+    URI wsURI;
+    DummyWebSocketServer webSocketServer;
+    InetSocketAddress proxyAddress;
+
+    @BeforeTest
+    public void setup() throws Exception {
+        ProxyServer proxyServer = new ProxyServer(0, true);
+        proxyAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                                             proxyServer.getPort());
+        webSocketServer = new DummyWebSocketServer();
+        webSocketServer.open();
+        wsURI = webSocketServer.getURI();
+
+        System.out.println("Proxy Server: " + proxyAddress);
+        System.out.println("DummyWebSocketServer: " + wsURI);
+    }
+
+    @AfterTest
+    public void teardown() {
+        webSocketServer.close();
+    }
+
+    static class NoOpListener implements WebSocket.Listener {}
+    static final WebSocket.Listener noOpListener = new NoOpListener();
+
+    interface ExceptionAction<T> {
+        T run() throws Exception;
+    }
+
+    @DataProvider(name = "passingScenarios")
+    public Object[][] passingScenarios() {
+        HttpClient noProxyClient = HttpClient.newHttpClient();
+        return new Object[][]{
+            { (ExceptionAction<?>)() -> {
+                 noProxyClient.newWebSocketBuilder()
+                              .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "0"  /* for log file identification */ },
+
+            { (ExceptionAction<?>)() -> {
+                URI uriWithPath = wsURI.resolve("/path/x");
+                 noProxyClient.newWebSocketBuilder()
+                              .buildAsync(uriWithPath, noOpListener).get().abort();
+                 return null; },
+              "1" },
+
+            { (ExceptionAction<?>)() -> {
+                 noProxyClient.newWebSocketBuilder()
+                              .header("A-Header", "A-Value")  // header
+                              .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "2" },
+
+            { (ExceptionAction<?>)() -> {
+                 noProxyClient.newWebSocketBuilder()
+                              .header("A-Header", "A-Value")  // headers
+                              .header("B-Header", "B-Value")  // headers
+                              .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "3" },
+
+            // client with a DIRECT proxy
+            { (ExceptionAction<?>)() -> {
+                 ProxySelector ps = ProxySelector.of(null);
+                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
+                 client.newWebSocketBuilder()
+                       .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "4" },
+
+            // client with a SOCKS proxy! ( expect implementation to ignore SOCKS )
+            { (ExceptionAction<?>)() -> {
+                 ProxySelector ps = new ProxySelector() {
+                     @Override public List<Proxy> select(URI uri) {
+                         return List.of(new Proxy(Proxy.Type.SOCKS, proxyAddress)); }
+                     @Override
+                     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { }
+                 };
+                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
+                 client.newWebSocketBuilder()
+                       .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "5" },
+
+            // client with an HTTP/HTTPS proxy
+            { (ExceptionAction<?>)() -> {
+                 assert proxyAddress != null;
+                 ProxySelector ps = ProxySelector.of(proxyAddress);
+                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
+                 client.newWebSocketBuilder()
+                       .buildAsync(wsURI, noOpListener).get().abort();
+                 return null; },
+              "6" },
+
+            { (ExceptionAction<?>)() -> {
+                 assert proxyAddress != null;
+                 CountingProxySelector ps = CountingProxySelector.of(proxyAddress);
+                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
+                 client.newWebSocketBuilder()
+                       .buildAsync(wsURI, noOpListener).get().abort();
+                 assertEquals(ps.count(), 1);  // ps.select only invoked once
+                 return null; },
+              "7" },
+
+        };
+    }
+
+    @Test(dataProvider = "passingScenarios")
+    public void testScenarios(ExceptionAction<?> action, String dataProviderId)
+        throws Exception
+    {
+        action.run();
+    }
+
+    /**
+     * A Proxy Selector that wraps a ProxySelector.of(), and counts the number
+     * of times its select method has been invoked. This can be used to ensure
+     * that the Proxy Selector is invoked only once per WebSocket.Builder::buildAsync
+     * invocation.
+     */
+    static class CountingProxySelector extends ProxySelector {
+        private final ProxySelector proxySelector;
+        private volatile int count; // 0
+        private CountingProxySelector(InetSocketAddress proxyAddress) {
+            proxySelector = ProxySelector.of(proxyAddress);
+        }
+
+        public static CountingProxySelector of(InetSocketAddress proxyAddress) {
+            return new CountingProxySelector(proxyAddress);
+        }
+
+        int count() { return count; }
+
+        @Override
+        public List<Proxy> select(URI uri) {
+            System.out.println("PS: uri");
+            Throwable t = new Throwable();
+            t.printStackTrace(System.out);
+            count++;
+            return proxySelector.select(uri);
+        }
+
+        @Override
+        public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+            proxySelector.connectFailed(uri, sa, ioe);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java b/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
deleted file mode 100644
index abcf91ad114..00000000000
--- a/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @summary Basic security checks for WebSocket URI from the Builder
- * @compile ../DummyWebSocketServer.java ../../ProxyServer.java
- * @run testng/othervm/java.security.policy=httpclient.policy WSURLPermissionTest
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.net.URLPermission;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.net.http.HttpClient;
-import java.net.http.WebSocket;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
-public class WSURLPermissionTest {
-
-    static AccessControlContext withPermissions(Permission... perms) {
-        Permissions p = new Permissions();
-        for (Permission perm : perms) {
-            p.add(perm);
-        }
-        ProtectionDomain pd = new ProtectionDomain(null, p);
-        return new AccessControlContext(new ProtectionDomain[]{ pd });
-    }
-
-    static AccessControlContext noPermissions() {
-        return withPermissions(/*empty*/);
-    }
-
-    URI wsURI;
-    DummyWebSocketServer webSocketServer;
-    InetSocketAddress proxyAddress;
-
-    @BeforeTest
-    public void setup() throws Exception {
-        ProxyServer proxyServer = new ProxyServer(0, true);
-        proxyAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(),
-                                             proxyServer.getPort());
-        webSocketServer = new DummyWebSocketServer();
-        webSocketServer.open();
-        wsURI = webSocketServer.getURI();
-
-        System.out.println("Proxy Server: " + proxyAddress);
-        System.out.println("DummyWebSocketServer: " + wsURI);
-    }
-
-    @AfterTest
-    public void teardown() {
-        webSocketServer.close();
-    }
-
-    static class NoOpListener implements WebSocket.Listener {}
-    static final WebSocket.Listener noOpListener = new NoOpListener();
-
-    @DataProvider(name = "passingScenarios")
-    public Object[][] passingScenarios() {
-        HttpClient noProxyClient = HttpClient.newHttpClient();
-        return new Object[][]{
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                       // no actions
-              new URLPermission[] { new URLPermission(wsURI.toString()) },
-              "0"  /* for log file identification */ },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                       // scheme wildcard
-              new URLPermission[] { new URLPermission("ws://*") },
-              "0.1" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                       // port wildcard
-              new URLPermission[] { new URLPermission("ws://"+wsURI.getHost()+":*") },
-              "0.2" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // empty actions
-              new URLPermission[] { new URLPermission(wsURI.toString(), "") },
-              "1" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                         // colon
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":") },
-              "2" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // wildcard
-              new URLPermission[] { new URLPermission(wsURI.toString(), "*:*") },
-              "3" },
-
-            // WS permission checking is agnostic of method, any/none will do
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // specific method
-              new URLPermission[] { new URLPermission(wsURI.toString(), "GET") },
-              "3.1" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // specific method
-              new URLPermission[] { new URLPermission(wsURI.toString(), "POST") },
-              "3.2" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                       // path
-              new URLPermission[] { new URLPermission(wsURI.resolve("/path/x").toString()) },
-              "4" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                       // same dir wildcard
-              new URLPermission[] { new URLPermission(wsURI.resolve("/path/*").toString()) },
-              "5" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                       // recursive
-              new URLPermission[] { new URLPermission(wsURI.resolve("/path/-").toString()) },
-              "6" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                       // recursive top
-              new URLPermission[] { new URLPermission(wsURI.resolve("/-").toString()) },
-              "7" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // header
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":A-Header") },
-              "8" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // header
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // wildcard
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":*") },
-              "9" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // headers
-                              .header("B-Header", "B-Value")  // headers
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":A-Header,B-Header") },
-              "10" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // headers
-                              .header("B-Header", "B-Value")  // headers
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // wildcard
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":*") },
-              "11" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // headers
-                              .header("B-Header", "B-Value")  // headers
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // wildcards
-              new URLPermission[] { new URLPermission(wsURI.toString(), "*:*") },
-              "12" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // multi-value
-                              .header("A-Header", "B-Value")  // headers
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // wildcard
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":*") },
-              "13" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .header("A-Header", "A-Value")  // multi-value
-                              .header("A-Header", "B-Value")  // headers
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                        // single grant
-              new URLPermission[] { new URLPermission(wsURI.toString(), ":A-Header") },
-              "14" },
-
-            // client with a DIRECT proxy
-            { (PrivilegedExceptionAction<?>)() -> {
-                 ProxySelector ps = ProxySelector.of(null);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] { new URLPermission(wsURI.toString()) },
-              "15" },
-
-            // client with a SOCKS proxy! ( expect implementation to ignore SOCKS )
-            { (PrivilegedExceptionAction<?>)() -> {
-                 ProxySelector ps = new ProxySelector() {
-                     @Override public List<Proxy> select(URI uri) {
-                         return List.of(new Proxy(Proxy.Type.SOCKS, proxyAddress)); }
-                     @Override
-                     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { }
-                 };
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] { new URLPermission(wsURI.toString()) },
-              "16" },
-
-            // client with a HTTP/HTTPS proxy
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),            // CONNECT action string
-                    new URLPermission("socket://"+proxyAddress.getHostName()
-                                      +":"+proxyAddress.getPort(), "CONNECT")},
-              "17" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),            // no action string
-                    new URLPermission("socket://"+proxyAddress.getHostName()
-                                      +":"+proxyAddress.getPort())},
-              "18" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),            // wildcard headers
-                    new URLPermission("socket://"+proxyAddress.getHostName()
-                                      +":"+proxyAddress.getPort(), "CONNECT:*")},
-              "19" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 CountingProxySelector ps = CountingProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 assertEquals(ps.count(), 1);  // ps.select only invoked once
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),            // empty headers
-                    new URLPermission("socket://"+proxyAddress.getHostName()
-                                      +":"+proxyAddress.getPort(), "CONNECT:")},
-              "20" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),
-                    new URLPermission("socket://*")},               // wildcard socket URL
-              "21" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission("ws://*"),                    // wildcard ws URL
-                    new URLPermission("socket://*")},               // wildcard socket URL
-              "22" },
-
-        };
-    }
-
-    @Test(dataProvider = "passingScenarios")
-    public void testWithNoSecurityManager(PrivilegedExceptionAction<?> action,
-                                          URLPermission[] unused,
-                                          String dataProviderId)
-        throws Exception
-    {
-        // sanity ( no security manager )
-        System.setSecurityManager(null);
-        try {
-            AccessController.doPrivileged(action);
-        } finally {
-            System.setSecurityManager(new SecurityManager());
-        }
-    }
-
-    @Test(dataProvider = "passingScenarios")
-    public void testWithAllPermissions(PrivilegedExceptionAction<?> action,
-                                       URLPermission[] unused,
-                                       String dataProviderId)
-        throws Exception
-    {
-        // Run with all permissions, i.e. no further restrictions than test's AllPermission
-        assert System.getSecurityManager() != null;
-        AccessController.doPrivileged(action);
-    }
-
-    @Test(dataProvider = "passingScenarios")
-    public void testWithMinimalPermissions(PrivilegedExceptionAction<?> action,
-                                           URLPermission[] perms,
-                                           String dataProviderId)
-        throws Exception
-    {
-        // Run with minimal permissions, i.e. just what is required
-        assert System.getSecurityManager() != null;
-        AccessControlContext minimalACC = withPermissions(perms);
-        AccessController.doPrivileged(action, minimalACC);
-    }
-
-    @Test(dataProvider = "passingScenarios")
-    public void testWithNoPermissions(PrivilegedExceptionAction<?> action,
-                                      URLPermission[] unused,
-                                      String dataProviderId)
-        throws Exception
-    {
-        // Run with NO permissions, i.e. expect SecurityException
-        assert System.getSecurityManager() != null;
-        try {
-            AccessController.doPrivileged(action, noPermissions());
-            fail("EXPECTED SecurityException");
-        } catch (PrivilegedActionException expected) {
-            Throwable t = expected.getCause();
-            if (t instanceof ExecutionException)
-                t = t.getCause();
-
-            if (t instanceof SecurityException)
-                System.out.println("Caught expected SE:" + expected);
-            else
-                fail("Expected SecurityException, but got: " + t);
-        }
-    }
-
-    // --- Negative tests ---
-
-    @DataProvider(name = "failingScenarios")
-    public Object[][] failingScenarios() {
-        HttpClient noProxyClient = HttpClient.newHttpClient();
-        return new Object[][]{
-            { (PrivilegedExceptionAction<?>) () -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null;
-              },
-              new URLPermission[]{ /* no permissions */ },
-              "50"  /* for log file identification */},
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null;
-              },                                        // wrong scheme
-              new URLPermission[]{ new URLPermission("http://*") },
-              "51" },
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null;
-              },                                        // wrong scheme
-              new URLPermission[]{ new URLPermission("socket://*") },
-              "52" },
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null;
-              },                                        // wrong host
-              new URLPermission[]{ new URLPermission("ws://foo.com/") },
-              "53" },
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(wsURI, noOpListener).get().abort();
-                 return null;
-              },                                        // wrong port
-              new URLPermission[]{ new URLPermission("ws://"+ wsURI.getHost()+":5") },
-              "54" },
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                  noProxyClient.newWebSocketBuilder()
-                               .header("A-Header", "A-Value")
-                               .buildAsync(wsURI, noOpListener).get().abort();
-                  return null;
-              },                                                    // only perm to set B not A
-              new URLPermission[] { new URLPermission(wsURI.toString(), "*:B-Header") },
-              "55" },
-
-            { (PrivilegedExceptionAction<?>) () -> {
-                  noProxyClient.newWebSocketBuilder()
-                               .header("A-Header", "A-Value")
-                               .header("B-Header", "B-Value")
-                               .buildAsync(wsURI, noOpListener).get().abort();
-                  return null;
-              },                                                    // only perm to set B not A
-              new URLPermission[] { new URLPermission(wsURI.toString(), "*:B-Header") },
-              "56" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                    // wrong path
-              new URLPermission[] { new URLPermission(wsURI.resolve("/aDiffPath/").toString()) },
-              "57" },
-
-            { (PrivilegedExceptionAction<?>)() -> {
-                URI uriWithPath = wsURI.resolve("/path/x");
-                 noProxyClient.newWebSocketBuilder()
-                              .buildAsync(uriWithPath, noOpListener).get().abort();
-                 return null; },                                    // more specific path
-              new URLPermission[] { new URLPermission(wsURI.resolve("/path/x/y").toString()) },
-              "58" },
-
-            // client with a HTTP/HTTPS proxy
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },                                    // missing proxy perm
-              new URLPermission[] { new URLPermission(wsURI.toString()) },
-              "100" },
-
-            // client with a HTTP/HTTPS proxy
-            { (PrivilegedExceptionAction<?>)() -> {
-                 assert proxyAddress != null;
-                 ProxySelector ps = ProxySelector.of(proxyAddress);
-                 HttpClient client = HttpClient.newBuilder().proxy(ps).build();
-                 client.newWebSocketBuilder()
-                       .buildAsync(wsURI, noOpListener).get().abort();
-                 return null; },
-              new URLPermission[] {
-                    new URLPermission(wsURI.toString()),            // missing proxy CONNECT
-                    new URLPermission("socket://*", "GET") },
-              "101" },
-        };
-    }
-
-    @Test(dataProvider = "failingScenarios")
-    public void testWithoutEnoughPermissions(PrivilegedExceptionAction<?> action,
-                                             URLPermission[] perms,
-                                             String dataProviderId)
-        throws Exception
-    {
-        // Run without Enough permissions, i.e. expect SecurityException
-        assert System.getSecurityManager() != null;
-        AccessControlContext notEnoughPermsACC = withPermissions(perms);
-        try {
-            AccessController.doPrivileged(action, notEnoughPermsACC);
-            fail("EXPECTED SecurityException");
-        } catch (PrivilegedActionException expected) {
-            Throwable t = expected.getCause();
-            if (t instanceof ExecutionException)
-                t = t.getCause();
-
-            if (t instanceof SecurityException)
-                System.out.println("Caught expected SE:" + expected);
-            else
-                fail("Expected SecurityException, but got: " + t);
-        }
-    }
-
-    /**
-     * A Proxy Selector that wraps a ProxySelector.of(), and counts the number
-     * of times its select method has been invoked. This can be used to ensure
-     * that the Proxy Selector is invoked only once per WebSocket.Builder::buildAsync
-     * invocation.
-     */
-    static class CountingProxySelector extends ProxySelector {
-        private final ProxySelector proxySelector;
-        private volatile int count; // 0
-        private CountingProxySelector(InetSocketAddress proxyAddress) {
-            proxySelector = ProxySelector.of(proxyAddress);
-        }
-
-        public static CountingProxySelector of(InetSocketAddress proxyAddress) {
-            return new CountingProxySelector(proxyAddress);
-        }
-
-        int count() { return count; }
-
-        @Override
-        public List<Proxy> select(URI uri) {
-            System.out.println("PS: uri");
-            Throwable t = new Throwable();
-            t.printStackTrace(System.out);
-            count++;
-            return proxySelector.select(uri);
-        }
-
-        @Override
-        public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
-            proxySelector.connectFailed(uri, sa, ioe);
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/security/httpclient.policy b/test/jdk/java/net/httpclient/websocket/security/httpclient.policy
deleted file mode 100644
index 22f71a6972f..00000000000
--- a/test/jdk/java/net/httpclient/websocket/security/httpclient.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// bootstrap to get the test going, it will do its own restrictions
-grant codeBase "file:${test.classes}/*" {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/net/spi/InetAddressResolverProvider/ResolvePermissionTest.java b/test/jdk/java/net/spi/InetAddressResolverProvider/ResolvePermissionTest.java
deleted file mode 100644
index 9f77ad073ed..00000000000
--- a/test/jdk/java/net/spi/InetAddressResolverProvider/ResolvePermissionTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.InetAddress;
-import java.net.SocketPermission;
-import java.net.UnknownHostException;
-import java.security.Permission;
-import java.util.logging.Logger;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @summary Test that resolution of host name requires SocketPermission("resolve", <host name>)
- * permission when running with security manager and custom resolver provider installed.
- * @library lib providers/simple
- * @build test.library/testlib.ResolutionRegistry simple.provider/impl.SimpleResolverProviderImpl
- *        ResolvePermissionTest
- * @run testng/othervm -Dtest.dataFileName=nonExistentFile -Djava.security.manager=allow
- *                      ResolvePermissionTest
- */
-
-public class ResolvePermissionTest {
-
-    @Test
-    public void withResolvePermission() throws Exception {
-        testResolvePermission(true);
-    }
-
-    @Test
-    public void noResolvePermission() throws Exception {
-        testResolvePermission(false);
-    }
-
-    @SuppressWarnings("removal")
-    private void testResolvePermission(boolean grantResolvePermission) throws Exception {
-        // Set security manager which grants or denies permission to resolve 'javaTest.org' host
-        var securityManager = new ResolvePermissionTest.TestSecurityManager(grantResolvePermission);
-        try {
-            System.setSecurityManager(securityManager);
-            Class expectedExceptionClass = grantResolvePermission ?
-                    UnknownHostException.class : SecurityException.class;
-            var exception = Assert.expectThrows(expectedExceptionClass, () -> InetAddress.getByName("javaTest.org"));
-            LOGGER.info("Got expected exception: " + exception);
-        } finally {
-            System.setSecurityManager(null);
-        }
-    }
-
-    static class TestSecurityManager extends SecurityManager {
-        final boolean allowJavaTestOrgResolve;
-
-        public TestSecurityManager(boolean allowJavaTestOrgResolve) {
-            this.allowJavaTestOrgResolve = allowJavaTestOrgResolve;
-        }
-
-        @Override
-        public void checkPermission(Permission permission) {
-            if (permission instanceof java.net.SocketPermission) {
-                SocketPermission sockPerm = (SocketPermission) permission;
-                if ("resolve".equals(sockPerm.getActions())) {
-                    String host = sockPerm.getName();
-                    LOGGER.info("Checking 'resolve' SocketPermission: " + permission);
-                    if ("javaTest.org".equals(host) && !allowJavaTestOrgResolve) {
-                        LOGGER.info("Denying 'resolve' permission for 'javaTest.org'");
-                        throw new SecurityException("Access Denied");
-                    }
-                }
-            }
-        }
-    }
-
-    private static final Logger LOGGER = Logger.getLogger(ResolvePermissionTest.class.getName());
-}
diff --git a/test/jdk/java/net/spi/InetAddressResolverProvider/RuntimePermissionTest.java b/test/jdk/java/net/spi/InetAddressResolverProvider/RuntimePermissionTest.java
deleted file mode 100644
index a804a2c6b0e..00000000000
--- a/test/jdk/java/net/spi/InetAddressResolverProvider/RuntimePermissionTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.net.InetAddress;
-import java.security.Permission;
-import java.util.ServiceConfigurationError;
-import java.util.logging.Logger;
-
-/*
- * @test
- * @summary Test that instantiation of InetAddressResolverProvider requires "inetAddressResolverProvider"
- *          RuntimePermission when running with security manager.
- * @library lib providers/simple
- * @build test.library/testlib.ResolutionRegistry simple.provider/impl.SimpleResolverProviderImpl
- *        RuntimePermissionTest
- * @run testng/othervm -Djava.security.manager=allow RuntimePermissionTest
- */
-
-public class RuntimePermissionTest {
-
-    @Test
-    public void withRuntimePermission() throws Exception {
-        testRuntimePermission(true);
-    }
-
-    @Test
-    public void noRuntimePermission() throws Exception {
-        testRuntimePermission(false);
-    }
-
-    @SuppressWarnings("removal")
-    private void testRuntimePermission(boolean permitInetAddressResolver) throws Exception {
-        // Set security manager which grants all permissions + RuntimePermission("inetAddressResolverProvider")
-        var securityManager = new TestSecurityManager(permitInetAddressResolver);
-        try {
-            System.setSecurityManager(securityManager);
-            if (permitInetAddressResolver) {
-                InetAddress.getByName("javaTest.org");
-            } else {
-                ServiceConfigurationError sce =
-                        Assert.expectThrows(ServiceConfigurationError.class,
-                                            () -> InetAddress.getByName("javaTest.org"));
-                System.err.println("Got ServiceConfigurationError: " + sce);
-                Throwable cause = sce.getCause();
-                Assert.assertTrue(cause instanceof SecurityException);
-                Assert.assertTrue(cause.getMessage().contains(RUNTIME_PERMISSION_NAME));
-            }
-        } finally {
-            System.setSecurityManager(null);
-        }
-    }
-
-    static class TestSecurityManager extends SecurityManager {
-        final boolean permitInetAddressResolver;
-
-        public TestSecurityManager(boolean permitInetAddressResolver) {
-            this.permitInetAddressResolver = permitInetAddressResolver;
-            System.err.println("inetAddressResolverProvider permission is " +
-                               (permitInetAddressResolver ? "granted" : "not granted"));
-        }
-
-        @Override
-        public void checkPermission(Permission permission) {
-            if (permission instanceof RuntimePermission) {
-                if (RUNTIME_PERMISSION_NAME.equals(permission.getName()) && !permitInetAddressResolver) {
-                    System.err.println("Denying '" + RUNTIME_PERMISSION_NAME + "' permission");
-                    throw new SecurityException("Access Denied: " + RUNTIME_PERMISSION_NAME);
-                } else {
-                   // Do not do anything for non-matching Permission. Otherwise the test
-                   // has a chance to re-enter here recursively, e.g. due to permission
-                   // checks during class load. This would eventually overflow the stack.
-               }
-            }
-        }
-    }
-
-    private static final String RUNTIME_PERMISSION_NAME = "inetAddressResolverProvider";
-
-}
diff --git a/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java b/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java
index fc62594e032..9f8381a92c8 100644
--- a/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java
+++ b/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java
@@ -75,20 +75,10 @@ public static void main(String[] args) throws Throwable {
         unknownProtocol("bar", UNKNOWN);
         viaProvider("baz", KNOWN);
         viaProvider("bert", KNOWN);
-        viaProvider("ernie", UNKNOWN, "-Djava.security.manager");
-        viaProvider("curly", UNKNOWN, "-Djava.security.manager");
-        viaProvider("larry", KNOWN, "-Djava.security.manager",
-                "-Djava.security.policy=" + TEST_SRC + File.separator + "basic.policy");
-        viaProvider("moe", KNOWN, "-Djava.security.manager",
-                "-Djava.security.policy=" + TEST_SRC + File.separator + "basic.policy");
         viaBadProvider("tom", SCE);
         viaBadProvider("jerry", SCE);
     }
 
-    static final String SECURITY_MANAGER_DEPRECATED
-            = "WARNING: The Security Manager is deprecated and will be removed in a future release."
-                    + System.getProperty("line.separator");
-
     private static String withoutWarning(String in) {
         return in.lines().filter(s -> !s.startsWith("WARNING:")).collect(Collectors.joining());
     }
diff --git a/test/jdk/java/net/spi/URLStreamHandlerProvider/basic.policy b/test/jdk/java/net/spi/URLStreamHandlerProvider/basic.policy
deleted file mode 100644
index fa84f5fe5d9..00000000000
--- a/test/jdk/java/net/spi/URLStreamHandlerProvider/basic.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- grant {
-    permission java.lang.RuntimePermission "setFactory";
-};
-
diff --git a/test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java
index 043c33d303a..02a8cbf3deb 100644
--- a/test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java
+++ b/test/jdk/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,7 @@
  * @test
  * @bug 4607272
  * @summary tests tasks can be submitted to a channel group's thread pool.
- * @library /test/lib bootlib
- * @build PrivilegedThreadFactory Attack
- *        jdk.test.lib.util.JarUtils
- * @run driver SetupJar
- * @run main/othervm -Xbootclasspath/a:privileged.jar -Djava.security.manager=allow AsExecutor
+ * @run main AsExecutor
  */
 
 import java.nio.channels.AsynchronousChannelGroup;
@@ -42,7 +38,7 @@ public class AsExecutor {
 
     public static void main(String[] args) throws Exception {
         // create channel groups
-        ThreadFactory factory = new PrivilegedThreadFactory();
+        ThreadFactory factory = Executors.defaultThreadFactory();
         AsynchronousChannelGroup group1 = AsynchronousChannelGroup
             .withFixedThreadPool(5, factory);
         AsynchronousChannelGroup group2 = AsynchronousChannelGroup
@@ -55,18 +51,6 @@ public static void main(String[] args) throws Exception {
             testSimpleTask(group1);
             testSimpleTask(group2);
             testSimpleTask(group3);
-
-            // install security manager and test again
-            System.setSecurityManager( new SecurityManager() );
-            testSimpleTask(group1);
-            testSimpleTask(group2);
-            testSimpleTask(group3);
-
-            // attempt to execute tasks that run with only frames from boot
-            // class loader on the stack.
-            testAttackingTask(group1);
-            testAttackingTask(group2);
-            testAttackingTask(group3);
         } finally {
             group1.shutdown();
             group2.shutdown();
@@ -84,14 +68,4 @@ public void run() {
         });
         latch.await();
     }
-
-    static void testAttackingTask(AsynchronousChannelGroup group) throws Exception {
-        Executor executor = (Executor)group;
-        Attack task = new Attack();
-        executor.execute(task);
-        task.waitUntilDone();
-        if (!task.failedDueToSecurityException())
-            throw new RuntimeException("SecurityException expected");
-    }
-
 }
diff --git a/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java
deleted file mode 100644
index ae0bf64d037..00000000000
--- a/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * A task that attempts to attack the current host.
- */
-
-public class Attack implements Runnable {
-    private final CountDownLatch latch = new CountDownLatch(1);
-    private volatile boolean failedDueToSecurityException;
-
-    public void Attack() {
-        // check class is on boot class path
-        if (Attack.class.getClassLoader() != null)
-            throw new RuntimeException("Attack class not on boot class path");
-    }
-
-    @Override
-    public void run() {
-        try {
-            new Socket(InetAddress.getLoopbackAddress(), 9999).close();
-            throw new RuntimeException("Connected (not expected)");
-        } catch (IOException e) {
-            throw new RuntimeException("IOException (not expected)");
-        } catch (SecurityException e) {
-            failedDueToSecurityException = true;
-        } finally {
-            latch.countDown();
-        }
-    }
-
-    public void waitUntilDone() throws InterruptedException {
-        latch.await();
-    }
-
-    public boolean failedDueToSecurityException() {
-        return failedDueToSecurityException;
-    }
-}
diff --git a/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java b/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java
deleted file mode 100644
index 0a2d58eaf64..00000000000
--- a/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.concurrent.ThreadFactory;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * The "privileged" ThreadFactory used by the AsExecutor test.
- */
-
-public class PrivilegedThreadFactory implements ThreadFactory {
-    public void PrivilegedThreadPoolFactory() {
-        // check class is on boot class path
-        if (PrivilegedThreadFactory.class.getClassLoader() != null)
-            throw new RuntimeException("PrivilegedThreadFactory class not on boot class path");
-    }
-
-    @Override
-    public Thread newThread(final Runnable r) {
-        return AccessController.doPrivileged(new PrivilegedAction<Thread>() {
-            @Override
-            public Thread run() {
-                Thread t = new Thread(r);
-                t.setDaemon(true);
-                return t;
-            }
-        });
-    }
-}
diff --git a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java
deleted file mode 100644
index a48ac19469d..00000000000
--- a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4607272
- * @summary Unit test for AsynchronousServerServerSocketChannel
- * @build WithSecurityManager
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager allow
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager deny
- */
-
-import java.nio.file.Paths;
-import java.nio.channels.*;
-import java.net.*;
-import java.util.concurrent.*;
-
-public class WithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        boolean allow = false;
-        String policy = (args[0].equals("allow")) ? "java.policy.allow" :
-            "java.policy.deny";
-
-        String testSrc = System.getProperty("test.src");
-        if (testSrc == null)
-            testSrc = ".";
-
-        System.setProperty("java.security.policy",
-            Paths.get(testSrc).resolve(policy).toString());
-        System.setSecurityManager(new SecurityManager());
-
-        AsynchronousServerSocketChannel listener =
-            AsynchronousServerSocketChannel.open().bind(new InetSocketAddress(0));
-
-        InetAddress lh = InetAddress.getLocalHost();
-        int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
-
-        // establish and accept connection
-        SocketChannel sc = SocketChannel.open(new InetSocketAddress(lh, port));
-        Future<AsynchronousSocketChannel> result = listener.accept();
-
-        if (allow) {
-            // no security exception
-            result.get().close();
-        } else {
-            try {
-                result.get();
-            } catch (ExecutionException x) {
-                if (!(x.getCause() instanceof SecurityException))
-                    throw new RuntimeException("SecurityException expected");
-            }
-        }
-
-        sc.close();
-        listener.close();
-    }
-}
diff --git a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow
deleted file mode 100644
index 73da4b089ec..00000000000
--- a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.net.SocketPermission "*:1024-", "accept,connect,resolve";
-};
diff --git a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny b/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny
deleted file mode 100644
index 00b9cb0685d..00000000000
--- a/test/jdk/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.net.SocketPermission "*:1024-", "connect,resolve";
-};
diff --git a/test/jdk/java/nio/channels/DatagramChannel/ConnectPortZero.java b/test/jdk/java/nio/channels/DatagramChannel/ConnectPortZero.java
index 6074d4cd543..4aa28e5226e 100644
--- a/test/jdk/java/nio/channels/DatagramChannel/ConnectPortZero.java
+++ b/test/jdk/java/nio/channels/DatagramChannel/ConnectPortZero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
-import java.net.SocketPermission;
 import java.nio.channels.DatagramChannel;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,27 +45,22 @@
  * @bug 8240533
  * @library /test/lib
  * @build jdk.test.lib.net.IPSupport
- * @summary Check that DatagramChannel throws expected Exception when connecting
- *          to port 0
- * @run testng/othervm -Djava.security.manager=allow ConnectPortZero
- * @run testng/othervm -Djava.security.manager=allow -Djava.net.preferIPv4Stack=true ConnectPortZero
+ * @summary Check that DatagramChannel throws expected Exception when connecting to port 0
+ * @run testng ConnectPortZero
+ * @run testng/othervm -Djava.net.preferIPv4Stack=true ConnectPortZero
  */
 
 public class ConnectPortZero {
     private InetSocketAddress loopbackZeroAddr, wildcardZeroAddr;
-    private DatagramChannel datagramChannel, datagramChannelIPv4,
-    datagramChannelIPv6;
+    private DatagramChannel datagramChannel, datagramChannelIPv4, datagramChannelIPv6;
     private List<Object[]> channels;
 
     private static final Class<SocketException> SE = SocketException.class;
-    private static final Class<AccessControlException> ACE =
-            AccessControlException.class;
 
     @BeforeTest
     public void setUp() throws IOException {
         wildcardZeroAddr = new InetSocketAddress(0);
-        loopbackZeroAddr = new
-                InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        loopbackZeroAddr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
         channels = new ArrayList<>();
 
@@ -99,31 +87,6 @@ public void testChannelConnect(DatagramChannel dc) {
         assertThrows(SE, () -> dc.connect(wildcardZeroAddr));
     }
 
-    @Test(dataProvider = "data")
-    public void testSendWithSecurityManager(DatagramChannel dc) {
-        Policy defaultPolicy = Policy.getPolicy();
-        try {
-            Policy.setPolicy(new SendPortZero.NoSendPolicy());
-            System.setSecurityManager(new SecurityManager());
-
-            assertThrows(ACE, () -> dc.connect(loopbackZeroAddr));
-            assertThrows(ACE, () -> dc.connect(wildcardZeroAddr));
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    static class NoSendPolicy extends Policy {
-        final PermissionCollection perms = new Permissions();
-        { perms.add(
-                new SocketPermission("*:0", "connect")); }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return !perms.implies(perm);
-        }
-    }
-
     @AfterTest
     public void tearDown() throws IOException {
         for(Object[] ch : channels) {
diff --git a/test/jdk/java/nio/channels/DatagramChannel/SendPortZero.java b/test/jdk/java/nio/channels/DatagramChannel/SendPortZero.java
index dc3511abb34..6a8b9f24d41 100644
--- a/test/jdk/java/nio/channels/DatagramChannel/SendPortZero.java
+++ b/test/jdk/java/nio/channels/DatagramChannel/SendPortZero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
-import java.net.SocketPermission;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,30 +46,25 @@
  * @bug 8236105 8240533
  * @library /test/lib
  * @build jdk.test.lib.net.IPSupport
- * @summary Check that DatagramChannel throws expected Exception when sending to
- *          port 0
- * @run testng/othervm -Djava.security.manager=allow SendPortZero
- * @run testng/othervm -Djava.security.manager=allow -Djava.net.preferIPv4Stack=true SendPortZero
+ * @summary Check that DatagramChannel throws expected Exception when sending to port 0
+ * @run testng/othervm SendPortZero
+ * @run testng/othervm -Djava.net.preferIPv4Stack=true SendPortZero
  */
 
 public class SendPortZero {
     private ByteBuffer buf;
     private List<Object[]> channels;
     private InetSocketAddress loopbackZeroAddr, wildcardZeroAddr;
-    private DatagramChannel datagramChannel, datagramChannelIPv4,
-    datagramChannelIPv6;
+    private DatagramChannel datagramChannel, datagramChannelIPv4, datagramChannelIPv6;
 
     private static final Class<SocketException> SE = SocketException.class;
-    private static final Class<AccessControlException> ACE =
-            AccessControlException.class;
 
     @BeforeTest
     public void setUp() throws IOException {
         buf = ByteBuffer.wrap("test".getBytes());
 
         wildcardZeroAddr = new InetSocketAddress(0);
-        loopbackZeroAddr = new
-                InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        loopbackZeroAddr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
         channels = new ArrayList<>();
 
@@ -103,31 +91,6 @@ public void testChannelSend(DatagramChannel dc) {
         assertThrows(SE, () -> dc.send(buf, wildcardZeroAddr));
     }
 
-    @Test(dataProvider = "data")
-    public void testSendWithSecurityManager(DatagramChannel dc) {
-        Policy defaultPolicy = Policy.getPolicy();
-        try {
-            Policy.setPolicy(new NoSendPolicy());
-            System.setSecurityManager(new SecurityManager());
-
-            assertThrows(ACE, () -> dc.send(buf, loopbackZeroAddr));
-            assertThrows(ACE, () -> dc.send(buf, wildcardZeroAddr));
-        } finally {
-            System.setSecurityManager(null);
-            Policy.setPolicy(defaultPolicy);
-        }
-    }
-
-    static class NoSendPolicy extends Policy {
-        final PermissionCollection perms = new Permissions();
-        { perms.add(
-                new SocketPermission("*:0", "connect")); }
-
-        public boolean implies(ProtectionDomain domain, Permission perm) {
-            return !perms.implies(perm);
-        }
-    }
-
     @AfterTest
     public void tearDown() throws IOException {
         for(Object[] ch : channels) {
diff --git a/test/jdk/java/nio/channels/FileChannel/MapWithSecurityManager.java b/test/jdk/java/nio/channels/FileChannel/MapWithSecurityManager.java
deleted file mode 100644
index 1985799caf1..00000000000
--- a/test/jdk/java/nio/channels/FileChannel/MapWithSecurityManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8236582
- * @summary Tests the map method when running with a security manager
- * @run main/othervm -Djava.security.manager=allow MapWithSecurityManager
- */
-
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class MapWithSecurityManager {
-    public static void main(String[] args) throws IOException {
-        Path tempFile = Files.createTempFile("test", "test");
-        try (FileChannel ch = FileChannel.open(tempFile)) {
-             System.setSecurityManager(new SecurityManager());
-             ch.map(FileChannel.MapMode.READ_ONLY, 0, 0);
-        }
-    }
-}
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
index 813bb839bfc..be50e8b7864 100644
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,6 @@ public class InheritedChannelTest {
     private static final String TEST_SRC = System.getProperty("test.src");
     private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
     private static final String TEST_CLASSES = System.getProperty("test.classes");
-    private static final Path POLICY_PASS = Paths.get(TEST_SRC, "java.policy.pass");
-    private static final Path POLICY_FAIL = Paths.get(TEST_SRC, "java.policy.fail");
 
     private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
 
@@ -82,25 +80,6 @@ public Object[][] testCases() {
             { "EchoTest",  List.of(EchoTest.class.getName())  },
             { "CheckIPv6Test",  List.of(CheckIPv6Test.class.getName())  },
             { "CloseTest", List.of(CloseTest.class.getName()) },
-
-            // run StateTest with a SecurityManager set
-            // Note that the system properties are arguments to StateTest and not options.
-            // These system properties are passed to the launched service as options:
-            // java [-options] class [args...]
-
-            { "StateTest run with " + POLICY_PASS, List.of(StateTest.class.getName(),
-                                                           "-Djava.security.manager",
-                                                           "-Dtest.classes=" + TEST_CLASSES,
-                                                           "-Djava.security.policy="
-                                                           + POLICY_PASS)
-            },
-            { "StateTest run with " + POLICY_FAIL, List.of(StateTest.class.getName(),
-                                                           "-expectFail",
-                                                           "-Djava.security.manager",
-                                                           "-Dtest.classes=" + TEST_CLASSES,
-                                                           "-Djava.security.policy="
-                                                           + POLICY_FAIL)
-            }
         };
     }
 
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
index 002fb4141f9..aa1962b35c5 100644
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,12 +105,7 @@ public static void main(String args[]) throws IOException {
             reply_port = Integer.parseInt(args[0]);
             logDir = System.getProperty("test.classes");
 
-            Channel c = null;
-            try {
-                c = System.inheritedChannel();
-            } catch (SecurityException se) {
-                // ignore
-            }
+            Channel c = System.inheritedChannel();
             if (c == null) {
                 println("c == null");
                 reply("FAILED");
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail
deleted file mode 100644
index f8f1746bfc4..00000000000
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Used by unit tests for System.inheritedChannel() method. This policy
-// file allows doesn't grant the service the runtime permission needed
-// to obtain the inherited channel but does grant the socket permission
-// needed to report a test result over a socket connection.
-//
-grant {
-    permission java.net.SocketPermission "*:1024-", "resolve,connect";
-    permission java.io.FilePermission "${test.classes}${/}statetest.txt", "read,write";
-    permission java.util.PropertyPermission "test.classes", "read";
-};
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass
deleted file mode 100644
index 66a480d2df5..00000000000
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Used by unit tests for System.inheritedChannel() method. This policy
-// file allows a service to obtain the inherited channel and additionally
-// allows the service to report a test result over a socket connection.
-//
-grant {
-    permission java.lang.RuntimePermission "inheritedChannel";
-    permission java.net.SocketPermission "*:1024-", "resolve,connect";
-    permission java.io.FilePermission "${test.classes}${/}statetest.txt", "read,write";
-    permission java.util.PropertyPermission "test.classes", "read";
-};
diff --git a/test/jdk/java/nio/channels/unixdomain/Security.java b/test/jdk/java/nio/channels/unixdomain/Security.java
deleted file mode 100644
index 4cef6cef893..00000000000
--- a/test/jdk/java/nio/channels/unixdomain/Security.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8245194
- * @run main/othervm/java.security.policy=policy1 Security policy1
- * @run main/othervm/java.security.policy=policy2 Security policy2
- * @run main/othervm -Djava.security.manager=allow Security policy3
- * @summary Security test for Unix Domain socket and server socket channels
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.net.SocketAddress;
-import java.net.UnixDomainSocketAddress;
-import java.nio.channels.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-
-import static java.net.StandardProtocolFamily.UNIX;
-
-/**
- * Tests required all with security manager
- */
-
-public class Security {
-
-    static interface Command {
-        public void run() throws Exception;
-    }
-
-    static <T extends Exception> void call(Command r, Class<? extends Exception> expectedException) {
-        boolean threw = false;
-        try {
-            r.run();
-        } catch (Throwable t) {
-            if (expectedException == null) {
-                t.printStackTrace();
-                throw new RuntimeException("an exception was thrown but was not expected");
-            }
-            threw = true;
-            if (!(expectedException.isAssignableFrom(t.getClass()))) {
-                throw new RuntimeException("wrong exception type thrown " + t.toString());
-            }
-        }
-        if (expectedException != null && !threw) {
-            // should have thrown
-            throw new RuntimeException("% was expected".formatted(expectedException.getName()));
-        }
-    }
-
-
-    public static void main(String[] args) throws Exception {
-        try {
-           SocketChannel.open(UNIX);
-        } catch (UnsupportedOperationException e) {
-            System.out.println("Unix domain not supported");
-            return;
-        }
-
-        String policy = args[0];
-        switch (policy) {
-            case "policy1":
-                testPolicy1();
-                break;
-            case "policy2":
-                testPolicy2();
-                break;
-            case "policy3":
-                testPolicy3();
-                break;
-        }
-    }
-
-    static void setSecurityManager(String policy) {
-        String testSrc = System.getProperty("test.src");
-        // Three /// required for Windows below
-        String policyURL = "file:///" + testSrc + File.separator + policy;
-        System.out.println("POLICY: " + policyURL);
-        System.setProperty("java.security.policy", policyURL);
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    static void close(NetworkChannel... channels) {
-
-        for (NetworkChannel chan : channels) {
-            try {
-                chan.close();
-            } catch (Exception e) {
-            }
-        }
-    }
-
-    private static final Class<SecurityException> SE = SecurityException.class;
-    private static final Class<IOException> IOE = IOException.class;
-
-    // No permission
-
-    public static void testPolicy1() throws Exception {
-        Path servername = Path.of("sock");
-        Files.deleteIfExists(servername);
-        // Permission exists to bind a ServerSocketChannel
-        final UnixDomainSocketAddress saddr = UnixDomainSocketAddress.of(servername);
-        try (final ServerSocketChannel server = ServerSocketChannel.open(UNIX)) {
-            try (final SocketChannel client = SocketChannel.open(UNIX)) {
-                call(() -> {
-                    server.bind(saddr);
-                }, SE);
-                call(() -> {
-                    client.connect(saddr);
-                }, SE);
-            }
-        } finally {
-            Files.deleteIfExists(servername);
-        }
-    }
-
-    // All permissions
-
-    public static void testPolicy2() throws Exception {
-        Path servername = Path.of("sock");
-        Files.deleteIfExists(servername);
-        final UnixDomainSocketAddress saddr = UnixDomainSocketAddress.of(servername);
-        try (final ServerSocketChannel server = ServerSocketChannel.open(UNIX)) {
-            try (final SocketChannel client = SocketChannel.open(UNIX)) {
-                call(() -> {
-                    server.bind(saddr);
-                }, null);
-                call(() -> {
-                    client.connect(saddr);
-                }, null);
-                try (final SocketChannel peer = server.accept()) {
-                    // Should succeed
-                }
-            }
-        } finally {
-            Files.deleteIfExists(servername);
-        }
-    }
-
-    public static void testPolicy3() throws Exception {
-        Path sock1 = Path.of("sock3");
-        Path sock2 = null;
-        Files.deleteIfExists(sock1);
-        final UnixDomainSocketAddress saddr = UnixDomainSocketAddress.of(sock1);
-        try (var s1 = ServerSocketChannel.open(UNIX)) {
-            s1.bind(saddr);
-            try (var s2 = ServerSocketChannel.open(UNIX)) {
-                s2.bind(null);
-                var add2 = (UnixDomainSocketAddress)s2.getLocalAddress();
-                sock2 = add2.getPath();
-
-                // Now set security manager and check if we can see addresses
-
-                setSecurityManager("policy3");
-
-                if (((UnixDomainSocketAddress)s1
-                            .getLocalAddress())
-                            .getPath()
-                            .toString()
-                            .length() != 0)
-                {
-                    throw new RuntimeException("address should have been empty");
-                }
-
-                if (((UnixDomainSocketAddress)s2
-                            .getLocalAddress())
-                            .getPath()
-                            .toString()
-                            .length() != 0)
-                {
-                    throw new RuntimeException("address should have been empty");
-                }
-            }
-        } finally {
-            System.setSecurityManager(null);
-            Files.deleteIfExists(sock1);
-            Files.deleteIfExists(sock2);
-        }
-    }
-}
diff --git a/test/jdk/java/nio/channels/unixdomain/policy1 b/test/jdk/java/nio/channels/unixdomain/policy1
deleted file mode 100644
index ccfe2ef15a7..00000000000
--- a/test/jdk/java/nio/channels/unixdomain/policy1
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-grant {
-    // No permission
-    permission java.io.FilePermission "sock", "delete";
-};
diff --git a/test/jdk/java/nio/channels/unixdomain/policy2 b/test/jdk/java/nio/channels/unixdomain/policy2
deleted file mode 100644
index 00643294155..00000000000
--- a/test/jdk/java/nio/channels/unixdomain/policy2
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-grant {
-    // permission to bind a SocketChannel in sockets directory
-    permission java.net.NetPermission "accessUnixDomainSocket";
-
-    permission java.io.FilePermission "sock", "delete";
-};
diff --git a/test/jdk/java/nio/channels/unixdomain/policy3 b/test/jdk/java/nio/channels/unixdomain/policy3
deleted file mode 100644
index 89edb67117a..00000000000
--- a/test/jdk/java/nio/channels/unixdomain/policy3
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-grant {
-    // No permission
-    permission java.io.FilePermission "sock", "delete";
-
-    permission java.lang.RuntimePermission "setSecurityManager";
-};
diff --git a/test/jdk/java/nio/channels/vthread/SelectorOps.java b/test/jdk/java/nio/channels/vthread/SelectorOps.java
index 950bdaf0671..1abb5c8bc5f 100644
--- a/test/jdk/java/nio/channels/vthread/SelectorOps.java
+++ b/test/jdk/java/nio/channels/vthread/SelectorOps.java
@@ -28,6 +28,14 @@
  * @run junit/othervm --enable-native-access=ALL-UNNAMED SelectorOps
  */
 
+/*
+ * @test id=poller-modes
+ * @requires (os.family == "linux") | (os.family == "mac")
+ * @library /test/lib
+ * @run junit/othervm -Djdk.pollerMode=1 --enable-native-access=ALL-UNNAMED SelectorOps
+ * @run junit/othervm -Djdk.pollerMode=2 --enable-native-access=ALL-UNNAMED SelectorOps
+ */
+
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
diff --git a/test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java b/test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java
index 0dc0734513c..abf46d81b1c 100644
--- a/test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java
+++ b/test/jdk/java/nio/charset/spi/CharsetProviderBasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,16 +61,6 @@ public class CharsetProviderBasicTest {
         "US-ASCII", "8859_1", "iso-ir-6", "UTF-16", "windows-1252", "!BAR", "cp1252"
     );
 
-    private static final List MINIMAL_POLICY = List.of(
-        "-Djava.security.manager",
-        "-Djava.security.policy=" + TEST_SRC + File.separator + "default-pol"
-    );
-
-    private static final List CP_POLICY = List.of(
-        "-Djava.security.manager",
-        "-Djava.security.policy=" + TEST_SRC + File.separator + "charsetProvider.sp"
-    );
-
     private static boolean checkSupports(String locale) throws Throwable {
         return ProcessTools.executeProcess("sh", "-c", "LC_ALL=" + locale + " && "
                                            + "locale -a | grep " + locale)
@@ -82,16 +72,12 @@ private static boolean checkSupports(String locale) throws Throwable {
     @DataProvider
     public static Iterator<Object[]> testCases() {
         return Stream.of("", "ja_JP.eucJP", "tr_TR")
-                     .flatMap(locale -> Stream.of(
-                             new Object[]{locale, List.of(""), "FOO"},
-                             new Object[]{locale, MINIMAL_POLICY, "!FOO"},
-                             new Object[]{locale, CP_POLICY, "FOO"}
-                     ))
+                     .map(locale -> new Object[]{locale, "FOO"})
                      .iterator();
     }
 
     @Test(dataProvider = "testCases")
-    public void testDefaultCharset(String locale, List opts, String css) throws Throwable {
+    public void testDefaultCharset(String locale, String css) throws Throwable {
         if ((System.getProperty("os.name").startsWith("Windows") || !checkSupports(locale))
                 && (!locale.isEmpty())) {
             System.out.println(locale + ": Locale not supported, skipping...");
@@ -103,7 +89,6 @@ public void testDefaultCharset(String locale, List opts, String css) throws Thro
         args.addAll(asList(Utils.getTestJavaOpts()));
         args.add("-cp");
         args.add(System.getProperty("test.class.path") + File.pathSeparator + "test.jar");
-        args.addAll(opts);
         args.add(CharsetTest.class.getName());
         args.addAll(DEFAULT_CSS);
         args.add(css);
diff --git a/test/jdk/java/nio/charset/spi/charsetProvider.sp b/test/jdk/java/nio/charset/spi/charsetProvider.sp
deleted file mode 100644
index a50c8a463a3..00000000000
--- a/test/jdk/java/nio/charset/spi/charsetProvider.sp
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-
-grant { 
-    permission java.lang.RuntimePermission "charsetProvider";
-};
diff --git a/test/jdk/java/nio/charset/spi/default-pol b/test/jdk/java/nio/charset/spi/default-pol
deleted file mode 100644
index da0bbc85776..00000000000
--- a/test/jdk/java/nio/charset/spi/default-pol
+++ /dev/null
@@ -1,39 +0,0 @@
-grant codeBase "jrt:/jdk.charsets" {
-        permission java.io.FilePermission "${java.home}/-", "read";
-        permission java.util.PropertyPermission "os.name", "read";
-        permission java.lang.RuntimePermission "charsetProvider";
-        permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-        permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.cs";
-};
-
-// default permissions granted to all domains
-
-grant { 
-	// allows anyone to listen on un-privileged ports
-	permission java.net.SocketPermission "localhost:1024-", "listen";
-
-	// "standard" properies that can be read by anyone
-
-	permission java.util.PropertyPermission "java.version", "read";
-	permission java.util.PropertyPermission "java.vendor", "read";
-	permission java.util.PropertyPermission "java.vendor.url", "read";
-	permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "os.name", "read";
-	permission java.util.PropertyPermission "os.version", "read";
-	permission java.util.PropertyPermission "os.arch", "read";
-	permission java.util.PropertyPermission "file.separator", "read";
-	permission java.util.PropertyPermission "path.separator", "read";
-	permission java.util.PropertyPermission "line.separator", "read";
-
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-};
-
diff --git a/test/jdk/java/nio/file/Files/CheckPermissions.java b/test/jdk/java/nio/file/Files/CheckPermissions.java
deleted file mode 100644
index 397ace359f7..00000000000
--- a/test/jdk/java/nio/file/Files/CheckPermissions.java
+++ /dev/null
@@ -1,792 +0,0 @@
-/*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 6866804 7006126 8028270 8065109 8289984
- * @summary Unit test for java.nio.file.Files
- * @library ..
- * @build CheckPermissions
- * @run main/othervm -Djava.security.manager=allow CheckPermissions
- */
-
-import java.nio.ByteBuffer;
-import java.nio.file.*;
-import static java.nio.file.Files.*;
-import static java.nio.file.StandardOpenOption.*;
-import java.nio.file.attribute.*;
-import java.nio.channels.SeekableByteChannel;
-import java.security.Permission;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-/**
- * Checks each method that accesses the file system does the right permission
- * check when there is a security manager set.
- */
-
-public class CheckPermissions {
-
-    static class Checks {
-        private List<Permission> permissionsChecked = new ArrayList<>();
-        private Set<String>  propertiesChecked = new HashSet<>();
-        private List<String> readsChecked   = new ArrayList<>();
-        private List<String> writesChecked  = new ArrayList<>();
-        private List<String> deletesChecked = new ArrayList<>();
-        private List<String> execsChecked   = new ArrayList<>();
-
-        List<Permission> permissionsChecked()  { return permissionsChecked; }
-        Set<String> propertiesChecked()        { return propertiesChecked; }
-        List<String> readsChecked()            { return readsChecked; }
-        List<String> writesChecked()           { return writesChecked; }
-        List<String> deletesChecked()          { return deletesChecked; }
-        List<String> execsChecked()            { return execsChecked; }
-    }
-
-    static ThreadLocal<Checks> myChecks =
-        new ThreadLocal<Checks>() {
-            @Override protected Checks initialValue() {
-                return null;
-            }
-        };
-
-    static void prepare() {
-        myChecks.set(new Checks());
-    }
-
-    static void assertCheckPermission(Permission expected) {
-        if (!myChecks.get().permissionsChecked().contains(expected))
-          throw new RuntimeException(expected + " not checked");
-    }
-
-    static void assertCheckPropertyAccess(String key) {
-        if (!myChecks.get().propertiesChecked().contains(key))
-            throw new RuntimeException("Property " + key + " not checked");
-    }
-
-    static void assertChecked(Path file, List<String> list) {
-        String s = file.toString();
-        for (String f: list) {
-            if (f.endsWith(s))
-                return;
-        }
-        throw new RuntimeException("Access not checked");
-    }
-
-    static void assertCheckRead(Path file) {
-        assertChecked(file, myChecks.get().readsChecked());
-    }
-
-    static void assertCheckWrite(Path file) {
-        assertChecked(file, myChecks.get().writesChecked());
-    }
-
-    static void assertCheckWriteToDirectory(Path dir) {
-        String s = dir.toString();
-        List<String> list = myChecks.get().writesChecked();
-        for (String f: list) {
-            if (f.startsWith(s)) {
-                return;
-            }
-        }
-        throw new RuntimeException("Access not checked");
-    }
-
-    static void assertCheckDelete(Path file) {
-        assertChecked(file, myChecks.get().deletesChecked());
-    }
-
-    static void assertCheckExec(Path file) {
-        assertChecked(file, myChecks.get().execsChecked());
-    }
-
-    static class LoggingSecurityManager extends SecurityManager {
-        static void install() {
-            System.setSecurityManager(new LoggingSecurityManager());
-        }
-
-        @Override
-        public void checkPermission(Permission perm) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.permissionsChecked().add(perm);
-        }
-
-        @Override
-        public void checkPropertyAccess(String key) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.propertiesChecked().add(key);
-        }
-
-        @Override
-        public void checkRead(String file) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.readsChecked().add(file);
-        }
-
-        @Override
-        public void checkWrite(String file) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.writesChecked().add(file);
-        }
-
-        @Override
-        public void checkDelete(String file) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.deletesChecked().add(file);
-        }
-
-        @Override
-        public void checkExec(String file) {
-            Checks checks = myChecks.get();
-            if (checks != null)
-                checks.execsChecked().add(file);
-        }
-    }
-
-    static void testBasicFileAttributeView(BasicFileAttributeView view, Path file)
-        throws IOException
-    {
-        prepare();
-        view.readAttributes();
-        assertCheckRead(file);
-
-        prepare();
-        FileTime now = FileTime.fromMillis(System.currentTimeMillis());
-        view.setTimes(null, now, now);
-        assertCheckWrite(file);
-    }
-
-    static void testPosixFileAttributeView(PosixFileAttributeView view, Path file)
-        throws IOException
-    {
-        prepare();
-        PosixFileAttributes attrs = view.readAttributes();
-        assertCheckRead(file);
-        assertCheckPermission(new RuntimePermission("accessUserInformation"));
-
-        prepare();
-        view.setPermissions(attrs.permissions());
-        assertCheckWrite(file);
-        assertCheckPermission(new RuntimePermission("accessUserInformation"));
-
-        prepare();
-        view.setOwner(attrs.owner());
-        assertCheckWrite(file);
-        assertCheckPermission(new RuntimePermission("accessUserInformation"));
-
-        prepare();
-        view.setOwner(attrs.owner());
-        assertCheckWrite(file);
-        assertCheckPermission(new RuntimePermission("accessUserInformation"));
-    }
-
-    public static void main(String[] args) throws IOException {
-        final Path testdir = Paths.get(System.getProperty("test.dir", ".")).toAbsolutePath();
-        final Path tmpdir = Paths.get(System.getProperty("java.io.tmpdir"));
-
-        Path file = createFile(testdir.resolve("file1234"));
-        try {
-            LoggingSecurityManager.install();
-
-            // -- check access --
-
-            prepare();
-            exists(file);
-            assertCheckRead(file);
-
-            prepare();
-            isDirectory(file);
-            assertCheckRead(file);
-
-            prepare();
-            isRegularFile(file);
-            assertCheckRead(file);
-
-            prepare();
-            isReadable(file);
-            assertCheckRead(file);
-
-            prepare();
-            isWritable(file);
-            assertCheckWrite(file);
-
-            prepare();
-            isExecutable(file);
-            assertCheckExec(file);
-
-            // -- copy --
-
-            Path target = testdir.resolve("target1234");
-            prepare();
-            copy(file, target);
-            try {
-                assertCheckRead(file);
-                assertCheckWrite(target);
-            } finally {
-                delete(target);
-            }
-
-            if (TestUtil.supportsSymbolicLinks(testdir)) {
-                Path link = testdir.resolve("link1234");
-                createSymbolicLink(link, file);
-                try {
-                    prepare();
-                    copy(link, target, LinkOption.NOFOLLOW_LINKS);
-                    try {
-                        assertCheckRead(link);
-                        assertCheckWrite(target);
-                        assertCheckPermission(new LinkPermission("symbolic"));
-                    } finally {
-                        delete(target);
-                    }
-
-                    prepare();
-                    readSymbolicLink(link);
-                    assertCheckPermission(new FilePermission(link.toString(), "readlink"));
-                } finally {
-                    delete(link);
-                }
-            }
-
-            // -- createDirectory --
-
-            Path subdir = testdir.resolve("subdir1234");
-            prepare();
-            createDirectory(subdir);
-            try {
-                assertCheckWrite(subdir);
-            } finally {
-                delete(subdir);
-            }
-
-            // -- createFile --
-
-            Path fileToCreate = testdir.resolve("file7890");
-            prepare();
-            createFile(fileToCreate);
-            try {
-                assertCheckWrite(fileToCreate);
-            } finally {
-                delete(fileToCreate);
-            }
-
-            // -- createSymbolicLink --
-
-            if (TestUtil.supportsSymbolicLinks(testdir)) {
-                prepare();
-                Path link = testdir.resolve("link1234");
-                createSymbolicLink(link, file);
-                try {
-                    assertCheckWrite(link);
-                    assertCheckPermission(new LinkPermission("symbolic"));
-                } finally {
-                    delete(link);
-                }
-            }
-
-            // -- createLink --
-
-            if (TestUtil.supportsHardLinks(testdir)) {
-                prepare();
-                Path link = testdir.resolve("entry234");
-                createLink(link, file);
-                try {
-                    assertCheckWrite(link);
-                    assertCheckPermission(new LinkPermission("hard"));
-                } finally {
-                    delete(link);
-                }
-            }
-
-            // -- createTempFile --
-
-            prepare();
-            Path tmpfile1 = createTempFile("foo", null);
-            try {
-                assertCheckWriteToDirectory(tmpdir);
-            } finally {
-                delete(tmpfile1);
-            }
-            prepare();
-            Path tmpfile2 = createTempFile(testdir, "foo", ".tmp");
-            try {
-                assertCheckWriteToDirectory(testdir);
-            } finally {
-                delete(tmpfile2);
-            }
-
-            // -- createTempDirectory --
-
-            prepare();
-            Path tmpdir1 = createTempDirectory("foo");
-            try {
-                assertCheckWriteToDirectory(tmpdir);
-            } finally {
-                delete(tmpdir1);
-            }
-            prepare();
-            Path tmpdir2 = createTempDirectory(testdir, "foo");
-            try {
-                assertCheckWriteToDirectory(testdir);
-            } finally {
-                delete(tmpdir2);
-            }
-
-            // -- delete/deleteIfExists --
-
-            Path fileToDelete = testdir.resolve("file7890");
-
-            createFile(fileToDelete);
-            prepare();
-            delete(fileToDelete);
-            assertCheckDelete(fileToDelete);
-
-            createFile(fileToDelete);
-            prepare();
-            deleteIfExists(fileToDelete);   // file exists
-            assertCheckDelete(fileToDelete);
-
-            prepare();
-            deleteIfExists(fileToDelete);   // file does not exist
-            assertCheckDelete(fileToDelete);
-
-            // -- exists/notExists --
-
-            prepare();
-            exists(file);
-            assertCheckRead(file);
-
-            prepare();
-            notExists(file);
-            assertCheckRead(file);
-
-            // -- getFileStore --
-
-            prepare();
-            getFileStore(file);
-            assertCheckRead(file);
-            assertCheckPermission(new RuntimePermission("getFileStoreAttributes"));
-
-            // -- isSameFile --
-
-            prepare();
-            isSameFile(file, testdir);
-            assertCheckRead(file);
-            assertCheckRead(testdir);
-
-            // -- move --
-
-            Path target2 = testdir.resolve("target1234");
-            prepare();
-            move(file, target2);
-            try {
-                assertCheckWrite(file);
-                assertCheckWrite(target2);
-            } finally {
-                // restore file
-                move(target2, file);
-            }
-
-            // -- newByteChannel --
-
-            prepare();
-            try (SeekableByteChannel sbc = newByteChannel(file)) {
-                assertCheckRead(file);
-            }
-            prepare();
-            try (SeekableByteChannel sbc = newByteChannel(file, WRITE)) {
-                assertCheckWrite(file);
-            }
-            prepare();
-            try (SeekableByteChannel sbc = newByteChannel(file, READ, WRITE)) {
-                assertCheckRead(file);
-                assertCheckWrite(file);
-            }
-
-            prepare();
-            try (SeekableByteChannel sbc = newByteChannel(file, DELETE_ON_CLOSE)) {
-                assertCheckRead(file);
-                assertCheckDelete(file);
-            }
-            createFile(file); // restore file
-
-            // -- newBufferedReader/newBufferedWriter --
-
-            prepare();
-            try (BufferedReader br = newBufferedReader(file)) {
-                assertCheckRead(file);
-            }
-
-            prepare();
-            try (BufferedWriter bw = newBufferedWriter(file, WRITE)) {
-                assertCheckWrite(file);
-            }
-
-            prepare();
-            try (BufferedWriter bw = newBufferedWriter(file, DELETE_ON_CLOSE)) {
-                assertCheckWrite(file);
-                assertCheckDelete(file);
-            }
-            createFile(file); // restore file
-
-            prepare();
-            try (BufferedWriter bw = newBufferedWriter(file,
-                StandardCharsets.UTF_16, WRITE)) {
-                assertCheckWrite(file);
-            }
-
-            prepare();
-            try (BufferedWriter bw = newBufferedWriter(file,
-                StandardCharsets.UTF_16, DELETE_ON_CLOSE)) {
-                assertCheckWrite(file);
-                assertCheckDelete(file);
-            }
-            createFile(file); // restore file
-
-            // -- newInputStream/newOutputStream --
-
-            prepare();
-            try (InputStream in = newInputStream(file)) {
-                assertCheckRead(file);
-            }
-            prepare();
-            try (OutputStream out = newOutputStream(file)) {
-                assertCheckWrite(file);
-            }
-
-            // -- write --
-
-            prepare();
-            Files.write(file, new byte[]{(byte) 42, (byte) 666}, WRITE);
-            assertCheckWrite(file);
-
-            prepare();
-            Files.write(file, new byte[]{(byte) 42, (byte) 666}, WRITE,
-                DELETE_ON_CLOSE);
-            assertCheckWrite(file);
-            assertCheckDelete(file);
-            createFile(file); // restore file
-
-            List<String> lines = Arrays.asList("42", "666");
-
-            prepare();
-            Files.write(file, lines, StandardCharsets.UTF_16, WRITE);
-            assertCheckWrite(file);
-
-            prepare();
-            Files.write(file, lines, StandardCharsets.UTF_16, WRITE,
-                DELETE_ON_CLOSE);
-            assertCheckWrite(file);
-            assertCheckDelete(file);
-            createFile(file); // restore file
-
-            prepare();
-            Files.write(file, lines, WRITE);
-            assertCheckWrite(file);
-
-            prepare();
-            Files.write(file, lines, WRITE, DELETE_ON_CLOSE);
-            assertCheckWrite(file);
-            assertCheckDelete(file);
-            createFile(file); // restore file
-
-            // -- newDirectoryStream --
-
-            prepare();
-            try (DirectoryStream<Path> stream = newDirectoryStream(testdir)) {
-                assertCheckRead(testdir);
-
-                if (stream instanceof SecureDirectoryStream<?>) {
-                    Path entry;
-                    SecureDirectoryStream<Path> sds =
-                        (SecureDirectoryStream<Path>)stream;
-
-                    // newByteChannel
-                    entry = file.getFileName();
-                    prepare();
-                    try (SeekableByteChannel sbc = sds.newByteChannel(entry, EnumSet.of(READ))) {
-                        assertCheckRead(file);
-                    }
-                    prepare();
-                    try (SeekableByteChannel sbc = sds.newByteChannel(entry, EnumSet.of(WRITE))) {
-                        assertCheckWrite(file);
-                    }
-
-                    // deleteFile
-                    entry = file.getFileName();
-                    prepare();
-                    sds.deleteFile(entry);
-                    assertCheckDelete(file);
-                    createFile(testdir.resolve(entry));  // restore file
-
-                    // deleteDirectory
-                    entry = Paths.get("subdir1234");
-                    createDirectory(testdir.resolve(entry));
-                    prepare();
-                    sds.deleteDirectory(entry);
-                    assertCheckDelete(testdir.resolve(entry));
-
-                    // move
-                    entry = Paths.get("tempname1234");
-                    prepare();
-                    sds.move(file.getFileName(), sds, entry);
-                    assertCheckWrite(file);
-                    assertCheckWrite(testdir.resolve(entry));
-                    sds.move(entry, sds, file.getFileName());  // restore file
-
-                    // newDirectoryStream
-                    entry = Paths.get("subdir1234");
-                    createDirectory(testdir.resolve(entry));
-                    try {
-                        prepare();
-                        sds.newDirectoryStream(entry).close();
-                        assertCheckRead(testdir.resolve(entry));
-                    } finally {
-                        delete(testdir.resolve(entry));
-                    }
-
-                    // getFileAttributeView to access attributes of directory
-                    testBasicFileAttributeView(sds
-                        .getFileAttributeView(BasicFileAttributeView.class), testdir);
-                    testPosixFileAttributeView(sds
-                        .getFileAttributeView(PosixFileAttributeView.class), testdir);
-
-                    // getFileAttributeView to access attributes of entry
-                    entry = file.getFileName();
-                    testBasicFileAttributeView(sds
-                        .getFileAttributeView(entry, BasicFileAttributeView.class), file);
-                    testPosixFileAttributeView(sds
-                        .getFileAttributeView(entry, PosixFileAttributeView.class), file);
-
-                } else {
-                    System.out.println("SecureDirectoryStream not tested");
-                }
-            }
-
-            // -- toAbsolutePath --
-
-            prepare();
-            file.getFileName().toAbsolutePath();
-            assertCheckPropertyAccess("user.dir");
-
-            // -- toRealPath --
-
-            prepare();
-            file.toRealPath();
-            assertCheckRead(file);
-
-            prepare();
-            file.toRealPath(LinkOption.NOFOLLOW_LINKS);
-            assertCheckRead(file);
-
-            prepare();
-            Paths.get(".").toRealPath();
-            assertCheckPropertyAccess("user.dir");
-
-            prepare();
-            Paths.get(".").toRealPath(LinkOption.NOFOLLOW_LINKS);
-            assertCheckPropertyAccess("user.dir");
-
-            // -- register --
-
-            try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
-                prepare();
-                testdir.register(watcher, StandardWatchEventKinds.ENTRY_DELETE);
-                assertCheckRead(testdir);
-            }
-
-            // -- getAttribute/setAttribute/readAttributes --
-
-            prepare();
-            getAttribute(file, "size");
-            assertCheckRead(file);
-
-            prepare();
-            setAttribute(file, "lastModifiedTime",
-                FileTime.fromMillis(System.currentTimeMillis()));
-            assertCheckWrite(file);
-
-            prepare();
-            readAttributes(file, "*");
-            assertCheckRead(file);
-
-            // -- BasicFileAttributeView --
-            testBasicFileAttributeView(
-                getFileAttributeView(file, BasicFileAttributeView.class), file);
-
-            // -- PosixFileAttributeView --
-
-            {
-                PosixFileAttributeView view =
-                    getFileAttributeView(file, PosixFileAttributeView.class);
-                if (view != null &&
-                    getFileStore(file).supportsFileAttributeView(PosixFileAttributeView.class))
-                {
-                    testPosixFileAttributeView(view, file);
-                } else {
-                    System.out.println("PosixFileAttributeView not tested");
-                }
-            }
-
-            // -- DosFileAttributeView --
-
-            {
-                DosFileAttributeView view =
-                    getFileAttributeView(file, DosFileAttributeView.class);
-                if (view != null &&
-                    getFileStore(file).supportsFileAttributeView(DosFileAttributeView.class))
-                {
-                    prepare();
-                    view.readAttributes();
-                    assertCheckRead(file);
-
-                    prepare();
-                    view.setArchive(false);
-                    assertCheckWrite(file);
-
-                    prepare();
-                    view.setHidden(false);
-                    assertCheckWrite(file);
-
-                    prepare();
-                    view.setReadOnly(false);
-                    assertCheckWrite(file);
-
-                    prepare();
-                    view.setSystem(false);
-                    assertCheckWrite(file);
-                } else {
-                    System.out.println("DosFileAttributeView not tested");
-                }
-            }
-
-            // -- FileOwnerAttributeView --
-
-            {
-                FileOwnerAttributeView view =
-                    getFileAttributeView(file, FileOwnerAttributeView.class);
-                if (view != null &&
-                    getFileStore(file).supportsFileAttributeView(FileOwnerAttributeView.class))
-                {
-                    prepare();
-                    UserPrincipal owner = view.getOwner();
-                    assertCheckRead(file);
-                    assertCheckPermission(new RuntimePermission("accessUserInformation"));
-
-                    prepare();
-                    view.setOwner(owner);
-                    assertCheckWrite(file);
-                    assertCheckPermission(new RuntimePermission("accessUserInformation"));
-
-                } else {
-                    System.out.println("FileOwnerAttributeView not tested");
-                }
-            }
-
-            // -- UserDefinedFileAttributeView --
-
-            {
-                UserDefinedFileAttributeView view =
-                    getFileAttributeView(file, UserDefinedFileAttributeView.class);
-                if (view != null &&
-                    getFileStore(file).supportsFileAttributeView(UserDefinedFileAttributeView.class))
-                {
-                    prepare();
-                    view.write("test", ByteBuffer.wrap(new byte[100]));
-                    assertCheckWrite(file);
-                    assertCheckPermission(new RuntimePermission("accessUserDefinedAttributes"));
-
-                    prepare();
-                    view.read("test", ByteBuffer.allocate(100));
-                    assertCheckRead(file);
-                    assertCheckPermission(new RuntimePermission("accessUserDefinedAttributes"));
-
-                    prepare();
-                    view.size("test");
-                    assertCheckRead(file);
-                    assertCheckPermission(new RuntimePermission("accessUserDefinedAttributes"));
-
-                    prepare();
-                    view.list();
-                    assertCheckRead(file);
-                    assertCheckPermission(new RuntimePermission("accessUserDefinedAttributes"));
-
-                    prepare();
-                    view.delete("test");
-                    assertCheckWrite(file);
-                    assertCheckPermission(new RuntimePermission("accessUserDefinedAttributes"));
-                } else {
-                    System.out.println("UserDefinedFileAttributeView not tested");
-                }
-            }
-
-            // -- AclFileAttributeView --
-            {
-                AclFileAttributeView view =
-                    getFileAttributeView(file, AclFileAttributeView.class);
-                if (view != null &&
-                    getFileStore(file).supportsFileAttributeView(AclFileAttributeView.class))
-                {
-                    prepare();
-                    List<AclEntry> acl = view.getAcl();
-                    assertCheckRead(file);
-                    assertCheckPermission(new RuntimePermission("accessUserInformation"));
-                    prepare();
-                    view.setAcl(acl);
-                    assertCheckWrite(file);
-                    assertCheckPermission(new RuntimePermission("accessUserInformation"));
-                } else {
-                    System.out.println("AclFileAttributeView not tested");
-                }
-            }
-
-            // -- UserPrincipalLookupService
-
-            UserPrincipalLookupService lookupService =
-                FileSystems.getDefault().getUserPrincipalLookupService();
-            UserPrincipal owner = getOwner(file);
-
-            prepare();
-            lookupService.lookupPrincipalByName(owner.getName());
-            assertCheckPermission(new RuntimePermission("lookupUserInformation"));
-
-            try {
-                UserPrincipal group = readAttributes(file, PosixFileAttributes.class).group();
-                prepare();
-                lookupService.lookupPrincipalByGroupName(group.getName());
-                assertCheckPermission(new RuntimePermission("lookupUserInformation"));
-            } catch (UnsupportedOperationException ignore) {
-                System.out.println("lookupPrincipalByGroupName not tested");
-            }
-
-
-        } finally {
-            deleteIfExists(file);
-        }
-    }
-}
diff --git a/test/jdk/java/nio/file/Files/CopyToNonDefaultFS.java b/test/jdk/java/nio/file/Files/CopyToNonDefaultFS.java
index 540b52da82d..7f2fe3b4f25 100644
--- a/test/jdk/java/nio/file/Files/CopyToNonDefaultFS.java
+++ b/test/jdk/java/nio/file/Files/CopyToNonDefaultFS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8245194
- * @run main/othervm/java.security.policy=copy.policy CopyToNonDefaultFS
+ * @run main/othervm CopyToNonDefaultFS
  * @summary Test for exception copying from default to non-default file system
  */
 
diff --git a/test/jdk/java/nio/file/Files/FaultyFileSystem.java b/test/jdk/java/nio/file/Files/FaultyFileSystem.java
index 8399820dd51..b6c88e16364 100644
--- a/test/jdk/java/nio/file/Files/FaultyFileSystem.java
+++ b/test/jdk/java/nio/file/Files/FaultyFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,10 +214,6 @@ private void triggerEx(String filename, String... names) throws IOException {
                 return;
             }
 
-            if (filename.equals("SecurityException")) {
-                throw new SecurityException("FaultyFS", new FaultyException());
-            }
-
             if (filename.equals("IOException")) {
                 throw new FaultyException();
             }
@@ -402,10 +398,6 @@ public boolean hasNext() {
                                     triggerEx(next, "DirectoryIteratorException");
                                 } catch (IOException ioe) {
                                     throw new DirectoryIteratorException(ioe);
-                                } catch (SecurityException se) {
-                                    // ??? Does DS throw SecurityException during iteration?
-                                    next = null;
-                                    return hasNext();
                                 }
                             }
                             return (next != null);
diff --git a/test/jdk/java/nio/file/Files/StreamTest.java b/test/jdk/java/nio/file/Files/StreamTest.java
index 275201eec42..0c93a622322 100644
--- a/test/jdk/java/nio/file/Files/StreamTest.java
+++ b/test/jdk/java/nio/file/Files/StreamTest.java
@@ -500,157 +500,6 @@ public void testUncheckedIOException() throws IOException {
         }
     }
 
-    public void testSecurityException() throws IOException {
-        Path empty = testFolder.resolve("empty");
-        Path triggerFile = Files.createFile(empty.resolve("SecurityException"));
-        Path sampleFile = Files.createDirectories(empty.resolve("sample"));
-
-        Path dir2 = testFolder.resolve("dir2");
-        Path triggerDir = Files.createDirectories(dir2.resolve("SecurityException"));
-        Files.createFile(triggerDir.resolve("fileInSE"));
-        Path sample = Files.createFile(dir2.resolve("file"));
-
-        Path triggerLink = null;
-        Path linkTriggerDir = null;
-        Path linkTriggerFile = null;
-        if (supportsSymbolicLinks) {
-            Path dir = testFolder.resolve("dir");
-            triggerLink = Files.createSymbolicLink(dir.resolve("SecurityException"), empty);
-            linkTriggerDir = Files.createSymbolicLink(dir.resolve("lnDirSE"), triggerDir);
-            linkTriggerFile = Files.createSymbolicLink(dir.resolve("lnFileSE"), triggerFile);
-        }
-
-        FaultyFileSystem.FaultyFSProvider fsp = FaultyFileSystem.FaultyFSProvider.getInstance();
-        FaultyFileSystem fs = (FaultyFileSystem) fsp.newFileSystem(testFolder, null);
-
-        try {
-            fsp.setFaultyMode(false);
-            Path fakeRoot = fs.getRoot();
-            // validate setting
-            try (Stream<Path> s = Files.list(fakeRoot.resolve("empty"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "SecurityException", "sample" });
-            }
-
-            try (Stream<Path> s = Files.walk(fakeRoot.resolve("dir2"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "dir2", "SecurityException", "fileInSE", "file" });
-            }
-
-            if (supportsSymbolicLinks) {
-                try (Stream<Path> s = Files.list(fakeRoot.resolve("dir"))) {
-                    String[] result = s.map(path -> path.getFileName().toString())
-                                       .toArray(String[]::new);
-                    assertEqualsNoOrder(result, new String[] { "d1", "f1", "lnDir2", "SecurityException", "lnDirSE", "lnFileSE" });
-                }
-            }
-
-            // execute test
-            fsp.setFaultyMode(true);
-            // ignore file cause SecurityException
-            try (Stream<Path> s = Files.walk(fakeRoot.resolve("empty"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "empty", "sample" });
-            }
-            // skip folder cause SecurityException
-            try (Stream<Path> s = Files.walk(fakeRoot.resolve("dir2"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "dir2", "file" });
-            }
-
-            if (supportsSymbolicLinks) {
-                // not following links
-                try (Stream<Path> s = Files.walk(fakeRoot.resolve("dir"))) {
-                    String[] result = s.map(path -> path.getFileName().toString())
-                                       .toArray(String[]::new);
-                    assertEqualsNoOrder(result, new String[] { "dir", "d1", "f1", "lnDir2", "lnDirSE", "lnFileSE" });
-                }
-
-                // following links
-                try (Stream<Path> s = Files.walk(fakeRoot.resolve("dir"), FileVisitOption.FOLLOW_LINKS)) {
-                    String[] result = s.map(path -> path.getFileName().toString())
-                                       .toArray(String[]::new);
-                    // ?? Should fileInSE show up?
-                    // With FaultyFS, it does as no exception thrown for link to "SecurityException" with read on "lnXxxSE"
-                    assertEqualsNoOrder(result, new String[] { "dir", "d1", "f1", "lnDir2", "file", "lnDirSE", "lnFileSE", "fileInSE" });
-                }
-            }
-
-            // list instead of walk
-            try (Stream<Path> s = Files.list(fakeRoot.resolve("empty"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "sample" });
-            }
-            try (Stream<Path> s = Files.list(fakeRoot.resolve("dir2"))) {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                assertEqualsNoOrder(result, new String[] { "file" });
-            }
-
-            // root cause SecurityException should be reported
-            try (Stream<Path> s = Files.walk(
-                fakeRoot.resolve("dir2").resolve("SecurityException")))
-            {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                fail("should not reach here due to SecurityException");
-            } catch (SecurityException se) {
-                assertTrue(se.getCause() instanceof FaultyFileSystem.FaultyException);
-            }
-
-            // Walk a file cause SecurityException, we should get SE
-            try (Stream<Path> s = Files.walk(
-                fakeRoot.resolve("dir").resolve("SecurityException")))
-            {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                fail("should not reach here due to SecurityException");
-            } catch (SecurityException se) {
-                assertTrue(se.getCause() instanceof FaultyFileSystem.FaultyException);
-            }
-
-            // List a file cause SecurityException, we should get SE as cannot read attribute
-            try (Stream<Path> s = Files.list(
-                fakeRoot.resolve("dir2").resolve("SecurityException")))
-            {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                fail("should not reach here due to SecurityException");
-            } catch (SecurityException se) {
-                assertTrue(se.getCause() instanceof FaultyFileSystem.FaultyException);
-            }
-
-            try (Stream<Path> s = Files.list(
-                fakeRoot.resolve("dir").resolve("SecurityException")))
-            {
-                String[] result = s.map(path -> path.getFileName().toString())
-                                   .toArray(String[]::new);
-                fail("should not reach here due to SecurityException");
-            } catch (SecurityException se) {
-                assertTrue(se.getCause() instanceof FaultyFileSystem.FaultyException);
-            }
-         } finally {
-            // Cleanup
-            if (fs != null) {
-                fs.close();
-            }
-            if (supportsSymbolicLinks) {
-                Files.delete(triggerLink);
-                Files.delete(linkTriggerDir);
-                Files.delete(linkTriggerFile);
-            }
-            Files.delete(triggerFile);
-            Files.delete(sampleFile);
-            Files.delete(sample);
-            TestUtil.removeAll(triggerDir);
-        }
-    }
-
     public void testConstructException() {
         try (Stream<String> s = Files.lines(testFolder.resolve("notExist"), Charset.forName("UTF-8"))) {
             s.forEach(l -> fail("File is not even exist!"));
diff --git a/test/jdk/java/nio/file/Files/copy.policy b/test/jdk/java/nio/file/Files/copy.policy
deleted file mode 100644
index 8630e502747..00000000000
--- a/test/jdk/java/nio/file/Files/copy.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>", "read,write";
-    permission java.io.FilePermission "out.zip", "delete";
-};
diff --git a/test/jdk/java/nio/file/Files/walkFileTree/WalkWithSecurity.java b/test/jdk/java/nio/file/Files/walkFileTree/WalkWithSecurity.java
deleted file mode 100644
index 2e58c92f542..00000000000
--- a/test/jdk/java/nio/file/Files/walkFileTree/WalkWithSecurity.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 6876541
- * @summary Test Files.walkFileTree in the presence of a security manager
- * @build WalkWithSecurity
- * @run main/othervm -Djava.security.manager=allow WalkWithSecurity grantAll.policy pass
- * @run main/othervm -Djava.security.manager=allow WalkWithSecurity denyAll.policy fail
- * @run main/othervm -Djava.security.manager=allow WalkWithSecurity grantTopOnly.policy top_only
- */
-
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.io.IOException;
-
-public class WalkWithSecurity {
-
-    public static void main(String[] args) throws IOException {
-        String policyFile = args[0];
-        ExpectedResult expectedResult = ExpectedResult.valueOf(args[1].toUpperCase());
-
-        String here = System.getProperty("user.dir");
-        String testSrc = System.getProperty("test.src");
-        if (testSrc == null)
-            throw new RuntimeException("This test must be run by jtreg");
-        Path dir = Paths.get(testSrc);
-
-        // Sanity check the environment
-        if (Files.isSameFile(Paths.get(here), dir))
-            throw new RuntimeException("Working directory cannot be " + dir);
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-            if (!stream.iterator().hasNext())
-                throw new RuntimeException(testSrc + " is empty");
-        }
-
-        // Install security manager with the given policy file
-        System.setProperty("java.security.policy",
-            dir.resolve(policyFile).toString());
-        System.setSecurityManager(new SecurityManager());
-
-        // Walk the source tree
-        CountingVisitor visitor = new CountingVisitor();
-        SecurityException exception = null;
-        try {
-            Files.walkFileTree(dir, visitor);
-        } catch (SecurityException se) {
-            exception = se;
-        }
-
-        // Check result
-        switch (expectedResult) {
-            case PASS:
-                if (exception != null) {
-                    exception.printStackTrace();
-                    throw new RuntimeException("SecurityException not expected");
-                }
-                if (visitor.count() == 0)
-                    throw new RuntimeException("No files visited");
-                break;
-            case FAIL:
-                if (exception == null)
-                    throw new RuntimeException("SecurityException expected");
-                if (visitor.count() > 0)
-                    throw new RuntimeException("Files were visited");
-                break;
-            case TOP_ONLY:
-                if (exception != null) {
-                    exception.printStackTrace();
-                    throw new RuntimeException("SecurityException not expected");
-                }
-                if (visitor.count() == 0)
-                    throw new RuntimeException("Starting file not visited");
-                if (visitor.count() > 1)
-                    throw new RuntimeException("More than starting file visited");
-                break;
-            default:
-                throw new RuntimeException("Should not get here");
-        }
-    }
-
-    static enum ExpectedResult {
-        PASS,
-        FAIL,
-        TOP_ONLY;
-    }
-
-    static class CountingVisitor extends SimpleFileVisitor<Path> {
-        private int count;
-
-        int count() {
-            return count;
-        }
-
-        @Override
-        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
-            System.out.println(dir);
-            count++;
-            return FileVisitResult.CONTINUE;
-        }
-
-        @Override
-        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-            System.out.println(file);
-            count++;
-            return FileVisitResult.CONTINUE;
-        }
-    }
-}
diff --git a/test/jdk/java/nio/file/Files/walkFileTree/denyAll.policy b/test/jdk/java/nio/file/Files/walkFileTree/denyAll.policy
deleted file mode 100644
index 32500947791..00000000000
--- a/test/jdk/java/nio/file/Files/walkFileTree/denyAll.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-// policy file that does not grant any permissions
-grant {
-};
diff --git a/test/jdk/java/nio/file/Files/walkFileTree/grantAll.policy b/test/jdk/java/nio/file/Files/walkFileTree/grantAll.policy
deleted file mode 100644
index 85bc0d0fb51..00000000000
--- a/test/jdk/java/nio/file/Files/walkFileTree/grantAll.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-// policy file that grants read access to source directory and all descendants
-grant {
-    permission java.io.FilePermission "${test.src}", "read";
-    permission java.io.FilePermission "${test.src}${file.separator}-", "read";
-};
diff --git a/test/jdk/java/nio/file/Files/walkFileTree/grantTopOnly.policy b/test/jdk/java/nio/file/Files/walkFileTree/grantTopOnly.policy
deleted file mode 100644
index fca1539416f..00000000000
--- a/test/jdk/java/nio/file/Files/walkFileTree/grantTopOnly.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-// policy file that grants read access to source directory
-grant {
-    permission java.io.FilePermission "${test.src}", "read";
-};
diff --git a/test/jdk/java/nio/file/Path/MacToRealPath.policy b/test/jdk/java/nio/file/Path/MacToRealPath.policy
deleted file mode 100644
index 29d6035f26b..00000000000
--- a/test/jdk/java/nio/file/Path/MacToRealPath.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.io.FilePermission "${java.io.tmpdir}", "read,write";
-    permission java.io.FilePermission "${java.io.tmpdir}/-", "read,write,delete";
-};
diff --git a/test/jdk/java/nio/file/Path/MacToRealPathWithSM.java b/test/jdk/java/nio/file/Path/MacToRealPathWithSM.java
deleted file mode 100644
index 409239dd2a5..00000000000
--- a/test/jdk/java/nio/file/Path/MacToRealPathWithSM.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 8308678
- * @requires (os.family == "mac")
- * @summary Verify UnixPath::toRealPath falls back if no perms on macOS
- * @run junit/othervm -Djava.security.manager=allow MacToRealPathWithSM
- */
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-public class MacToRealPathWithSM {
-    private static final String POLICY_FILE = "MacToRealPath.policy";
-
-    private static Path src;
-    private static Path path;
-
-    @BeforeAll
-    public static void setup() throws IOException {
-        String testSrc = System.getProperty("test.src");
-        String tmpDir = System.getProperty("java.io.tmpdir");
-        if (testSrc == null || tmpDir == null)
-            throw new RuntimeException("This test must be run by jtreg");
-        System.out.printf("testSrc: %s%ntmpDir:  %s%n", testSrc, tmpDir);
-
-        src = Path.of(testSrc);
-        Path tmp = Path.of(tmpDir);
-
-        path = Files.createTempFile(tmp, "bonjour", ".txt");
-        path.toFile().deleteOnExit();
-
-        // Write to the path
-        Files.writeString(path, "\nBonjour, tout le monde!\n");
-        System.out.println(Files.readString(path));
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"", POLICY_FILE})
-    @SuppressWarnings("removal")
-    public void testToRealPath(String policyFile) throws IOException {
-        // Install security manager with the given policy file
-        if (!policyFile.isEmpty()) {
-            System.setProperty("java.security.policy",
-                src.resolve(policyFile).toString());
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        // Derive real path. Without the source change for this issue applied,
-        // if a SecurityManager is used which does not grant read permission
-        // for traversing "path" down from its root, an AccessContolException
-        // is thrown by UnixPath::toRealPath
-        assertDoesNotThrow(() ->
-            System.out.printf("real path: %s%n", path.toRealPath()),
-            "UnixPath::toRealPath() failed");
-        assertDoesNotThrow(() ->
-            System.out.printf("real path no follow: %s%n",
-                              path.toRealPath(LinkOption.NOFOLLOW_LINKS)),
-            "UnixPath::toRealPath(LinkOption.NOFOLLOW_LINKS) failed");
-    }
-}
diff --git a/test/jdk/java/nio/file/WatchService/WithSecurityManager.java b/test/jdk/java/nio/file/WatchService/WithSecurityManager.java
deleted file mode 100644
index 14cab205440..00000000000
--- a/test/jdk/java/nio/file/WatchService/WithSecurityManager.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4313887
- * @summary Unit test for Watchable#register's permission checks
- * @modules jdk.unsupported
- * @build WithSecurityManager
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager denyAll.policy - fail
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager denyAll.policy tree fail
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirOnly.policy - pass
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirOnly.policy tree fail
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirAndOneLevel.policy - pass
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirAndOneLevel.policy tree fail
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirAndTree.policy - pass
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager grantDirAndTree.policy tree pass
- */
-
-import java.nio.file.*;
-import java.io.IOException;
-import com.sun.nio.file.ExtendedWatchEventModifier;
-
-public class WithSecurityManager {
-
-    public static void main(String[] args) throws IOException {
-        String policyFile = args[0];
-        boolean recursive = args[1].equals("tree");
-        boolean expectedToFail = args[2].equals("fail");
-
-        // install security manager with the given policy file
-        String testSrc = System.getProperty("test.src");
-        if (testSrc == null)
-            throw new RuntimeException("This test must be run by jtreg");
-        Path dir = Paths.get(testSrc);
-        System.setProperty("java.security.policy", dir.resolve(policyFile).toString());
-        System.setSecurityManager(new SecurityManager());
-
-        // initialize optional modifier
-        WatchEvent.Modifier[] modifiers;
-        if (recursive) {
-            modifiers = new WatchEvent.Modifier[1];
-            modifiers[0] = ExtendedWatchEventModifier.FILE_TREE;
-        } else {
-            modifiers = new WatchEvent.Modifier[0];
-        }
-
-        // attempt to register directory
-        try {
-            dir.register(dir.getFileSystem().newWatchService(),
-                         new WatchEvent.Kind<?>[]{ StandardWatchEventKinds.ENTRY_CREATE },
-                         modifiers);
-            if (expectedToFail)
-                throw new RuntimeException("SecurityException not thrown");
-        } catch (SecurityException e) {
-            if (!expectedToFail)
-                throw e;
-        } catch (UnsupportedOperationException e) {
-            // FILE_TREE modifier only supported on some platforms
-            if (!recursive)
-                throw new RuntimeException(e);
-            System.out.println("FILE_TREE option not supported");
-        }
-    }
-}
diff --git a/test/jdk/java/nio/file/WatchService/denyAll.policy b/test/jdk/java/nio/file/WatchService/denyAll.policy
deleted file mode 100644
index 32500947791..00000000000
--- a/test/jdk/java/nio/file/WatchService/denyAll.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-// policy file that does not grant any permissions
-grant {
-};
diff --git a/test/jdk/java/nio/file/WatchService/grantDirAndOneLevel.policy b/test/jdk/java/nio/file/WatchService/grantDirAndOneLevel.policy
deleted file mode 100644
index 1a34646464a..00000000000
--- a/test/jdk/java/nio/file/WatchService/grantDirAndOneLevel.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-// policy file that grants read access to source directory and its entries
-grant {
-    permission java.io.FilePermission "${test.src}", "read";
-    permission java.io.FilePermission "${test.src}${file.separator}*", "read";
-};
diff --git a/test/jdk/java/nio/file/WatchService/grantDirAndTree.policy b/test/jdk/java/nio/file/WatchService/grantDirAndTree.policy
deleted file mode 100644
index 85bc0d0fb51..00000000000
--- a/test/jdk/java/nio/file/WatchService/grantDirAndTree.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-// policy file that grants read access to source directory and all descendants
-grant {
-    permission java.io.FilePermission "${test.src}", "read";
-    permission java.io.FilePermission "${test.src}${file.separator}-", "read";
-};
diff --git a/test/jdk/java/nio/file/WatchService/grantDirOnly.policy b/test/jdk/java/nio/file/WatchService/grantDirOnly.policy
deleted file mode 100644
index fca1539416f..00000000000
--- a/test/jdk/java/nio/file/WatchService/grantDirOnly.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-// policy file that grants read access to source directory
-grant {
-    permission java.io.FilePermission "${test.src}", "read";
-};
diff --git a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
index 0c07c9ab9db..d71b9407bbc 100644
--- a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
+++ b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,13 @@
  */
 
 /* @test
- * @bug 8181493 8231174
+ * @bug 8181493 8231174 8343417
  * @summary Verify that nanosecond precision is maintained for file timestamps
  * @requires (os.family == "linux") | (os.family == "mac") | (os.family == "windows")
+ * @library ../.. /test/lib
+ * @build jdk.test.lib.Platform
  * @modules java.base/sun.nio.fs:+open
+ * @run main SetTimesNanos
  */
 
 import java.io.IOException;
@@ -36,15 +39,19 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.FileTime;
+import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
+
+import static java.nio.file.LinkOption.*;
+import static java.util.concurrent.TimeUnit.*;
+
+import jdk.test.lib.Platform;
+import jtreg.SkippedException;
 
 public class SetTimesNanos {
-    private static final boolean IS_WINDOWS =
-        System.getProperty("os.name").startsWith("Windows");
 
     public static void main(String[] args) throws Exception {
-        if (!IS_WINDOWS) {
+        if (!Platform.isWindows()) {
             // Check whether futimens() system call is supported
             Class unixNativeDispatcherClass =
                 Class.forName("sun.nio.fs.UnixNativeDispatcher");
@@ -52,8 +59,7 @@ public static void main(String[] args) throws Exception {
                 unixNativeDispatcherClass.getDeclaredMethod("futimensSupported");
             futimensSupported.setAccessible(true);
             if (!(boolean)futimensSupported.invoke(null)) {
-                System.err.println("futimens() not supported; skipping test");
-                return;
+                throw new SkippedException("futimens() not supported");
             }
         }
 
@@ -63,30 +69,34 @@ public static void main(String[] args) throws Exception {
         System.out.format("FileStore: \"%s\" on %s (%s)%n",
             dir, store.name(), store.type());
 
-        Set<String> testedTypes = IS_WINDOWS ?
+        Set<String> testedTypes = Platform.isWindows() ?
             Set.of("NTFS") : Set.of("apfs", "ext4", "xfs", "zfs");
         if (!testedTypes.contains(store.type())) {
-            System.err.format("%s not in %s; skipping test", store.type(), testedTypes);
-            return;
+            throw new SkippedException(store.type() + " not in " + testedTypes);
         }
 
         testNanos(dir);
 
         Path file = Files.createFile(dir.resolve("test.dat"));
         testNanos(file);
+
+        if (Platform.isLinux()) {
+            testNanosLink(false);
+            testNanosLink(true);
+        }
     }
 
     private static void testNanos(Path path) throws IOException {
         // Set modification and access times
         // Time stamp = "2017-01-01 01:01:01.123456789";
         long timeNanos = 1_483_261_261L*1_000_000_000L + 123_456_789L;
-        FileTime pathTime = FileTime.from(timeNanos, TimeUnit.NANOSECONDS);
+        FileTime pathTime = FileTime.from(timeNanos, NANOSECONDS);
         BasicFileAttributeView view =
             Files.getFileAttributeView(path, BasicFileAttributeView.class);
         view.setTimes(pathTime, pathTime, null);
 
         // Windows file time resolution is 100ns so truncate
-        if (IS_WINDOWS) {
+        if (Platform.isWindows()) {
             timeNanos = 100L*(timeNanos/100L);
         }
 
@@ -99,7 +109,7 @@ private static void testNanos(Path path) throws IOException {
         FileTime[] times = new FileTime[] {attrs.lastModifiedTime(),
             attrs.lastAccessTime()};
         for (int i = 0; i < timeNames.length; i++) {
-            long nanos = times[i].to(TimeUnit.NANOSECONDS);
+            long nanos = times[i].to(NANOSECONDS);
             if (nanos != timeNanos) {
                 throw new RuntimeException("Expected " + timeNames[i] +
                     " timestamp to be '" + timeNanos + "', but was '" +
@@ -107,4 +117,42 @@ private static void testNanos(Path path) throws IOException {
             }
         }
     }
+
+    private static void testNanosLink(boolean absolute) throws IOException {
+        System.out.println("absolute: " + absolute);
+
+        var target = Path.of("target");
+        var symlink = Path.of("symlink");
+        if (absolute)
+            symlink = symlink.toAbsolutePath();
+
+        try {
+            Files.createFile(target);
+            Files.createSymbolicLink(symlink, target);
+
+            var newTime = FileTime.from(1730417633157646106L, NANOSECONDS);
+            System.out.println("newTime: " + newTime.to(NANOSECONDS));
+
+            for (Path p : List.of(target, symlink)) {
+                System.out.println("p: " + p);
+
+                var view = Files.getFileAttributeView(p,
+                    BasicFileAttributeView.class, NOFOLLOW_LINKS);
+                view.setTimes(newTime, newTime, null);
+                var attrs = view.readAttributes();
+
+                if (!attrs.lastAccessTime().equals(newTime))
+                    throw new RuntimeException("Last access time "
+                                               + attrs.lastAccessTime()
+                                               + " != " + newTime);
+                if (!attrs.lastAccessTime().equals(newTime))
+                    throw new RuntimeException("Last modified time "
+                                               + attrs.lastModifiedTime()
+                                               + " != " + newTime);
+            }
+        } finally {
+            Files.deleteIfExists(target);
+            Files.deleteIfExists(symlink);
+        }
+    }
 }
diff --git a/test/jdk/java/nio/file/spi/SetDefaultProvider.java b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
index 5af47da4f19..034d6ed6ebd 100644
--- a/test/jdk/java/nio/file/spi/SetDefaultProvider.java
+++ b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,22 +114,6 @@ private void createFileSystemProviderJar(Path jar, Path dir) throws IOException
         assertEquals(ret, 0);
     }
 
-    /**
-     * Test override of default FileSystemProvider with the main application
-     * on the class path and a SecurityManager enabled.
-     */
-    public void testClassPathWithSecurityManager() throws Exception {
-        String moduleClasses = moduleClasses();
-        String testClasses = System.getProperty("test.classes");
-        String classpath = moduleClasses + File.pathSeparator + testClasses;
-        String policyFile = System.getProperty("test.src", ".")
-            + File.separator + "fs.policy";
-        int exitValue = exec(SET_DEFAULT_FSP, "-cp", classpath,
-            "-Dtest.classes=" + testClasses, "-Djava.security.manager",
-            "-Djava.security.policy==" + policyFile, "p.Main");
-        assertEquals(exitValue, 0);
-    }
-
     /**
      * Test override of default FileSystemProvider with the main application
      * on the module path as an exploded module.
diff --git a/test/jdk/java/nio/file/spi/fs.policy b/test/jdk/java/nio/file/spi/fs.policy
deleted file mode 100644
index 15032c70ba8..00000000000
--- a/test/jdk/java/nio/file/spi/fs.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant codeBase "file:${test.classes}${/}-" {
-    permission java.io.FilePermission "${java.io.tmpdir}${/}-", "write";
-};
diff --git a/test/jdk/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java b/test/jdk/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java
deleted file mode 100644
index 657e37f4ad3..00000000000
--- a/test/jdk/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4180392
- * @summary When an instance of java.rmi.RMISecurityManager is set the VM's
- * security manager, the same package access restrictions should be in effect
- * as when the default java.lang.SecurityManager is set, which with the
- * default "java.security" file in the JDK means that access to packages in
- * the sun.* package hierarchy is denied (without explicit runtime permission
- * "accessClassInPackage.*").
- * @author Peter Jones
- *
- * @run main/othervm -Djava.security.manager=allow CheckPackageAccess
- */
-
-import java.rmi.RMISecurityManager;
-
-public class CheckPackageAccess {
-
-    /*
-     * This test assumes that the default security manager protects untrusted
-     * access to classes in the sun.* hierarchy, which is what is specified
-     * in the JDK's default java.security file.
-     */
-    private final static String restrictedClassName = "sun.misc.Cache";
-
-    public static void main(String[] args) {
-
-        System.err.println("\nRegression test for bug 4180392\n");
-
-        System.err.println("Setting RMISecurityManager.");
-        System.setSecurityManager(new RMISecurityManager());
-
-        try {
-            System.err.println("Attempting to acquire restricted class " +
-                restrictedClassName);
-            Class restrictedClass = Class.forName(restrictedClassName);
-            throw new RuntimeException(
-                "TEST FAILED: successfully acquired restricted class " +
-                    restrictedClass);
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(
-                "TEST FAILED: couldn't find (but was allowed to look for) " +
-                    "restricted class " + restrictedClassName);
-        } catch (SecurityException e) {
-            System.err.println("TEST PASSED: ");
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/dgc/VMID/CheckVMID.java b/test/jdk/java/rmi/dgc/VMID/CheckVMID.java
index 692969cc5af..43aeb1cfdf5 100644
--- a/test/jdk/java/rmi/dgc/VMID/CheckVMID.java
+++ b/test/jdk/java/rmi/dgc/VMID/CheckVMID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,8 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
- * @run main/othervm/policy=security.policy CheckVMID
+ * @run main/othervm -Djdk.net.hosts.file=nonExistentFile
+ *                   CheckVMID
  */
 
 import java.rmi.dgc.VMID;
@@ -47,8 +48,6 @@ public static void main(String[] args) {
 
         System.err.println("\nRegression test for bug 4171370\n");
 
-        TestLibrary.suggestSecurityManager(null);
-
         try {
             System.err.println("Create a VMID");
             VMID vmid = new VMID();
diff --git a/test/jdk/java/rmi/dgc/VMID/security.policy b/test/jdk/java/rmi/dgc/VMID/security.policy
deleted file mode 100644
index d61012dad31..00000000000
--- a/test/jdk/java/rmi/dgc/VMID/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * security policy used by MarshalForeignStub test
- */
-grant {
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-};
diff --git a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java
deleted file mode 100644
index 9a0490beb0f..00000000000
--- a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4465315
- * @summary The RMI runtime's server-side DGC implementation object should
- * not be exported with the arbitrary access control context that was in
- * effect when it gets lazily created.  For example, calls to it should not
- * fail due to the "accept" SocketPermission check simply because of the
- * access control context that it was exported with.
- * @author Peter Jones
- *
- * @library ../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary DGCImplInsulation_Stub
- * @run main/othervm/policy=security.policy DGCImplInsulation
- */
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.net.SocketPermission;
-import java.rmi.MarshalledObject;
-import java.rmi.Remote;
-import java.rmi.server.UnicastRemoteObject;
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.Permissions;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import java.security.cert.Certificate;
-
-public class DGCImplInsulation implements java.rmi.Remote {
-
-    private static final long TIMEOUT = 5000;
-
-    public static void main(String[] args) throws Exception {
-
-        TestLibrary.suggestSecurityManager(null);
-
-        Permissions perms = new Permissions();
-        perms.add(new SocketPermission("*:1024-", "listen"));
-        AccessControlContext acc =
-            new AccessControlContext(new ProtectionDomain[] {
-                new ProtectionDomain(
-                    new CodeSource(null, (Certificate[]) null), perms) });
-
-        Remote impl = new DGCImplInsulation();
-
-        try {
-            Remote stub = (Remote) java.security.AccessController.doPrivileged(
-                new ExportAction(impl));
-            System.err.println("exported remote object; local stub: " + stub);
-
-            MarshalledObject mobj = new MarshalledObject(stub);
-            stub = (Remote) mobj.get();
-            System.err.println("marshalled/unmarshalled stub: " + stub);
-
-            ReferenceQueue refQueue = new ReferenceQueue();
-            Reference weakRef = new WeakReference(impl, refQueue);
-            impl = null;
-            System.gc();
-            if (refQueue.remove(TIMEOUT) == weakRef) {
-                throw new RuntimeException(
-                    "TEST FAILED: remote object garbage collected");
-            } else {
-                System.err.println("TEST PASSED");
-                stub = null;
-                System.gc();
-                Thread.sleep(2000);
-                System.gc();
-            }
-        } finally {
-            try {
-                UnicastRemoteObject.unexportObject(impl, true);
-            } catch (Exception e) {
-            }
-        }
-    }
-
-    private static class ExportAction implements PrivilegedExceptionAction {
-        private final Remote impl;
-        ExportAction(Remote impl) {
-            this.impl = impl;
-        }
-        public Object run() throws Exception {
-            return UnicastRemoteObject.exportObject(impl);
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java
deleted file mode 100644
index 07f11fe1c8b..00000000000
--- a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-public final class DGCImplInsulation_Stub
-    extends java.rmi.server.RemoteStub
-    implements java.rmi.Remote
-{
-    private static final long serialVersionUID = 2;
-
-    // constructors
-    public DGCImplInsulation_Stub(java.rmi.server.RemoteRef ref) {
-        super(ref);
-    }
-
-}
diff --git a/test/jdk/java/rmi/dgc/dgcImplInsulation/security.policy b/test/jdk/java/rmi/dgc/dgcImplInsulation/security.policy
deleted file mode 100644
index 047846ac892..00000000000
--- a/test/jdk/java/rmi/dgc/dgcImplInsulation/security.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * security policy used by the test process
- */
-grant {
-  // so that synchronous DGC dirty call will succeed
-  permission java.net.SocketPermission "*:1024-", "accept,connect,listen";
-};
diff --git a/test/jdk/java/rmi/registry/altSecurityManager/AltSecurityManager.java b/test/jdk/java/rmi/registry/altSecurityManager/AltSecurityManager.java
deleted file mode 100644
index 0a542c2d036..00000000000
--- a/test/jdk/java/rmi/registry/altSecurityManager/AltSecurityManager.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4183202
- * @summary rmiregistry could allow alternate security manager
- * @author Laird Dornin
- *
- * @library ../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- *          java.base/sun.nio.ch
- * @build TestLibrary RegistryVM RMIRegistryRunner TestSecurityManager
- * @run main/othervm AltSecurityManager
- */
-
-/**
- * Ensure that a user is able to specify alternate security managers to
- * be used in rmiregistry.  Test specifies a security manager
- * that throws a runtime exception in its checkListen method, this
- * will cause rmiregistry to exit early because those
- * utilities will be unable to export any remote objects; test fails
- * if registry takes too long to exit.
- */
-public class AltSecurityManager implements Runnable {
-    // variable to hold registry child
-    static JavaVM vm = null;
-
-    // names of utilities
-    static String utilityToStart = null;
-    static final String REGISTRY_IMPL = "sun.rmi.registry.RegistryImpl";
-
-    // children should exit in at least this time.
-    private static final long TIME_OUT =
-            (long)(15000 * TestLibrary.getTimeoutFactor());
-
-    public void run() {
-        try {
-            if (utilityToStart.equals(REGISTRY_IMPL)) {
-                vm = RegistryVM.createRegistryVMWithRunner(
-                        "RMIRegistryRunner",
-                        "-Djava.security.manager=TestSecurityManager");
-            } else {
-                TestLibrary.bomb("Utility to start must be " + REGISTRY_IMPL);
-            }
-
-            System.err.println("starting " + utilityToStart);
-            try {
-                vm.start();
-                throw new RuntimeException("Expected exception did not occur!");
-            } catch (Exception expected) {
-                int exit = vm.waitFor();
-                if (exit != TestSecurityManager.EXIT_VALUE) {
-                    throw new RuntimeException(utilityToStart
-                            + " exit with an unexpected value "
-                            + exit + ".");
-                }
-                System.err.format("Success: starting %s exited with status %d%n",
-                                  utilityToStart, TestSecurityManager.EXIT_VALUE);
-            }
-
-        } catch (Exception e) {
-            TestLibrary.bomb(e);
-        }
-    }
-
-    /**
-     * Wait to make sure that the registry exits after
-     * their security manager is set.
-     */
-    public static void ensureExit(String utility) throws Exception {
-        utilityToStart = utility;
-
-        try {
-            Thread thread = new Thread(new AltSecurityManager());
-            System.err.println("expecting RuntimeException for " +
-                               "checkListen in child process");
-            long start = System.currentTimeMillis();
-            thread.start();
-            thread.join(TIME_OUT);
-
-            long time = System.currentTimeMillis() - start;
-            System.err.println("waited " + time + " millis for " +
-                               utilityToStart + " to die");
-
-            if (time >= TIME_OUT) {
-                TestLibrary.bomb(utilityToStart +
-                                 " took too long to die...");
-            } else {
-                System.err.println(utilityToStart +
-                                   " terminated on time");
-            }
-        } finally {
-            vm.cleanup();
-            vm = null;
-        }
-    }
-
-    public static void main(String[] args) {
-        try {
-            System.err.println("\nRegression test for bug 4183202\n");
-
-            // make sure the registry exits early.
-            ensureExit(REGISTRY_IMPL);
-
-            System.err.println("test passed");
-
-        } catch (Exception e) {
-            TestLibrary.bomb(e);
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/registry/altSecurityManager/TestSecurityManager.java b/test/jdk/java/rmi/registry/altSecurityManager/TestSecurityManager.java
deleted file mode 100644
index 42e370fa3d8..00000000000
--- a/test/jdk/java/rmi/registry/altSecurityManager/TestSecurityManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**/
-
-public class TestSecurityManager extends SecurityManager {
-    public static final int EXIT_VALUE = 123;
-
-    public TestSecurityManager() {
-    }
-
-    public void checkListen(int port) {
-        // 4269910: ok, now the registry will *really* go away...
-        //
-        // the registry needs to listen on sockets so they
-        // will exit when they try to do so... this is used as a sign
-        // by the main test process to detect that the proper security
-        // manager has been installed in the relevant VMs.
-        //
-        System.exit(EXIT_VALUE);
-    }
-
-    public void checkExit(int status) {
-        // permit check exit for all code
-    }
-}
diff --git a/test/jdk/java/rmi/registry/altSecurityManager/registry.security.policy b/test/jdk/java/rmi/registry/altSecurityManager/registry.security.policy
deleted file mode 100644
index 5c09bd0d93b..00000000000
--- a/test/jdk/java/rmi/registry/altSecurityManager/registry.security.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.util.PropertyPermission "env.class.path", "read";
-  permission java.io.FilePermission ".", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.lang.RuntimePermission "createClassLoader";
-  permission java.lang.RuntimePermission "setContextClassLoader";
-};
diff --git a/test/jdk/java/rmi/registry/altSecurityManager/rmid.security.policy b/test/jdk/java/rmi/registry/altSecurityManager/rmid.security.policy
deleted file mode 100644
index 81c0c85c188..00000000000
--- a/test/jdk/java/rmi/registry/altSecurityManager/rmid.security.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "selectorProvider";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";
-  permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
-};
diff --git a/test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java b/test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java
index 217010d2cf5..adaecc2d42c 100644
--- a/test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java
+++ b/test/jdk/java/rmi/registry/classPathCodebase/ClassPathCodebase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,8 @@
  *          java.rmi/sun.rmi.server
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Dummy RegistryVM RMIRegistryRunner
- * @run main/othervm/policy=security.policy
+ * @build TestLibrary Dummy RegistryVM RMIRegistryRunner TestLoaderHandler
+ * @run main/othervm
  *     -Djava.rmi.server.useCodebaseOnly=false ClassPathCodebase
  */
 
@@ -63,8 +63,7 @@ public static void main(String[] args) {
 
         System.err.println("\nRegression test for bug 4242317\n");
 
-        TestLibrary.suggestSecurityManager("java.lang.SecurityManager");
-
+        System.setProperty("java.rmi.server.RMIClassLoaderSpi", "TestLoaderHandler");
         RegistryVM rmiregistry = null;
 
         try {
@@ -85,7 +84,7 @@ public static void main(String[] args) {
             File rmiregistryDir =
                   new File(System.getProperty("user.dir", "."), importCodebase);
             rmiregistry = RegistryVM.createRegistryVMWithRunner("RMIRegistryRunner",
-                            " -Denv.class.path=. -Djava.security.manager=allow"
+                            " -Denv.class.path=."
                             + " -Djava.rmi.server.codebase=" + exportCodebaseURL
                             + " -Duser.dir=" + rmiregistryDir.getAbsolutePath());
             rmiregistry.start();
diff --git a/test/jdk/java/rmi/registry/classPathCodebase/registry.security.policy b/test/jdk/java/rmi/registry/classPathCodebase/registry.security.policy
deleted file mode 100644
index 291fb8e9f88..00000000000
--- a/test/jdk/java/rmi/registry/classPathCodebase/registry.security.policy
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * security policy used by the registry process started by RegistryVM.
- */
-
-grant {
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.util.PropertyPermission "env.class.path", "read";
-  permission java.io.FilePermission ".", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.lang.RuntimePermission "createClassLoader";
-  permission java.lang.RuntimePermission "setContextClassLoader";
-  permission java.io.FilePermission ".-Djava.rmi.server.codebase=file", "read";
-  permission java.io.FilePermission ".${/}-", "read";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
-  permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
-};
diff --git a/test/jdk/java/rmi/registry/classPathCodebase/security.policy b/test/jdk/java/rmi/registry/classPathCodebase/security.policy
deleted file mode 100644
index 743e8f1355e..00000000000
--- a/test/jdk/java/rmi/registry/classPathCodebase/security.policy
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // need to move some classes out of the test's classpath; specific to this test
-  permission java.io.FilePermission "${test.classes}", "read,write,delete";
-  permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-
-  permission java.io.FilePermission ".", "read,write,delete";
-  permission java.io.FilePermission ".${/}-", "read,write,delete";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  // test needs to use java to exec an rmiregistry
-  permission java.io.FilePermission "${java.home}${/}bin${/}-", "execute";
-
-  // test needs to communicate with its registry
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-
-  permission java.util.PropertyPermission "java.security.policy", "read";
-  permission java.util.PropertyPermission "java.security.manager", "read";
-
-  // used by TestLibrary to determine extra commandline properties
-  permission java.io.FilePermission "..${/}..${/}test.props", "read";
-};
diff --git a/test/jdk/java/rmi/registry/readTest/CodebaseTest.java b/test/jdk/java/rmi/registry/readTest/CodebaseTest.java
index 480bb8e6064..5b9b204e56f 100644
--- a/test/jdk/java/rmi/registry/readTest/CodebaseTest.java
+++ b/test/jdk/java/rmi/registry/readTest/CodebaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @library ../../testlibrary
- * @build TestLibrary RMIRegistryRunner RegistryVM JavaVM testPkg.* RegistryLookup
+ * @build TestLibrary RMIRegistryRunner RegistryVM JavaVM testPkg.* RegistryLookup TestLoaderHandler
  * @summary remove java.rmi.server.codebase property parsing from registyimpl
  * @run main/othervm CodebaseTest
 */
@@ -36,16 +36,15 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.rmi.registry.Registry;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
 
 public class CodebaseTest {
 
     public static void main(String args[]) throws Exception {
         RegistryVM rmiregistry = null;
         JavaVM client = null;
+
+        System.setProperty("java.rmi.server.RMIClassLoaderSpi", "TestLoaderHandler");
+
         try {
             File src = new File(System.getProperty("test.classes", "."), "testPkg");
             File dest = new File(System.getProperty("user.dir", "."), "testPkg");
@@ -57,8 +56,9 @@ public static void main(String args[]) throws Exception {
             rmiregistryDir.mkdirs();
             rmiregistry = RegistryVM.createRegistryVMWithRunner(
                     "RMIRegistryRunner",
-                    " -Djava.rmi.server.useCodebaseOnly=false -Djava.security.manager=allow"
-                    + " -Duser.dir=" + rmiregistryDir.getAbsolutePath());
+                    " -Djava.rmi.server.useCodebaseOnly=false"
+                    + " -Duser.dir=" + rmiregistryDir.getAbsolutePath()
+                    + " -Djava.rmi.server.RMIClassLoaderSpi=TestLoaderHandler");
             rmiregistry.start();
             int port = rmiregistry.getPort();
 
@@ -72,7 +72,8 @@ public static void main(String args[]) throws Exception {
             File codebase = new File(System.getProperty("user.dir", "."));
             client = new JavaVM("RegistryLookup",
                     " -Djava.rmi.server.codebase=" + codebase.toURI().toURL()
-                    + " -cp ." + File.pathSeparator + System.getProperty("test.class.path"),
+                    + " -cp ." + File.pathSeparator + System.getProperty("test.class.path")
+                    + " -Djava.rmi.server.RMIClassLoaderSpi=TestLoaderHandler",
                     Integer.toString(port));
             int exit = client.execute();
             if (exit == RegistryLookup.EXIT_FAIL) {
diff --git a/test/jdk/java/rmi/registry/readTest/registry.security.policy b/test/jdk/java/rmi/registry/readTest/registry.security.policy
deleted file mode 100644
index d1aef0cb9fa..00000000000
--- a/test/jdk/java/rmi/registry/readTest/registry.security.policy
+++ /dev/null
@@ -1,12 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.util.PropertyPermission "env.class.path", "read";
-  permission java.io.FilePermission ".", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.lang.RuntimePermission "createClassLoader";
-  permission java.lang.RuntimePermission "setContextClassLoader";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
-  permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
-};
diff --git a/test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java b/test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java
index 33f5f5aada3..1a393cad2c4 100644
--- a/test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java
+++ b/test/jdk/java/rmi/registry/serialFilter/RegistryFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
  *        -Dsun.rmi.registry.registryFilter=!java.lang.Long;!RegistryFilterTest$RejectableClass;maxdepth=19
  *        -Dtest.maxdepth=19
  *        RegistryFilterTest
- * @run testng/othervm/policy=security.policy
+ * @run testng/othervm
  *        -Djava.security.properties=${test.src}/java.security-extra1
  *        RegistryFilterTest
  */
diff --git a/test/jdk/java/rmi/registry/serialFilter/security.policy b/test/jdk/java/rmi/registry/serialFilter/security.policy
deleted file mode 100644
index 554e9eaee47..00000000000
--- a/test/jdk/java/rmi/registry/serialFilter/security.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-        permission java.security.AllPermission;
-};
-
diff --git a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
index 6e7405df896..43ec26522c7 100644
--- a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
+++ b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
@@ -45,7 +45,7 @@
  * bench.rmi.IntCalls bench.rmi.ClassLoading bench.rmi.LongArrayCalls
  * bench.rmi.ShortArrayCalls
  * bench.rmi.altroot.Node
- * @run main/othervm/policy=policy.all/timeout=1800 bench.rmi.Main -server -c config
+ * @run main/othervm/timeout=1800 bench.rmi.Main -server -c config
  * @author Mike Warres, Nigel Daley
  */
 
@@ -214,7 +214,6 @@ static void die(String mesg) {
      * @param args
      */
     public static void main(String[] args) {
-        setupSecurity();
         parseArgs(args);
         setupStreams();
         if (list) {
@@ -239,8 +238,6 @@ public static void main(String[] args) {
                     //Setup for client mode, server will fork client process
                     //after its initiation.
                     List<String> clientProcessStr = new ArrayList<>();
-                    clientProcessStr.add("-Djava.security.policy=" + TEST_SRC_PATH + "policy.all");
-                    clientProcessStr.add("-Djava.security.manager=allow");
                     clientProcessStr.add("-Dtest.src=" + TEST_SRC_PATH);
                     clientProcessStr.add("bench.rmi.Main"); //Client mode
                     if (verbose) {
@@ -398,22 +395,6 @@ static void parseArgs(String[] args) {
         }
     }
 
-    /**
-     * Set up security manager and policy, if not set already.
-     */
-    static void setupSecurity() {
-        if (System.getSecurityManager() != null) {
-            return;
-        }
-
-        /* As of 1.4, it is too late to set the security policy
-         * file at this point so these line have been commented out.
-         */
-        //System.setProperty("java.security.policy",
-        //      Main.class.getResource("/bench/rmi/policy.all").toString());
-        System.setSecurityManager(new SecurityManager());
-    }
-
     /**
      * Set up configuration file and report streams, if not set already.
      */
diff --git a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/policy.all b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/policy.all
deleted file mode 100644
index 1d0ce886705..00000000000
--- a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/policy.all
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-        permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java b/test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java
index a8e9f1e93aa..3c1e44bcf91 100644
--- a/test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java
+++ b/test/jdk/java/rmi/reliability/juicer/AppleUserImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@
  *     Orange OrangeEcho OrangeEchoImpl OrangeImpl
  *     ApplicationServer
  *
- * @run main/othervm/policy=security.policy AppleUserImpl -seconds 30
+ * @run main/othervm AppleUserImpl -seconds 30
  *
  * @author Peter Jones, Nigel Daley
  */
diff --git a/test/jdk/java/rmi/reliability/juicer/security.policy b/test/jdk/java/rmi/reliability/juicer/security.policy
deleted file mode 100644
index 6bf998c4010..00000000000
--- a/test/jdk/java/rmi/reliability/juicer/security.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-
-grant {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java
deleted file mode 100644
index 4c883c93362..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4191926 4349670
- * @summary When the RMIClassLoader.loadClass() methods are invoked with a
- * codebase URL that the caller does not have permission to load from, but
- * with a class name that is accessible through the caller's context class
- * loader (such as in the boot or system class paths, for an application),
- * the operations should succeed, instead of throwing a
- * ClassNotFoundException (wrapping a SecurityExcpetion) because the caller
- * does not have permission to access the codebase URL.
- * @author Peter Jones
- *
- * @library ../../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Foo
- * @run main/othervm -Djava.security.manager=allow DelegateBeforePermissionCheck
- */
-
-import java.net.*;
-import java.rmi.*;
-import java.rmi.server.*;
-
-public class DelegateBeforePermissionCheck {
-
-    private final static String tabooCodebase = "http://taboo/codebase/";
-
-    public static void main(String[] args) {
-
-        System.err.println("\nRegression test for bug 4191926\n");
-
-        TestLibrary.suggestSecurityManager(null);
-
-        try {
-            String localClassName = Foo.class.getName();
-            System.err.println("Attempting to load local class \"" +
-                localClassName + "\" from codebase " + tabooCodebase);
-            Class cl = RMIClassLoader.loadClass(
-                tabooCodebase, localClassName);
-            System.err.println("TEST PASSED: loaded " + cl + " locally");
-
-        } catch (Exception e) {
-            TestLibrary.bomb(e);
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java
deleted file mode 100644
index 093ea09b472..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class Foo implements java.io.Serializable {
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java
index ec8ef6b9eb7..443ae1278a3 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,12 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Dummy
- * @run main/othervm/policy=security.policy/timeout=120 DelegateToContextLoader
+ * @run main/othervm/timeout=120 DelegateToContextLoader
  */
 
 import java.io.*;
 import java.net.*;
 import java.security.*;
-import java.rmi.RMISecurityManager;
 import java.rmi.server.RMIClassLoader;
 
 public class DelegateToContextLoader {
@@ -52,14 +51,6 @@ public class DelegateToContextLoader {
     private static final String classFileName = className + ".class";
 
     public static void main(String[] args) throws Exception {
-
-        /*
-         * Set a security manager so that RMI class loading will not
-         * be disabled.
-         */
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-
-
         URL codebaseURL = TestLibrary.
             installClassInCodebase(className, "codebase");
 
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy
deleted file mode 100644
index 989ed1c731f..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // test must create a context loader for the current thread.
-  permission java.lang.RuntimePermission "createClassLoader";
-  permission java.lang.RuntimePermission "setContextClassLoader";
-
-  // need to move some classes out of the test's classpath; specific to this test
-  permission java.io.FilePermission "${test.classes}", "read,write,delete";
-  permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-
-  permission java.io.FilePermission ".${/}codebase", "read,write,delete";
-  permission java.io.FilePermission ".${/}codebase${/}-", "read,write,delete";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java
deleted file mode 100644
index 8cba35ba527..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4211906
- * @summary If the type of a parameter or return value in an RMI call can be
- * successfully downloaded by the receiving endpoint, then an array class with
- * that type as its element type should likewise be able to be successfully
- * downloaded.  This should be true regardless of how many dimensions the
- * array has.
- * @author Peter Jones
- *
- * @library ../../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Receiver DownloadArrayClass_Stub Foo
- * @run main/othervm/policy=security.policy DownloadArrayClass
- */
-
-import java.lang.reflect.Array;
-import java.net.*;
-import java.rmi.*;
-import java.rmi.server.*;
-
-public class DownloadArrayClass
-    extends UnicastRemoteObject
-    implements Receiver
-{
-
-    public DownloadArrayClass() throws RemoteException {
-    }
-
-    public void receive(Object obj) {
-        System.err.println("+ receive(): received object " + obj);
-    }
-
-    public static void main(String[] args) {
-
-        System.err.println("\nRegression test for bug 4082868\n");
-
-        URL remoteCodebase = null;
-        try {
-            remoteCodebase =
-                TestLibrary.installClassInCodebase("Foo", "remote_codebase");
-        } catch (MalformedURLException e) {
-            TestLibrary.bomb(e);
-        }
-
-        System.err.println("Setting codebase property to: " + remoteCodebase);
-        System.setProperty("java.rmi.server.codebase",
-            remoteCodebase.toString());
-
-        /*
-         * Load Foo from a non-RMI class loader so that it won't be already
-         * loaded by an RMI class loader in this VM (for whatever that's
-         * worth), but with URLClassLoader so that they will be annotated
-         * properly.
-         */
-        System.err.println("Creating class loader for remote codebase " +
-            remoteCodebase);
-        ClassLoader remoteCodebaseLoader =
-            URLClassLoader.newInstance(new URL[] { remoteCodebase });
-
-        TestLibrary.suggestSecurityManager(null);
-
-        System.err.println("Creating remote object.");
-        DownloadArrayClass obj = null;
-        try {
-            obj = new DownloadArrayClass();
-        } catch (RemoteException e) {
-            TestLibrary.bomb(e);
-        }
-
-        try {
-            Receiver stub = (Receiver) RemoteObject.toStub(obj);
-
-            /*
-             * Load the downloadable class "Foo" to marshal over RMI calls
-             * in various forms.
-             */
-            Class fooClass = remoteCodebaseLoader.loadClass("Foo");
-            Object arg;
-
-            /*
-             * First, to establish that simple class downloading is working
-             * properly, try marshalling a simple instance of Foo.
-             */
-            arg = fooClass.newInstance();
-            System.err.println("Passing object of type " + arg.getClass());
-            stub.receive(arg);
-
-            /*
-             * Second, try marshalling a one-dimensional array of element
-             * type Foo.
-             */
-            arg = Array.newInstance(fooClass, 26);
-            System.err.println("Passing object of type " + arg.getClass());
-            stub.receive(arg);
-
-            /*
-             * Finally, try marshalling a multi-dimensional array with
-             * Foo as the eventual element type.
-             */
-            arg = Array.newInstance(fooClass, new int[] { 1, 42, 0 });
-            System.err.println("Passing object of type " + arg.getClass());
-            stub.receive(arg);
-
-            System.err.println("TEST PASSED: " +
-                "arrays of downloaded classes successfully passed");
-
-        } catch (Exception e) {
-            System.err.println("TEST FAILED: ");
-            e.printStackTrace();
-            throw new RuntimeException("TEST FAILED: " + e.toString());
-        } finally {
-            try {
-                UnicastRemoteObject.unexportObject(obj, true);
-            } catch (Throwable e) {
-            }
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java
deleted file mode 100644
index 7ba5614d870..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_Stub.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-public final class DownloadArrayClass_Stub
-    extends java.rmi.server.RemoteStub
-    implements Receiver, java.rmi.Remote
-{
-    private static final java.rmi.server.Operation[] operations = {
-        new java.rmi.server.Operation("void receive(java.lang.Object)")
-    };
-
-    private static final long interfaceHash = -953299374608818732L;
-
-    private static final long serialVersionUID = 2;
-
-    private static boolean useNewInvoke;
-    private static java.lang.reflect.Method $method_receive_0;
-
-    static {
-        try {
-            java.rmi.server.RemoteRef.class.getMethod("invoke",
-                new java.lang.Class[] {
-                    java.rmi.Remote.class,
-                    java.lang.reflect.Method.class,
-                    java.lang.Object[].class,
-                    long.class
-                });
-            useNewInvoke = true;
-            $method_receive_0 = Receiver.class.getMethod("receive", new java.lang.Class[] {java.lang.Object.class});
-        } catch (java.lang.NoSuchMethodException e) {
-            useNewInvoke = false;
-        }
-    }
-
-    // constructors
-    public DownloadArrayClass_Stub() {
-        super();
-    }
-    public DownloadArrayClass_Stub(java.rmi.server.RemoteRef ref) {
-        super(ref);
-    }
-
-    // methods from remote interfaces
-
-    // implementation of receive(Object)
-    public void receive(java.lang.Object $param_Object_1)
-        throws java.rmi.RemoteException
-    {
-        try {
-            if (useNewInvoke) {
-                ref.invoke(this, $method_receive_0, new java.lang.Object[] {$param_Object_1}, -578858472643205929L);
-            } else {
-                java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 0, interfaceHash);
-                try {
-                    java.io.ObjectOutput out = call.getOutputStream();
-                    out.writeObject($param_Object_1);
-                } catch (java.io.IOException e) {
-                    throw new java.rmi.MarshalException("error marshalling arguments", e);
-                }
-                ref.invoke(call);
-                ref.done(call);
-            }
-        } catch (java.lang.RuntimeException e) {
-            throw e;
-        } catch (java.rmi.RemoteException e) {
-            throw e;
-        } catch (java.lang.Exception e) {
-            throw new java.rmi.UnexpectedException("undeclared checked exception", e);
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java
deleted file mode 100644
index 093ea09b472..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class Foo implements java.io.Serializable {
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy
deleted file mode 100644
index 3e843ebdc5f..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-    permission java.util.PropertyPermission
-        "java.rmi.server.codebase", "read,write";
-
-    // permissions needed to move classes into separate codebase directories
-    permission java.io.FilePermission
-	"${test.classes}${/}-", "read,write,delete";
-    permission java.io.FilePermission
-	".${/}-", "read,write,delete";
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-
-    // allow exporting of remote objects on an arbitrary port
-    permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java
deleted file mode 100644
index 093ea09b472..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class Foo implements java.io.Serializable {
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java
deleted file mode 100644
index c1deb15da5e..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4240710
- * @summary RMIClassLoader.getClassLoader for a codebase should return the
- * same class loader that is used to load classes from that codebase (using
- * RMIClassLoader.loadClass).
- * @author Ann Wollrath
- *
- * @library ../../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Foo
- * @run main/othervm/policy=security.policy GetClassLoader
- */
-
-import java.net.*;
-import java.rmi.*;
-import java.rmi.server.*;
-
-public class GetClassLoader
-{
-
-    public static void main(String[] args) {
-
-        System.err.println("\nTest for rfe 4240710\n");
-
-        URL codebase1 = null;
-        Class cl = null;
-        ClassLoader loader = null;
-
-        TestLibrary.suggestSecurityManager(null);
-
-        try {
-            codebase1 =
-                TestLibrary.installClassInCodebase("Foo", "codebase1");
-        } catch (MalformedURLException e) {
-            TestLibrary.bomb(e);
-        }
-
-
-        /*
-         * Force SecurityException for attempt to obtain a class loader
-         * for a codebase that the test does not have permission to read from.
-         */
-        try {
-            System.err.println(
-                "getClassLoader for codebase that I can't read");
-            loader = RMIClassLoader.getClassLoader("file:/foo");
-            TestLibrary.bomb(
-                "Failed: no SecurityException obtaining loader");
-        } catch (MalformedURLException e) {
-            System.err.println(
-                "Failed: MalformedURLException getting loader");
-            TestLibrary.bomb(e);
-        } catch (SecurityException e) {
-            System.err.println(
-                "Passed: SecurityException obtaining loader");
-        }
-
-        /*
-         * Verify that a specific class loaded by name via
-         * RMIClassLoader.loadClass is the same as the class obtained by
-         * loading that class by name through the loader obtained using
-         * the RMIClassLoader.getClassLoader method.
-         */
-        System.err.println("load Foo from codebase1");
-        try {
-            cl = RMIClassLoader.loadClass(codebase1.toString(), "Foo");
-        } catch (Exception e) {
-            System.err.println(
-                "Failed: exception loading class from codebase1");
-            TestLibrary.bomb(e);
-        }
-
-        System.err.println(
-            "load Foo using loader obtained using getClassLoader");
-        try {
-            loader = RMIClassLoader.getClassLoader(codebase1.toString());
-        } catch (MalformedURLException e) {
-            System.err.println(
-                "Failed: MalformedURLException getting codebase1 loader");
-            TestLibrary.bomb(e);
-        }
-
-        try {
-            if (cl == loader.loadClass("Foo")) {
-                System.err.println("Passed: Foo classes are equal");
-            } else {
-                TestLibrary.bomb("Failed: Foo classes are not equal");
-            }
-        } catch (Exception e) {
-            System.err.println(
-                "Failed: exception loading class from codebase1");
-            TestLibrary.bomb(e);
-        }
-
-        /*
-         * Force MalformedURLException by passing bogus URL to
-         * getClassLoader.
-         */
-        try {
-            loader = RMIClassLoader.getClassLoader("malformed:///URL");
-            TestLibrary.bomb(
-                "Failed: getClassLoader should throw MalformedURLException");
-        } catch (MalformedURLException e) {
-            System.err.println(
-                "Passed: getClassLoader threw MalformedURLException");
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/security.policy
deleted file mode 100644
index ca6fedbe2bf..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/getClassLoader/security.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-    // permissions needed to move classes into separate codebase directories
-    permission java.io.FilePermission
-	"${test.classes}${/}-", "read,write,delete";
-    permission java.io.FilePermission
-	".${/}-", "read,write,delete";
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-
-    // needed because RMIClassLoader.getClassLoader now requires it
-    permission java.lang.RuntimePermission "getClassLoader";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java
index 13a7ccd9df3..98548940b59 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary FnnClass FnnUnmarshal NonpublicInterface
  *     NonpublicInterface1 PublicInterface PublicInterface1
- * @run main/othervm/policy=security.policy
+ * @run main/othervm
  *     -Djava.rmi.server.useCodebaseOnly=false LoadProxyClasses
  */
 
@@ -73,16 +73,18 @@
  *  interface (java.util.zip.CheckSum) loaded from bootclasspath,
  *  proxy class defined in null/boot class loader.  Should succeed.
  *
- *  3. Public interface classes loaded in FNNL are also available in
+ *  3. Disabled. Public interface classes loaded in FNNL are also available in
  *  RMI loader parent.  FNNL is grandparent of RMI loader. Proxy class
  *  must be defined in RMI class loader. Should succeed. public
- *  interface must be defined in FNNL.
+ *  interface must be defined in FNNL. Disabled because the default
+ *  RMIClassLoader provider no longer creates class loaders.
  *
  *  4. Non-public interfaces have multiple class loaders. Should fail
  *  with a LinkageError.
  *
- *  5. Interface classes loaded from RMI class loader. Proxy class
- *  defined in RMI class loader.
+ *  5. Disabled. Interface classes loaded from RMI class loader. Proxy class
+ *  defined in RMI class loader. Disabled because the default RMIClassLoader
+ *  provider no longer creates class loaders.
  *
  *  6. Not all interfaces classes can be loaded from a single class
  *  loader; should fail with ClassNotFoundException.  All interface
@@ -127,9 +129,6 @@ public static void main(String[] args) {
             URL fnnUrl =
                 TestLibrary.installClassInCodebase("FnnClass", "fnn");
 
-            TestLibrary.suggestSecurityManager(null);
-
-
             /* Case 1 */
             ClassLoader grandParentPublic =
                 new URLClassLoader(new URL[] {publicUrl});
@@ -180,8 +179,8 @@ public static void main(String[] args) {
                 new Class[] {publicInterface3},
                 new TestInvocationHandler());
 
-            unmarshalProxyClass(proxy3, fnnLoader3, fnnLoader3,
-                3, new Case3Checker());
+//            unmarshalProxyClass(proxy3, fnnLoader3, fnnLoader3,
+//                3, new Case3Checker());
 
             currentThread.setContextClassLoader(currentCtxLoader);
 
@@ -240,8 +239,8 @@ public static void main(String[] args) {
             currentCtxLoader =
                 currentThread.getContextClassLoader();
             currentThread.setContextClassLoader(publicLoader);
-            unmarshalProxyClass(proxy5, fnnLoader2, publicLoader, 5,
-                                new Case5Checker());
+//            unmarshalProxyClass(proxy5, fnnLoader2, publicLoader, 5,
+//                                new Case5Checker());
             currentThread.setContextClassLoader(currentCtxLoader);
 
 
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
deleted file mode 100644
index 194493983e4..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-
-    // permissions needed to move classes into separate codebase directories
-    permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-    permission java.io.FilePermission ".${/}-", "read,write,delete";
-
-    permission java.lang.RuntimePermission "createClassLoader";
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.lang.RuntimePermission "setContextClassLoader";
-
-    permission java.lang.reflect.ReflectPermission "newProxyInPackage.";
-    permission java.lang.reflect.ReflectPermission "newProxyInPackage.java.util.zip";
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java
deleted file mode 100644
index fb0af3233c2..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4450891
- * @summary verify that the java.util.ServiceLoader-based location of an
- * RMIClassLoader provider does not require any permissions of the
- * (arbitrary) protection domains that happens to be on the stack
- * when RMIClassLoader is first used.
- * @author Peter Jones
- *
- * @library ../../../testlibrary
- * @modules java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary ServiceConfiguration TestProvider TestProvider2
- * @run main/othervm/policy=security.policy ContextInsulation
- */
-
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.Permissions;
-import java.security.ProtectionDomain;
-import java.security.cert.Certificate;
-
-public class ContextInsulation {
-    public static void main(String[] args) throws Exception {
-
-        /*
-         * If we delay setting the security manager until after the service
-         * configuration file has been installed, then this test still
-         * functions properly, but the -Djava.security.debug output is
-         * lacking, so to ease debugging, we'll set it early-- at the cost
-         * of having to specify the policy even when running standalone.
-         */
-        TestLibrary.suggestSecurityManager(null);
-
-        ServiceConfiguration.installServiceConfigurationFile();
-
-        /*
-         * Execute use of RMIClassLoader within an AccessControlContext
-         * that has a protection domain with no permissions, to make sure
-         * that RMIClassLoader can still properly initialize itself.
-         */
-        CodeSource codesource = new CodeSource(null, (Certificate[]) null);
-        Permissions perms = null;
-        ProtectionDomain pd = new ProtectionDomain(codesource, perms);
-        AccessControlContext acc =
-            new AccessControlContext(new ProtectionDomain[] { pd });
-
-        java.security.AccessController.doPrivileged(
-        new java.security.PrivilegedExceptionAction() {
-            public Object run() throws Exception {
-                TestProvider.exerciseTestProvider(
-                    TestProvider2.loadClassReturn,
-                    TestProvider2.loadProxyClassReturn,
-                    TestProvider2.getClassLoaderReturn,
-                    TestProvider2.getClassAnnotationReturn,
-                    TestProvider2.invocations);
-                return null;
-            }
-        }, acc);
-    }
-}
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java
index 59f89510620..a7792064a9a 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,18 @@
  * @author Peter Jones
  *
  * @library ../../../testlibrary
- * @modules java.rmi/sun.rmi.registry
+ * @modules java.rmi/java.rmi.server:+open
+ *          java.rmi/sun.rmi.registry
  *          java.rmi/sun.rmi.server
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary ServiceConfiguration Foo
- * @run main/othervm/policy=security.policy DefaultProperty
+ * @build TestLibrary ServiceConfiguration
+ * @run main/othervm DefaultProperty
  */
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
+import java.lang.reflect.Field;
 import java.rmi.server.RMIClassLoader;
+import java.rmi.server.RMIClassLoaderSpi;
 
 public class DefaultProperty {
 
@@ -51,30 +51,19 @@ public static void main(String[] args) throws Exception {
         System.setProperty(
             "java.rmi.server.RMIClassLoaderSpi", "default");
 
-        String classname = "Foo";
-
-        URL codebaseURL = null;
-        try {
-            codebaseURL = TestLibrary.installClassInCodebase(
-                classname, "remote_codebase");
-        } catch (MalformedURLException e) {
-            TestLibrary.bomb(e);
-        }
+        // Force loading of RMIClassLoader, which will initialize the
+        // provider instance.
+        RMIClassLoaderSpi def = RMIClassLoader.getDefaultProviderInstance();
 
-        TestLibrary.suggestSecurityManager(null);
-
-        Class fooClass = RMIClassLoader.loadClass(codebaseURL, classname);
-        if (!fooClass.getName().equals(classname)) {
-            throw new RuntimeException(
-                "wrong class name, expected: " + classname +
-                ", received: " + fooClass.getName());
-        }
+        Field fProvider = RMIClassLoader.class.getDeclaredField("provider");
+        fProvider.setAccessible(true);
+        RMIClassLoaderSpi actual = (RMIClassLoaderSpi) fProvider.get(null);
 
-        String annotation = RMIClassLoader.getClassAnnotation(fooClass);
-        if (!annotation.equals(codebaseURL.toString())) {
-            throw new RuntimeException(
-                "wrong class annotation, expected: " + codebaseURL.toString() +
-                ", received: " + annotation);
+        if (def != actual) {
+            System.err.println("TEST FAILED");
+            System.err.println("default provider = " + def);
+            System.err.println("actual provider = " + actual);
+            throw new AssertionError("TEST FAILED");
         }
 
         System.err.println("TEST PASSED");
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java
index 194dd01268c..a946bea9717 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/spi/Installed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary ServiceConfiguration TestProvider TestProvider2
- * @run main/othervm/policy=security.policy Installed
+ * @run main/othervm Installed
  */
 
 public class Installed {
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java
index bdf73067c08..47ab0a9aa68 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary ServiceConfiguration
- * @run main/othervm/policy=security.policy InvalidProperty
+ * @run main/othervm InvalidProperty
  */
 
 import java.rmi.server.RMIClassLoader;
@@ -50,8 +50,6 @@ public static void main(String[] args) throws Exception {
 
         String classname = "Foo";
 
-        TestLibrary.suggestSecurityManager(null);
-
         try {
             System.err.println("first attempt:");
             Object ret;
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java
index b13322773a8..0ccca8155f8 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/spi/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary ServiceConfiguration TestProvider
- * @run main/othervm/policy=security.policy Property
+ * @run main/othervm Property
  */
 
 public class Property {
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java b/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java
index e0cf78effb7..e3cd752e16d 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/spi/TestProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,8 +139,6 @@ public static void exerciseTestProvider(Object loadClassReturn,
         String[] interfaces = new String[] { "Bar", "Baz" };
         Class dummyClass = (new Object() { }).getClass();
 
-        TestLibrary.suggestSecurityManager(null);
-
         String testcase;
         Object ret;
 
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/spi/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/spi/security.policy
deleted file mode 100644
index fc8a55fd793..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/spi/security.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-
-    // permissions needed to move classes into separate codebase directories
-    permission java.io.FilePermission
-	"${test.src}${/}-", "read";
-    permission java.io.FilePermission
-	"${test.classes}${/}-", "read,write,delete";
-    permission java.io.FilePermission
-	".${/}-", "read,write,delete";
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-
-    permission java.util.PropertyPermission
-	"java.rmi.server.RMIClassLoaderSpi", "read,write";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java
index 7f921994b84..c30cde12059 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,8 +35,8 @@
  *          java.rmi/sun.rmi.server
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Receiver UseCodebaseOnly_Stub Foo Bar
- * @run main/othervm/policy=security.policy UseCodebaseOnly
+ * @build TestLibrary Receiver UseCodebaseOnly_Stub Foo Bar TestLoaderHandler
+ * @run main/othervm UseCodebaseOnly
  */
 
 import java.net.*;
@@ -59,6 +59,8 @@ public static void main(String[] args) {
 
         System.err.println("\nRegression test for bug 4174006\n");
 
+        System.setProperty("java.rmi.server.RMIClassLoaderSpi", "TestLoaderHandler");
+
         URL localCodebase = null, remoteCodebase = null;
         try {
             remoteCodebase =
@@ -88,8 +90,6 @@ public static void main(String[] args) {
         ClassLoader localCodebaseLoader =
             URLClassLoader.newInstance(new URL[] { localCodebase });
 
-        TestLibrary.suggestSecurityManager(null);
-
         System.err.println("Creating remote object.");
         UseCodebaseOnly obj = null;
         try {
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy
deleted file mode 100644
index 2ec8b5349c5..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-
-    // specific property access needed by this test
-    permission java.util.PropertyPermission
-	"java.rmi.server.codebase", "read,write";
-    permission java.util.PropertyPermission
-	"java.rmi.server.useCodebaseOnly", "read,write";
-
-    // permissions needed to move classes into separate codebase directories
-    permission java.io.FilePermission
-	"${test.classes}${/}-", "read,write,delete";
-    permission java.io.FilePermission
-	".${/}-", "read,write,delete";
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-
-    // allow exporting of remote objects on an arbitrary port
-    permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java
index 486e44f5ee0..619fdd16365 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java
+++ b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Dummy
- * @run main/othervm/policy=security.policy/timeout=120 UseGetURLs
+ * @run main/othervm/timeout=120 UseGetURLs
  */
 
 import java.io.*;
@@ -50,10 +50,6 @@ public static void main(String[] args) {
 
         System.err.println("\nRegression test for bug 4137605\n");
 
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-        System.err.println("Security manager: " +
-                           System.getSecurityManager().getClass().getName());
-
         /*
          * Install dummy class in first codebase to be loaded from an
          * arbitrary URLClassLoader; the second codebase is used to make
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/security.policy b/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/security.policy
deleted file mode 100644
index 4b97ac42f53..00000000000
--- a/test/jdk/java/rmi/server/RMIClassLoader/useGetURLs/security.policy
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // the test needs to move classfiles out of its classpath
-  permission java.io.FilePermission "${test.classes}", "read,write,delete";
-  permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";
-
-  // test needs to install class files
-  permission java.io.FilePermission ".", "read,write,delete";
-  permission java.io.FilePermission ".${/}-", "read,write,delete";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-};
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java
index e2dde858b05..e05267726d9 100644
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java
+++ b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,8 +58,6 @@ public static void main(String[] args) {
         Hello hello = null;
         Registry registry = null;
 
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-
         try {
             String protocol = "";
             if (args.length >= 1)
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java
index b200893434d..47a3bce52ba 100644
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java
+++ b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Compress Hello HelloImpl HelloImpl_Stub
- * @run main/othervm/policy=security.policy/timeout=240 UseCustomSocketFactory
+ * @run main/othervm/timeout=240 UseCustomSocketFactory
  */
 
 import java.io.*;
@@ -57,7 +57,6 @@ public static void main(String[] args) {
 
         System.out.println("\nRegression test for bug 4148850\n");
 
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
         int registryPort = -1;
 
         try {
@@ -80,9 +79,6 @@ public static void main(String[] args) {
         }
 
         JavaVM serverVM = new JavaVM("HelloImpl",
-                                     "-Djava.security.manager=allow" +
-                                     " -Djava.security.policy=" +
-                                     TestParams.defaultPolicy +
                                      " -Drmi.registry.port=" +
                                      registryPort,
                                      "");
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy
deleted file mode 100644
index e35814e04b1..00000000000
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // used by TestLibrary to determine extra commandline properties
-  permission java.io.FilePermission "..${/}..${/}test.props", "read";
-
-  // property specifically accessed by this test.
-  permission java.util.PropertyPermission "user.name", "read";
-
-  // test needs to use java to exec an EchoImpl object
-  permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  permission java.util.PropertyPermission "rmi.registry.port", "read";	
-
-  permission java.util.PropertyPermission "java.security.policy", "read";
-  permission java.util.PropertyPermission "java.security.manager", "read";
-
-  // used by TestLibrary to get the RMI Registry port
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.proxy";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
-
-  // test needs to communicate with objects on arbitrary ports
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java
index d1b4d062531..385a2725dff 100644
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java
+++ b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,6 @@ public static void main(String[] args) {
          */
         Object dummy = new Object();
 
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-
         try {
             String protocol = "";
             if (args.length >= 1)
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java
index 945111b8a92..b8708f40eda 100644
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java
+++ b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary JavaVM Echo EchoImpl EchoImpl_Stub
- * @run main/othervm/policy=security.policy/timeout=120 UseCustomSocketFactory
+ * @run main/othervm/timeout=120 UseCustomSocketFactory
  */
 
 import java.io.IOException;
@@ -52,8 +52,6 @@ public static void main(String[] args) {
 
         System.out.println("\nRegression test for bug 4127826\n");
 
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-
         try {
             Registry registry = TestLibrary.createRegistryOnEphemeralPort();
             registryPort = TestLibrary.getRegistryPort(registry);
@@ -61,11 +59,7 @@ public static void main(String[] args) {
             TestLibrary.bomb("creating registry", e);
         }
         for (String protocol : protocols) {
-            System.err.println("test policy: " +
-                    TestParams.defaultPolicy);
             JavaVM serverVM = new JavaVM("EchoImpl",
-                    "-Djava.security.manager=allow -Djava.security.policy=" +
-                    TestParams.defaultPolicy +
                     " -Drmi.registry.port=" +
                     registryPort, protocol);
             System.err.println("\nusing protocol: " +
diff --git a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy b/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy
deleted file mode 100644
index e35814e04b1..00000000000
--- a/test/jdk/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // used by TestLibrary to determine extra commandline properties
-  permission java.io.FilePermission "..${/}..${/}test.props", "read";
-
-  // property specifically accessed by this test.
-  permission java.util.PropertyPermission "user.name", "read";
-
-  // test needs to use java to exec an EchoImpl object
-  permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  permission java.util.PropertyPermission "rmi.registry.port", "read";	
-
-  permission java.util.PropertyPermission "java.security.policy", "read";
-  permission java.util.PropertyPermission "java.security.manager", "read";
-
-  // used by TestLibrary to get the RMI Registry port
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.proxy";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
-
-  // test needs to communicate with objects on arbitrary ports
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java b/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java
index cf0216e327c..fdddfe15999 100644
--- a/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java
+++ b/test/jdk/java/rmi/server/RemoteObject/toStub/ToStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @author Ann Wollrath
  *
  * @build ToStub ToStub_Stub
- * @run main/othervm/policy=security.policy/timeout=240 ToStub
+ * @run main/othervm/timeout=240 ToStub
  */
 
 import java.io.IOException;
@@ -57,10 +57,6 @@ public static void main(String[] args) throws Exception {
         try {
             System.setProperty("java.rmi.server.ignoreStubClasses", "true");
 
-            if (System.getSecurityManager() == null) {
-                System.setSecurityManager(new SecurityManager());
-            }
-
             System.err.println("export objects");
             server1 = new ToStub();
             server2 = new ToStub();
diff --git a/test/jdk/java/rmi/server/RemoteObject/toStub/security.policy b/test/jdk/java/rmi/server/RemoteObject/toStub/security.policy
deleted file mode 100644
index a4339ad70e4..00000000000
--- a/test/jdk/java/rmi/server/RemoteObject/toStub/security.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java b/test/jdk/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java
deleted file mode 100644
index fd6c6ad5b62..00000000000
--- a/test/jdk/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4533390
- * @summary SecurityException can be obtained but is not specified.
- * The RemoteServer.setLog method requires
- * java.util.log.LoggingPermission("control").
- * @author Ann Wollrath
- * @run main/othervm/policy=security.policy SetLogPermission
- */
-
-import java.rmi.server.RemoteServer;
-import java.io.ByteArrayOutputStream;
-import java.net.URL;
-import java.security.*;
-import java.security.cert.Certificate;
-
-public class SetLogPermission {
-
-    public static void main(String[] args) throws Exception {
-
-        System.err.println("\nRegression test for bug 4533390\n");
-
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
-        CodeSource codesource = new CodeSource(null, (Certificate[]) null);
-        Permissions perms = null;
-        ProtectionDomain pd = new ProtectionDomain(codesource, perms);
-        AccessControlContext acc =
-            new AccessControlContext(new ProtectionDomain[] { pd });
-
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction() {
-            public Object run() {
-                try {
-                    System.err.println(
-                        "Attempt to set log without permission");
-                    RemoteServer.setLog(new ByteArrayOutputStream());
-                    throw new RuntimeException(
-                        "TEST FAILED: set log without permission");
-                } catch (SecurityException e) {
-                    System.err.println(
-                        "TEST PASSED: unable to set log without permission");
-                }
-                return null;
-            }}, acc);
-
-        try {
-            System.err.println("Attempt to set log with permission");
-            RemoteServer.setLog(new ByteArrayOutputStream());
-            System.err.println(
-                "TEST PASSED: sufficient permission to set log");
-        } catch (SecurityException e) {
-            System.err.println("TEST FAILED: unable to set log");
-            throw e;
-        }
-    }
-}
diff --git a/test/jdk/java/rmi/server/RemoteServer/setLogPermission/security.policy b/test/jdk/java/rmi/server/RemoteServer/setLogPermission/security.policy
deleted file mode 100644
index e41f260730e..00000000000
--- a/test/jdk/java/rmi/server/RemoteServer/setLogPermission/security.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.util.logging.LoggingPermission "control";
-};
diff --git a/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java
index 4217d6cf57e..1d94a9471a8 100644
--- a/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java
+++ b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
  * @author Ann Wollrath
  *
  * @build UseDynamicProxies UseDynamicProxies_Stub
- * @run main/othervm/policy=security.policy/timeout=240 UseDynamicProxies true
- * @run main/othervm/policy=security.policy/timeout=240 UseDynamicProxies
+ * @run main/othervm/timeout=240 UseDynamicProxies true
+ * @run main/othervm/timeout=240 UseDynamicProxies
  * false
  */
 
@@ -63,10 +63,6 @@ public static void main(String[] args) throws Exception {
             System.setProperty("java.rmi.server.ignoreStubClasses", args[0]);
             boolean ignoreStubClasses = Boolean.parseBoolean(args[0]);
 
-            if (System.getSecurityManager() == null) {
-                System.setSecurityManager(new SecurityManager());
-            }
-
             System.err.println("export object");
             server = new UseDynamicProxies();
             proxy =
diff --git a/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy b/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy
deleted file mode 100644
index a4339ad70e4..00000000000
--- a/test/jdk/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java b/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java
index f1de500a9e2..804e7267153 100644
--- a/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java
+++ b/test/jdk/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary UnreferencedContext_Stub
- * @run main/othervm/timeout=120 -Djava.security.manager=allow UnreferencedContext
+ * @run main/othervm/timeout=120 UnreferencedContext
  */
 
 import java.net.*;
@@ -67,10 +67,6 @@ public void run() {
     }
 
     public void unreferenced() {
-        // turn on security to ensure that the action below will not
-        // require extra permissions
-        System.setSecurityManager(new java.rmi.RMISecurityManager());
-
         // exercise functionality prohibited by 4214123
         (new Thread(this)).start();
 
diff --git a/test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java b/test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java
index a4db112ab7b..286ea12725d 100644
--- a/test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java
+++ b/test/jdk/java/rmi/server/clientStackTrace/ClientStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary ClientStackTrace MyRemoteObject_Stub
- * @run main/othervm/policy=security.policy/timeout=120 ClientStackTrace
+ * @run main/othervm/timeout=120 ClientStackTrace
  */
 
 /*
@@ -65,9 +65,6 @@ public class ClientStackTrace {
     Object dummy = new Object();
 
     public static void main(String[] args) {
-
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
-
         Object dummy = new Object();
         MyRemoteObject myRobj = null;
         MyRemoteInterface myStub = null;
diff --git a/test/jdk/java/rmi/server/clientStackTrace/security.policy b/test/jdk/java/rmi/server/clientStackTrace/security.policy
deleted file mode 100644
index 0585c072708..00000000000
--- a/test/jdk/java/rmi/server/clientStackTrace/security.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // test needs to communicate with objects on arbitrary ports
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java b/test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java
index a62cfadc1b9..09b09b4d59d 100644
--- a/test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java
+++ b/test/jdk/java/rmi/server/useCustomRef/UseCustomRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Ping UseCustomRef_Stub UseCustomRef_Skel
- * @run main/othervm/policy=security.policy/secure=java.rmi.RMISecurityManager/timeout=120 UseCustomRef
+ * @run main/othervm/timeout=120 UseCustomRef
  *
  * This test was failing to run because the synthetic access
  * control context used by the application class loader to find and define
@@ -82,7 +82,6 @@ public static void main(String[] args) {
             /*
              * create registry
              */
-            TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
 
             System.err.println("creating Registry...");
 
diff --git a/test/jdk/java/rmi/server/useCustomRef/security.policy b/test/jdk/java/rmi/server/useCustomRef/security.policy
deleted file mode 100644
index 6f5e0c9ad37..00000000000
--- a/test/jdk/java/rmi/server/useCustomRef/security.policy
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // the test uses a class in the package sun.rmi.server
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.proxy";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
-  permission java.util.PropertyPermission "package.restrict.access.sun", "read";
-  permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  // allow exporting of remote objects on an arbitrary port.
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-
-  permission java.io.FilePermission ".", "read,write,delete";
-  permission java.io.FilePermission ".${/}-", "read,write,delete";
-};
diff --git a/test/jdk/java/rmi/testlibrary/TestLibrary.java b/test/jdk/java/rmi/testlibrary/TestLibrary.java
index 51cfa2c9282..de033033447 100644
--- a/test/jdk/java/rmi/testlibrary/TestLibrary.java
+++ b/test/jdk/java/rmi/testlibrary/TestLibrary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -369,35 +369,6 @@ public static void unexport(Remote obj) {
         }
     }
 
-    /**
-     * Allow test framework to control the security manager set in
-     * each test.
-     *
-     * @param managerClassName The class name of the security manager
-     *                         to be instantiated and set if no security
-     *                         manager has already been set.
-     */
-    public static void suggestSecurityManager(String managerClassName) {
-        SecurityManager manager = null;
-
-        if (System.getSecurityManager() == null) {
-            try {
-                if (managerClassName == null) {
-                    managerClassName = TestParams.defaultSecurityManager;
-                }
-                manager = ((SecurityManager) Class.
-                           forName(managerClassName).newInstance());
-            } catch (ClassNotFoundException cnfe) {
-                bomb("Security manager could not be found: " +
-                     managerClassName, cnfe);
-            } catch (Exception e) {
-                bomb("Error creating security manager. ", e);
-            }
-
-            System.setSecurityManager(manager);
-        }
-    }
-
     /**
      * Creates an RMI {@link Registry} on a random, un-reserved port.
      *
diff --git a/test/jdk/java/rmi/testlibrary/TestLoaderHandler.java b/test/jdk/java/rmi/testlibrary/TestLoaderHandler.java
new file mode 100644
index 00000000000..8cb6e866876
--- /dev/null
+++ b/test/jdk/java/rmi/testlibrary/TestLoaderHandler.java
@@ -0,0 +1,696 @@
+/*
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.rmi.server.RMIClassLoaderSpi;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.WeakHashMap;
+
+/**
+ * Derived from <code>LoaderHandler</code> to provides the implementation of the
+ * static methods of the <code>java.rmi.server.RMIClassLoader</code> class.
+ *
+ * WARNING: this loader will load classes from codebase annotations received over the
+ * wire, without performing any security checks. It is intended only for testing.
+ *
+ * @author      Ann Wollrath
+ * @author      Peter Jones
+ * @author      Laird Dornin
+ */
+@SuppressWarnings("deprecation")
+public final class TestLoaderHandler extends RMIClassLoaderSpi {
+
+    /**
+     * value of "java.rmi.server.codebase" property, as cached at class
+     * initialization time.  It may be null or contain malformed URLs.
+     */
+    private static String codebaseProperty = null;
+    static {
+        String prop = System.getProperty("java.rmi.server.codebase");
+        if (prop != null && prop.trim().length() > 0) {
+            codebaseProperty = prop;
+        }
+    }
+
+    /** list of URLs represented by the codebase property, if valid */
+    private static URL[] codebaseURLs = null;
+
+    /** table of class loaders that use codebase property for annotation */
+    private static final Set<ClassLoader> codebaseLoaders =
+        Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>(5)));
+    static {
+        for (ClassLoader codebaseLoader = ClassLoader.getSystemClassLoader();
+             codebaseLoader != null;
+             codebaseLoader = codebaseLoader.getParent())
+        {
+            codebaseLoaders.add(codebaseLoader);
+        }
+    }
+
+    /**
+     * table mapping codebase URL path and context class loader pairs
+     * to class loader instances.  Entries hold class loaders with weak
+     * references, so this table does not prevent loaders from being
+     * garbage collected.
+     */
+    private static final HashMap<LoaderKey, LoaderEntry> loaderTable
+        = new HashMap<>(5);
+
+    /** reference queue for cleared class loader entries */
+    private static final ReferenceQueue<Loader> refQueue = new ReferenceQueue<>();
+
+    public TestLoaderHandler() {
+        System.err.println("*** TestLoaderHandler created ***");
+    }
+
+    /**
+     * Returns an array of URLs initialized with the value of the
+     * java.rmi.server.codebase property as the URL path.
+     */
+    private static synchronized URL[] getDefaultCodebaseURLs()
+        throws MalformedURLException
+    {
+        /*
+         * If it hasn't already been done, convert the codebase property
+         * into an array of URLs; this may throw a MalformedURLException.
+         */
+        if (codebaseURLs == null) {
+            if (codebaseProperty != null) {
+                codebaseURLs = pathToURLs(codebaseProperty);
+            } else {
+                codebaseURLs = new URL[0];
+            }
+        }
+        return codebaseURLs;
+    }
+
+    /**
+     * Load a class from a network location (one or more URLs),
+     * but first try to resolve the named class through the given
+     * "default loader".
+     */
+    public Class<?> loadClass(String codebase, String name,
+                                     ClassLoader defaultLoader)
+        throws MalformedURLException, ClassNotFoundException
+    {
+        URL[] urls;
+        if (codebase != null) {
+            urls = pathToURLs(codebase);
+        } else {
+            urls = getDefaultCodebaseURLs();
+        }
+
+        if (defaultLoader != null) {
+            try {
+                return Class.forName(name, false, defaultLoader);
+            } catch (ClassNotFoundException e) {
+            }
+        }
+
+        return loadClass(urls, name);
+    }
+
+    /**
+     * Returns the class annotation (representing the location for
+     * a class) that RMI will use to annotate the call stream when
+     * marshalling objects of the given class.
+     */
+    public String getClassAnnotation(Class<?> cl) {
+        String name = cl.getName();
+
+        /*
+         * Class objects for arrays of primitive types never need an
+         * annotation, because they never need to be (or can be) downloaded.
+         *
+         * REMIND: should we (not) be annotating classes that are in
+         * "java.*" packages?
+         */
+        int nameLength = name.length();
+        if (nameLength > 0 && name.charAt(0) == '[') {
+            // skip past all '[' characters (see bugid 4211906)
+            int i = 1;
+            while (nameLength > i && name.charAt(i) == '[') {
+                i++;
+            }
+            if (nameLength > i && name.charAt(i) != 'L') {
+                return null;
+            }
+        }
+
+        /*
+         * Get the class's class loader.  If it is null, the system class
+         * loader, an ancestor of the base class loader (such as the loader
+         * for installed extensions), return the value of the
+         * "java.rmi.server.codebase" property.
+         */
+        ClassLoader loader = cl.getClassLoader();
+        if (loader == null || codebaseLoaders.contains(loader)) {
+            return codebaseProperty;
+        }
+
+        /*
+         * Get the codebase URL path for the class loader, if it supports
+         * such a notion (i.e., if it is a URLClassLoader or subclass).
+         */
+        String annotation = null;
+        if (loader instanceof Loader) {
+            /*
+             * If the class loader is one of our RMI class loaders, we have
+             * already computed the class annotation string, and no
+             * permissions are required to know the URLs.
+             */
+            annotation = ((Loader) loader).getClassAnnotation();
+
+        } else if (loader instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) loader).getURLs();
+            if (urls != null) {
+                annotation = urlsToPath(urls);
+            }
+        }
+
+        if (annotation != null) {
+            return annotation;
+        } else {
+            return codebaseProperty;    // REMIND: does this make sense??
+        }
+    }
+
+    /**
+     * Returns a classloader that loads classes from the given codebase URL
+     * path.  The parent classloader of the returned classloader is the
+     * context class loader.
+     */
+    public ClassLoader getClassLoader(String codebase)
+        throws MalformedURLException
+    {
+        ClassLoader parent = getRMIContextClassLoader();
+
+        URL[] urls;
+        if (codebase != null) {
+            urls = pathToURLs(codebase);
+        } else {
+            urls = getDefaultCodebaseURLs();
+        }
+
+        return lookupLoader(urls, parent);
+    }
+
+    /**
+     * Return the security context of the given class loader.
+     */
+    public static Object getSecurityContext(ClassLoader loader) {
+        /*
+         * REMIND: This is a bogus JDK1.1-compatible implementation.
+         * This method should never be called by application code anyway
+         * (hence the deprecation), but should it do something different
+         * and perhaps more useful, like return a String or a URL[]?
+         */
+        if (loader instanceof Loader) {
+            URL[] urls = ((Loader) loader).getURLs();
+            if (urls.length > 0) {
+                return urls[0];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Register a class loader as one whose classes should always be
+     * annotated with the value of the "java.rmi.server.codebase" property.
+     */
+    public static void registerCodebaseLoader(ClassLoader loader) {
+        codebaseLoaders.add(loader);
+    }
+
+    /**
+     * Load a class from the RMI class loader corresponding to the given
+     * codebase URL path in the current execution context.
+     */
+    private Class<?> loadClass(URL[] urls, String name)
+        throws ClassNotFoundException
+    {
+        ClassLoader parent = getRMIContextClassLoader();
+
+        /*
+         * Get or create the RMI class loader for this codebase URL path
+         * and parent class loader pair.
+         */
+        Loader loader = lookupLoader(urls, parent);
+
+        return Class.forName(name, false, loader);
+    }
+
+    /**
+     * Define and return a dynamic proxy class in a class loader with
+     * URLs supplied in the given location.  The proxy class will
+     * implement interface classes named by the given array of
+     * interface names.
+     */
+    public Class<?> loadProxyClass(String codebase, String[] interfaces,
+                                          ClassLoader defaultLoader)
+        throws MalformedURLException, ClassNotFoundException
+    {
+        /*
+         * This method uses a fairly complex algorithm to load the
+         * proxy class and its interface classes in order to maximize
+         * the likelihood that the proxy's codebase annotation will be
+         * preserved.  The algorithm is (assuming that all of the
+         * proxy interface classes are public):
+         *
+         * If the default loader is not null, try to load the proxy
+         * interfaces through that loader. If the interfaces can be
+         * loaded in that loader, try to define the proxy class in an
+         * RMI class loader (child of the context class loader) before
+         * trying to define the proxy in the default loader.  If the
+         * attempt to define the proxy class succeeds, the codebase
+         * annotation is preserved.  If the attempt fails, try to
+         * define the proxy class in the default loader.
+         *
+         * If the interface classes can not be loaded from the default
+         * loader or the default loader is null, try to load them from
+         * the RMI class loader.  Then try to define the proxy class
+         * in the RMI class loader.
+         *
+         * Additionally, if any of the proxy interface classes are not
+         * public, all of the non-public interfaces must reside in the
+         * same class loader or it will be impossible to define the
+         * proxy class (an IllegalAccessError will be thrown).  An
+         * attempt to load the interfaces from the default loader is
+         * made.  If the attempt fails, a second attempt will be made
+         * to load the interfaces from the RMI loader. If all of the
+         * non-public interfaces classes do reside in the same class
+         * loader, then we attempt to define the proxy class in the
+         * class loader of the non-public interfaces.  No other
+         * attempt to define the proxy class will be made.
+         */
+        ClassLoader parent = getRMIContextClassLoader();
+
+        URL[] urls;
+        if (codebase != null) {
+            urls = pathToURLs(codebase);
+        } else {
+            urls = getDefaultCodebaseURLs();
+        }
+
+        /*
+         * Get or create the RMI class loader for this codebase URL path
+         * and parent class loader pair.
+         */
+        Loader loader = lookupLoader(urls, parent);
+
+        return loadProxyClass(interfaces, defaultLoader, loader, true);
+    }
+
+    /**
+     * Define a proxy class in the default loader if appropriate.
+     * Define the class in an RMI class loader otherwise.  The proxy
+     * class will implement classes which are named in the supplied
+     * interfaceNames.
+     */
+    private Class<?> loadProxyClass(String[] interfaceNames,
+                                           ClassLoader defaultLoader,
+                                           ClassLoader codebaseLoader,
+                                           boolean preferCodebase)
+        throws ClassNotFoundException
+    {
+        ClassLoader proxyLoader = null;
+        Class<?>[] classObjs = new Class<?>[interfaceNames.length];
+        boolean[] nonpublic = { false };
+
+      defaultLoaderCase:
+        if (defaultLoader != null) {
+            try {
+                proxyLoader =
+                    loadProxyInterfaces(interfaceNames, defaultLoader,
+                                        classObjs, nonpublic);
+            } catch (ClassNotFoundException e) {
+                break defaultLoaderCase;
+            }
+            if (!nonpublic[0]) {
+                if (preferCodebase) {
+                    try {
+                        return Proxy.getProxyClass(codebaseLoader, classObjs);
+                    } catch (IllegalArgumentException e) {
+                    }
+                }
+                proxyLoader = defaultLoader;
+            }
+            return loadProxyClass(proxyLoader, classObjs);
+        }
+
+        nonpublic[0] = false;
+        proxyLoader = loadProxyInterfaces(interfaceNames, codebaseLoader,
+                                          classObjs, nonpublic);
+        if (!nonpublic[0]) {
+            proxyLoader = codebaseLoader;
+        }
+        return loadProxyClass(proxyLoader, classObjs);
+    }
+
+    /**
+     * Define a proxy class in the given class loader.  The proxy
+     * class will implement the given interfaces Classes.
+     */
+    private Class<?> loadProxyClass(ClassLoader loader, Class<?>[] interfaces)
+        throws ClassNotFoundException
+    {
+        try {
+            return Proxy.getProxyClass(loader, interfaces);
+        } catch (IllegalArgumentException e) {
+            throw new ClassNotFoundException(
+                "error creating dynamic proxy class", e);
+        }
+    }
+
+    /*
+     * Load Class objects for the names in the interfaces array from
+     * the given class loader.
+     *
+     * We pass classObjs and nonpublic arrays to avoid needing a
+     * multi-element return value.  nonpublic is an array to enable
+     * the method to take a boolean argument by reference.
+     *
+     * nonpublic array is needed to signal when the return value of
+     * this method should be used as the proxy class loader.  Because
+     * null represents a valid class loader, that value is
+     * insufficient to signal that the return value should not be used
+     * as the proxy class loader.
+     */
+    private static ClassLoader loadProxyInterfaces(String[] interfaces,
+                                                   ClassLoader loader,
+                                                   Class<?>[] classObjs,
+                                                   boolean[] nonpublic)
+        throws ClassNotFoundException
+    {
+        /* loader of a non-public interface class */
+        ClassLoader nonpublicLoader = null;
+
+        for (int i = 0; i < interfaces.length; i++) {
+            Class<?> cl =
+                (classObjs[i] = Class.forName(interfaces[i], false, loader));
+
+            if (!Modifier.isPublic(cl.getModifiers())) {
+                ClassLoader current = cl.getClassLoader();
+                if (!nonpublic[0]) {
+                    nonpublicLoader = current;
+                    nonpublic[0] = true;
+                } else if (current != nonpublicLoader) {
+                    throw new IllegalAccessError(
+                        "non-public interfaces defined in different " +
+                        "class loaders");
+                }
+            }
+        }
+        return nonpublicLoader;
+    }
+
+    /**
+     * Convert a string containing a space-separated list of URLs into a
+     * corresponding array of URL objects, throwing a MalformedURLException
+     * if any of the URLs are invalid.
+     */
+    private static URL[] pathToURLs(String path)
+        throws MalformedURLException
+    {
+        synchronized (pathToURLsCache) {
+            Object[] v = pathToURLsCache.get(path);
+            if (v != null) {
+                return ((URL[])v[0]);
+            }
+        }
+        StringTokenizer st = new StringTokenizer(path); // divide by spaces
+        URL[] urls = new URL[st.countTokens()];
+        for (int i = 0; st.hasMoreTokens(); i++) {
+            @SuppressWarnings("deprecation")
+            var url = new URL(st.nextToken());
+            urls[i] = url;
+        }
+        synchronized (pathToURLsCache) {
+            pathToURLsCache.put(path,
+                                new Object[] {urls, new SoftReference<String>(path)});
+        }
+        return urls;
+    }
+
+    /** map from weak(key=string) to [URL[], soft(key)] */
+    private static final Map<String, Object[]> pathToURLsCache
+        = new WeakHashMap<>(5);
+
+    /**
+     * Convert an array of URL objects into a corresponding string
+     * containing a space-separated list of URLs.
+     *
+     * Note that if the array has zero elements, the return value is
+     * null, not the empty string.
+     */
+    private static String urlsToPath(URL[] urls) {
+        if (urls.length == 0) {
+            return null;
+        } else if (urls.length == 1) {
+            return urls[0].toExternalForm();
+        } else {
+            StringBuilder path = new StringBuilder(urls[0].toExternalForm());
+            for (int i = 1; i < urls.length; i++) {
+                path.append(' ');
+                path.append(urls[i].toExternalForm());
+            }
+            return path.toString();
+        }
+    }
+
+    /**
+     * Return the class loader to be used as the parent for an RMI class
+     * loader used in the current execution context.
+     */
+    private static ClassLoader getRMIContextClassLoader() {
+        /*
+         * The current implementation simply uses the current thread's
+         * context class loader.
+         */
+        return Thread.currentThread().getContextClassLoader();
+    }
+
+    /**
+     * Look up the RMI class loader for the given codebase URL path
+     * and the given parent class loader.  A new class loader instance
+     * will be created and returned if no match is found.
+     */
+    @SuppressWarnings("removal")
+    private static Loader lookupLoader(final URL[] urls,
+                                       final ClassLoader parent)
+    {
+        /*
+         * If the requested codebase URL path is empty, the supplied
+         * parent class loader will be sufficient.
+         *
+         * REMIND: To be conservative, this optimization is commented out
+         * for now so that it does not open a security hole in the future
+         * by providing untrusted code with direct access to the public
+         * loadClass() method of a class loader instance that it cannot
+         * get a reference to.  (It's an unlikely optimization anyway.)
+         *
+         * if (urls.length == 0) {
+         *     return parent;
+         * }
+         */
+
+        LoaderEntry entry;
+        Loader loader;
+
+        synchronized (TestLoaderHandler.class) {
+            /*
+             * Take this opportunity to remove from the table entries
+             * whose weak references have been cleared.
+             */
+            while ((entry = (LoaderEntry) refQueue.poll()) != null) {
+                if (!entry.removed) {   // ignore entries removed below
+                    loaderTable.remove(entry.key);
+                }
+            }
+
+            /*
+             * Look up the codebase URL path and parent class loader pair
+             * in the table of RMI class loaders.
+             */
+            LoaderKey key = new LoaderKey(urls, parent);
+            entry = loaderTable.get(key);
+
+            if (entry == null || (loader = entry.get()) == null) {
+                /*
+                 * If entry was in table but it's weak reference was cleared,
+                 * remove it from the table and mark it as explicitly cleared,
+                 * so that new matching entry that we put in the table will
+                 * not be erroneously removed when this entry is processed
+                 * from the weak reference queue.
+                 */
+                if (entry != null) {
+                    loaderTable.remove(key);
+                    entry.removed = true;
+                }
+
+                /*
+                 * A matching loader was not found, so create a new class
+                 * loader instance for the requested codebase URL path and
+                 * parent class loader.  The instance is created within an
+                 * access control context restricted to the permissions
+                 * necessary to load classes from its codebase URL path.
+                 */
+                loader = new Loader(urls, parent);
+
+                /*
+                 * Finally, create an entry to hold the new loader with a
+                 * weak reference and store it in the table with the key.
+                 */
+                entry = new LoaderEntry(key, loader);
+                loaderTable.put(key, entry);
+            }
+        }
+
+        return loader;
+    }
+
+    /**
+     * LoaderKey holds a codebase URL path and parent class loader pair
+     * used to look up RMI class loader instances in its class loader cache.
+     */
+    private static class LoaderKey {
+
+        private URL[] urls;
+
+        private ClassLoader parent;
+
+        private int hashValue;
+
+        public LoaderKey(URL[] urls, ClassLoader parent) {
+            this.urls = urls;
+            this.parent = parent;
+
+            if (parent != null) {
+                hashValue = parent.hashCode();
+            }
+            for (int i = 0; i < urls.length; i++) {
+                hashValue ^= urls[i].hashCode();
+            }
+        }
+
+        public int hashCode() {
+            return hashValue;
+        }
+
+        public boolean equals(Object obj) {
+            if (obj instanceof LoaderKey) {
+                LoaderKey other = (LoaderKey) obj;
+                if (parent != other.parent) {
+                    return false;
+                }
+                if (urls == other.urls) {
+                    return true;
+                }
+                if (urls.length != other.urls.length) {
+                    return false;
+                }
+                for (int i = 0; i < urls.length; i++) {
+                    if (!urls[i].equals(other.urls[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * LoaderEntry contains a weak reference to an RMIClassLoader.  The
+     * weak reference is registered with the private static "refQueue"
+     * queue.  The entry contains the codebase URL path and parent class
+     * loader key for the loader so that the mapping can be removed from
+     * the table efficiently when the weak reference is cleared.
+     */
+    private static class LoaderEntry extends WeakReference<Loader> {
+
+        public LoaderKey key;
+
+        /**
+         * set to true if the entry has been removed from the table
+         * because it has been replaced, so it should not be attempted
+         * to be removed again
+         */
+        public boolean removed = false;
+
+        public LoaderEntry(LoaderKey key, Loader loader) {
+            super(loader, refQueue);
+            this.key = key;
+        }
+    }
+
+    /**
+     * Loader is the actual class of the RMI class loaders created
+     * by the RMIClassLoader static methods.
+     */
+    private static class Loader extends URLClassLoader {
+
+        /** string form of loader's codebase URL path, also an optimization */
+        private String annotation;
+
+        private Loader(URL[] urls, ClassLoader parent) {
+            super(urls, parent);
+
+            /*
+             * Caching the value of class annotation string here assumes
+             * that the protected method addURL() is never called on this
+             * class loader.
+             */
+            annotation = urlsToPath(urls);
+        }
+
+        /**
+         * Return the string to be annotated with all classes loaded from
+         * this class loader.
+         */
+        public String getClassAnnotation() {
+            return annotation;
+        }
+
+        /**
+         * Return a string representation of this loader (useful for
+         * debugging).
+         */
+        public String toString() {
+            return super.toString() + "[\"" + annotation + "\"]";
+        }
+    }
+}
diff --git a/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
index 295646cab5d..2137cfb3721 100644
--- a/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
+++ b/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Test TestImpl RegistryVM RegistryRunner
- * @run main/othervm/policy=security.policy/timeout=360 DGCDeadLock
+ * @run main/othervm/timeout=360 DGCDeadLock
  */
 
 /* This test attempts to cause a deadlock between the rmi leaseChecker
@@ -71,7 +71,6 @@ static public void main(String[] args) {
         RegistryVM testImplVM = null;
 
         System.err.println("\nregression test for 4118056\n");
-        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
 
         try {
             String options = " --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED" +
diff --git a/test/jdk/java/rmi/transport/dgcDeadLock/registry.security.policy b/test/jdk/java/rmi/transport/dgcDeadLock/registry.security.policy
deleted file mode 100644
index bd6ca55df35..00000000000
--- a/test/jdk/java/rmi/transport/dgcDeadLock/registry.security.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * security policy used by the registry sub-process
- */
-
-grant {
-  // used by TestLibrary to determine extra commandline properties
-  permission java.io.FilePermission "..${/}..${/}test.props", "read";
-
-  // property specifically accessed by this test.
-  permission java.util.PropertyPermission "sun.rmi.transport.cleanInterval", "write";
-  permission java.util.PropertyPermission "package.restrict.access.sun", "read";
-  permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read";
-
-  // test needs to use java to exec an EchoImpl object
-  permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  permission java.util.PropertyPermission "java.security.policy", "read";
-  permission java.util.PropertyPermission "java.security.manager", "read";
-
-  // test needs to communicate with objects on arbitrary ports
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/transport/dgcDeadLock/security.policy b/test/jdk/java/rmi/transport/dgcDeadLock/security.policy
deleted file mode 100644
index df76916420c..00000000000
--- a/test/jdk/java/rmi/transport/dgcDeadLock/security.policy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * security policy used by the test process
- */
-
-grant {
-  // used by TestLibrary to determine extra commandline properties
-  permission java.io.FilePermission "..${/}..${/}test.props", "read";
-
-  // property specifically accessed by this test.
-  permission java.util.PropertyPermission "sun.rmi.transport.cleanInterval", "write";
-  permission java.util.PropertyPermission "package.restrict.access.sun", "read";
-  permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read";
-
-  // test needs to use java to exec an EchoImpl object
-  permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
-
-  // used by TestLibrary to determine test environment 
-  permission java.util.PropertyPermission "test.*", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.util.PropertyPermission "java.home", "read";
-
-  permission java.util.PropertyPermission "java.security.policy", "read";
-  permission java.util.PropertyPermission "java.security.manager", "read";
-
-  // test needs to communicate with objects on arbitrary ports
-  permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java b/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java
index d10ca072f10..645de6ce218 100644
--- a/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java
+++ b/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @author Adrian Colley
  *
  * @build TestIface TestImpl TestImpl_Stub
- * @run main/othervm/policy=security.policy/timeout=60
+ * @run main/othervm/timeout=60
  *     -Dsun.rmi.transport.tcp.readTimeout=5000 ReadTimeoutTest
  */
 
@@ -54,10 +54,6 @@ public class ReadTimeoutTest
     public static void main(String[] args)
         throws Exception
     {
-        // Make trouble for ourselves
-        if (System.getSecurityManager() == null)
-            System.setSecurityManager(new RMISecurityManager());
-
         // Flaky code alert - hope this is executed before TCPTransport.<clinit>
         System.setProperty("sun.rmi.transport.tcp.readTimeout", Integer.toString(DELAY));
 
diff --git a/test/jdk/java/rmi/transport/readTimeout/security.policy b/test/jdk/java/rmi/transport/readTimeout/security.policy
deleted file mode 100644
index a8c8d0a64d8..00000000000
--- a/test/jdk/java/rmi/transport/readTimeout/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-    // Take this out once we can specify -Djava.security.debug on
-    // the run line and figure out what else is needed
-    permission java.security.AllPermission;
-
-    permission java.net.SocketPermission "*:1024-65535", "connect,listen";
-    permission java.util.PropertyPermission "http.proxyHost", "write";
-    permission java.util.PropertyPermission "http.proxyPort", "write";
-    permission java.lang.RuntimePermission "setFactory";
-};
diff --git a/test/jdk/java/security/AccessControlContext/CheckNullPermission.java b/test/jdk/java/security/AccessControlContext/CheckNullPermission.java
deleted file mode 100644
index 60855579422..00000000000
--- a/test/jdk/java/security/AccessControlContext/CheckNullPermission.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4232768
- * @summary Make sure NullPointerException is raised when permission to check
- * for is null
- */
-
-import java.security.ProtectionDomain;
-import java.security.AccessControlContext;
-
-public class CheckNullPermission {
-
-   public static void main (String argv[]) throws Exception {
-       ProtectionDomain pd[] = new ProtectionDomain[1];
-
-       try {
-           (new AccessControlContext(pd)).checkPermission(null);
-           throw new Exception("Expected NullPointerException not thrown");
-       } catch (NullPointerException npe) {
-       }
-   }
-}
diff --git a/test/jdk/java/security/AccessController/DoPriv.java b/test/jdk/java/security/AccessController/DoPriv.java
deleted file mode 100644
index e99b8f62468..00000000000
--- a/test/jdk/java/security/AccessController/DoPriv.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8214583
- * @summary Check that getContext works after JIT compiler escape analysis.
- */
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.DomainCombiner;
-import java.security.ProtectionDomain;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class DoPriv {
-
-    static void go(final DomainCombiner dc0, final AccessControlContext co, final int index) throws Exception {
-        final AccessControlContext ci = new AccessControlContext(co, dc0);
-        AccessController.doPrivileged((PrivilegedExceptionAction<Integer>)() -> {
-            AccessControlContext c1 = AccessController.getContext();
-            DomainCombiner dc = c1.getDomainCombiner();
-            if (dc != dc0 || dc == null) {
-                throw new AssertionError("iteration " + index + " " + dc + " != " + dc0);
-            }
-            return 0;
-        }, ci);
-    }
-
-    public static void main(String[] args) throws Exception {
-        final DomainCombiner dc0 = new DomainCombiner() {
-            public ProtectionDomain[] combine(ProtectionDomain[] currentDomains,
-                                            ProtectionDomain[] assignedDomains) {
-                return null;
-            }
-        };
-
-        final AccessControlContext co = AccessController.getContext();
-
-        for (int i = 0; i < 500_000; ++i) {
-            go(dc0, co, i);
-        }
-    }
-}
diff --git a/test/jdk/java/security/AccessController/DoPrivAccomplice.java b/test/jdk/java/security/AccessController/DoPrivAccomplice.java
deleted file mode 100644
index bb58809918e..00000000000
--- a/test/jdk/java/security/AccessController/DoPrivAccomplice.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DoPrivAccomplice {
-
-    public String go() {
-        String name = (String)java.security.AccessController.
-                doPrivileged((java.security.PrivilegedAction)() ->
-                        System.getProperty("user.name"));
-        return name;
-    }
-}
diff --git a/test/jdk/java/security/AccessController/DoPrivAccompliceTest.java b/test/jdk/java/security/AccessController/DoPrivAccompliceTest.java
deleted file mode 100644
index d7a924e0066..00000000000
--- a/test/jdk/java/security/AccessController/DoPrivAccompliceTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.util.JarUtils;
-import jdk.test.lib.helpers.ClassFileInstaller;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/*
- * @test
- * @bug 8048362
- * @summary Tests the doPrivileged with accomplice Generate two jars
- * (DoPrivTest.jar and DoPrivAccomplice.jar) and grant permission to
- * DoPrivAccmplice.jar for reading user.name property from a PrivilagedAction.
- * Run DoPrivTest.jar and try to access user.name property using
- * DoPrivAccmplice.jar.
- *
- * @library /test/lib
- * @build jdk.test.lib.util.JarUtils
- *        jdk.test.lib.Utils
- *        jdk.test.lib.Asserts
- *        jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.Platform
- *        jdk.test.lib.process.*
- * @run main/othervm DoPrivAccompliceTest
- */
-
-public class DoPrivAccompliceTest {
-    private static final String ACTION_SOURCE = DoPrivAccomplice.class.getName();
-    private static final String TEST_SOURCE = DoPrivTest.class.getName();
-
-    private static void createPolicyFile(Path jarFile, Path policy) {
-        String codebase = jarFile.toFile().toURI().toString();
-        String quotes = "\"";
-        StringBuilder policyFile = new StringBuilder();
-        policyFile.append("grant codeBase ")
-                  .append(quotes).append(codebase).append(quotes)
-                  .append("{\n")
-                  .append("permission java.util.PropertyPermission ")
-                  .append(quotes).append("user.name").append(quotes)
-                  .append(",")
-                  .append(quotes).append("read").append(quotes)
-                  .append(";\n};");
-        try (FileWriter writer = new FileWriter(policy.toFile())) {
-            writer.write(policyFile.toString());
-        } catch (IOException e) {
-            throw new Error("Error while creating policy file " + policy, e);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        // copy class files to pwd
-        ClassFileInstaller.main(ACTION_SOURCE, TEST_SOURCE);
-        Path pwd = Paths.get(".");
-        Path jarFile1 = pwd.resolve(ACTION_SOURCE + ".jar").toAbsolutePath();
-        Path jarFile2 = pwd.resolve(TEST_SOURCE + ".jar").toAbsolutePath();
-        Path policy = pwd.resolve("java.policy").toAbsolutePath();
-
-        JarUtils.createJar(jarFile1.toString(), ACTION_SOURCE + ".class");
-        System.out.println("Created jar file " + jarFile1);
-        JarUtils.createJar(jarFile2.toString(), TEST_SOURCE + ".class");
-        System.out.println("Created jar file " + jarFile2);
-
-
-        String pathSepartor = System.getProperty("path.separator");
-        String[] commands = {
-                "-Djava.security.manager",
-                "-Djava.security.policy=" + policy,
-                "-classpath", jarFile1 + pathSepartor + jarFile2,
-                TEST_SOURCE
-        };
-
-        String userName = System.getProperty("user.name");
-
-        createPolicyFile(jarFile1, policy);
-        System.out.println("Created policy for " + jarFile1);
-        ProcessTools.executeTestJava(commands)
-                    .shouldHaveExitValue(0)
-                    .shouldContain(userName)
-                    .stderrShouldBeEmptyIgnoreWarnings();
-
-        createPolicyFile(jarFile2, policy);
-        System.out.println("Created policy for " + jarFile2);
-        ProcessTools.executeTestJava(commands)
-                    .shouldNotHaveExitValue(0)
-                    .shouldNotContain(userName)
-                    .stderrShouldContain("java.security.AccessControlException");
-
-        System.out.println("Test PASSES");
-    }
-}
diff --git a/test/jdk/java/security/AccessController/DoPrivTest.java b/test/jdk/java/security/AccessController/DoPrivTest.java
deleted file mode 100644
index 6bc319b9a9f..00000000000
--- a/test/jdk/java/security/AccessController/DoPrivTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DoPrivTest {
-
-    public static void main(String[] args) {
-        String name = new DoPrivAccomplice().go();
-        System.out.println("Received Name : " + name);
-    }
-}
diff --git a/test/jdk/java/security/AccessController/LimitedDoPrivileged.java b/test/jdk/java/security/AccessController/LimitedDoPrivileged.java
deleted file mode 100644
index bbdf677fbea..00000000000
--- a/test/jdk/java/security/AccessController/LimitedDoPrivileged.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8014097
- * @summary Test the limited privilege scope version of doPrivileged
- */
-
-import java.security.*;
-import java.util.*;
-
-public class LimitedDoPrivileged {
-    /*
-     * Test variations of doPrivileged() and doPrivileged() with a limited privilege scope
-     * in a sandbox with the usual default permission to read the system properties for the
-     * file and path separators.
-     *
-     * By passing in an "assigned" AccessControlContext that has
-     * no default permissions we can test how code privileges are being scoped.
-     */
-
-    private static final ProtectionDomain domain =
-        new ProtectionDomain(null, null, null, null);
-    private static final AccessControlContext acc =
-        new AccessControlContext(new ProtectionDomain[] { domain });
-    private static final PropertyPermission pathPerm =
-        new PropertyPermission("path.separator", "read");
-    private static final PropertyPermission filePerm =
-        new PropertyPermission("file.separator", "read");
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Verify that we have the usual default property read permission.
-         */
-        AccessController.getContext().checkPermission(filePerm);
-        AccessController.getContext().checkPermission(pathPerm);
-        System.out.println("test 1 passed");
-
-        /*
-         * Inject the "no permission" AccessControlContext.
-         */
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-
-                /*
-                 * Verify that we no longer have the "file.separator" permission.
-                 */
-                try {
-                    AccessController.getContext().checkPermission(pathPerm);
-                } catch (AccessControlException ace) {
-                    System.out.println("test 2 passed");
-                }
-
-                /*
-                 * Verify that we can give ourselves limited privilege to read
-                 * any system property starting with "path.".
-                 */
-                AccessController.doPrivileged
-                    (new PrivilegedAction() {
-                        public Object run() {
-                            AccessController.getContext().checkPermission(pathPerm);
-                            return null;
-                        }
-                }, null, new PropertyPermission("path.*", "read"));
-                System.out.println("test 3 passed");
-
-                /*
-                 * Verify that if we give ourselves limited privilege to read
-                 * any system property starting with "path." it won't give us the
-                 * the ability to read "file.separator".
-                 */
-                try {
-                    AccessController.doPrivileged
-                        (new PrivilegedAction() {
-                            public Object run() {
-                                AccessController.getContext().checkPermission(filePerm);
-                                return null;
-                            }
-                    }, null, new PropertyPermission("path.*", "read"));
-                } catch (AccessControlException ace) {
-                    System.out.println("test 4 passed");
-                }
-
-                /*
-                 * Verify that capturing and passing in the context with no default
-                 * system property permission grants will prevent access that succeeded
-                 * earlier without the context assignment.
-                 */
-                final AccessControlContext context = AccessController.getContext();
-                try {
-                    AccessController.doPrivileged
-                        (new PrivilegedAction() {
-                            public Object run() {
-                                AccessController.getContext().checkPermission(pathPerm);
-                                return null;
-                            }
-                    }, context, new PropertyPermission("path.*", "read"));
-                } catch (AccessControlException ace) {
-                    System.out.println("test 5 passed");
-                }
-
-                /*
-                 * Verify that we can give ourselves full privilege to read
-                 * any system property starting with "path.".
-                 */
-                AccessController.doPrivileged
-                     (new PrivilegedAction() {
-                        public Object run() {
-                            AccessController.getContext().checkPermission(pathPerm);
-                            return null;
-                        }
-                });
-                System.out.println("test 6 passed");
-
-                /*
-                 * Verify that capturing and passing in the context with no default
-                 * system property permission grants will prevent access that succeeded
-                 * earlier without the context assignment.
-                 */
-                try {
-                    AccessController.doPrivileged
-                        (new PrivilegedAction() {
-                            public Object run() {
-                                AccessController.getContext().checkPermission(pathPerm);
-                                return null;
-                            }
-                    }, context);
-                } catch (AccessControlException ace) {
-                    System.out.println("test 7 passed");
-                }
-
-                /*
-                 * Verify that we can give ourselves limited privilege to read
-                 * any system property starting with "path." when a limited
-                 * privilege scope context is captured and passed to a regular
-                 * doPrivileged() as an assigned context.
-                 */
-                AccessController.doPrivileged
-                     (new PrivilegedAction() {
-                        public Object run() {
-
-                            /*
-                             * Capture the limited privilege scope and inject it into the
-                             * regular doPrivileged().
-                             */
-                            final AccessControlContext limitedContext = AccessController.getContext();
-                            AccessController.doPrivileged
-                                (new PrivilegedAction() {
-                                    public Object run() {
-                                        AccessController.getContext().checkPermission(pathPerm);
-                                        return null;
-                                }
-                            }, limitedContext);
-                            return null;
-                        }
-                }, null, new PropertyPermission("path.*", "read"));
-                System.out.println("test 8 passed");
-
-                /*
-                 * Verify that we can give ourselves limited privilege to read
-                 * any system property starting with "path." it won't give us the
-                 * the ability to read "file.separator" when a limited
-                 * privilege scope context is captured and passed to a regular
-                 * doPrivileged() as an assigned context.
-                 */
-                AccessController.doPrivileged
-                     (new PrivilegedAction() {
-                        public Object run() {
-
-                            /*
-                             * Capture the limited privilege scope and inject it into the
-                             * regular doPrivileged().
-                             */
-                            final AccessControlContext limitedContext = AccessController.getContext();
-                            try {
-                                AccessController.doPrivileged
-                                    (new PrivilegedAction() {
-                                        public Object run() {
-                                            AccessController.getContext().checkPermission(filePerm);
-                                            return null;
-                                    }
-                                }, limitedContext);
-                            } catch (AccessControlException ace) {
-                                System.out.println("test 9 passed");
-                            }
-                            return null;
-                        }
-                }, null, new PropertyPermission("path.*", "read"));
-
-                return null;
-            }
-        }, acc);
-    }
-}
diff --git a/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java b/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java
deleted file mode 100644
index b42d88da335..00000000000
--- a/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8050281
- * @summary Test that NullPointerException is thrown if any element of perms
- * parameter is null
- * @run testng LimitedDoPrivilegedWithNullPerms
- */
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.PropertyPermission;
-import org.testng.annotations.Test;
-
-public class LimitedDoPrivilegedWithNullPerms {
-
-    AccessControlContext acc = AccessController.getContext();
-    Permission p1 = new PropertyPermission("user.name", "read");
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test1() {
-        AccessController.doPrivileged(
-                (PrivilegedAction<Void>) () -> null, acc, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test2() {
-        AccessController.doPrivileged(
-                (PrivilegedAction<Void>) () -> null, acc, p1, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test3() {
-        AccessController.doPrivilegedWithCombiner(
-                (PrivilegedAction<Void>) () -> null, acc, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test4() {
-        AccessController.doPrivilegedWithCombiner(
-                (PrivilegedAction<Void>) () -> null, acc, p1, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test5() throws PrivilegedActionException {
-        AccessController.doPrivileged(
-                (PrivilegedExceptionAction<Void>) () -> null,
-                acc, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test6() throws PrivilegedActionException {
-        AccessController.doPrivileged(
-                (PrivilegedExceptionAction<Void>) () -> null,
-                acc, p1, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test7() throws PrivilegedActionException {
-        AccessController.doPrivilegedWithCombiner(
-                (PrivilegedExceptionAction<Void>) () -> null,
-                acc, null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void test8() throws PrivilegedActionException {
-        AccessController.doPrivilegedWithCombiner(
-                (PrivilegedExceptionAction<Void>) () -> null,
-                acc, p1, null);
-    }
-}
diff --git a/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithThread.java b/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithThread.java
deleted file mode 100644
index 2995893e1a3..00000000000
--- a/test/jdk/java/security/AccessController/LimitedDoPrivilegedWithThread.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8050281
- * @summary Test limited doprivileged action with trhead calls.
- * @run main/othervm/policy=policy LimitedDoPrivilegedWithThread
- */
-import java.io.FilePermission;
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.util.PropertyPermission;
-
-public class LimitedDoPrivilegedWithThread {
-
-    private static final Permission PROPERTYPERM
-            = new PropertyPermission("user.name", "read");
-    private static final Permission FILEPERM
-            = new FilePermission("*", "read");
-    private static final AccessControlContext ACC
-            = new AccessControlContext(
-                    new ProtectionDomain[]{new ProtectionDomain(null, null)});
-
-    public static void main(String args[]) {
-        //parent thread without any permission
-        AccessController.doPrivileged(
-                (PrivilegedAction) () -> {
-                    Thread ct = new Thread(
-                            new ChildThread(PROPERTYPERM, FILEPERM));
-                    ct.start();
-                    try {
-                        ct.join();
-                    } catch (InterruptedException ie) {
-                        Thread.currentThread().interrupt();
-                        ie.printStackTrace();
-                        throw new RuntimeException("Unexpected InterruptedException");
-                    }
-                    return null;
-                }, ACC);
-    }
-}
-
-class ChildThread implements Runnable {
-
-    private final Permission P1;
-    private final Permission P2;
-    private boolean catchACE = false;
-
-    public ChildThread(Permission p1, Permission p2) {
-        this.P1 = p1;
-        this.P2 = p2;
-    }
-
-    @Override
-    public void run() {
-        //Verified that child thread has permission p1,
-        runTest(null, P1, false, 1);
-        //Verified that child thread inherits parent thread's access control context
-        AccessControlContext childAcc = AccessController.getContext();
-        runTest(childAcc, P1, true, 2);
-        //Verified that we can give permision p2 to limit the "privilege" of the
-        //class calling doprivileged action, stack walk will continue
-        runTest(null, P2, true, 3);
-
-    }
-
-    public void runTest(AccessControlContext acc, Permission perm,
-            boolean expectACE, int id) {
-
-        AccessController.doPrivileged(
-                (PrivilegedAction) () -> {
-                    try {
-                        AccessController.getContext().checkPermission(P1);
-                    } catch (AccessControlException ace) {
-                        catchACE = true;
-                    }
-                    if (catchACE ^ expectACE) {
-                        throw new RuntimeException("test" + id + " failed");
-                    }
-                    return null;
-                }, acc, perm);
-    }
-}
diff --git a/test/jdk/java/security/AccessController/policy b/test/jdk/java/security/AccessController/policy
deleted file mode 100644
index 83ed146df9e..00000000000
--- a/test/jdk/java/security/AccessController/policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant{
-	permission java.util.PropertyPermission "user.name", "read";
- 	permission java.io.FilePermission "*", "read";
-};
diff --git a/test/jdk/java/security/BasicPermission/NullOrEmptyName.java b/test/jdk/java/security/BasicPermission/NullOrEmptyName.java
index 970d011e64f..aad8fc3986d 100644
--- a/test/jdk/java/security/BasicPermission/NullOrEmptyName.java
+++ b/test/jdk/java/security/BasicPermission/NullOrEmptyName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,33 +27,27 @@
  * @summary Make sure BasicPermission constructor raises
  * NullPointerException if permission name is null, and
  * IllegalArgumentException is permission name is empty.
- * @run main/othervm -Djava.security.manager=allow NullOrEmptyName
+ * @run main/othervm NullOrEmptyName
  */
 
+import java.util.PropertyPermission;
+
 public class NullOrEmptyName {
 
     public static void main(String[]args) throws Exception {
         NullOrEmptyName noe = new NullOrEmptyName();
 
-        // run without sm installed
-        noe.run();
-
-        // run with sm installed
-        SecurityManager sm = new SecurityManager();
-        System.setSecurityManager(sm);
         noe.run();
 
         try {
-            // called by System.getProperty()
-            sm.checkPropertyAccess(null);
+            new PropertyPermission(null, "read");
             throw new Exception("Expected NullPointerException not thrown");
         } catch (NullPointerException npe) {
             // expected exception thrown
         }
 
         try {
-            // called by System.getProperty()
-            sm.checkPropertyAccess("");
+            new PropertyPermission("", "read");
             throw new Exception("Expected IllegalArgumentException not " +
                                 "thrown");
         } catch (IllegalArgumentException iae) {
diff --git a/test/jdk/java/security/KeyRep/Serial.java b/test/jdk/java/security/KeyRep/Serial.java
index 88c91a091e7..163ac8a4744 100644
--- a/test/jdk/java/security/KeyRep/Serial.java
+++ b/test/jdk/java/security/KeyRep/Serial.java
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @summary Serializing KeyPair on one VM (Sun),
  *      and Deserializing on another (IBM) fails
- * @run main/othervm/java.security.policy=Serial.policy Serial
  */
 
 import java.io.*;
diff --git a/test/jdk/java/security/KeyRep/Serial.policy b/test/jdk/java/security/KeyRep/Serial.policy
deleted file mode 100644
index 3c529c87a13..00000000000
--- a/test/jdk/java/security/KeyRep/Serial.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "test.provider.name", "read";
-    // XXX note package access is *not* granted to the 'sun' package
-};
diff --git a/test/jdk/java/security/KeyRep/SerialDSAPubKey.java b/test/jdk/java/security/KeyRep/SerialDSAPubKey.java
index 41f06cff08d..0c02e31d8f5 100644
--- a/test/jdk/java/security/KeyRep/SerialDSAPubKey.java
+++ b/test/jdk/java/security/KeyRep/SerialDSAPubKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 6232513
  * @summary RMI interoperability issue with DSAPublicKey obj between
  *              JDK1.4 & JDK1.5
- * @run main/othervm/java.security.policy=SerialDSAPubKey.policy -Dsun.security.key.serial.interop=true -Dsun.security.pkcs11.enable-solaris=false SerialDSAPubKey
+ * @run main/othervm -Dsun.security.key.serial.interop=true -Dsun.security.pkcs11.enable-solaris=false SerialDSAPubKey
  */
 
 import java.io.*;
diff --git a/test/jdk/java/security/KeyRep/SerialDSAPubKey.policy b/test/jdk/java/security/KeyRep/SerialDSAPubKey.policy
deleted file mode 100644
index 726c362549a..00000000000
--- a/test/jdk/java/security/KeyRep/SerialDSAPubKey.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission
-		"accessClassInPackage.sun.security.provider";
-    permission java.lang.RuntimePermission
-		"accessClassInPackage.sun.security.x509";
-}; 
diff --git a/test/jdk/java/security/KeyRep/SerialOld.java b/test/jdk/java/security/KeyRep/SerialOld.java
index 0729883cd2f..1c831e7f72b 100644
--- a/test/jdk/java/security/KeyRep/SerialOld.java
+++ b/test/jdk/java/security/KeyRep/SerialOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 4532506 8301126
  * @summary Serializing KeyPair on one VM (Sun),
  *      and Deserializing on another (IBM) fails
- * @run main/othervm/java.security.policy=SerialOld.policy SerialOld
  */
 
 import java.io.*;
diff --git a/test/jdk/java/security/KeyRep/SerialOld.policy b/test/jdk/java/security/KeyRep/SerialOld.policy
deleted file mode 100644
index 4ab31832721..00000000000
--- a/test/jdk/java/security/KeyRep/SerialOld.policy
+++ /dev/null
@@ -1,16 +0,0 @@
-grant codeBase "file:${test.classes}/*" {
-
-    permission java.io.FilePermission "${test.src}${file.separator}*", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.provider";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.pkcs";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.x509";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.rsa";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.com.sun.crypto.provider";
-};
diff --git a/test/jdk/java/security/Policy/Dynamic/DynamicPolicy.java b/test/jdk/java/security/Policy/Dynamic/DynamicPolicy.java
deleted file mode 100644
index db4e7adc82a..00000000000
--- a/test/jdk/java/security/Policy/Dynamic/DynamicPolicy.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.*;
-import java.util.PropertyPermission;
-import java.net.SocketPermission;
-import java.lang.*;
-
-public class DynamicPolicy extends Policy{
-
-    static final Policy DEFAULT_POLICY = Policy.getPolicy(); // do this early before setPolicy is called
-    static int refresher = 0;
-
-
-    public DynamicPolicy() {
-    }
-
-    public PermissionCollection getPermissions(CodeSource cs) {
-
-        Permissions perms = new Permissions();
-        initStaticPolicy(perms);
-        // Defalut policy in the beginning...
-        // toggle from refresh to refresh
-        if (refresher == 1)
-            perms.add(new PropertyPermission("user.name","read"));
-
-        System.err.println("perms=[" + perms + "]");
-        return perms;
-    }
-
-    public boolean implies(ProtectionDomain pd, Permission p) {
-        return getPermissions(pd).implies(p) || DEFAULT_POLICY.implies(pd, p);
-    }
-
-    public PermissionCollection getPermissions(ProtectionDomain pd) {
-
-        Permissions perms = new Permissions();
-        initStaticPolicy(perms);
-        // Defalut policy in the beginning...
-        // toggle from refresh to refresh
-        if (refresher == 1)
-            perms.add(new PropertyPermission("user.name","read"));
-
-        return perms;
-    }
-
-    public void refresh() {
-        refresher++;
-    }
-
-    private void initStaticPolicy(PermissionCollection perms) {
-
-        perms.add(new java.security.SecurityPermission("getPolicy"));
-        perms.add(new java.security.SecurityPermission("setPolicy"));
-        perms.add(new java.net.SocketPermission("localhost:1024-", "listen"));
-        perms.add(new PropertyPermission("java.version","read"));
-        perms.add(new PropertyPermission("java.vendor","read"));
-        perms.add(new PropertyPermission("java.vendor.url","read"));
-        perms.add(new PropertyPermission("java.class.version","read"));
-        perms.add(new PropertyPermission("os.name","read"));
-        perms.add(new PropertyPermission("os.version","read"));
-        perms.add(new PropertyPermission("os.arch","read"));
-        perms.add(new PropertyPermission("file.separator","read"));
-        perms.add(new PropertyPermission("path.separator","read"));
-        perms.add(new PropertyPermission("line.separator","read"));
-        perms.add(new PropertyPermission("java.specification.version", "read"));
-        perms.add(new PropertyPermission("java.specification.vendor", "read"));
-        perms.add(new PropertyPermission("java.specification.name", "read"));
-        perms.add(new PropertyPermission("java.vm.specification.version", "read"));
-        perms.add(new PropertyPermission("java.vm.specification.vendor", "read"));
-        perms.add(new PropertyPermission("java.vm.specification.name", "read"));
-        perms.add(new PropertyPermission("java.vm.version", "read"));
-        perms.add(new PropertyPermission("java.vm.vendor", "read"));
-        perms.add(new PropertyPermission("java.vm.name", "read"));
-        return;
-    }
-}
diff --git a/test/jdk/java/security/Policy/Dynamic/TestDynamicPolicy.java b/test/jdk/java/security/Policy/Dynamic/TestDynamicPolicy.java
deleted file mode 100644
index 8220dcf147f..00000000000
--- a/test/jdk/java/security/Policy/Dynamic/TestDynamicPolicy.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @author Danny Hendler
- * @author Gary Ellison
- * @bug 4244271
- * @summary New policy sometimes has no effect with no  indication given
- * @run main/othervm/policy=setpolicy.jp TestDynamicPolicy
- */
-
-/*
-  The test should be given the following permissions:
-
-  grant codeBase "file:testPath" {
-        permission java.security.SecurityPermission "setPolicy";
-        permission java.security.SecurityPermission "getPolicy";
-  };
-
- */
-
-
-import java.io.PrintStream;
-import java.io.IOException;
-
-import java.lang.System;
-import java.security.Policy;
-
-
-public class TestDynamicPolicy {
-
-    public static void main(String args[]) throws Exception {
-
-        try {
-            //
-            TestDynamicPolicy jstest = new TestDynamicPolicy();
-            jstest.doit();
-        } catch(Exception e)  {
-            System.out.println("Failed. Unexpected exception:" + e);
-            throw e;
-        }
-        System.out.println("Passed. OKAY");
-    }
-
-    private void doit() throws Exception {
-        // A security manager must be installed
-        SecurityManager sm=System.getSecurityManager();
-        if (sm==null)
-            throw new
-                Exception("Test must be run with a security manager installed");
-
-        // Instantiate and set the new policy
-        DynamicPolicy dp = new DynamicPolicy();
-        Policy.setPolicy(dp);
-
-        // Verify that policy has been set
-        if (dp != Policy.getPolicy())
-            throw new Exception("Policy was not set!!");
-
-        // now see this class can access user.name
-        String usr = getUserName();
-
-        if (usr != null) {
-            System.out.println("Test was able to read user.name prior to refresh!");
-            throw new
-                Exception("Test was able to read user.name prior to refresh!");
-        }
-
-        // Now, make policy allow reading user.name
-        dp.refresh();
-
-        // now I should be able to read it
-        usr = getUserName();
-
-        if (usr == null) {
-            System.out.println("Test was unable to read user.name after refresh!");
-            throw new
-                Exception("Test was unable to read user.name after refresh!");
-        }
-        // Now, take away permission to read user.name
-        dp.refresh();
-
-        // now I should not be able to read it
-        usr = getUserName();
-
-        if (usr != null) {
-            System.out.println("Test was able to read user.name following 2nd refresh!");
-            throw new
-                Exception("Test was able to read user.name following 2nd refresh!");
-        }
-
-    }
-
-    private String getUserName() {
-        String usr = null;
-
-        try {
-            usr = System.getProperty("user.name");
-        } catch (Exception e) {
-        }
-        return usr;
-    }
-}
diff --git a/test/jdk/java/security/Policy/Dynamic/setpolicy.jp b/test/jdk/java/security/Policy/Dynamic/setpolicy.jp
deleted file mode 100644
index 3b57d86dd58..00000000000
--- a/test/jdk/java/security/Policy/Dynamic/setpolicy.jp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// @bug 4244271
-
-
-grant {
-        permission java.security.SecurityPermission "setPolicy";
-        permission java.security.SecurityPermission "getPolicy";
-  };
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java
deleted file mode 100644
index 68d04510bdd..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import TVJar.TVPermission;
-import java.security.AccessController;
-
-/**
- * @test @bug 8050402
- * @summary Check policy is extensible with user defined permissions
- * @run main/othervm/policy=ExtensiblePolicyTest1.policy
- *      ExtensiblePolicyTest false
- * @run main/othervm/policy=ExtensiblePolicyTest2.policy
- *      ExtensiblePolicyTest true
- * @run main/othervm/policy=ExtensiblePolicyTest3.policy
- *      ExtensiblePolicyTest true
- */
-public class ExtensiblePolicyTest {
-
-    public static void main(String args[]) throws Throwable {
-        // ExtensiblePolicyTest1.policy: policy file grants permission to
-        // watch TVChannel 3-6
-        // ExtensiblePolicyTest2.policy: policy file grants permission to
-        // watch TVChanel 4
-        // ExtensiblePolicyTest3.policy: policy file grants permission signed
-        // by duke2 to watch TVChanel 5
-
-        TVPermission perm = new TVPermission("channel:5", "watch");
-        boolean getException = false;
-        String exceptionMessage = null;
-        boolean expectException = Boolean.parseBoolean(args[0]);
-        try {
-            AccessController.checkPermission(perm);
-        } catch (SecurityException se) {
-            getException = true;
-            exceptionMessage = se.getMessage();
-        }
-
-        if (expectException ^ getException) {
-            throw new RuntimeException("Test Failed: expectException = "
-                    + expectException + " getException = " + getException
-                    + "\n" + exceptionMessage);
-        }
-    }
-
-}
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy
deleted file mode 100644
index 3ac5df2fd01..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest1.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-	permission TVJar.TVPermission "channel:3-6", "watch";
-};
-
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy
deleted file mode 100644
index 740770420e9..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest2.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-	permission TVJar.TVPermission "channel:4", "watch";
-};
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy
deleted file mode 100644
index 3553000c1d6..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyTest3.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-keystore "file:${user.dir}/epkeystore";
-
-grant {
-	permission TVJar.TVPermission "channel:5", "watch", SignedBy "duke2";
-};
\ No newline at end of file
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java b/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java
deleted file mode 100644
index fdbe44fb03c..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import TVJar.TVPermission;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.AccessController;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.util.JarUtils;
-
-/**
- * @test
- * @bug 8050402
- * @summary Check policy is extensible with user defined permissions
- * @library /test/lib
- * @build jdk.test.lib.util.JarUtils
- * @compile TVJar/TVPermission.java
- * @run main ExtensiblePolicyWithJarTest
- */
-public class ExtensiblePolicyWithJarTest {
-
-    public static void main(String args[]) throws Throwable {
-        final String FS = File.separator;
-        final String PS = File.pathSeparator;
-        final String POL = "ExtensiblePolicyTest3.policy";
-        final String JAVA_HOME = System.getProperty("test.jdk");
-        final String KEYTOOL = JAVA_HOME + FS + "bin" + FS + "keytool";
-        final String JARSIGNER = JAVA_HOME + FS + "bin" + FS + "jarsigner";
-        final String KEYSTORE = "epkeystore";
-        final String PASSWORD = "password";
-        final String ALIAS = "duke2";
-        final String CLASSPATH = System.getProperty("test.class.path", "");
-        final String TESTCLASSES = System.getProperty("test.classes", "");
-        final String TVPERMJAR = "tvPerm.jar";
-        final String PATHTOJAR = System.getProperty("user.dir", "")
-                                + FS + TVPERMJAR;
-
-        // create jar file for TVpermission
-        new File("TVJar").mkdir();
-        Files.copy(Paths.get(TESTCLASSES + FS + "TVJar", "TVPermission.class"),
-                Paths.get("TVJar", "TVPermission.class"));
-        Files.copy(Paths.get(TESTCLASSES + FS + "TVJar",
-                "TVPermissionCollection.class"),
-                Paths.get("TVJar", "TVPermissionCollection.class"));
-        JarUtils.createJar(TVPERMJAR, "TVJar/TVPermission.class",
-                "TVJar/TVPermissionCollection.class");
-
-        // create key pair for jar signing
-        ProcessTools.executeCommand(KEYTOOL,
-                "-genkey",
-                "-keyalg", "DSA",
-                "-alias", ALIAS,
-                "-keystore", KEYSTORE,
-                "-storetype", "JKS",
-                "-keypass", PASSWORD,
-                "-dname", "cn=Blah",
-                "-storepass", PASSWORD
-        ).shouldHaveExitValue(0);
-        // sign jar
-        ProcessTools.executeCommand(JARSIGNER,
-                "-keystore", KEYSTORE,
-                "-storepass", PASSWORD,
-                "-keypass", PASSWORD,
-                TVPERMJAR,
-                ALIAS).shouldHaveExitValue(0);
-        // add jar file to classpath
-        String cp = PATHTOJAR + PS + CLASSPATH;
-
-        // policy file grants permission signed by duke2 to watch TVChanel 5
-        try {
-            String[] cmd = {
-            "-classpath", cp,
-            "-Djava.security.manager",
-            "-Djava.security.policy=" + POL,
-            "ExtensiblePolicyTest_orig$TestMain"};
-            ProcessTools.executeTestJava(cmd).shouldHaveExitValue(0);
-        } catch (Exception ex) {
-            System.out.println("ExtensiblePolicyWithJarTest Failed");
-        }
-
-    }
-
-    public static class TestMain {
-        public static void main(String args[]) {
-            TVPermission perm = new TVPermission("channel:5", "watch");
-            try {
-                AccessController.checkPermission(perm);
-            } catch (SecurityException se) {
-                throw new RuntimeException(se);
-            }
-        }
-    }
-
-}
diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java b/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java
deleted file mode 100644
index e1ab7630ca0..00000000000
--- a/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package TVJar;
-
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.StringJoiner;
-import java.util.StringTokenizer;
-
-public class TVPermission extends Permission {
-
-    /**
-     * Watch
-     */
-    private final static int WATCH = 0x1;
-
-    /**
-     * Preview
-     */
-    private final static int PREVIEW = 0x2;
-
-    /**
-     * No actions
-     */
-    private final static int NONE = 0x0;
-
-    /**
-     * All actions
-     */
-    private final static int ALL = WATCH | PREVIEW;
-
-    // the actions mask
-    private int mask;
-
-    // the actions string
-    private String actions;
-
-    // the canonical name of the channel
-    private String cname;
-
-    // true if the channelname is a wildcard
-    private boolean wildcard;
-
-    // num range on channel
-    private int[] numrange;
-
-    // various num constants
-    private final static int NUM_MIN = 1;
-    private final static int NUM_MAX = 128;
-
-    public TVPermission(String channel, String action) {
-        this(channel, getMask(action));
-    }
-
-    TVPermission(String channel, int mask) {
-        super(channel);
-        init(channel, mask);
-    }
-
-    private synchronized int[] parseNum(String num)
-            throws Exception {
-
-        if (num == null || num.equals("") || num.equals("*")) {
-            wildcard = true;
-            return new int[]{NUM_MIN, NUM_MAX};
-        }
-
-        int dash = num.indexOf('-');
-
-        if (dash == -1) {
-            int p = 0;
-            try {
-                p = Integer.parseInt(num);
-            } catch (NumberFormatException nfe) {
-                throw new IllegalArgumentException("invalid input" + num);
-            }
-            return new int[]{p, p};
-        } else {
-            String low = num.substring(0, dash);
-            String high = num.substring(dash + 1);
-            int l, h;
-
-            if (low.equals("")) {
-                l = NUM_MIN;
-            } else {
-                try {
-                    l = Integer.parseInt(low);
-                } catch (NumberFormatException nfe) {
-                    throw new IllegalArgumentException("invalid input" + num);
-                }
-            }
-
-            if (high.equals("")) {
-                h = NUM_MAX;
-            } else {
-                try {
-                    h = Integer.parseInt(high);
-                } catch (NumberFormatException nfe) {
-                    throw new IllegalArgumentException("invalid input" + num);
-                }
-            }
-            if (h < l || l < NUM_MIN || h > NUM_MAX) {
-                throw new IllegalArgumentException("invalid num range");
-            }
-
-            return new int[]{l, h};
-        }
-    }
-
-    /**
-     * Initialize the TVPermission object.
-     */
-    private synchronized void init(String channel, int mask) {
-
-        // Parse the channel name.
-        int sep = channel.indexOf(':');
-
-        if (sep != -1) {
-            String num = channel.substring(sep + 1);
-            cname = channel.substring(0, sep);
-            try {
-                numrange = parseNum(num);
-            } catch (Exception e) {
-                throw new IllegalArgumentException("invalid num range: " + num);
-            }
-        } else {
-            numrange = new int[]{NUM_MIN, NUM_MAX};
-        }
-    }
-
-    /**
-     * Convert an action string to an integer actions mask.
-     *
-     * @param action the action string
-     * @return the action mask
-     */
-    private synchronized static int getMask(String action) {
-        int mask = NONE;
-
-        if (action == null) {
-            return mask;
-        }
-
-        StringTokenizer st = new StringTokenizer(action.toLowerCase(), ",");
-        while (st.hasMoreTokens()) {
-            String token = st.nextToken();
-            if (token.equals("watch")) {
-                mask |= WATCH;
-            } else if (token.equals("preview")) {
-                mask |= PREVIEW;
-            } else {
-                throw new IllegalArgumentException("invalid TV permission: " + token);
-            }
-        }
-        return mask;
-    }
-
-    @Override
-    public boolean implies(Permission p) {
-        if (!(p instanceof TVPermission)) {
-            return false;
-        }
-
-        if (this.wildcard) {
-            return true;
-        }
-
-        TVPermission that = (TVPermission) p;
-
-        if ((this.mask & that.mask) != that.mask) {
-            System.out.println("Masks are not ok this = "
-                    + this.mask + "THat = " + that.mask);
-            return false;
-        }
-
-        if ((this.numrange[0] > that.numrange[0])
-                || (this.numrange[1] < that.numrange[1])) {
-
-            System.out.println("This 0= " + this.numrange[0]
-                    + " 1 = " + this.numrange[1]);
-            System.out.println("That 0= " + that.numrange[0]
-                    + " 1 = " + that.numrange[1]);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Checks two TVPermission objects for equality.
-     * <p>
-     * @param obj the object we are testing for equality.
-     * @return true if obj is a TVPermission, and has the same channelname and
-     * action mask as this TVPermission object.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-
-        if (!(obj instanceof TVPermission)) {
-            return false;
-        }
-
-        TVPermission that = (TVPermission) obj;
-
-        // check the mask first
-        if (this.mask != that.mask) {
-            return false;
-        }
-
-        // now check the num range...
-        if ((this.numrange[0] != that.numrange[0])
-                || (this.numrange[1] != that.numrange[1])) {
-            return false;
-        }
-
-        return this.getName().equals(that.getName());
-    }
-
-    /**
-     * Returns the hash code value for this object.
-     *
-     * @return a hash code value for this object.
-     */
-    @Override
-    public int hashCode() {
-        return this.getName().hashCode();
-    }
-
-    /**
-     * Return the canonical string representation of the actions. Always returns
-     * actions in the following order: watch,preview.
-     *
-     * @param mask a specific integer action mask to translate into a string
-     * @return the canonical string representation of the actions
-     */
-    private synchronized static String getActions(int mask) {
-        StringJoiner sj = new StringJoiner(",");
-        if ((mask & WATCH) == WATCH) {
-            sj.add("watch");
-        }
-        if ((mask & PREVIEW) == PREVIEW) {
-            sj.add("preview");
-        }
-        return sj.toString();
-    }
-
-    /**
-     * Return the canonical string representation of the actions. Always returns
-     * actions in the following order: watch,preview.
-     *
-     * @return the canonical string representation of the actions.
-     */
-    @Override
-    public String getActions() {
-        if (actions == null) {
-            actions = getActions(this.mask);
-        }
-
-        return actions;
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + "\n"
-                + "cname = " + cname + "\n"
-                + "wildcard = " + wildcard + "\n"
-                + "numrange = " + numrange[0] + "," + numrange[1] + "\n";
-
-    }
-
-    @Override
-    public PermissionCollection newPermissionCollection() {
-        return new TVPermissionCollection();
-    }
-}
-
-final class TVPermissionCollection extends PermissionCollection {
-
-    /**
-     * The TVPermissions for this set.
-     */
-    private final ArrayList<TVPermission> permissions = new ArrayList<>();
-
-    /**
-     * Adds a permission to the TVPermissions. The key for the hash is the name
-     * in the case of wildcards, or all the IP addresses.
-     *
-     * @param permission the Permission object to add.
-     */
-    @Override
-    public void add(Permission permission) {
-        if (!(permission instanceof TVPermission)) {
-            throw new IllegalArgumentException("invalid permission: " + permission);
-        }
-        permissions.add((TVPermission) permission);
-    }
-
-    /**
-     * Check and see if this collection of permissions implies the permissions
-     * expressed in "permission".
-     *
-     * @param p the Permission object to compare
-     *
-     * @return true if "permission" is a proper subset of a permission in the
-     * collection, false if not.
-     */
-    @Override
-    public boolean implies(Permission p) {
-        if (!(p instanceof TVPermission)) {
-            return false;
-        }
-
-        Iterator<TVPermission> i = permissions.iterator();
-        while (i.hasNext()) {
-            if (((TVPermission) i.next()).implies(p)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns an enumeration of all the TVPermission objects in the container.
-     *
-     * @return an enumeration of all the TVPermission objects.
-     */
-    @Override
-    public Enumeration elements() {
-        return Collections.enumeration(permissions);
-    }
-
-}
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstance.java b/test/jdk/java/security/Policy/GetInstance/GetInstance.java
deleted file mode 100644
index d399db20f71..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstance.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 5100561
- * @bug 6273812
- * @summary Can not explicitly create a java.security.Policy object from a file
- * @modules java.base/sun.security.provider
- * @build GetInstancePolicySpi GetInstanceProvider
- * @run main/othervm/policy=GetInstance.policy GetInstance
- */
-
-import java.security.*;
-
-import java.io.File;
-import java.net.URI;
-
-public class GetInstance {
-
-    private static final String JAVA_POLICY = "JavaPolicy";
-
-    private static class BadParam implements Policy.Parameters { }
-
-    public static void main(String[] args) throws Exception {
-
-        int testnum = 1;
-        GetInstance gi = new GetInstance();
-
-        testnum = gi.testDefault(testnum);
-        testnum = gi.testStringProvider(testnum);
-        testnum = gi.testProvider(testnum);
-        testnum = gi.testCustomImpl(testnum);
-        testnum = gi.testBadParam(testnum);
-
-        // make this go last because we don't want to leave its policy set
-        // for other tests
-        testnum = gi.testURIParam(testnum);
-    }
-
-    private int testDefault(int testnum) throws Exception {
-        // get an instance of the default PolicySpiFile
-        Policy p = Policy.getInstance(JAVA_POLICY, null);
-        doTest(p, testnum++);
-        Policy.setPolicy(p);
-        doTestSM(testnum++);
-
-        // get an instance of FooPolicy
-        try {
-            p = Policy.getInstance("FooPolicy", null);
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (NoSuchAlgorithmException nsae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        return testnum;
-    }
-
-    private int testStringProvider(int testnum) throws Exception {
-        // get an instance of JavaPolicy from SUN
-        Policy p = Policy.getInstance(JAVA_POLICY, null, "SUN");
-        doTest(p, testnum++);
-        Policy.setPolicy(p);
-        doTestSM(testnum++);
-
-        // get an instance of JavaPolicy from SunRsaSign
-        try {
-            p = Policy.getInstance(JAVA_POLICY, null, "SunRsaSign");
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (NoSuchAlgorithmException nsae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        // get an instance of JavaPolicy from FOO
-        try {
-            p = Policy.getInstance(JAVA_POLICY, null, "FOO");
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (NoSuchProviderException nspe) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        return testnum;
-    }
-
-    private int testProvider(int testnum) throws Exception {
-        // get an instance of JavaPolicy from SUN
-        Policy p = Policy.getInstance(JAVA_POLICY,
-                                null,
-                                Security.getProvider("SUN"));
-        doTest(p, testnum++);
-        Policy.setPolicy(p);
-        doTestSM(testnum++);
-
-        // get an instance of JavaPolicy from SunRsaSign
-        try {
-            p = Policy.getInstance(JAVA_POLICY,
-                                null,
-                                Security.getProvider("SunRsaSign"));
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (NoSuchAlgorithmException nsae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        return testnum;
-    }
-
-    private int testBadParam(int testnum) throws Exception {
-
-        // pass bad param
-
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY,
-                                new BadParam());
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (IllegalArgumentException iae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY,
-                                new BadParam(),
-                                "SUN");
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (IllegalArgumentException iae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY,
-                                new BadParam(),
-                                Security.getProvider("SUN"));
-            throw new SecurityException("test " + testnum++ + " failed");
-        } catch (IllegalArgumentException iae) {
-            // good
-            System.out.println("test " + testnum++ + " passed");
-        }
-
-        return testnum;
-    }
-
-    private int testURIParam(int testnum) throws Exception {
-        // get an instance of JavaPolicy from SUN and have it read from the URL
-
-        File file = new File(System.getProperty("test.src", "."),
-                                "GetInstance.policyURL");
-        URI uri = file.toURI();
-        Policy p = Policy.getInstance(JAVA_POLICY, new URIParameter(uri));
-
-        doTest(p, testnum++);
-        Policy.setPolicy(p);
-        doTestSM(testnum++);
-
-        return testnum;
-    }
-
-    private int testCustomImpl(int testnum) throws Exception {
-        Provider customProvider = new GetInstanceProvider();
-        Policy p = Policy.getInstance("GetInstancePolicySpi",
-                                null,
-                                customProvider);
-
-        // doTest has a case that will not work with custom policies,
-        // so do not call it
-        //
-        // doTest(p, testnum++);
-
-        Policy.setPolicy(p);
-        doTestSM(testnum++);
-
-        return testnum;
-    }
-
-    private void doTest(Policy p, int testnum) throws Exception {
-
-        // check granted perm
-        if (p.implies(this.getClass().getProtectionDomain(),
-                        new SecurityPermission("GetInstanceTest"))) {
-            System.out.println("test " + testnum + ".1 passed");
-        } else {
-            throw new SecurityException("test " + testnum + ".1 failed");
-        }
-
-        // check perm not granted
-        if (p.implies(this.getClass().getProtectionDomain(),
-                        new SecurityPermission("NotGranted"))) {
-            throw new SecurityException("test " + testnum + ".2 failed");
-        } else {
-            System.out.println("test " + testnum + ".2 passed");
-        }
-
-        // test getProvider
-        if ("SUN".equals(p.getProvider().getName())) {
-            System.out.println("test " + testnum + ".3 passed");
-        } else {
-            throw new SecurityException("test " + testnum + ".3 failed");
-        }
-
-        // test getType
-        if (JAVA_POLICY.equals(p.getType())) {
-            System.out.println("test " + testnum + ".4 passed");
-        } else {
-            throw new SecurityException("test " + testnum + ".4 failed");
-        }
-    }
-
-    private void doTestSM(int testnum) throws Exception {
-
-        // check granted perm
-        System.getSecurityManager().checkPermission
-                        (new SecurityPermission("GetInstanceTest"));
-        System.out.println("test " + testnum + ".1 passed");
-
-        // check perm not granted
-        try {
-            System.getSecurityManager().checkPermission
-                        (new SecurityPermission("NotGranted"));
-            throw new RuntimeException("test " + testnum + ".2 failed");
-        } catch (SecurityException se) {
-            System.out.println("test " + testnum + ".2 passed");
-        }
-    }
-}
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstance.policy b/test/jdk/java/security/Policy/GetInstance/GetInstance.policy
deleted file mode 100644
index 6fa7f37ae16..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstance.policy
+++ /dev/null
@@ -1,28 +0,0 @@
-
-grant {
-    permission java.security.SecurityPermission
-			"createPolicy.JavaPolicy";
-    permission java.security.SecurityPermission
-			"createPolicy.FooPolicy";
-    permission java.security.SecurityPermission
-			"createPolicy.GetInstancePolicySpi";
-    permission java.util.PropertyPermission
-			"test.src", "read";
-    permission java.lang.RuntimePermission
-			"accessClassInPackage.sun.net.www";
-    permission java.io.FilePermission
-			"${test.src}/GetInstance.policyURL",
-			"read";
-    permission java.lang.RuntimePermission
-			"accessClassInPackage.sun.security.provider";
-    permission java.lang.SecurityPermission
-			"setSecurityManager";
-    permission java.lang.RuntimePermission
-			"getProtectionDomain";
-    permission java.security.SecurityPermission
-			"setPolicy";
-    permission java.security.SecurityPermission
-			"putProviderProperty.GetInstanceProvider";
-    permission java.security.SecurityPermission
-			"GetInstanceTest";
-};
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstance.policyURL b/test/jdk/java/security/Policy/GetInstance/GetInstance.policyURL
deleted file mode 100644
index 766819b042a..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstance.policyURL
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "GetInstanceTest";
-};
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstancePolicySpi.java b/test/jdk/java/security/Policy/GetInstance/GetInstancePolicySpi.java
deleted file mode 100644
index e04760fda53..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstancePolicySpi.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.*;
-import java.net.URL;
-import java.net.MalformedURLException;
-import sun.security.provider.*;
-
-public class GetInstancePolicySpi extends PolicySpi {
-
-    private Policy p;
-
-    public GetInstancePolicySpi(final Policy.Parameters params) {
-        p = AccessController.doPrivileged
-            (new PrivilegedAction<Policy>() {
-            public Policy run() {
-                if (params instanceof URIParameter) {
-                    URIParameter uriParam = (URIParameter)params;
-                    try {
-                        URL url = uriParam.getURI().toURL();
-                        return new PolicyFile(url);
-                    } catch (MalformedURLException mue) {
-                        throw new IllegalArgumentException(mue);
-                    }
-                }
-                return new PolicyFile();
-            }
-        });
-    }
-
-    public boolean engineImplies(ProtectionDomain domain, Permission perm) {
-
-        /**
-         * Note there is no need to capture own protection domain and
-         * return immediately if we are performing a check against ourself
-         * (a task normally needed for custom policy implementations).
-         *
-         * We simply call PolicyFile.implies - any doPrivileged
-         * that PolicyFile performs will truncate us from the current ACC.
-         */
-
-        return p.implies(domain, perm);
-    }
-}
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstanceProvider.java b/test/jdk/java/security/Policy/GetInstance/GetInstanceProvider.java
deleted file mode 100644
index 3bd6184aba0..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstanceProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.*;
-
-public class GetInstanceProvider extends Provider {
-
-    public GetInstanceProvider() {
-        super("GetInstanceProvider",
-                "1",
-                "GetInstanceProvider: Policy.GetInstancePolicySpi");
-
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                put("Policy.GetInstancePolicySpi", "GetInstancePolicySpi");
-                return null;
-            }
-        });
-    }
-}
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.java b/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.java
deleted file mode 100644
index 81af7df1bee..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test 1.1, 00/12/07
- * @bug 5100561
- * @summary Can not explicitly create a java.security.Policy object from a file
- * @run main/othervm/policy=GetInstanceSecurity.policy GetInstanceSecurity
- */
-
-import java.security.*;
-
-public class GetInstanceSecurity {
-
-    private static final String JAVA_POLICY = "JavaPolicy";
-
-    public static void main(String[] args) throws Exception {
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY, null);
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY, null, "SUN");
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        try {
-            Policy p = Policy.getInstance(JAVA_POLICY, null,
-                                        Security.getProvider("SUN"));
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        System.out.println("test passed");
-    }
-}
diff --git a/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.policy b/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.policy
deleted file mode 100644
index c5dc0eab23f..00000000000
--- a/test/jdk/java/security/Policy/GetInstance/GetInstanceSecurity.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    // do not grant this:
-    //
-    // permission java.security.SecurityPermission
-    //			"createPolicy.JavaPolicy";
-};
diff --git a/test/jdk/java/security/Policy/GetPermissions/JarURL.policy b/test/jdk/java/security/Policy/GetPermissions/JarURL.policy
deleted file mode 100644
index f568b91ea1a..00000000000
--- a/test/jdk/java/security/Policy/GetPermissions/JarURL.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-grant codeBase "file:${user.dir}/*" {
-    permission java.security.AllPermission;
-};
-
-grant {
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.security.SecurityPermission "getPolicy";
-};
diff --git a/test/jdk/java/security/Policy/PolicyProvider/CustomPolicy.java b/test/jdk/java/security/Policy/PolicyProvider/CustomPolicy.java
deleted file mode 100644
index a898c27eca6..00000000000
--- a/test/jdk/java/security/Policy/PolicyProvider/CustomPolicy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-
-public class CustomPolicy extends Policy {
-
-    // the ProtectionDomain of CustomPolicy
-    private final ProtectionDomain policyPd;
-
-    public CustomPolicy() {
-        policyPd = AccessController.doPrivileged(
-            (PrivilegedAction<ProtectionDomain>)
-                () -> this.getClass().getProtectionDomain());
-    }
-
-    @Override
-    public boolean implies(ProtectionDomain pd, Permission perm) {
-        System.out.println("CustomPolicy.implies");
-
-        // If the protection domain is the same as CustomPolicy, then
-        // we return true. This is to prevent recursive permission checks
-        // that lead to StackOverflow errors when the policy implementation
-        // performs a sensitive operation that triggers a permission check,
-        // for example, as below.
-        if (pd == policyPd) {
-            return true;
-        }
-
-        // Do something that triggers a permission check to make sure that
-        // we don't cause a StackOverflow error.
-        String home = AccessController.doPrivileged(
-            (PrivilegedAction<String>) () -> System.getProperty("user.home"));
-
-        return true;
-    }
-}
diff --git a/test/jdk/java/security/Policy/PolicyProvider/UseSystemClassLoader.java b/test/jdk/java/security/Policy/PolicyProvider/UseSystemClassLoader.java
deleted file mode 100644
index 7988f19c0a8..00000000000
--- a/test/jdk/java/security/Policy/PolicyProvider/UseSystemClassLoader.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.net.URL;
-import java.security.Policy;
-import java.security.Security;
-
-/*
- * @test
- * @bug 8075706
- * @summary Check that a custom policy provider can be loaded from the classpath
- * @modules java.base/sun.security.provider
- * @run main/othervm -Djava.security.manager=allow UseSystemClassLoader CUSTOM
- * @run main/othervm -Djava.security.manager=allow UseSystemClassLoader DEFAULT
- * @run main/othervm -Djava.security.manager=allow UseSystemClassLoader NOT_AVAIL
- * @run main/othervm -Djava.security.manager=allow UseSystemClassLoader NOT_SET
- */
-
-public class UseSystemClassLoader {
-
-    enum Type {
-        CUSTOM, DEFAULT, NOT_AVAIL, NOT_SET
-    };
-
-    public static void main(String[] args) throws Exception {
-
-        Type t = Type.valueOf(args[0]);
-
-        // We can't use the jtreg java.security.policy option to specify
-        // the policy file because that causes the default JDK policy provider
-        // to be set and once set, we cannot change it. So, instead we use the
-        // policy.url security property.
-        File file = new File(System.getProperty("test.src"), "test.policy");
-        URL policyURL = file.toURI().toURL();
-        Security.setProperty("policy.url.1", policyURL.toString());
-
-        switch (t) {
-            case CUSTOM:
-                // Set policy.provider to our custom policy provider
-                Security.setProperty("policy.provider", "CustomPolicy");
-                break;
-            case NOT_AVAIL:
-                // Set policy.provider to a non-existent policy provider
-                Security.setProperty("policy.provider", "NonExistentPolicy");
-                break;
-            case DEFAULT:
-                // Don't set policy.provider (leave default)
-                break;
-            case NOT_SET:
-                // Set policy.provider to empty string
-                Security.setProperty("policy.provider", "");
-                break;
-        }
-
-        System.setSecurityManager(new SecurityManager());
-        Policy p = Policy.getPolicy();
-        switch (t) {
-            case CUSTOM:
-                // check that the custom policy provider has been set
-                if (!(p instanceof CustomPolicy)) {
-                    throw new Exception("CustomPolicy was not set");
-                }
-                break;
-            case NOT_AVAIL:
-            case DEFAULT:
-            case NOT_SET:
-                // check that the default policy provider has been set
-                if (!(p instanceof sun.security.provider.PolicyFile)) {
-                    throw new Exception("default provider was not set");
-                }
-                break;
-        }
-    }
-}
diff --git a/test/jdk/java/security/Policy/PolicyProvider/test.policy b/test/jdk/java/security/Policy/PolicyProvider/test.policy
deleted file mode 100644
index d4684e5d3b4..00000000000
--- a/test/jdk/java/security/Policy/PolicyProvider/test.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-grant {
-  permission java.lang.RuntimePermission "createSecurityManager";
-  permission java.lang.RuntimePermission "setSecurityManager";
-  permission java.security.SecurityPermission "setProperty.policy.provider";
-  permission java.security.SecurityPermission "getPolicy";
-  permission java.util.PropertyPermission "user.home", "read";
-  permission java.lang.RuntimePermission "getProtectionDomain";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.security.provider";
-};
diff --git a/test/jdk/java/security/Policy/Root/Root.java b/test/jdk/java/security/Policy/Root/Root.java
deleted file mode 100644
index 8610a14be9b..00000000000
--- a/test/jdk/java/security/Policy/Root/Root.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4619757
- * @summary User Policy Setting is not recognized on Netscape 6
- *          when invoked as root.
- * @library /test/lib
- * @requires os.family != "windows"
- * @run testng/othervm/manual Root
- */
-
-/*
-* Run test as root user.
-* */
-
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.security.*;
-
-public class Root {
-    private static final String SRC = System.getProperty("test.src");
-    private static final String ROOT = System.getProperty("user.home");
-    private static final Path SOURCE = Paths.get(SRC, "Root.policy");
-    private static final Path TARGET = Paths.get(ROOT, ".java.policy");
-    private static final Path BACKUP = Paths.get(ROOT, ".backup.policy");
-    private static final String ROOT_USER_ID = "0";
-
-    @BeforeTest
-    public void setup() throws IOException {
-        // Backup user policy file if it already exists
-        if (TARGET.toFile().exists()) {
-            Files.copy(TARGET, BACKUP, StandardCopyOption.REPLACE_EXISTING);
-        }
-        Files.copy(SOURCE, TARGET, StandardCopyOption.REPLACE_EXISTING);
-    }
-
-    @AfterTest
-    public void cleanUp() throws IOException {
-        Files.delete(TARGET);
-        // Restore original policy file if backup exists
-        if (BACKUP.toFile().exists()) {
-            Files.copy(BACKUP, TARGET, StandardCopyOption.REPLACE_EXISTING);
-            Files.delete(BACKUP);
-        }
-    }
-
-    @Test
-    private void test() throws InterruptedException, IOException {
-        System.out.println("Run test as root user.");
-
-        Process process = Runtime.getRuntime().exec("id -u");
-        process.waitFor();
-        if (process.exitValue() != 0) {
-            throw new RuntimeException("Failed to retrieve user id.");
-        }
-
-        try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(process.getInputStream()))) {
-            String line = reader.readLine();
-
-            if (!ROOT_USER_ID.equals(line)) {
-                throw new RuntimeException(
-                        "This test needs to be run with root privilege.");
-            }
-        }
-
-        Policy p = Policy.getPolicy();
-        Assert.assertTrue(p.implies(Root.class.getProtectionDomain(),
-                new AllPermission()));
-    }
-}
diff --git a/test/jdk/java/security/Policy/Root/Root.policy b/test/jdk/java/security/Policy/Root/Root.policy
deleted file mode 100644
index cb9dbed32cc..00000000000
--- a/test/jdk/java/security/Policy/Root/Root.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/java/security/Policy/SignedJar/SignedJarTest.java b/test/jdk/java/security/Policy/SignedJar/SignedJarTest.java
deleted file mode 100644
index cd06cc15691..00000000000
--- a/test/jdk/java/security/Policy/SignedJar/SignedJarTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import jdk.test.lib.process.ProcessTools;
-
-/**
- * @test
- * @bug 8048360 8242565
- * @summary test policy entry with signedBy alias
- * @library /test/lib
- * @run main/othervm SignedJarTest
- */
-public class SignedJarTest {
-
-    private static final String FS = File.separator;
-    private static final String JAVA_HOME = System.getProperty("test.jdk");
-    private static final String TESTCLASSES = System.getProperty("test.classes", "");
-    private static final String TESTSRC = System.getProperty("test.src", "");
-    private static final String KEYTOOL = JAVA_HOME + FS + "bin" + FS + "keytool";
-    private static final String JAR = JAVA_HOME + FS + "bin" + FS + "jar";
-    private static final String JARSIGNER = JAVA_HOME + FS + "bin" + FS + "jarsigner";
-    private static final String PASSWORD = "password";
-    private static final String PWDFILE = "keypass";
-    private static final String POLICY1 = "SignedJarTest_1.policy";
-    private static final String POLICY2 = "SignedJarTest_2.policy";
-    private static final String KEYSTORE1 = "both.jks";
-    private static final String KEYSTORE2 = "first.jks";
-    private static final String SECPROPS = TESTSRC + FS + "java.security";
-
-    public static void main(String args[]) throws Throwable {
-        //copy PrivilegeTest.class, policy files and keystore password file into current direcotry
-        Files.copy(Paths.get(TESTCLASSES, "PrivilegeTest.class"), Paths.get("PrivilegeTest.class"));
-        Files.copy(Paths.get(TESTSRC, POLICY1), Paths.get(POLICY1));
-        Files.copy(Paths.get(TESTSRC, POLICY2), Paths.get(POLICY2));
-        Files.copy(Paths.get(TESTSRC, PWDFILE), Paths.get(PWDFILE));
-
-        //create Jar file
-        ProcessTools.executeCommand(JAR, "-cvf", "test.jar", "PrivilegeTest.class");
-
-        //Creating first key , keystore both.jks
-        ProcessTools.executeCommand(KEYTOOL,
-                "-genkey",
-                "-keyalg", "DSA",
-                "-alias", "first",
-                "-keystore", KEYSTORE1,
-                "-keypass", PASSWORD,
-                "-dname", "cn=First",
-                "-storepass", PASSWORD
-        ).shouldHaveExitValue(0);
-
-        //Creating Second key, keystore both.jks
-        ProcessTools.executeCommand(KEYTOOL,
-                "-genkey",
-                "-keyalg", "DSA",
-                // "-storetype","JKS",
-                "-alias", "second",
-                "-keystore", KEYSTORE1,
-                "-keypass", PASSWORD,
-                "-dname", "cn=Second",
-                "-storepass", PASSWORD
-        ).shouldHaveExitValue(0);
-
-        //copy both.jks to first.jks, remove second Keypair from first.jks
-        Files.copy(Paths.get(KEYSTORE1), Paths.get(KEYSTORE2));
-        ProcessTools.executeCommand(KEYTOOL,
-                "-delete",
-                "-keystore", KEYSTORE2,
-                "-alias", "second",
-                "-storepass", PASSWORD
-        ).shouldHaveExitValue(0);
-
-        //sign jar with first key, first.jar is only signed by first signer
-        ProcessTools.executeCommand(JARSIGNER,
-                "-keystore", KEYSTORE1,
-                "-storepass", PASSWORD,
-                "-keypass", PASSWORD,
-                "-signedjar", "first.jar", "test.jar",
-                "first").shouldHaveExitValue(0);
-
-        //sign jar with second key, both.jar is signed by first and second signer
-        ProcessTools.executeCommand(JARSIGNER,
-                "-keystore", KEYSTORE1,
-                "-storepass", PASSWORD,
-                "-keypass", PASSWORD,
-                "-signedjar", "both.jar", "first.jar",
-                "second").shouldHaveExitValue(0);
-
-        //test case 1
-        //setIO permission granted to code that was signed by first signer
-        //setFactory permission granted to code that was signed by second signer
-        //Keystore that contains both first and second  keypairs
-        //code was singed by first signer
-        //Expect AccessControlException for setFactory permission
-        System.out.println("Test Case 1");
-        //copy policy file into current directory
-        String[] cmd = constructCMD("first.jar", POLICY1, "false", "true");
-        ProcessTools.executeTestJava(cmd).shouldHaveExitValue(0);
-
-        //test case 2, test with both.jar
-        //setIO permission granted to code that was signed by first signer
-        //setFactory permission granted to code that was signed by second signer
-        //Keystore that contains both first and second  keypairs
-        //code was singed by first signer and second signer
-        //Expect no AccessControlException
-        System.out.println("Test Case 2");
-        cmd = constructCMD("both.jar", POLICY1, "false", "false");
-        ProcessTools.executeTestJava(cmd).shouldHaveExitValue(0);
-
-        //test case 3
-        //setIO permission granted to code that was signed by first signer
-        //setFactory permission granted to code that was signed by second signer
-        //Keystore that contains only first keypairs
-        //code was singed by first signer and second signer
-        //Expect AccessControlException for setFactory permission
-        System.out.println("Test Case 3");
-        cmd = constructCMD("both.jar", POLICY2, "false", "true");
-        ProcessTools.executeTestJava(cmd).shouldHaveExitValue(0);
-
-    }
-
-    private static String[] constructCMD(String classpath, String policy, String arg1, String arg2) {
-        String[] cmd = {
-            "-classpath", classpath,
-            "-Djava.security.manager",
-            "-Djava.security.policy=" + policy,
-            "-Djava.security.properties=" + SECPROPS,
-            "PrivilegeTest",
-            arg1, arg2};
-        return cmd;
-    }
-}
-
-class PrivilegeTest {
-
-    private static final Permission PERM1 = new RuntimePermission("setIO");
-    private static final Permission PERM2 = new RuntimePermission("setFactory");
-
-    public static void main(String args[]) {
-        boolean expectException1 = Boolean.parseBoolean(args[0]);
-        boolean expectException2 = Boolean.parseBoolean(args[1]);
-        test(PERM1, expectException1);
-        test(PERM2, expectException2);
-    }
-
-    public static void test(Permission perm, boolean expectException) {
-        boolean getException = (Boolean) AccessController.doPrivileged((PrivilegedAction) () -> {
-            try {
-                AccessController.checkPermission(perm);
-                return (Boolean) false;
-            } catch (AccessControlException ex) {
-                return (Boolean) true;
-            }
-        });
-
-        if (expectException ^ getException) {
-            String message = "Check Permission :" + perm + "\n ExpectException = "
-                    + expectException + "\n getException = " + getException;
-            throw new RuntimeException(message);
-        }
-
-    }
-
-}
diff --git a/test/jdk/java/security/Policy/SignedJar/SignedJarTest_1.policy b/test/jdk/java/security/Policy/SignedJar/SignedJarTest_1.policy
deleted file mode 100644
index 6094fe56bb2..00000000000
--- a/test/jdk/java/security/Policy/SignedJar/SignedJarTest_1.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-keystore "file:both.jks";
-keystorePasswordURL "file:keypass";
-
-grant signedBy "first" {
-    permission java.lang.RuntimePermission "setIO";
-};
-
-grant signedBy "second" {
-    permission java.lang.RuntimePermission "setFactory";
-};
diff --git a/test/jdk/java/security/Policy/SignedJar/SignedJarTest_2.policy b/test/jdk/java/security/Policy/SignedJar/SignedJarTest_2.policy
deleted file mode 100644
index 596dd3832eb..00000000000
--- a/test/jdk/java/security/Policy/SignedJar/SignedJarTest_2.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-keystore "file:first.jks";
-keystorePasswordURL "file:keypass";
-
-grant signedBy "first" {
-    permission java.lang.RuntimePermission "setIO";
-};
-
-grant signedBy "second" {
-    permission java.lang.RuntimePermission "setFactory";
-};
-
diff --git a/test/jdk/java/security/Policy/SignedJar/java.security b/test/jdk/java/security/Policy/SignedJar/java.security
deleted file mode 100644
index 75e7cec7013..00000000000
--- a/test/jdk/java/security/Policy/SignedJar/java.security
+++ /dev/null
@@ -1,3 +0,0 @@
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024, include jdk.disabled.namedCurves, \
-      SHA1 jdkCA & denyAfter 2019-01-01
diff --git a/test/jdk/java/security/Policy/SignedJar/keypass b/test/jdk/java/security/Policy/SignedJar/keypass
deleted file mode 100644
index f3097ab1308..00000000000
--- a/test/jdk/java/security/Policy/SignedJar/keypass
+++ /dev/null
@@ -1 +0,0 @@
-password
diff --git a/test/jdk/java/security/ProtectionDomain/AllPerm.jar b/test/jdk/java/security/ProtectionDomain/AllPerm.jar
deleted file mode 100644
index 430610fb230..00000000000
Binary files a/test/jdk/java/security/ProtectionDomain/AllPerm.jar and /dev/null differ
diff --git a/test/jdk/java/security/ProtectionDomain/AllPerm.java b/test/jdk/java/security/ProtectionDomain/AllPerm.java
deleted file mode 100644
index 7be2d1e216f..00000000000
--- a/test/jdk/java/security/ProtectionDomain/AllPerm.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6256734
- * @summary ProtectionDomain could optimize implies by first checking for
- *          AllPermission in internal collection
- * @run main/othervm -Djava.security.manager=allow AllPerm
- */
-
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.lang.reflect.*;
-
-public class AllPerm {
-
-    private static final Class[] ARGS = new Class[] { };
-    private static ProtectionDomain allPermClassDomain;
-
-    public static void main(String[]args) throws Exception {
-
-        // create custom class loader that assigns AllPermission to
-        // classes it loads
-
-        File file = new File(System.getProperty("test.src"), "AllPerm.jar");
-        URL[] urls = new URL[] { file.toURL() };
-        ClassLoader parent = Thread.currentThread().getContextClassLoader();
-        AllPermLoader loader = new AllPermLoader(urls, parent);
-
-        // load a class from AllPerm.jar using custom loader
-
-        Object o = loader.loadClass("AllPermClass").newInstance();
-        Method doCheck = o.getClass().getMethod("doCheck", ARGS);
-        allPermClassDomain = o.getClass().getProtectionDomain();
-
-        // set a custom Policy and set the SecurityManager
-
-        Policy.setPolicy(new AllPermPolicy());
-        System.setSecurityManager(new SecurityManager());
-
-        // invoke method on loaded class, which will perform a
-        // security-sensitive operation.  custom policy will check
-        // to see if it is called (it should not be called)
-
-        doCheck.invoke(o, ARGS);
-    }
-
-    /**
-     * this class loader assigns AllPermission to classes that it loads
-     */
-    private static class AllPermLoader extends URLClassLoader {
-
-        public AllPermLoader(URL[] urls, ClassLoader parent) {
-            super(urls, parent);
-        }
-
-        protected PermissionCollection getPermissions(CodeSource codesource) {
-            Permissions perms = new Permissions();
-            perms.add(new AllPermission());
-            return perms;
-        }
-    }
-
-    /**
-     * this policy should not be called if domain is allPermClassDomain
-     */
-    private static class AllPermPolicy extends Policy {
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (domain == allPermClassDomain) {
-                throw new SecurityException
-                        ("Unexpected call into AllPermPolicy");
-            }
-            return true;
-        }
-    }
-}
-
-/**
- * here is the source code for AllPermClass inside AllPerm.jar
- */
-/*
-public class AllPermClass {
-    public void doCheck() {
-        System.getProperty("user.name");
-    }
-}
-*/
diff --git a/test/jdk/java/security/ProtectionDomain/NullGetActions.java b/test/jdk/java/security/ProtectionDomain/NullGetActions.java
deleted file mode 100644
index 4986395d5f9..00000000000
--- a/test/jdk/java/security/ProtectionDomain/NullGetActions.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8043252
- * @summary Debug of access control is obfuscated - NullPointerException in
- *          ProtectionDomain
- * @run main/othervm/java.security.policy=NullGetActions.policy NullGetActions
- */
-
-import java.net.*;
-import java.security.*;
-
-public class NullGetActions {
-
-    public static void main(String[] args) throws Exception {
-        Permissions permset = new Permissions();
-        permset.add(new EvilPermission("java.let.me.do.stuff"));
-
-        Policy.getPolicy();
-        ProtectionDomain protDom = new ProtectionDomain(
-                new CodeSource(new URL("http://bar"),
-                        (java.security.cert.Certificate[])null), permset,
-                        null, null);
-
-        System.out.println("Protection Domain:\n" + protDom);
-    }
-
-    public static class EvilPermission extends Permission {
-        public EvilPermission(String name) {
-            super(name);
-        }
-
-        @Override
-        public String getActions() {
-            return null;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return (obj == this);
-        }
-
-        @Override
-        public int hashCode() {
-            return 42;
-        }
-
-        @Override
-        public boolean implies(Permission permission) {
-            return false;
-        }
-    }
-}
diff --git a/test/jdk/java/security/ProtectionDomain/NullGetActions.policy b/test/jdk/java/security/ProtectionDomain/NullGetActions.policy
deleted file mode 100644
index 87c88439050..00000000000
--- a/test/jdk/java/security/ProtectionDomain/NullGetActions.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "getPolicy";
-};
diff --git a/test/jdk/java/security/ProtectionDomain/PreserveCombinerTest.java b/test/jdk/java/security/ProtectionDomain/PreserveCombinerTest.java
deleted file mode 100644
index bd27b84dad1..00000000000
--- a/test/jdk/java/security/ProtectionDomain/PreserveCombinerTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.DomainCombiner;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import jdk.internal.access.SharedSecrets;
-
-/*
- * @test
- * @bug 8064331
- * @summary Make sure that JavaSecurityAccess.doIntersectionPrivilege()
- *          is not dropping the information about the domain combiner of
- *          the stack ACC
- * @modules java.base/jdk.internal.access
- */
-
-public class PreserveCombinerTest {
-    public static void main(String[]args) throws Exception {
-        final DomainCombiner dc = new DomainCombiner() {
-            @Override
-            public ProtectionDomain[] combine(ProtectionDomain[] currentDomains, ProtectionDomain[] assignedDomains) {
-                return currentDomains; // basically a no-op
-            }
-        };
-
-        // Get an instance of the saved ACC
-        AccessControlContext saved = AccessController.getContext();
-        // Simulate the stack ACC with a DomainCombiner attached
-        AccessControlContext stack = new AccessControlContext(AccessController.getContext(), dc);
-
-        // Now try to run JavaSecurityAccess.doIntersectionPrivilege() and assert
-        // whether the DomainCombiner from the stack ACC is preserved
-        boolean ret = SharedSecrets.getJavaSecurityAccess().doIntersectionPrivilege(new PrivilegedAction<Boolean>() {
-            @Override
-            public Boolean run() {
-                return dc == AccessController.getContext().getDomainCombiner();
-            }
-        }, stack, saved);
-
-        if (!ret) {
-            System.exit(1);
-        }
-    }
-}
-
diff --git a/test/jdk/java/security/ProtectionDomain/Recursion.java b/test/jdk/java/security/ProtectionDomain/Recursion.java
deleted file mode 100644
index bedce60e22b..00000000000
--- a/test/jdk/java/security/ProtectionDomain/Recursion.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4947618
- * @summary Recursion problem in security manager and policy code
- *
- * @run main/othervm/policy=Recursion.policy Recursion
- */
-
-import java.net.*;
-import java.security.*;
-
-public class Recursion {
-
-    public static void main(String[] args) throws Exception {
-
-        // trigger security check to make sure policy is set
-        try {
-            System.getProperty("foo.bar");
-        } catch (Exception e) {
-            // fall thru
-        }
-
-        // static perms
-        Permissions staticPerms = new Permissions();
-        staticPerms.add(new java.util.PropertyPermission("static.foo", "read"));
-
-        ProtectionDomain pd = new ProtectionDomain
-                        (new CodeSource
-                                (new URL("http://foo"),
-                                (java.security.cert.Certificate[])null),
-                        staticPerms,
-                        null,
-                        null);
-
-        // test with no SecurityManager
-        //
-        // merging should have occured - check for policy merged.foo permission
-
-        System.setSecurityManager(null);
-        if (pd.toString().indexOf("merged.foo") < 0) {
-            throw new Exception("Test without SecurityManager failed");
-        }
-
-        // test with SecurityManager on the bootclasspath, debug turned off,
-        // getPolicyPermission granted
-        //
-        // merging should have occured - check for policy merged.foo permission
-
-        ProtectionDomain pd2 = new ProtectionDomain
-                        (new CodeSource
-                                (new URL("http://bar"),
-                                (java.security.cert.Certificate[])null),
-                        staticPerms,
-                        null,
-                        null);
-
-        System.setSecurityManager(new SecurityManager());
-        if (pd2.toString().indexOf("merged.foo") < 0) {
-            throw new Exception("Test with bootclass SecurityManager failed");
-        }
-    }
-}
diff --git a/test/jdk/java/security/ProtectionDomain/Recursion.policy b/test/jdk/java/security/ProtectionDomain/Recursion.policy
deleted file mode 100644
index 732c893d685..00000000000
--- a/test/jdk/java/security/ProtectionDomain/Recursion.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.lang.RuntimePermission "createSecurityManager";
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.util.PropertyPermission "merged.foo", "read";
-};
diff --git a/test/jdk/java/security/ProtectionDomain/RecursionDebug.java b/test/jdk/java/security/ProtectionDomain/RecursionDebug.java
deleted file mode 100644
index 4b12a238098..00000000000
--- a/test/jdk/java/security/ProtectionDomain/RecursionDebug.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4947618 8268349
- * @summary Recursion problem in security manager and policy code
- *
- * @run main/othervm/policy=Recursion.policy -Djava.security.debug=domain RecursionDebug
- */
-
-import java.security.*;
-import java.net.*;
-
-public class RecursionDebug {
-
-    // non bootclasspath SecurityManager
-    public static class RecursionSM extends SecurityManager {
-        public void checkPermission(Permission p) {
-            super.checkPermission(p);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        // trigger security check to make sure policy is set
-        try {
-            System.getProperty("foo.bar");
-        } catch (Exception e) {
-            // fall thru
-        }
-
-        // static perms
-        Permissions staticPerms = new Permissions();
-        staticPerms.add(new java.util.PropertyPermission("static.foo", "read"));
-
-        ProtectionDomain pd = new ProtectionDomain
-                        (new CodeSource
-                                (new URL("http://foo"),
-                                (java.security.cert.Certificate[])null),
-                        staticPerms,
-                        null,
-                        null);
-
-        // test with SecurityManager on the bootclasspath, debug turned on
-        //
-        // merging should have occured - check for policy merged.foo permission
-
-        if (pd.toString().indexOf("merged.foo") < 0) {
-            throw new Exception("Test with bootclass SecurityManager failed");
-        }
-
-        // test with SecurityManager not on bootclasspath, debug turned on
-        //
-        // merging should not have occured, and there should be no recursion
-
-        ProtectionDomain pd2 = new ProtectionDomain
-                        (new CodeSource
-                                (new URL("http://bar"),
-                                (java.security.cert.Certificate[])null),
-                        staticPerms,
-                        null,
-                        null);
-
-        System.setSecurityManager(new RecursionDebug.RecursionSM());
-        if (pd2.toString().indexOf("merged.foo") >= 0) {
-            throw new Exception
-                ("Test with custom non-bootclass SecurityManager failed");
-        }
-    }
-}
diff --git a/test/jdk/java/security/SecureClassLoader/DefineClass.java b/test/jdk/java/security/SecureClassLoader/DefineClass.java
deleted file mode 100644
index 7ad634c0e4c..00000000000
--- a/test/jdk/java/security/SecureClassLoader/DefineClass.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.security.CodeSource;
-import java.security.Key;
-import java.security.KeyStoreException;
-import java.security.KeyStoreSpi;
-import java.security.NoSuchAlgorithmException;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.Provider;
-import java.security.SecureClassLoader;
-import java.security.Security;
-import java.security.UnrecoverableKeyException;
-import java.security.URIParameter;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.PropertyPermission;
-
-/*
- * @test
- * @bug 6826789 8131486 8130181
- * @summary Make sure equivalent ProtectionDomains are granted the same
- *          permissions when the CodeSource URLs are different but resolve
- *          to the same ip address after name service resolution.
- * @run main/othervm -Djava.security.manager=allow DefineClass
- */
-
-public class DefineClass {
-
-    // permissions that are expected to be granted by the policy file
-    private final static Permission[] GRANTED_PERMS = new Permission[] {
-        new PropertyPermission("user.home", "read"),
-        new PropertyPermission("user.name", "read")
-    };
-
-    // Base64 encoded bytes of simple class: "package foo; public class Foo {}"
-    private final static String FOO_CLASS =
-        "yv66vgAAADMADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" +
-        "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhGb28uamF2YQwABAAF" +
-        "AQAHZm9vL0ZvbwEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" +
-        "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" +
-        "AAIACQ==";
-
-    // Base64 encoded bytes of simple class: "package bar; public class Bar {}"
-    private final static String BAR_CLASS =
-        "yv66vgAAADMADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" +
-        "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhCYXIuamF2YQwABAAF" +
-        "AQAHYmFyL0JhcgEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" +
-        "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" +
-        "AAIACQ==";
-
-    // Base64 encoded bytes of simple class: "package baz; public class Baz {}"
-    private final static String BAZ_CLASS =
-        "yv66vgAAADQADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" +
-        "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhCYXouamF2YQwABAAF" +
-        "AQAHYmF6L0JhegEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" +
-        "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" +
-        "AAIACQ==";
-
-    private final static String BAZ_CERT =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIIEFzCCA8OgAwIBAgIESpPf8TANBglghkgBZQMEAwIFADAOMQwwCgYDVQQDEwNG\n" +
-        "b28wHhcNMTUwNzE1MTY1ODM5WhcNMTUxMDEzMTY1ODM5WjAOMQwwCgYDVQQDEwNG\n" +
-        "b28wggNCMIICNQYHKoZIzjgEATCCAigCggEBAI95Ndm5qum/q+2Ies9JUbbzLsWe\n" +
-        "O683GOjqxJYfPv02BudDUanEGDM5uAnnwq4cU5unR1uF0BGtuLR5h3VJhGlcrA6P\n" +
-        "FLM2CCiiL/onEQo9YqmTRTQJoP5pbEZY+EvdIIGcNwmgEFexla3NACM9ulSEtikf\n" +
-        "nWSO+INEhneXnOwEtDSmrC516Zhd4j2wKS/BEYyf+p2BgeczjbeStzDXueNJWS9o\n" +
-        "CZhyFTkV6j1ri0ZTxjNFj4A7MqTC4PJykCVuTj+KOwg4ocRQ5OGMGimjfd9eoUPe\n" +
-        "S2b/BJA+1c8WI+FY1IfGCOl/IRzYHcojy244B2X4IuNCvkhMBXY5OWAc1mcCHQC6\n" +
-        "9pamhXj3397n+mfJd8eF7zKyM7rlgMC81WldAoIBABamXFggSFBwTnUCo5dXBA00\n" +
-        "2jo0eMFU1OSlwC0kLuBPluYeS9CQSr2sjzfuseCfMYLSPJBDy2QviABBYO35ygmz\n" +
-        "IHannDKmJ/JHPpGHm6LE50S9IIFUTLVbgCw2jR+oPtSJ6U4PoGiOMkKKXHjEeMaN\n" +
-        "BSe3HJo6uwsL4SxEaJY559POdNsQGmWqK4f2TGgm2z7HL0tVmYNLtO2wL3yQ6aSW\n" +
-        "06VdU1vr/EXU9hn2Pz3tu4c5JcLyJOB3MSltqIfsHkdI+H77X963VIQxayIy3uVT\n" +
-        "3a8CESsNHwLaMJcyJP4nrtqLnUspItm6i+Oe2eEDpjxSgQvGiLfi7UMW4e8X294D\n" +
-        "ggEFAAKCAQBsGeU8/STExzQsJ8kFM9xarA/2VAFMzyUpd3IQ2UGHQC5rEnGh/RiU\n" +
-        "T20y7a2hCpQ1f/qgLnY8hku9GRVY3z8WamBzWLzCAEAx67EsS58mf4o8R3sUbkH5\n" +
-        "/mRaZoNVSPUy+tXoLmTzIetU4W+JT8Rq4OcXXU9uo9TreeBehhVexS3vpVgQeUIn\n" +
-        "MmMma8WHpovIJQQlp4cyjalX7Beda/tqX/HPLkAS4TRqQAz7hFr3FqFrVMKFSGo4\n" +
-        "fTS06GGdQ4tw9c6NQLuQ9WF9BxYSwSk9yENQvKDZaBNarqPMnsh1Gi/QcKMRBVhM\n" +
-        "RT/9vb4QUi/pOowhhKCDBLgjY60QgX3HoyEwHzAdBgNVHQ4EFgQUa787CE+3ZNAb\n" +
-        "g1ql9yJVVrRCdx0wDQYJYIZIAWUDBAMCBQADPwAwPAIcCUkZIRrBlKdTzhKYBEOm\n" +
-        "E1i45MMum1RuHc28agIcfHQkkjBA4FfH5UMRgKpIyRR8V/dVboxDj4hKOA==\n" +
-        "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        Security.addProvider(new TestProvider());
-
-        MySecureClassLoader scl = new MySecureClassLoader();
-
-        File policyFile = new File(System.getProperty("test.src", "."),
-                                   "DefineClass.policy");
-        Policy p = Policy.getInstance("JavaPolicy",
-                                      new URIParameter(policyFile.toURI()));
-        Policy.setPolicy(p);
-
-        System.setSecurityManager(new SecurityManager());
-        ArrayList<Permission> perms1 = getPermissions(scl, p,
-                                                      "http://localhost/",
-                                                      "foo.Foo", FOO_CLASS,
-                                                      null);
-        checkPerms(perms1, GRANTED_PERMS);
-        ArrayList<Permission> perms2 = getPermissions(scl, p,
-                                                      "http://127.0.0.1/",
-                                                      "bar.Bar", BAR_CLASS,
-                                                      null);
-        checkPerms(perms2, GRANTED_PERMS);
-        assert(perms1.equals(perms2));
-
-        // check that class signed by baz is granted an additional permission
-        Certificate[] chain = new Certificate[] {getCert(BAZ_CERT)};
-        ArrayList<Permission> perms3 = getPermissions(scl, p,
-                                                      "http://localhost/",
-                                                      "baz.Baz", BAZ_CLASS,
-                                                      chain);
-        List<Permission> perms = new ArrayList<>(Arrays.asList(GRANTED_PERMS));
-        perms.add(new PropertyPermission("user.dir", "read"));
-        checkPerms(perms3, perms.toArray(new Permission[0]));
-    }
-
-    // returns the permissions granted to the codebase URL
-    private static ArrayList<Permission> getPermissions(MySecureClassLoader scl,
-                                                        Policy p, String url,
-                                                        String className,
-                                                        String classBytes,
-                                                        Certificate[] chain)
-                                                        throws IOException {
-        CodeSource cs = new CodeSource(new URL(url), chain);
-        Base64.Decoder bd = Base64.getDecoder();
-        byte[] bytes = bd.decode(classBytes);
-        Class<?> c = scl.defineMyClass(className, bytes, cs);
-        ProtectionDomain pd = c.getProtectionDomain();
-        return Collections.list(p.getPermissions(pd).elements());
-    }
-
-    private static void checkPerms(List<Permission> perms,
-                                   Permission... grantedPerms)
-        throws Exception
-    {
-        if (!perms.containsAll(Arrays.asList(grantedPerms))) {
-            throw new Exception("Granted permissions not correct");
-        }
-    }
-
-    private static Certificate getCert(String base64Cert) throws Exception {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        InputStream is = new ByteArrayInputStream(base64Cert.getBytes("UTF-8"));
-        return cf.generateCertificate(is);
-    }
-
-    // A SecureClassLoader that allows the test to define its own classes
-    private static class MySecureClassLoader extends SecureClassLoader {
-        Class<?> defineMyClass(String name, byte[] b, CodeSource cs) {
-            return super.defineClass(name, b, 0, b.length, cs);
-        }
-    }
-
-    private static class TestProvider extends Provider {
-        TestProvider() {
-            super("Test8131486", "0.0", "For testing only");
-            putService(new Provider.Service(this, "KeyStore", "Test8131486",
-                       "DefineClass$TestKeyStore", null, null));
-        }
-    }
-
-    /**
-     * A KeyStore containing a single certificate entry named "baz".
-     */
-    public static class TestKeyStore extends KeyStoreSpi {
-        private final String baz = "baz";
-        private final List<String> aliases = Collections.singletonList(baz);
-        private final Certificate bazCert;
-
-        public TestKeyStore() {
-            try {
-                this.bazCert = getCert(BAZ_CERT);
-            } catch (Exception e) {
-                throw new Error();
-            }
-        }
-
-        @Override
-        public Enumeration<String> engineAliases() {
-            return Collections.enumeration(aliases);
-        }
-
-        @Override
-        public boolean engineContainsAlias(String alias) {
-            return alias.equals(baz);
-        }
-
-        @Override
-        public void engineDeleteEntry(String alias) throws KeyStoreException {
-            throw new KeyStoreException();
-        }
-
-        @Override
-        public Certificate engineGetCertificate(String alias) {
-            return alias.equals(baz) ? bazCert : null;
-        }
-
-        @Override
-        public String engineGetCertificateAlias(Certificate cert) {
-            return cert.equals(bazCert) ? baz : null;
-        }
-
-        @Override
-        public Certificate[] engineGetCertificateChain(String alias) {
-            return alias.equals(baz) ? new Certificate[] {bazCert} : null;
-        }
-
-        @Override
-        public Date engineGetCreationDate(String alias) {
-            return alias.equals(baz) ? new Date() : null;
-        }
-
-        @Override
-        public Key engineGetKey(String alias, char[] password)
-            throws NoSuchAlgorithmException, UnrecoverableKeyException {
-            return null;
-        }
-
-        @Override
-        public boolean engineIsCertificateEntry(String alias) {
-            return alias.equals(baz);
-        }
-
-        @Override
-        public boolean engineIsKeyEntry(String alias) {
-            return false;
-        }
-
-        @Override
-        public void engineLoad(InputStream stream, char[] password)
-            throws IOException, NoSuchAlgorithmException, CertificateException {
-        }
-
-        @Override
-        public void engineSetCertificateEntry(String alias, Certificate cert)
-            throws KeyStoreException {
-            throw new KeyStoreException();
-        }
-
-        @Override
-        public void engineSetKeyEntry(String alias, byte[] key,
-                                      Certificate[] chain)
-            throws KeyStoreException {
-            throw new KeyStoreException();
-        }
-
-        @Override
-        public void engineSetKeyEntry(String alias, Key key, char[] password,
-                                      Certificate[] chain)
-            throws KeyStoreException {
-            throw new KeyStoreException();
-        }
-
-        @Override
-        public int engineSize() { return 1; }
-
-        @Override
-        public void engineStore(OutputStream stream, char[] password)
-            throws IOException, NoSuchAlgorithmException, CertificateException {
-        }
-    }
-}
diff --git a/test/jdk/java/security/SecureClassLoader/DefineClass.policy b/test/jdk/java/security/SecureClassLoader/DefineClass.policy
deleted file mode 100644
index dd9dbaa1efd..00000000000
--- a/test/jdk/java/security/SecureClassLoader/DefineClass.policy
+++ /dev/null
@@ -1,14 +0,0 @@
-keystore "NONE", "Test8131486", "Test8131486";
-
-grant {
-    permission java.lang.RuntimePermission "getProtectionDomain";
-};
-grant codebase "http://localhost/" {
-    permission java.util.PropertyPermission "user.home", "read";
-};
-grant codebase "http://127.0.0.1/" {
-    permission java.util.PropertyPermission "user.name", "read";
-};
-grant codebase "http://localhost/", signedby "baz" {
-    permission java.util.PropertyPermission "user.dir", "read";
-};
diff --git a/test/jdk/java/security/Security/AddProvider.java b/test/jdk/java/security/Security/AddProvider.java
deleted file mode 100644
index e265716c8f6..00000000000
--- a/test/jdk/java/security/Security/AddProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8001319 8130181
- * @summary check that SecurityPermission insertProvider permission is enforced
- *          correctly
- * @run main/othervm/policy=AddProvider.policy.1 AddProvider 1
- * @run main/othervm/policy=AddProvider.policy.2 AddProvider 2
- * @run main/othervm/policy=AddProvider.policy.3 AddProvider 3
- */
-import java.security.Provider;
-import java.security.Security;
-
-public class AddProvider {
-
-    public static void main(String[] args) throws Exception {
-        boolean legacy = args[0].equals("2");
-        Security.addProvider(new TestProvider("Test1"));
-        Security.insertProviderAt(new TestProvider("Test2"), 1);
-        try {
-            Security.addProvider(new TestProvider("Test3"));
-            if (legacy) {
-                throw new Exception("Expected SecurityException");
-            }
-        } catch (SecurityException se) {
-            if (!legacy) {
-                throw se;
-            }
-        }
-    }
-
-    private static class TestProvider extends Provider {
-        TestProvider(String name) {
-            super(name, "0.0", "Not for use in production systems!");
-        }
-    }
-}
diff --git a/test/jdk/java/security/Security/AddProvider.policy.1 b/test/jdk/java/security/Security/AddProvider.policy.1
deleted file mode 100644
index 64b43d7a1ef..00000000000
--- a/test/jdk/java/security/Security/AddProvider.policy.1
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "insertProvider";
-};
diff --git a/test/jdk/java/security/Security/AddProvider.policy.2 b/test/jdk/java/security/Security/AddProvider.policy.2
deleted file mode 100644
index f976821953d..00000000000
--- a/test/jdk/java/security/Security/AddProvider.policy.2
+++ /dev/null
@@ -1,5 +0,0 @@
-
-grant {
-    permission java.security.SecurityPermission "insertProvider.Test1";
-    permission java.security.SecurityPermission "insertProvider.Test2";
-};
diff --git a/test/jdk/java/security/Security/AddProvider.policy.3 b/test/jdk/java/security/Security/AddProvider.policy.3
deleted file mode 100644
index b35cd304280..00000000000
--- a/test/jdk/java/security/Security/AddProvider.policy.3
+++ /dev/null
@@ -1,4 +0,0 @@
-
-grant {
-    permission java.security.SecurityPermission "insertProvider.*";
-};
diff --git a/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
index f1eda924120..e2e57392853 100644
--- a/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
+++ b/test/jdk/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ ${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
         ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
 
 # run the test
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
 	-Djava.awt.headless=true \
         ClassLoaderDeadlock
diff --git a/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
index 230a0fec7ca..7013c4cc33a 100644
--- a/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
+++ b/test/jdk/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -62,5 +62,5 @@ esac
 
 JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java"
 
-${JAVA} ${TESTVMOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
 
diff --git a/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java
index b5802e77ef0..b0ba6c60854 100644
--- a/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java
+++ b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary be allowed to specify the security properties file
  *      as a -D system property
  *
- * @run main/othervm/policy=SecurityPropFile.policy -Djava.security.properties=${test.src}/SecurityPropFile.file -Djava.security.debug=properties SecurityPropFile
+ * @run main/othervm -Djava.security.properties=${test.src}/SecurityPropFile.file -Djava.security.debug=properties SecurityPropFile
  */
 
 public class SecurityPropFile {
diff --git a/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.policy b/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.policy
deleted file mode 100644
index 3501486e8ba..00000000000
--- a/test/jdk/java/security/Security/SecurityPropFile/SecurityPropFile.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "getProperty.policy.provider", "read";
-    permission java.security.SecurityPermission "getProperty.policy.url.1", "read";
-    permission java.security.SecurityPermission "getProperty.policy.url.2", "read";
-};
diff --git a/test/jdk/java/security/Security/removing/RemoveStaticProvider.java b/test/jdk/java/security/Security/removing/RemoveStaticProvider.java
index 237de13cf7e..8c66217fbc3 100644
--- a/test/jdk/java/security/Security/removing/RemoveStaticProvider.java
+++ b/test/jdk/java/security/Security/removing/RemoveStaticProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 4420687
  * @summary Make sure that a removed provider won't be acceessable.
- * @run main/othervm/java.security.policy=RemoveStaticProvider.policy RemoveStaticProvider
+ * @run main/othervm RemoveStaticProvider
  */
 import java.security.*;
 import javax.crypto.*;
diff --git a/test/jdk/java/security/Security/removing/RemoveStaticProvider.policy b/test/jdk/java/security/Security/removing/RemoveStaticProvider.policy
deleted file mode 100644
index f31e5878040..00000000000
--- a/test/jdk/java/security/Security/removing/RemoveStaticProvider.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "removeProvider.SunJCE";
-    permission java.security.SecurityPermission "insertProvider.SunJCE";
-};
-
diff --git a/test/jdk/java/security/UnresolvedPermission/Debug.java b/test/jdk/java/security/UnresolvedPermission/Debug.java
deleted file mode 100644
index 3ab5b529d11..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/Debug.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4350951
- * @summary     UnresolvedPermission assumes permission constructor
- *              with 2 string parameters
- *
- * @compile Debug.java DebugPermissionBad.java DebugPermission0.java DebugPermission1.java DebugPermission2.java
- * @run main/othervm/policy=Debug.policy -Djava.security.debug=policy,access Debug
- */
-
-public class Debug {
-
-    public static void main(String[] args) {
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            throw new SecurityException("Test Failed: no SecurityManager");
-        }
-
-        try {
-            sm.checkPermission(new DebugPermissionBad("hello", 1));
-            throw new SecurityException("Test 1 Failed: no SecurityException");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        try {
-            sm.checkPermission(new DebugPermission0());
-        } catch (SecurityException se) {
-            throw new SecurityException("Test 2 Failed");
-        }
-
-        try {
-            sm.checkPermission(new DebugPermission1("1"));
-        } catch (SecurityException se) {
-            throw new SecurityException("Test 3 Failed");
-        }
-
-        try {
-            sm.checkPermission(new DebugPermission2("1", "2"));
-        } catch (SecurityException se) {
-            throw new SecurityException("Test 4 Failed");
-        }
-
-        System.out.println("Test Succeeded");
-    }
-}
diff --git a/test/jdk/java/security/UnresolvedPermission/Debug.policy b/test/jdk/java/security/UnresolvedPermission/Debug.policy
deleted file mode 100644
index 2345180ba55..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/Debug.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission DebugPermissionBad "hello";
-    permission DebugPermission0;
-    permission DebugPermission1 "1";
-    permission DebugPermission2 "1", "2";
-};
diff --git a/test/jdk/java/security/UnresolvedPermission/DebugPermission0.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission0.java
deleted file mode 100644
index 0c400c87e75..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/DebugPermission0.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DebugPermission0 extends java.security.Permission {
-
-    public DebugPermission0() {
-        super("DebugPermission0");
-    }
-
-    public boolean implies(java.security.Permission perm) {
-        return true;
-    }
-
-    public boolean equals(Object obj) {
-        return false;
-    }
-
-    public int hashCode() {
-        return 0;
-    }
-
-    public String getActions() {
-        return null;
-    }
-};
diff --git a/test/jdk/java/security/UnresolvedPermission/DebugPermission1.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission1.java
deleted file mode 100644
index 5e4e42112ed..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/DebugPermission1.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DebugPermission1 extends java.security.Permission {
-
-    public DebugPermission1(String name) {
-        super(name);
-    }
-
-    public boolean implies(java.security.Permission perm) {
-        return true;
-    }
-
-    public boolean equals(Object obj) {
-        return false;
-    }
-
-    public int hashCode() {
-        return 0;
-    }
-
-    public String getActions() {
-        return null;
-    }
-};
diff --git a/test/jdk/java/security/UnresolvedPermission/DebugPermission2.java b/test/jdk/java/security/UnresolvedPermission/DebugPermission2.java
deleted file mode 100644
index 4c3e2a59465..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/DebugPermission2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DebugPermission2 extends java.security.Permission {
-
-    public DebugPermission2(String name, String actions) {
-        super("name");
-    }
-
-    public boolean implies(java.security.Permission perm) {
-        return true;
-    }
-
-    public boolean equals(Object obj) {
-        return false;
-    }
-
-    public int hashCode() {
-        return 0;
-    }
-
-    public String getActions() {
-        return null;
-    }
-};
diff --git a/test/jdk/java/security/UnresolvedPermission/DebugPermissionBad.java b/test/jdk/java/security/UnresolvedPermission/DebugPermissionBad.java
deleted file mode 100644
index e6de39c2d0a..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/DebugPermissionBad.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class DebugPermissionBad extends java.security.Permission {
-
-    public DebugPermissionBad(String name, int x) {
-        super(name);
-    }
-
-    public boolean implies(java.security.Permission perm) {
-        return true;
-    }
-
-    public boolean equals(Object obj) {
-        return false;
-    }
-
-    public int hashCode() {
-        return 0;
-    }
-
-    public String getActions() {
-        return null;
-    }
-};
diff --git a/test/jdk/java/security/UnresolvedPermission/Equals.java b/test/jdk/java/security/UnresolvedPermission/Equals.java
deleted file mode 100644
index a88a77b49ac..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/Equals.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4513737
- * @run main/othervm Equals
- * @summary UnresolvedPermission.equals() throws NullPointerException
- */
-
-import java.security.*;
-import java.util.*;
-
-public class Equals {
-    public static void main(String[] args) {
-        if (System.getProperty("test.src") == null) {
-            System.setProperty("test.src", ".");
-        }
-        System.setProperty("java.security.policy",
-                "file:${test.src}/Equals.policy");
-        PermissionCollection pc = Policy.getPolicy().getPermissions
-                        (Equals.class.getProtectionDomain());
-        ArrayList l = new ArrayList();
-        for (Enumeration e = pc.elements(); e.hasMoreElements();) {
-            Object p = e.nextElement();
-            if (p instanceof UnresolvedPermission) {
-                l.add(p);
-            }
-        }
-        System.out.println(l.get(0) + "\n" + l.get(1));
-        System.out.println(l.get(0).equals(l.get(1)));
-    }
-}
diff --git a/test/jdk/java/security/UnresolvedPermission/Equals.policy b/test/jdk/java/security/UnresolvedPermission/Equals.policy
deleted file mode 100644
index 54e29e19769..00000000000
--- a/test/jdk/java/security/UnresolvedPermission/Equals.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission FooPermission;
-    permission FooPermission;
-};
diff --git a/test/jdk/java/security/cert/CertPathBuilder/GetInstance.java b/test/jdk/java/security/cert/CertPathBuilder/GetInstance.java
index e7104db0468..5ec4d6caa5a 100644
--- a/test/jdk/java/security/cert/CertPathBuilder/GetInstance.java
+++ b/test/jdk/java/security/cert/CertPathBuilder/GetInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 4408997
  * @summary Should be able to pass a Provider object to getInstance().
  * @compile StubProvider.java StubProviderImpl.java
- * @run main/othervm/policy=provider.policy GetInstance
+ * @run main GetInstance
  * The test passes if it returns.
  * The test fails if an exception is thrown.
  */
diff --git a/test/jdk/java/security/cert/CertPathBuilder/provider.policy b/test/jdk/java/security/cert/CertPathBuilder/provider.policy
deleted file mode 100644
index 54e1244471f..00000000000
--- a/test/jdk/java/security/cert/CertPathBuilder/provider.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- *
- * @bug  4408997
- * Used by GetInstance test.
- */
-grant {
-    permission java.security.SecurityPermission "putProviderProperty.StubProvider";
-};
diff --git a/test/jdk/java/security/cert/CertificateFactory/slowstream.sh b/test/jdk/java/security/cert/CertificateFactory/slowstream.sh
index 7f26b1b4e30..8c1cbfed125 100644
--- a/test/jdk/java/security/cert/CertificateFactory/slowstream.sh
+++ b/test/jdk/java/security/cert/CertificateFactory/slowstream.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -50,5 +50,5 @@ esac
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
         ${TESTSRC}${FS}SlowStream.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \
-        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} SlowStreamReader
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \
+        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} SlowStreamReader
diff --git a/test/jdk/java/sql/permissionTests/DriverManagerPermissionsTests.java b/test/jdk/java/sql/permissionTests/DriverManagerPermissionsTests.java
deleted file mode 100644
index 756af982ba7..00000000000
--- a/test/jdk/java/sql/permissionTests/DriverManagerPermissionsTests.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import util.BaseTest;
-import util.StubDriver;
-import util.TestPolicy;
-
-import java.security.AccessControlException;
-import java.security.Policy;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/*
- * @test
- * @library /java/sql/testng
- * @run testng/othervm -Djava.security.manager=allow DriverManagerPermissionsTests
- * @summary Tests that a JDBC Driver that is a module can be loaded
- * via the service-provider loading mechanism.
- */
-public class DriverManagerPermissionsTests extends BaseTest {
-
-    private  static Policy policy;
-    private static SecurityManager sm;
-
-    /*
-     * Install a SecurityManager along with a base Policy to allow testNG to run
-     */
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        setPolicy(new TestPolicy());
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    /*
-     * Install the original Policy and SecurityManager
-     */
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        System.setSecurityManager(sm);
-        setPolicy(policy);
-    }
-
-    /*
-     * Save off the original Policy and SecurityManager
-     */
-    public DriverManagerPermissionsTests() {
-        policy = Policy.getPolicy();
-        sm = System.getSecurityManager();
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if SQLPermission("setLog")
-     * has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test() {
-        setPolicy(new TestPolicy());
-        DriverManager.setLogStream(null);
-    }
-
-    /*
-     * Validate that setLogStream succeeds if SQLPermission("setLog") has been
-     * granted
-     */
-    @Test
-    public void test1() {
-        Policy.setPolicy(new TestPolicy("setLog"));
-        DriverManager.setLogStream(null);
-    }
-
-    /*
-     * Validate that setLogStream succeeds if AllPermissions has been granted
-     */
-    @Test
-    public void test2() {
-        setPolicy(new TestPolicy("all"));
-        DriverManager.setLogStream(null);
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if SQLPermission("setLog")
-     * has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test4() {
-        setPolicy(new TestPolicy());
-        DriverManager.setLogWriter(null);
-    }
-
-    /*
-     * Validate that setLogWriter succeeds if SQLPermission("setLog") has been
-     * granted
-     */
-    @Test
-    public void test5() {
-        setPolicy(new TestPolicy("setLog"));
-        DriverManager.setLogWriter(null);
-    }
-
-    /*
-     * Validate that setLogWriter succeeds if AllPermissions has been granted
-     */
-    @Test
-    public void test6() {
-        setPolicy(new TestPolicy("all"));
-        DriverManager.setLogWriter(null);
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if
-     * SQLPermission("deregisterDriver") has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test7() throws SQLException {
-        setPolicy(new TestPolicy());
-        DriverManager.deregisterDriver(new StubDriver());
-    }
-
-    /*
-     * Validate that deregisterDriver succeeds if
-     * SQLPermission("deregisterDriver") has been granted
-     */
-    @Test
-    public void test8() throws SQLException {
-        setPolicy(new TestPolicy("deregisterDriver"));
-        DriverManager.deregisterDriver(new StubDriver());
-    }
-
-    /*
-     * Validate that deregisterDriver succeeds if AllPermissions has been
-     * granted
-     */
-    @Test
-    public void test9() throws SQLException {
-        setPolicy(new TestPolicy("all"));
-        DriverManager.deregisterDriver(new StubDriver());
-    }
-}
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/Bug8178823.java b/test/jdk/java/time/nontestng/java/time/chrono/Bug8178823.java
deleted file mode 100644
index d8449315993..00000000000
--- a/test/jdk/java/time/nontestng/java/time/chrono/Bug8178823.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package nontestng.java.time.chrono;
-
-import java.time.chrono.HijrahChronology;
-
-/* @test
- * @bug 8178823
- * @build Bug8178823
- * @run main/othervm/policy=bug8178823.policy -Djava.security.manager nontestng.java.time.chrono.Bug8178823
- * @summary Test Hijrah calendar is initialized with the security manager.
- */
-public class Bug8178823 {
-    public static void main(String[] args) {
-        HijrahChronology.INSTANCE.isLeapYear(2017);
-    }
-}
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/bug8178823.policy b/test/jdk/java/time/nontestng/java/time/chrono/bug8178823.policy
deleted file mode 100644
index 48cec7fb71a..00000000000
--- a/test/jdk/java/time/nontestng/java/time/chrono/bug8178823.policy
+++ /dev/null
@@ -1 +0,0 @@
-// Empty policy file for Bug8178823
diff --git a/test/jdk/java/util/PluggableLocale/PermissionTest.java b/test/jdk/java/util/PluggableLocale/PermissionTest.java
deleted file mode 100644
index 8d600b40912..00000000000
--- a/test/jdk/java/util/PluggableLocale/PermissionTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8075545 8210406 8174269
- * @summary Check whether RuntimePermission("localeServiceProvider") is
- *          handled correctly.
- * @library providersrc/foobarutils
- *          providersrc/barprovider
- *          providersrc/fooprovider
- * @build com.foobar.Utils
- *        com.bar.*
- *        com.foo.*
- * @run main/othervm PermissionTest
- * @run main/othervm/fail/java.security.policy=dummy.policy
- *                        -Djava.security.manager
- *                        -Djava.locale.providers=CLDR,SPI
- *                        PermissionTest
- * @run main/othervm/java.security.policy=localeServiceProvider.policy
- *                   -Djava.security.manager
- *                   -Djava.locale.providers=CLDR,SPI
- *                   PermissionTest
- */
-
-import com.bar.CalendarDataProviderImpl;
-import com.bar.CalendarNameProviderImpl;
-import com.bar.CurrencyNameProviderImpl;
-import com.bar.CurrencyNameProviderImpl2;
-import com.bar.GenericTimeZoneNameProviderImpl;
-import com.bar.LocaleNameProviderImpl;
-import com.bar.TimeZoneNameProviderImpl;
-import com.foo.BreakIteratorProviderImpl;
-import com.foo.CollatorProviderImpl;
-import com.foo.DateFormatProviderImpl;
-import com.foo.DateFormatSymbolsProviderImpl;
-import com.foo.DecimalFormatSymbolsProviderImpl;
-import com.foo.NumberFormatProviderImpl;
-
-public class PermissionTest{
-
-    //  Make sure provider impls can be instantiated under a security manager.ZZ
-    BreakIteratorProviderImpl breakIP = new BreakIteratorProviderImpl();
-    CollatorProviderImpl collatorP = new CollatorProviderImpl();
-    DateFormatProviderImpl dateFP = new DateFormatProviderImpl();
-    DateFormatSymbolsProviderImpl dateFSP = new DateFormatSymbolsProviderImpl();
-    DecimalFormatSymbolsProviderImpl decimalFSP = new DecimalFormatSymbolsProviderImpl();
-    NumberFormatProviderImpl numberFP = new NumberFormatProviderImpl();
-    CurrencyNameProviderImpl currencyNP = new CurrencyNameProviderImpl();
-    CurrencyNameProviderImpl2 currencyNP2 = new CurrencyNameProviderImpl2();
-    LocaleNameProviderImpl localeNP = new LocaleNameProviderImpl();
-    TimeZoneNameProviderImpl tzNP = new TimeZoneNameProviderImpl();
-    GenericTimeZoneNameProviderImpl tzGenNP = new GenericTimeZoneNameProviderImpl();
-    CalendarDataProviderImpl calDataP = new CalendarDataProviderImpl();
-    CalendarNameProviderImpl calNameP = new CalendarNameProviderImpl();
-
-    public static void main(String[] s) {
-        new PermissionTest();
-    }
-}
diff --git a/test/jdk/java/util/PluggableLocale/dummy.policy b/test/jdk/java/util/PluggableLocale/dummy.policy
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/jdk/java/util/PluggableLocale/localeServiceProvider.policy b/test/jdk/java/util/PluggableLocale/localeServiceProvider.policy
deleted file mode 100644
index 4a5d969c0b0..00000000000
--- a/test/jdk/java/util/PluggableLocale/localeServiceProvider.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "localeServiceProvider";
-};
diff --git a/test/jdk/java/util/Properties/LoadAndStoreXML.java b/test/jdk/java/util/Properties/LoadAndStoreXML.java
index e374d01a210..6a0b1973198 100644
--- a/test/jdk/java/util/Properties/LoadAndStoreXML.java
+++ b/test/jdk/java/util/Properties/LoadAndStoreXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8000354 8000685 8004371 8043119 8276207
  * @summary Basic test of storeToXML and loadToXML
- * @run main/othervm -Djava.security.manager=allow LoadAndStoreXML
+ * @run main/othervm LoadAndStoreXML
  */
 
 import java.io.ByteArrayInputStream;
@@ -38,48 +38,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.InvalidPropertiesFormatException;
 import java.util.Properties;
-import java.util.PropertyPermission;
 
 public class LoadAndStoreXML {
     static final String bomChar = "\uFEFF";
 
-    /**
-     * Simple policy implementation that grants a set of permissions to
-     * all code sources and protection domains.
-     */
-    static class SimplePolicy extends Policy {
-        private final Permissions perms;
-
-        public SimplePolicy(Permission...permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions)
-                perms.add(permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p);
-        }
-    }
-
     /**
      * A {@code ByteArrayInputStream} that allows testing if the
      * {@code close} method has been invoked.
@@ -270,7 +234,6 @@ static void testLoadWithSupplementaryCharacters() throws IOException {
     }
 
     public static void main(String[] args) throws IOException {
-
         testLoadAndStore("UTF-8", false);
         testLoadAndStore("UTF-16", false);
         testLoadAndStore("UTF-16BE", false);
@@ -287,20 +250,5 @@ public static void main(String[] args) throws IOException {
         String subdir = "invalidxml";
         Path dir = (src == null) ? Paths.get(subdir) : Paths.get(src, subdir);
         testLoadWithMalformedDoc(dir);
-
-        // re-run sanity test with security manager
-        Policy orig = Policy.getPolicy();
-        Policy p = new SimplePolicy(new RuntimePermission("setSecurityManager"),
-                                    new PropertyPermission("line.separator", "read"));
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
-        try {
-            testLoadAndStore("UTF-8", false);
-        } finally {
-            // turn off security manager and restore policy
-            System.setSecurityManager(null);
-            Policy.setPolicy(orig);
-        }
-
     }
 }
diff --git a/test/jdk/java/util/Properties/StoreReproducibilityTest.java b/test/jdk/java/util/Properties/StoreReproducibilityTest.java
index 7072b24dc0c..94995a3073a 100644
--- a/test/jdk/java/util/Properties/StoreReproducibilityTest.java
+++ b/test/jdk/java/util/Properties/StoreReproducibilityTest.java
@@ -59,13 +59,8 @@ public class StoreReproducibilityTest {
             .withZone(ZoneOffset.UTC);
 
     public static void main(final String[] args) throws Exception {
-        // no security manager enabled
-        testWithoutSecurityManager();
-        // security manager enabled and security policy explicitly allows
-        // read permissions on java.properties.date system property
-        testWithSecMgrExplicitPermission();
-        // security manager enabled and no explicit permission on java.properties.date system property
-        testWithSecMgrNoSpecificPermission();
+        // test that store method uses the java.properties.date system property
+        testStoreUsesPropValue();
         // free form non-date value for java.properties.date system property
         testNonDateSysPropValue();
         // blank value for java.properties.date system property
@@ -87,9 +82,8 @@ public static void main(final String[] args) throws Exception {
      * and the output written by each run of this program is verified to be exactly the same.
      * Additionally, the date comment that's written out is verified to be the expected date that
      * corresponds to the passed {@code java.properties.date}.
-     * The launched Java program is run without any security manager
      */
-    private static void testWithoutSecurityManager() throws Exception {
+    private static void testStoreUsesPropValue() throws Exception {
         final List<Path> storedFiles = new ArrayList<>();
         final String sysPropVal = FORMATTER.format(Instant.ofEpochSecond(243535322));
         for (int i = 0; i < 5; i++) {
@@ -109,94 +103,6 @@ private static void testWithoutSecurityManager() throws Exception {
         assertAllFileContentsAreSame(storedFiles, sysPropVal);
     }
 
-    /**
-     * Launches a Java program which is responsible for using Properties.store() to write out the
-     * properties to a file. The launched Java program is passed a value for the
-     * {@code java.properties.date} system property and the date comment written out to the file
-     * is expected to use this value.
-     * The launched Java program is run with the default security manager and is granted
-     * a {@code read} permission on {@code java.properties.date}.
-     * The program is launched multiple times with the same value for {@code java.properties.date}
-     * and the output written by each run of this program is verified to be exactly the same.
-     * Additionally, the date comment that's written out is verified to be the expected date that
-     * corresponds to the passed {@code java.properties.date}.
-     */
-    private static void testWithSecMgrExplicitPermission() throws Exception {
-        final Path policyFile = Files.createTempFile("8231640", ".policy");
-        Files.write(policyFile, Collections.singleton("""
-                grant {
-                    // test writes/stores to a file, so FilePermission
-                    permission java.io.FilePermission "<<ALL FILES>>", "read,write";
-                    // explicitly grant read permission on java.properties.date system property
-                    // to verify store() APIs work fine
-                    permission java.util.PropertyPermission "java.properties.date", "read";
-                };
-                """));
-        final List<Path> storedFiles = new ArrayList<>();
-        final String sysPropVal = FORMATTER.format(Instant.ofEpochSecond(1234342423));
-        for (int i = 0; i < 5; i++) {
-            final Path tmpFile = Files.createTempFile("8231640", ".props");
-            storedFiles.add(tmpFile);
-            final ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(
-                    "-D" + SYS_PROP_JAVA_PROPERTIES_DATE + "=" + sysPropVal,
-                    "-Djava.security.manager",
-                    "-Djava.security.policy=" + policyFile,
-                    StoreTest.class.getName(),
-                    tmpFile.toString(),
-                    i % 2 == 0 ? "--use-outputstream" : "--use-writer");
-            executeJavaProcess(processBuilder);
-            assertExpectedComment(tmpFile, sysPropVal);
-            if (!StoreTest.propsToStore.equals(loadProperties(tmpFile))) {
-                throw new RuntimeException("Unexpected properties stored in " + tmpFile);
-            }
-        }
-        assertAllFileContentsAreSame(storedFiles, sysPropVal);
-    }
-
-    /**
-     * Launches a Java program which is responsible for using Properties.store() to write out the
-     * properties to a file. The launched Java program is passed a value for the
-     * {@code java.properties.date} system property and the date comment written out to the file
-     * is expected to use this value.
-     * The launched Java program is run with the default security manager and is NOT granted
-     * any explicit permission for {@code java.properties.date} system property.
-     * The program is launched multiple times with the same value for {@code java.properties.date}
-     * and the output written by each run of this program is verified to be exactly the same.
-     * Additionally, the date comment that's written out is verified to be the expected date that
-     * corresponds to the passed {@code java.properties.date}.
-     */
-    private static void testWithSecMgrNoSpecificPermission() throws Exception {
-        final Path policyFile = Files.createTempFile("8231640", ".policy");
-        Files.write(policyFile, Collections.singleton("""
-                grant {
-                    // test writes/stores to a file, so FilePermission
-                    permission java.io.FilePermission "<<ALL FILES>>", "read,write";
-                    // no other grants, not even "read" java.properties.date system property.
-                    // test should still work fine and the date comment should correspond to the value of
-                    // java.properties.date system property.
-                };
-                """));
-        final List<Path> storedFiles = new ArrayList<>();
-        final String sysPropVal = FORMATTER.format(Instant.ofEpochSecond(1234342423));
-        for (int i = 0; i < 5; i++) {
-            final Path tmpFile = Files.createTempFile("8231640", ".props");
-            storedFiles.add(tmpFile);
-            final ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(
-                    "-D" + SYS_PROP_JAVA_PROPERTIES_DATE + "=" + sysPropVal,
-                    "-Djava.security.manager",
-                    "-Djava.security.policy=" + policyFile,
-                    StoreTest.class.getName(),
-                    tmpFile.toString(),
-                    i % 2 == 0 ? "--use-outputstream" : "--use-writer");
-            executeJavaProcess(processBuilder);
-            assertExpectedComment(tmpFile, sysPropVal);
-            if (!StoreTest.propsToStore.equals(loadProperties(tmpFile))) {
-                throw new RuntimeException("Unexpected properties stored in " + tmpFile);
-            }
-        }
-        assertAllFileContentsAreSame(storedFiles, sysPropVal);
-    }
-
     /**
      * Launches a Java program which is responsible for using Properties.store() to write out the
      * properties to a file. The launched Java program is passed a {@link String#isBlank() blank} value
diff --git a/test/jdk/java/util/ResourceBundle/Bug6359330.java b/test/jdk/java/util/ResourceBundle/Bug6359330.java
deleted file mode 100644
index 0fedadfcf3b..00000000000
--- a/test/jdk/java/util/ResourceBundle/Bug6359330.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * @test
- * @bug 6359330
- * @summary Make sure that getBundle doesn't cause a security error
- * with a security manager when instantialing RBClassLoader (internal
- * classloader).
- * @modules java.xml
- * @run main/othervm -Djava.security.manager=allow Bug6359330
- */
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import org.xml.sax.SAXNotRecognizedException;
-
-public class Bug6359330 {
-
-    public static void main(String[] args) throws Throwable {
-        System.setSecurityManager(new SecurityManager());
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setValidating(true);
-            SAXParser sp = spf.newSAXParser();
-            // The following line shouldn't throw a
-            // java.security.AccessControlException.
-            sp.setProperty("foo", "bar");
-        } catch (SAXNotRecognizedException e) {
-            // Ignore this expected exception.
-        }
-    }
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/TestPermission.java b/test/jdk/java/util/ResourceBundle/modules/security/TestPermission.java
deleted file mode 100644
index 5a5755146bc..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/TestPermission.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-
-import jdk.test.lib.compiler.CompilerUtils;
-import static jdk.test.lib.process.ProcessTools.executeTestJava;
-
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
-/**
- * @test
- * @library /test/lib
- * @modules jdk.compiler
- * @build TestPermission jdk.test.lib.compiler.CompilerUtils
- * @run testng TestPermission
- * @summary Driver for testing ResourceBundle::getBundle(String, Module)
- */
-
-public class TestPermission {
-
-    private static final String TEST_SRC = System.getProperty("test.src");
-    private static final String TEST_CLASSES = System.getProperty("test.classes");
-
-    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
-    private static final Path MODS_DIR = Paths.get("mods");
-
-    // the names of the modules in this test
-    private static List<String> modules = Arrays.asList("test", "m1");
-
-    /**
-     * Compiles all modules used by the test
-     */
-    @BeforeTest
-    public void compileAll() throws Exception {
-        for (String mn : modules) {
-            Path msrc = SRC_DIR.resolve(mn);
-            assertTrue(CompilerUtils.compile(msrc, MODS_DIR, "--module-source-path", SRC_DIR.toString()));
-        }
-    }
-
-    /**
-     * Run the modular test
-     */
-    @Test
-    public void runTest() throws Exception {
-        int exitValue = executeTestJava("--module-path", MODS_DIR.toString(),
-                                        "--add-modules", "m1",
-                                        "-Djava.security.manager=allow",
-                                        "-m", "test/jdk.test.Main")
-                            .outputTo(System.out)
-                            .errorTo(System.out)
-                            .getExitValue();
-
-        assertTrue(exitValue == 0);
-    }
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/module-info.java b/test/jdk/java/util/ResourceBundle/modules/security/src/m1/module-info.java
deleted file mode 100644
index ab2881baa40..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/module-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-module m1 {
-    exports p1;
-    opens p1.resources to test;
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java b/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java
deleted file mode 100644
index ea71d8c674e..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/Bundle.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p1;
-
-import java.util.ResourceBundle;
-
-public class Bundle {
-    public static ResourceBundle getBundle(String basename) {
-        return ResourceBundle.getBundle(basename);
-    }
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java
deleted file mode 100644
index 88b9222f137..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/Main.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test;
-
-import p1.Bundle;
-import java.util.ResourceBundle;
-
-public class Main {
-    private static final String TEST_RESOURCE_BUNDLE_NAME
-            = "jdk.test.resources.TestResources";
-    private static final String M1_RESOURCE_BUNDLE_NAME
-            = "p1.resources.MyResources";
-
-    public static void main(String[] args) {
-        // local resource
-        ResourceBundle.getBundle(TEST_RESOURCE_BUNDLE_NAME, Main.class.getModule());
-
-        // resource in another module
-        Module m1 = p1.Bundle.class.getModule();
-
-        // bundles loaded with different cache key
-        ResourceBundle rb1 = Bundle.getBundle(M1_RESOURCE_BUNDLE_NAME);
-        ResourceBundle rb2 = ResourceBundle.getBundle(M1_RESOURCE_BUNDLE_NAME, m1);
-        if (rb1 == rb2) {
-            throw new RuntimeException("unexpected resource bundle");
-        }
-
-        System.setSecurityManager(new SecurityManager());
-
-        // no permission needed for local resource
-        ResourceBundle.getBundle(TEST_RESOURCE_BUNDLE_NAME, Main.class.getModule());
-
-        // resource bundle through m1's exported API
-        Bundle.getBundle(M1_RESOURCE_BUNDLE_NAME);
-
-        try {
-            // fail to get resource bundle in another module
-            ResourceBundle.getBundle(M1_RESOURCE_BUNDLE_NAME, m1);
-            throw new RuntimeException("should deny access");
-        } catch (SecurityException e) {}
-    }
-
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java
deleted file mode 100644
index a32e3491127..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/test/jdk/test/resources/TestResources.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.resources;
-
-import java.util.ListResourceBundle;
-
-public class TestResources extends ListResourceBundle {
-    @Override
-    public Object[][] getContents() {
-        return new Object[][] {
-            { "msg", "test" }
-        };
-    }
-}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/test/module-info.java b/test/jdk/java/util/ResourceBundle/modules/security/src/test/module-info.java
deleted file mode 100644
index fec5381628a..00000000000
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/test/module-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-module test {
-    requires m1;
-}
diff --git a/test/jdk/java/util/ServiceLoader/security/test/module-info.java b/test/jdk/java/util/ServiceLoader/security/test/module-info.java
deleted file mode 100644
index 5bf1a8289cb..00000000000
--- a/test/jdk/java/util/ServiceLoader/security/test/module-info.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import p.Tests.*;
-
-module test {
-    uses S1;
-    uses S2;
-    uses S3;
-    uses S4;
-    uses S5;
-    uses S6;
-    provides S1 with P1;
-    provides S2 with P2;
-    provides S3 with P3;
-    provides S4 with P4;
-    provides S5 with P5;
-    provides S6 with P6;
-    requires org.testng;
-    exports p to org.testng;
-}
diff --git a/test/jdk/java/util/ServiceLoader/security/test/p/Tests.java b/test/jdk/java/util/ServiceLoader/security/test/p/Tests.java
deleted file mode 100644
index 10737bb37c3..00000000000
--- a/test/jdk/java/util/ServiceLoader/security/test/p/Tests.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p;
-
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-import java.util.ServiceLoader.Provider;
-import static java.security.AccessController.doPrivileged;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeTest;
-import static org.testng.Assert.*;
-
-/**
- * Tests ServiceLoader when running with a security manager, specifically
- * tests to ensure that provider code is run with permissions restricted by
- * the creater of ServiceLoader, and also testing of exceptions thrown
- * when loading or initializing a provider.
- */
-
-public class Tests {
-
-    static final Permission PERM = new RuntimePermission("eatMuffin");
-
-    static <T> PrivilegedAction<ServiceLoader<T>> loadAction(Class<T> service) {
-        return () -> ServiceLoader.load(service);
-    }
-
-    static AccessControlContext withPermissions(Permission... perms) {
-        Permissions p = new Permissions();
-        for (Permission perm : perms) {
-            p.add(perm);
-        }
-        ProtectionDomain pd = new ProtectionDomain(null, p);
-        return new AccessControlContext(new ProtectionDomain[]{ pd });
-    }
-
-    static AccessControlContext noPermissions() {
-        return withPermissions(/*empty*/);
-    }
-
-    @BeforeTest
-    public void setSecurityManager() {
-        class Policy extends java.security.Policy {
-            private final Permissions perms;
-            public Policy(Permission... permissions) {
-                perms = new Permissions();
-                for (Permission permission : permissions) {
-                    perms.add(permission);
-                }
-            }
-            public PermissionCollection getPermissions(CodeSource cs) {
-                return perms;
-            }
-            public PermissionCollection getPermissions(ProtectionDomain pd) {
-                return perms;
-            }
-            public boolean implies(ProtectionDomain pd, Permission p) {
-                return perms.implies(p);
-            }
-            public void refresh() { }
-        }
-        Policy policy = new Policy(new AllPermission());
-        Policy.setPolicy(policy);
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    @Test
-    public void testConstructorUsingIteratorWithPermission() {
-        ServiceLoader<S1> sl = doPrivileged(loadAction(S1.class), withPermissions(PERM));
-        S1 obj = sl.iterator().next();
-    }
-
-    @Test
-    public void testConstructorUsingStreamWithPermission() {
-        ServiceLoader<S1> sl = doPrivileged(loadAction(S1.class), withPermissions(PERM));
-        assertTrue(sl.stream().map(Provider::get).count() == 1);
-    }
-
-    @Test
-    public void testConstructorUsingIteratorNoPermission() {
-        ServiceLoader<S1> sl = doPrivileged(loadAction(S1.class), noPermissions());
-        try {
-            sl.iterator().next();
-            assertTrue(false);
-        } catch (ServiceConfigurationError e) {
-            assertTrue(e.getCause() instanceof AccessControlException);
-        }
-    }
-
-    @Test
-    public void testConstructorUsingStreamNoPermission() {
-        ServiceLoader<S1> sl = doPrivileged(loadAction(S1.class), noPermissions());
-        try {
-            sl.stream().map(Provider::get).count();
-            assertTrue(false);
-        } catch (ServiceConfigurationError e) {
-            assertTrue(e.getCause() instanceof AccessControlException);
-        }
-    }
-
-    @Test
-    public void testFactoryMethodUsingIteratorWithPermission() {
-        ServiceLoader<S2> sl = doPrivileged(loadAction(S2.class), withPermissions(PERM));
-        S2 obj = sl.iterator().next();
-    }
-
-    @Test
-    public void testFactoryMethodUsingStreamWithPermission() {
-        ServiceLoader<S2> sl = doPrivileged(loadAction(S2.class), withPermissions(PERM));
-        assertTrue(sl.stream().map(Provider::get).count() == 1);
-    }
-
-    @Test
-    public void testFactoryMethodUsingIteratorNoPermission() {
-        ServiceLoader<S2> sl = doPrivileged(loadAction(S2.class), noPermissions());
-        try {
-            sl.iterator().next();
-            assertTrue(false);
-        } catch (ServiceConfigurationError e) {
-            assertTrue(e.getCause() instanceof AccessControlException);
-        }
-    }
-
-    @Test
-    public void testFactoryMethodUsingStreamNoPermission() {
-        ServiceLoader<S2> sl = doPrivileged(loadAction(S2.class), noPermissions());
-        try {
-            sl.stream().map(Provider::get).count();
-            assertTrue(false);
-        } catch (ServiceConfigurationError e) {
-            assertTrue(e.getCause() instanceof AccessControlException);
-        }
-    }
-
-    @DataProvider(name = "failingServices")
-    public Object[][] failingServices() {
-        return new Object[][] {
-            { S3.class,    P3.Error3.class },
-            { S4.class,    P4.Error4.class },
-            { S5.class,    P5.Error5.class },
-            { S6.class,    P6.Error6.class },
-        };
-    }
-
-    @Test(dataProvider = "failingServices")
-    public void testFailingService(Class<?> service, Class<? extends Error> errorClass) {
-        ServiceLoader<?> sl = ServiceLoader.load(service);
-        try {
-            sl.iterator().next();
-            assertTrue(false);
-        } catch (ServiceConfigurationError e) {
-            assertTrue(e.getCause().getClass() == errorClass);
-        }
-    }
-
-    // service types and implementations
-
-    public static interface S1 { }
-    public static interface S2 { }
-    public static interface S3 { }
-    public static interface S4 { }
-    public static interface S5 { }
-    public static interface S6 { }
-
-    public static class P1 implements S1 {
-        public P1() {
-            AccessController.getContext().checkPermission(PERM);
-        }
-    }
-    public static class P2 implements S2 {
-        private P2() {
-            AccessController.getContext().checkPermission(PERM);
-        }
-        public static S2 provider() {
-            return new P2();
-        }
-    }
-
-    public static class P3 implements S3 {
-        static class Error3 extends Error { }
-        static {
-            if (1==1) throw new Error3();  // fail
-        }
-        public P3() { }
-    }
-
-    public static class P4 implements S4 {
-        static class Error4 extends Error { }
-        static {
-            if (1==1) throw new Error4();  // fail
-        }
-        public static S4 provider() {
-            return new P4();
-        }
-    }
-
-    public static class P5 implements S5 {
-        static class Error5 extends Error { }
-        public P5() {
-            throw new Error5();  // fail
-        }
-    }
-
-    public static class P6 implements S6 {
-        static class Error6 extends Error { }
-        public static S6 provider() {
-            throw new Error6();   // fail
-        }
-    }
-}
diff --git a/test/jdk/java/util/TimeZone/Bug6912560.java b/test/jdk/java/util/TimeZone/Bug6912560.java
deleted file mode 100644
index 524d754fd7d..00000000000
--- a/test/jdk/java/util/TimeZone/Bug6912560.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6912560
- * @run main/othervm -Djava.security.manager=allow Bug6912560
- * @summary Make sure that file path canonicalization in
- * sun.util.calendar.ZoneInfoFile works with the default security
- * manager.
- */
-
-import java.io.File;
-import java.util.*;
-
-public class Bug6912560 {
-    public static void main(String[] args) {
-        // set the user.timezone property
-        String tzname = "Asia/Tokyo";
-        System.setProperty("user.timezone", tzname);
-        // make sure the timezone will be initialized by
-        // the next call to TimeZone.getDefault()
-        TimeZone.setDefault(null);
-
-        System.setSecurityManager(new SecurityManager());
-        TimeZone tz = TimeZone.getDefault();
-        if (!tzname.equals(tz.getID())) {
-            throw new RuntimeException("got " + tz.getID()
-                                       + ", expected " + tzname);
-        }
-    }
-}
diff --git a/test/jdk/java/util/TimeZone/SetDefaultSecurityTest.java b/test/jdk/java/util/TimeZone/SetDefaultSecurityTest.java
deleted file mode 100644
index 8bf97f129c7..00000000000
--- a/test/jdk/java/util/TimeZone/SetDefaultSecurityTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8001029
- * @summary Make sure that TimeZone.setDefault throws a SecurityException if the
- *          security manager doesn't permit.
- * @run main/othervm -Djava.security.manager=allow SetDefaultSecurityTest
- */
-
-import java.util.SimpleTimeZone;
-import java.util.TimeZone;
-
-public class SetDefaultSecurityTest {
-    static final TimeZone NOWHERE = new SimpleTimeZone(Integer.MAX_VALUE, "Nowhere");
-
-    public static void main(String[] args)   {
-        TimeZone defaultZone = TimeZone.getDefault();
-
-        // Make sure that TimeZone.setDefault works for trusted code
-        TimeZone.setDefault(NOWHERE);
-        if (!NOWHERE.equals(TimeZone.getDefault())) {
-            new RuntimeException("TimeZone.setDefault doesn't work for trusted code.");
-        }
-        // Restore defaultZone
-        TimeZone.setDefault(defaultZone);
-        if (!defaultZone.equals(TimeZone.getDefault())) {
-            new RuntimeException("TimeZone.setDefault doesn't restore defaultZone.");
-        }
-
-        // Install a SecurityManager.
-        System.setSecurityManager(new SecurityManager());
-        try {
-            TimeZone.setDefault(NOWHERE);
-            throw new RuntimeException("TimeZone.setDefault doesn't throw a SecurityException.");
-        } catch (SecurityException se) {
-            // OK
-        }
-        TimeZone tz = TimeZone.getDefault();
-        if (!defaultZone.equals(tz)) {
-            throw new RuntimeException("Default TimeZone changed: " + tz);
-        }
-    }
-}
diff --git a/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.java b/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.java
deleted file mode 100644
index 52a1bf005f7..00000000000
--- a/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Testcase for PR381 Stackoverflow error with security manager, signed jars
- * and -Djava.security.debug set.
- * Copyright (c) 2009, Red Hat Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.Date;
-
-/**
- * Test class. Create a test keystore and dummy cert, create a jar file to
- * sign with the test class in it. Sign it run it with the security manager
- * on, plus accesscontroller debugging, will go into infinite recursion
- * trying to get enough permissions for printing Date of failing
- * certificate, unless fix is applied.
- */
-public class TimeZoneDatePermissionCheck
-{
-  public static void main(String[] args)
-  {
-    System.out.println(new Date());
-  }
-}
diff --git a/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheckRun.java b/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheckRun.java
deleted file mode 100644
index f5d80cd6069..00000000000
--- a/test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheckRun.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6584033
- * @summary Stackoverflow error with security manager, signed jars and debug.
- * @library /test/lib
- * @build TimeZoneDatePermissionCheck
- * @run main TimeZoneDatePermissionCheckRun
- */
-
-import java.io.File;
-import java.util.List;
-
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.ProcessTools;
-
-public class TimeZoneDatePermissionCheckRun {
-    private static String storePath = Utils.TEST_CLASSES + File.separator
-            + "timezonedatetest.store";
-    private static String jarPath = Utils.TEST_CLASSES + File.separator
-            + "timezonedatetest.jar";
-
-    public static void main(String[] args) throws Throwable {
-        try {
-            //create a test keystore and dummy cert. Note that we use the COMPILEJAVA
-            //as this test is a TimeZone test, it doesn't test keytool
-            runJavaCmd("keytool",
-                    List.of("-genkeypair", "-alias", "testcert", "-keystore",
-                            storePath, "-storepass", "testpass", "-validity",
-                            "360", "-keyalg", "rsa", "-dname",
-                            "cn=Mark Wildebeest, ou=FreeSoft, o=Red Hat, c=NL",
-                            "-keypass", "testpass"));
-
-            //create a jar file to sign with the test class in it.
-            runJavaCmd("jar", List.of("cf", jarPath, "-C", Utils.TEST_CLASSES,
-                    "TimeZoneDatePermissionCheck.class"));
-
-            //sign it
-            runJavaCmd("jarsigner",
-                    List.of("-keystore", storePath, "-storepass", "testpass",
-                            jarPath, "testcert"));
-
-            //run it with the security manager on, plus accesscontroller debugging
-            //will go into infinite recursion trying to get enough permissions for
-            //printing Date of failing certificate unless fix is applied.
-            // Build process (with VM flags)
-            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
-                    "-Djava.security.manager",
-                    "-Djava.security.debug=access,failure,policy",
-                    "-ea", "-esa",
-                    "-cp", jarPath,
-                    "TimeZoneDatePermissionCheck");
-            // Evaluate process status
-            int exitCode = ProcessTools.executeCommand(pb).getExitValue();
-            if (exitCode != 0) {
-                throw new RuntimeException("Unexpected exit code: " + exitCode);
-            }
-        } finally {
-            //clean up the test files
-            File storeFile = new File(storePath);
-            if (storeFile.exists()) {
-                storeFile.delete();
-            }
-            File jarFile = new File(jarPath);
-            if (jarFile.exists()) {
-                jarFile.delete();
-            }
-        }
-    }
-
-    private static void runJavaCmd(String cmd, List<String> javaParam)
-            throws Throwable{
-        JDKToolLauncher launcher = JDKToolLauncher.create(cmd);
-        for (String para: javaParam) {
-            launcher.addToolArg(para);
-        }
-
-        System.out.println(launcher.getCommand());
-        int exitCode = ProcessTools.executeCommand(launcher.getCommand())
-                .getExitValue();
-        if (exitCode != 0) {
-            throw new RuntimeException("Unexpected exit code: " + exitCode);
-        }
-    }
-}
diff --git a/test/jdk/java/util/concurrent/BlockingQueue/LastElement.java b/test/jdk/java/util/concurrent/BlockingQueue/LastElement.java
index 804cd0862ec..7553d9538b7 100644
--- a/test/jdk/java/util/concurrent/BlockingQueue/LastElement.java
+++ b/test/jdk/java/util/concurrent/BlockingQueue/LastElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ boolean noRetention(BlockingQueue<?> q) {
                 unexpected(e);
             }
             catch (IllegalAccessException e) {
-                // ignore - security manager must be installed
+                // ignore
             }
         }
         return true;
diff --git a/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java b/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
index fe4c980f673..6225b9cb3a9 100644
--- a/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
+++ b/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6552961 6558429
  * @summary Test privilegedCallable, privilegedCallableUsingCurrentClassLoader
- * @run main/othervm -Djava.security.manager=allow PrivilegedCallables
+ * @run main PrivilegedCallables
  * @author Martin Buchholz
  */
 
@@ -33,12 +33,6 @@
 import static java.util.concurrent.Executors.privilegedCallableUsingCurrentClassLoader;
 import static java.util.concurrent.Executors.privilegedThreadFactory;
 
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.ProtectionDomain;
 import java.util.Random;
 import java.util.concurrent.Callable;
 
@@ -66,59 +60,7 @@ void throwThrowable(Throwable t) throws Exception {
         throw (Exception) t;
     }
 
-    //----------------------------------------------------------------
-    // A Policy class designed to make permissions fiddling very easy.
-    //----------------------------------------------------------------
-    static class Policy extends java.security.Policy {
-        static final java.security.Policy DEFAULT_POLICY = java.security.Policy.getPolicy();
-
-        private Permissions perms;
-
-        public void setPermissions(Permission...permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions)
-                perms.add(permission);
-        }
-
-        public Policy() { setPermissions(/* Nothing */); }
-
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p) || DEFAULT_POLICY.implies(pd, p);
-        }
-
-        public void refresh() {}
-    }
-
     void test(String[] args) {
-        testPrivileged();
-
-        final Policy policy = new Policy();
-        Policy.setPolicy(policy);
-        policy.setPermissions(new RuntimePermission("getClassLoader"),
-                              new RuntimePermission("setContextClassLoader"));
-        System.setSecurityManager(new SecurityManager());
-
-        testPrivileged();
-
-        policy.setPermissions(/* Nothing */);
-
-        THROWS(AccessControlException.class,
-               new F() {void f(){ privilegedCallableUsingCurrentClassLoader(realCaller); }},
-               new F() {void f(){ privilegedThreadFactory(); }});
-
-        policy.setPermissions(new RuntimePermission("setSecurityManager"));
-        System.setSecurityManager(null);
-    }
-
-    void testPrivileged() {
         try { test(privilegedCallable(realCaller)); }
         catch (Throwable t) { unexpected(t); }
 
diff --git a/test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
index 73338770f28..7f720f14a68 100644
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Test proper handling of pool state changes
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
- * @run main/othervm -Djava.security.manager=allow ConfigChanges
+ * @run main ConfigChanges
  * @key randomness
  * @author Martin Buchholz
  */
@@ -36,7 +36,6 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
-import java.security.Permission;
 import java.util.Random;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CyclicBarrier;
@@ -71,10 +70,6 @@ static void report(String label, ThreadPoolExecutor tpe) {
         report(tpe);
     }
 
-    static class PermissiveSecurityManger extends SecurityManager {
-        public void checkPermission(Permission p) { /* bien sur, Monsieur */ }
-    }
-
     static void checkShutdown(final ExecutorService es) {
         final Runnable nop = new Runnable() {public void run() {}};
         try {
@@ -142,9 +137,6 @@ static void spinAwait(Supplier<Boolean> waitingForGodot) {
     }
 
     private static void realMain(String[] args) throws Throwable {
-        if (rnd.nextBoolean())
-            System.setSecurityManager(new PermissiveSecurityManger());
-
         final boolean prestart = rnd.nextBoolean();
 
         final Thread.UncaughtExceptionHandler handler
diff --git a/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java
index db2781f94eb..c378e6cf210 100644
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,9 @@
  * @bug 6450200 6450205 6450207 6450211
  * @summary Test proper handling of tasks that terminate abruptly
  * @author Martin Buchholz
- * @run main/othervm -Djava.security.manager=allow ThrowingTasks
+ * @run main ThrowingTasks
  */
 
-import java.security.Permission;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -124,10 +123,6 @@ static class Flaky implements Runnable {
     static final CountDownLatch allStarted = new CountDownLatch(flakes.size());
     static final CountDownLatch allContinue = new CountDownLatch(1);
 
-    static class PermissiveSecurityManger extends SecurityManager {
-        public void checkPermission(Permission p) { /* bien sur, Monsieur */ }
-    }
-
     static void checkTerminated(ThreadPoolExecutor tpe) {
         try {
             check(tpe.getQueue().isEmpty());
@@ -219,9 +214,6 @@ static class CheckingExecutor extends ThreadPoolExecutor {
     static final AtomicInteger terminatedCount    = new AtomicInteger(0);
 
     private static void realMain(String[] args) throws Throwable {
-        if (rnd.nextBoolean())
-            System.setSecurityManager(new PermissiveSecurityManger());
-
         CheckingExecutor tpe = new CheckingExecutor();
 
         for (Runnable task : flakes)
diff --git a/test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java b/test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java
index c02f2cdcaab..0c4b73ff79c 100644
--- a/test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java
+++ b/test/jdk/java/util/concurrent/atomic/AtomicUpdaters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,19 +26,11 @@
  * @bug 7103570 8189291
  * @author David Holmes
  * @run main/othervm AtomicUpdaters
- * @run main/othervm -Djava.security.manager=allow AtomicUpdaters UseSM
  * @summary Checks the (in)ability to create field updaters for differently
- *          accessible fields in different locations with/without a security
- *          manager
+ *          accessible fields in different locations
  */
 
 import java.lang.reflect.Field;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLong;
@@ -47,25 +39,21 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class  AtomicUpdaters {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
     enum TYPE { INT, LONG, REF }
 
     static class Config {
         final Class<?> clazz;
         final String field;
         final String access;
-        final boolean reflectOk;
         final boolean updaterOk;
         final String desc;
         final TYPE type;
 
         Config(Class<?> clazz, String field, String access,
-               boolean reflectOk, boolean updaterOk, String desc, TYPE type) {
+               boolean updaterOk, String desc, TYPE type) {
             this.clazz = clazz;
             this.field = field;
             this.access = access;
-            this.reflectOk = reflectOk;
             this.updaterOk = updaterOk;
             this.desc = desc;
             this.type =type;
@@ -78,20 +66,20 @@ public String toString() {
 
     static Config[] tests;
 
-    static void initTests(boolean hasSM) {
+    static void initTests() {
         tests = new Config[] {
-            new Config(AtomicUpdaters.class, "pub_int", "public", true, true, "public int field of current class", TYPE.INT),
-            new Config(AtomicUpdaters.class, "priv_int", "private", true, true, "private int field of current class", TYPE.INT),
-            new Config(AtomicUpdaters.class, "pub_long", "public", true, true, "public long field of current class", TYPE.LONG),
-            new Config(AtomicUpdaters.class, "priv_long", "private", true, true, "private long field of current class", TYPE.LONG),
-            new Config(AtomicUpdaters.class, "pub_ref", "public", true, true, "public ref field of current class", TYPE.REF),
-            new Config(AtomicUpdaters.class, "priv_ref", "private", true, true, "private ref field of current class", TYPE.REF),
+            new Config(AtomicUpdaters.class, "pub_int", "public", true, "public int field of current class", TYPE.INT),
+            new Config(AtomicUpdaters.class, "priv_int", "private", true, "private int field of current class", TYPE.INT),
+            new Config(AtomicUpdaters.class, "pub_long", "public", true, "public long field of current class", TYPE.LONG),
+            new Config(AtomicUpdaters.class, "priv_long", "private", true, "private long field of current class", TYPE.LONG),
+            new Config(AtomicUpdaters.class, "pub_ref", "public", true, "public ref field of current class", TYPE.REF),
+            new Config(AtomicUpdaters.class, "priv_ref", "private", true, "private ref field of current class", TYPE.REF),
 
             // Would like to test a public volatile in a class in another
             // package - but of course there aren't any
-            new Config(AtomicInteger.class, "value", "private", !hasSM, false, "private int field of class in different package", TYPE.INT),
-            new Config(AtomicLong.class, "value", "private", !hasSM, false, "private long field of class in different package", TYPE.LONG),
-            new Config(AtomicReference.class, "value", "private", !hasSM, false, "private reference field of class in different package", TYPE.REF),
+            new Config(AtomicInteger.class, "value", "private", false, "private int field of class in different package", TYPE.INT),
+            new Config(AtomicLong.class, "value", "private", false, "private long field of class in different package", TYPE.LONG),
+            new Config(AtomicReference.class, "value", "private", false, "private reference field of class in different package", TYPE.REF),
         };
     }
 
@@ -103,59 +91,31 @@ static void initTests(boolean hasSM) {
     private volatile Object priv_ref;
 
 
-    // This should be set dynamically at runtime using a System property, but
-    // ironically we get a SecurityException if we try to do that with a
-    // SecurityManager installed
+    // run with -v
     static boolean verbose;
 
     public static void main(String[] args) throws Throwable {
-        boolean hasSM = false;
         for (String arg : args) {
             if ("-v".equals(arg)) {
                 verbose = true;
             }
-            else if ("UseSM".equals(arg)) {
-                // Ensure that the test is not influenced by the default users policy.
-                Policy.setPolicy(new NoPermissionsPolicy());
-                SecurityManager m = System.getSecurityManager();
-                if (m != null)
-                    throw new RuntimeException("No security manager should initially be installed");
-                System.setSecurityManager(new java.lang.SecurityManager());
-                hasSM = true;
-            }
             else {
                 throw new IllegalArgumentException("Unexpected option: " + arg);
             }
         }
-        initTests(hasSM);
+        initTests();
 
         int failures = 0;
 
-        System.out.printf("Testing with%s a SecurityManager present\n", hasSM ? "" : "out");
+
         for (Config c : tests) {
             System.out.println("Testing: " + c);
-            Error reflectionFailure = null;
             Error updaterFailure = null;
             Class<?> clazz = c.clazz;
             // See if we can reflectively access the field
             System.out.println(" - testing getDeclaredField");
-            try {
-                Field f = clazz.getDeclaredField(c.field);
-                if (!c.reflectOk)
-                    reflectionFailure = new Error("Unexpected reflective access: " + c);
-            }
-            catch (AccessControlException e) {
-                if (c.reflectOk)
-                    reflectionFailure = new Error("Unexpected reflective access failure: " + c, e);
-                else if (verbose) {
-                    System.out.println("Got expected reflection exception: " + e);
-                    e.printStackTrace(System.out);
-                }
-            }
 
-            if (reflectionFailure != null) {
-                reflectionFailure.printStackTrace(System.out);
-            }
+            Field f = clazz.getDeclaredField(c.field);
 
             // see if we can create an atomic updater for the field
             Object u = null;
@@ -189,11 +149,7 @@ else if (verbose) {
 
             if (updaterFailure != null) {
                 updaterFailure.printStackTrace(System.out);
-            }
-
-            if (updaterFailure != null || reflectionFailure != null) {
                 failures++;
-
             }
         }
 
@@ -201,25 +157,4 @@ else if (verbose) {
             throw new Error("Some tests failed - see previous stacktraces");
         }
     }
-
-    /**
-     * Policy with no permissions.
-     */
-    private static class NoPermissionsPolicy extends Policy {
-        @Override
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return Policy.UNSUPPORTED_EMPTY_COLLECTION;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return Policy.UNSUPPORTED_EMPTY_COLLECTION;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return Policy.UNSUPPORTED_EMPTY_COLLECTION.implies(p) ||
-                    DEFAULT_POLICY.implies(pd, p);
-        }
-    }
 }
diff --git a/test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java b/test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java
index a2068f39bbf..9899b735ad4 100644
--- a/test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java
+++ b/test/jdk/java/util/concurrent/tck/AbstractExecutorServiceTest.java
@@ -146,10 +146,7 @@ public Object run() {
                 assertSame(TEST_STRING, future.get());
             }};
 
-        runWithPermissions(r,
-                           new RuntimePermission("getClassLoader"),
-                           new RuntimePermission("setContextClassLoader"),
-                           new RuntimePermission("modifyThread"));
+        r.run();
     }
 
     /**
@@ -167,7 +164,7 @@ public Object run() {
                 assertSame(TEST_STRING, future.get());
             }};
 
-        runWithPermissions(r);
+        r.run();
     }
 
     /**
@@ -189,7 +186,7 @@ public Object run() throws Exception {
                     assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
                 }}};
 
-        runWithPermissions(r);
+        r.run();
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
index fa6c4f3c885..60da228d175 100644
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
@@ -4083,15 +4083,6 @@ public void testDelayedExecutor(Executor executor, Item v) throws Exception {
     //--- tests of implementation details; not part of official tck ---
 
     Object resultOf(CompletableFuture<?> f) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                System.setSecurityManager(null);
-            } catch (SecurityException giveUp) {
-                return "Reflection not available";
-            }
-        }
-
         try {
             java.lang.reflect.Field resultField
                 = CompletableFuture.class.getDeclaredField("result");
@@ -4099,8 +4090,6 @@ Object resultOf(CompletableFuture<?> f) {
             return resultField.get(f);
         } catch (Throwable t) {
             throw new AssertionError(t);
-        } finally {
-            if (sm != null) System.setSecurityManager(sm);
         }
     }
 
diff --git a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
index 89cd430c6c5..b4b4324ae5c 100644
--- a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
+++ b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
@@ -35,9 +35,6 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
-import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
@@ -342,9 +339,7 @@ public void realRun() {
                     Thread current = Thread.currentThread();
                     assertFalse(current.isDaemon());
                     assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
-                    SecurityManager s = System.getSecurityManager();
-                    assertSame(current.getThreadGroup(),
-                               (s == null) ? egroup : s.getThreadGroup());
+                    assertSame(current.getThreadGroup(), egroup);
                     assertTrue(current.getName().endsWith("thread-1"));
                 } catch (SecurityException ok) {
                     // Also pass if not allowed to change setting
@@ -361,7 +356,7 @@ public void realRun() {
     /**
      * ThreadPoolExecutor using privilegedThreadFactory has
      * specified group, priority, daemon status, name,
-     * access control context and context class loader
+     * and context class loader
      */
     @SuppressWarnings("removal")
     public void testPrivilegedThreadFactory() throws Exception {
@@ -370,18 +365,14 @@ public void testPrivilegedThreadFactory() throws Exception {
             public void realRun() throws Exception {
                 final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
                 final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
-                final AccessControlContext thisacc = AccessController.getContext();
                 Runnable r = new CheckedRunnable() {
                     public void realRun() {
                         Thread current = Thread.currentThread();
                         assertFalse(current.isDaemon());
                         assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
-                        SecurityManager s = System.getSecurityManager();
-                        assertSame(current.getThreadGroup(),
-                                   (s == null) ? egroup : s.getThreadGroup());
+                        assertSame(current.getThreadGroup(), egroup);
                         assertTrue(current.getName().endsWith("thread-1"));
                         assertSame(thisccl, current.getContextClassLoader());
-                        assertEquals(thisacc, AccessController.getContext());
                         done.countDown();
                     }};
                 ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
@@ -391,165 +382,7 @@ public void realRun() {
                 }
             }};
 
-        runWithPermissions(r,
-                           new RuntimePermission("getClassLoader"),
-                           new RuntimePermission("setContextClassLoader"),
-                           new RuntimePermission("modifyThread"));
-    }
-
-    @SuppressWarnings("removal")
-    boolean haveCCLPermissions() {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-                sm.checkPermission(new RuntimePermission("getClassLoader"));
-            } catch (AccessControlException e) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @SuppressWarnings("removal")
-    void checkCCL() {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-            sm.checkPermission(new RuntimePermission("getClassLoader"));
-        }
-    }
-
-    class CheckCCL implements Callable<Object> {
-        public Object call() {
-            checkCCL();
-            return null;
-        }
-    }
-
-    /**
-     * Without class loader permissions, creating
-     * privilegedCallableUsingCurrentClassLoader throws ACE
-     */
-    @SuppressWarnings("removal")
-    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
-        Runnable r = new CheckedRunnable() {
-            public void realRun() throws Exception {
-                if (System.getSecurityManager() == null)
-                    return;
-                try {
-                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
-                    shouldThrow();
-                } catch (AccessControlException success) {}
-            }};
-
-        runWithoutPermissions(r);
-    }
-
-    /**
-     * With class loader permissions, calling
-     * privilegedCallableUsingCurrentClassLoader does not throw ACE
-     */
-    @SuppressWarnings("removal")
-    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
-        Runnable r = new CheckedRunnable() {
-            public void realRun() throws Exception {
-                Executors.privilegedCallableUsingCurrentClassLoader
-                    (new NoOpCallable())
-                    .call();
-            }};
-
-        runWithPermissions(r,
-                           new RuntimePermission("getClassLoader"),
-                           new RuntimePermission("setContextClassLoader"));
-    }
-
-    /**
-     * Without permissions, calling privilegedCallable throws ACE
-     */
-    @SuppressWarnings("removal")
-    public void testPrivilegedCallableWithNoPrivs() throws Exception {
-        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
-        Executors.privilegedCallable(new CheckCCL());
-
-        Runnable r = new CheckedRunnable() {
-            public void realRun() throws Exception {
-                if (System.getSecurityManager() == null)
-                    return;
-                Callable<?> task = Executors.privilegedCallable(new CheckCCL());
-                try {
-                    task.call();
-                    shouldThrow();
-                } catch (AccessControlException success) {}
-            }};
-
-        runWithoutPermissions(r);
-
-        // It seems rather difficult to test that the
-        // AccessControlContext of the privilegedCallable is used
-        // instead of its caller.  Below is a failed attempt to do
-        // that, which does not work because the AccessController
-        // cannot capture the internal state of the current Policy.
-        // It would be much more work to differentiate based on,
-        // e.g. CodeSource.
-
-//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
-//         final Callable[] task = new Callable[1];
-
-//         runWithPermissions
-//             (new CheckedRunnable() {
-//                 public void realRun() {
-//                     if (System.getSecurityManager() == null)
-//                         return;
-//                     noprivAcc[0] = AccessController.getContext();
-//                     task[0] = Executors.privilegedCallable(new CheckCCL());
-//                     try {
-//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
-//                                                           public Void run() {
-//                                                               checkCCL();
-//                                                               return null;
-//                                                           }}, noprivAcc[0]);
-//                         shouldThrow();
-//                     } catch (AccessControlException success) {}
-//                 }});
-
-//         runWithPermissions
-//             (new CheckedRunnable() {
-//                 public void realRun() throws Exception {
-//                     if (System.getSecurityManager() == null)
-//                         return;
-//                     // Verify that we have an underprivileged ACC
-//                     try {
-//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
-//                                                           public Void run() {
-//                                                               checkCCL();
-//                                                               return null;
-//                                                           }}, noprivAcc[0]);
-//                         shouldThrow();
-//                     } catch (AccessControlException success) {}
-
-//                     try {
-//                         task[0].call();
-//                         shouldThrow();
-//                     } catch (AccessControlException success) {}
-//                 }},
-//              new RuntimePermission("getClassLoader"),
-//              new RuntimePermission("setContextClassLoader"));
-    }
-
-    /**
-     * With permissions, calling privilegedCallable succeeds
-     */
-    @SuppressWarnings("removal")
-    public void testPrivilegedCallableWithPrivs() throws Exception {
-        Runnable r = new CheckedRunnable() {
-            public void realRun() throws Exception {
-                Executors.privilegedCallable(new CheckCCL()).call();
-            }};
-
-        runWithPermissions(r,
-                           new RuntimePermission("getClassLoader"),
-                           new RuntimePermission("setContextClassLoader"));
+        r.run();
     }
 
     /**
@@ -652,6 +485,16 @@ public void testCallable_toString() {
         }
     }
 
+    /**
+     * privilegedCallable
+     */
+    @SuppressWarnings("removal")
+    public void testPrivilegedCallable() throws Exception {
+        Callable<String> c = () -> "";
+        Callable<String> priv = Executors.privilegedCallable(c);
+        assertEquals("", priv.call());
+    }
+
     /**
      * privilegedCallable(callable).toString() contains toString of wrapped task
      */
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java
index a87aa7b916b..a7c6ac90b19 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java
@@ -67,7 +67,6 @@ public void testCommonPoolThreadContextClassLoader() throws Throwable {
             MethodHandles.privateLookupIn(Thread.class, MethodHandles.lookup())
             .findVarHandle(Thread.class, "contextClassLoader", ClassLoader.class);
         ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
-        boolean haveSecurityManager = (System.getSecurityManager() != null);
         CountDownLatch runInCommonPoolStarted = new CountDownLatch(1);
         ClassLoader classLoaderDistinctFromSystemClassLoader
             = ClassLoader.getPlatformClassLoader();
@@ -92,22 +91,9 @@ public void testCommonPoolThreadContextClassLoader() throws Throwable {
                       (ClassLoader) CCL.get(currentThread))
             .forEach(cl -> assertTrue(cl == systemClassLoader || cl == null));
 
-            if (haveSecurityManager)
-                assertThrows(
-                    SecurityException.class,
-                    () -> System.getProperty("foo"),
-                    () -> currentThread.setContextClassLoader(
-                        classLoaderDistinctFromSystemClassLoader));
-            else {
-                currentThread.setContextClassLoader(classLoaderDistinctFromSystemClassLoader);
-                assertSame(currentThread.getContextClassLoader(), classLoaderDistinctFromSystemClassLoader);
-                currentThread.setContextClassLoader(preexistingContextClassLoader);
-            }
-            // TODO ?
-//          if (haveSecurityManager
-//              && Thread.currentThread().getClass().getSimpleName()
-//                 .equals("InnocuousForkJoinWorkerThread"))
-//              assertThrows(SecurityException.class, /* ?? */);
+            currentThread.setContextClassLoader(classLoaderDistinctFromSystemClassLoader);
+            assertSame(currentThread.getContextClassLoader(), classLoaderDistinctFromSystemClassLoader);
+            currentThread.setContextClassLoader(preexistingContextClassLoader);
         };
         Future<?> f = ForkJoinPool.commonPool().submit(runInCommonPool);
         // Ensure runInCommonPool is truly running in the common pool,
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
index 7db3e20a2fb..9422128511e 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
@@ -510,7 +510,7 @@ public void realRun() throws Exception {
             }
         }};
 
-        runWithPermissions(r, new RuntimePermission("modifyThread"));
+        r.run();
     }
 
     /**
@@ -529,7 +529,7 @@ public void realRun() throws Exception {
             }
         }};
 
-        runWithPermissions(r, new RuntimePermission("modifyThread"));
+        r.run();
     }
 
     /**
@@ -553,7 +553,7 @@ public void realRun() throws Exception {
             }
         }};
 
-        runWithPermissions(r, new RuntimePermission("modifyThread"));
+        r.run();
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/FutureTaskTest.java b/test/jdk/java/util/concurrent/tck/FutureTaskTest.java
index 1d15380ecf9..dfeea76d612 100644
--- a/test/jdk/java/util/concurrent/tck/FutureTaskTest.java
+++ b/test/jdk/java/util/concurrent/tck/FutureTaskTest.java
@@ -463,52 +463,6 @@ public void realRun() {
         checkCancelled(task);
     }
 
-    /**
-     * cancel(true) tries to interrupt a running task, but
-     * Thread.interrupt throws (simulating a restrictive security
-     * manager)
-     */
-    public void testCancelInterrupt_ThrowsSecurityException() {
-        final CountDownLatch pleaseCancel = new CountDownLatch(1);
-        final CountDownLatch cancelled = new CountDownLatch(1);
-        final PublicFutureTask task =
-            new PublicFutureTask(new CheckedRunnable() {
-                public void realRun() {
-                    pleaseCancel.countDown();
-                    await(cancelled);
-                    assertFalse(Thread.interrupted());
-                }});
-
-        final Thread t = new Thread(task) {
-            // Simulate a restrictive security manager.
-            @Override public void interrupt() {
-                throw new SecurityException();
-            }};
-        t.setDaemon(true);
-        t.start();
-
-        await(pleaseCancel);
-        try {
-            task.cancel(true);
-            shouldThrow();
-        } catch (SecurityException success) {}
-
-        // We failed to deliver the interrupt, but the world retains
-        // its sanity, as if we had done task.cancel(false)
-        assertTrue(task.isCancelled());
-        assertTrue(task.isDone());
-        assertEquals(1, task.runCount());
-        assertEquals(1, task.doneCount());
-        assertEquals(0, task.setCount());
-        assertEquals(0, task.setExceptionCount());
-        cancelled.countDown();
-        awaitTermination(t);
-        assertEquals(1, task.setCount());
-        assertEquals(0, task.setExceptionCount());
-        tryToConfuseDoneTask(task);
-        checkCancelled(task);
-    }
-
     /**
      * cancel(true) interrupts a running task that subsequently throws
      */
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index 19897fa0785..92e2e82362a 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -42,15 +42,6 @@
  * @run junit/othervm/timeout=1000 JSR166TestCase
  */
 
-/*
- * @test id=security-manager
- * @summary Conformance testing variant of JSR-166 tck tests
- *          with java security manager set to allow.
- * @build *
- * @modules java.management java.base/jdk.internal.util
- * @run junit/othervm/timeout=1000 -Djava.security.manager=allow JSR166TestCase
- */
-
 /*
  * @test id=forkjoinpool-common-parallelism
  * @summary Test implementation details variant of JSR-166
@@ -84,11 +75,6 @@
  *      --add-opens java.base/java.lang=ALL-UNNAMED
  *      -Djsr166.testImplementationDetails=true
  *      JSR166TestCase
- * @run junit/othervm/timeout=1000/policy=tck.policy
- *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
- *      --add-opens java.base/java.lang=ALL-UNNAMED
- *      -Djsr166.testImplementationDetails=true
- *      JSR166TestCase
  */
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -106,13 +92,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.SecurityPermission;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -247,9 +226,6 @@
  * </ul>
  */
 public class JSR166TestCase extends TestCase {
-    // No longer run with custom securityManagers
-    private static final boolean useSecurityManager =
-    Boolean.getBoolean("jsr166.useSecurityManager");
 
     protected static final boolean expensiveTests =
         Boolean.getBoolean("jsr166.expensiveTests");
@@ -462,14 +438,6 @@ static junit.textui.TestRunner newPithyTestRunner() {
      */
     @SuppressWarnings("removal")
     static void main(Test suite, String[] args) {
-        if (useSecurityManager) {
-            System.err.println("Setting a permissive security manager");
-            Policy.setPolicy(permissivePolicy());
-            try {
-                System.setSecurityManager(new SecurityManager());
-            } catch(Throwable ok) {  // failure OK during deprecation
-            }
-        }
         for (int i = 0; i < suiteRuns; i++) {
             TestResult result = newPithyTestRunner().doRun(suite);
             if (!result.wasSuccessful())
@@ -508,22 +476,8 @@ public static void addNamedTestClasses(TestSuite suite,
     public static final double JAVA_CLASS_VERSION;
     public static final String JAVA_SPECIFICATION_VERSION;
     static {
-        try {
-            @SuppressWarnings("removal") double jcv =
-            java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<Double>() {
-                public Double run() {
-                    return Double.valueOf(System.getProperty("java.class.version"));}});
-            JAVA_CLASS_VERSION = jcv;
-            @SuppressWarnings("removal") String jsv =
-            java.security.AccessController.doPrivileged(
-                new java.security.PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty("java.specification.version");}});
-            JAVA_SPECIFICATION_VERSION = jsv;
-        } catch (Throwable t) {
-            throw new Error(t);
-        }
+        JAVA_CLASS_VERSION = Double.valueOf(System.getProperty("java.class.version"));
+        JAVA_SPECIFICATION_VERSION = System.getProperty("java.specification.version");
     }
 
     public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
@@ -1216,22 +1170,11 @@ static boolean threadOfInterest(ThreadInfo info) {
      */
     @SuppressWarnings("removal")
     static void dumpTestThreads() {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                System.setSecurityManager(null);
-            } catch (SecurityException giveUp) {
-                return;
-            }
-        }
-
         System.err.println("------ stacktrace dump start ------");
         for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
             if (threadOfInterest(info))
                 System.err.print(info);
         System.err.println("------ stacktrace dump end ------");
-
-        if (sm != null) System.setSecurityManager(sm);
     }
 
     /**
@@ -1441,120 +1384,6 @@ static void mustOffer(Queue<Item> c, Item i) {
         assertTrue(c.offer(i));
     }
 
-    /**
-     * Runs Runnable r with a security policy that permits precisely
-     * the specified permissions.  If there is no current security
-     * manager, the runnable is run twice, both with and without a
-     * security manager.  We require that any security manager permit
-     * getPolicy/setPolicy.
-     */
-    @SuppressWarnings("removal")
-    public void runWithPermissions(Runnable r, Permission... permissions) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            r.run();
-        }
-        runWithSecurityManagerWithPermissions(r, permissions);
-    }
-
-    /**
-     * Runs Runnable r with a security policy that permits precisely
-     * the specified permissions.  If there is no current security
-     * manager, a temporary one is set for the duration of the
-     * Runnable.  We require that any security manager permit
-     * getPolicy/setPolicy.
-     */
-    @SuppressWarnings("removal")
-    public void runWithSecurityManagerWithPermissions(Runnable r,
-                                                      Permission... permissions) {
-        if (!useSecurityManager) return;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            Policy savedPolicy = Policy.getPolicy();
-            try {
-                Policy.setPolicy(permissivePolicy());
-                System.setSecurityManager(new SecurityManager());
-                runWithSecurityManagerWithPermissions(r, permissions);
-            } catch (UnsupportedOperationException ok) {
-            } finally {
-                try {
-                    System.setSecurityManager(null);
-                    Policy.setPolicy(savedPolicy);
-                } catch (Exception ok) {
-                }
-            }
-        } else {
-            Policy savedPolicy = Policy.getPolicy();
-            AdjustablePolicy policy = new AdjustablePolicy(permissions);
-            Policy.setPolicy(policy);
-
-            try {
-                r.run();
-            } finally {
-                policy.addPermission(new SecurityPermission("setPolicy"));
-                Policy.setPolicy(savedPolicy);
-            }
-        }
-    }
-
-    /**
-     * Runs a runnable without any permissions.
-     */
-    public void runWithoutPermissions(Runnable r) {
-        runWithPermissions(r);
-    }
-
-    /**
-     * A security policy where new permissions can be dynamically added
-     * or all cleared.
-     */
-    @SuppressWarnings("removal")
-    public static class AdjustablePolicy extends java.security.Policy {
-        Permissions perms = new Permissions();
-        AdjustablePolicy(Permission... permissions) {
-            for (Permission permission : permissions)
-                perms.add(permission);
-        }
-        void addPermission(Permission perm) { perms.add(perm); }
-        void clearPermissions() { perms = new Permissions(); }
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p);
-        }
-        public void refresh() {}
-        public String toString() {
-            List<Permission> ps = new ArrayList<>();
-            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
-                ps.add(e.nextElement());
-            return "AdjustablePolicy with permissions " + ps;
-        }
-    }
-
-    /**
-     * Returns a policy containing all the permissions we ever need.
-     */
-    @SuppressWarnings("removal")
-    public static Policy permissivePolicy() {
-        return new AdjustablePolicy
-            // Permissions j.u.c. needs directly
-            (new RuntimePermission("modifyThread"),
-             new RuntimePermission("getClassLoader"),
-             new RuntimePermission("setContextClassLoader"),
-             // Permissions needed to change permissions!
-             new SecurityPermission("getPolicy"),
-             new SecurityPermission("setPolicy"),
-             new RuntimePermission("setSecurityManager"),
-             // Permissions needed by the junit test harness
-             new RuntimePermission("accessDeclaredMembers"),
-             new PropertyPermission("*", "read"),
-             new java.io.FilePermission("<<ALL FILES>>", "read"));
-    }
-
     /**
      * Sleeps until the given time has elapsed.
      * Throws AssertionError if interrupted.
diff --git a/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java b/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
index 3159dfbaa4a..d021b16d973 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
@@ -92,9 +92,6 @@ public void testNext() throws ReflectiveOperationException {
         try {
             m = ThreadLocalRandom.class.getDeclaredMethod("next", int.class);
             m.setAccessible(true);
-        } catch (SecurityException acceptable) {
-            // Security manager may deny access
-            return;
         } catch (Exception ex) {
             // jdk9 module system may deny access
             if (ex.getClass().getSimpleName()
diff --git a/test/jdk/java/util/concurrent/tck/ThreadTest.java b/test/jdk/java/util/concurrent/tck/ThreadTest.java
index 1cd9f0fbce4..190e97e44c0 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadTest.java
@@ -77,20 +77,14 @@ public void testGetAndSetUncaughtExceptionHandler() {
      */
     public void testGetAndSetDefaultUncaughtExceptionHandler() {
         assertNull(Thread.getDefaultUncaughtExceptionHandler());
-        // failure due to SecurityException is OK.
-        // Would be nice to explicitly test both ways, but cannot yet.
         Thread.UncaughtExceptionHandler defaultHandler
             = Thread.getDefaultUncaughtExceptionHandler();
         MyHandler eh = new MyHandler();
+        Thread.setDefaultUncaughtExceptionHandler(eh);
         try {
-            Thread.setDefaultUncaughtExceptionHandler(eh);
-            try {
-                assertSame(eh, Thread.getDefaultUncaughtExceptionHandler());
-            } finally {
-                Thread.setDefaultUncaughtExceptionHandler(defaultHandler);
-            }
-        } catch (SecurityException ok) {
-            assertNotNull(System.getSecurityManager());
+            assertSame(eh, Thread.getDefaultUncaughtExceptionHandler());
+        } finally {
+            Thread.setDefaultUncaughtExceptionHandler(defaultHandler);
         }
         assertSame(defaultHandler, Thread.getDefaultUncaughtExceptionHandler());
     }
diff --git a/test/jdk/java/util/concurrent/tck/tck.policy b/test/jdk/java/util/concurrent/tck/tck.policy
deleted file mode 100644
index 62018f792a3..00000000000
--- a/test/jdk/java/util/concurrent/tck/tck.policy
+++ /dev/null
@@ -1,18 +0,0 @@
-grant {
-    // Permissions j.u.c. needs directly
-    permission java.lang.RuntimePermission "modifyThread";
-    permission java.lang.RuntimePermission "modifyThreadGroup";
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.lang.RuntimePermission "setContextClassLoader";
-    permission java.util.PropertyPermission "*", "read";
-    // Permissions needed to change permissions!
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-    permission java.security.SecurityPermission "setSecurityManager";
-    // Permissions needed by the junit test harness
-    permission java.lang.RuntimePermission "accessDeclaredMembers";
-    permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-    // Allows test methods to inspect test thread state
-    permission java.lang.management.ManagementPermission "monitor";
-};
diff --git a/test/jdk/java/util/logging/AnonymousLogger/TestAnonymousLogger.java b/test/jdk/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
deleted file mode 100644
index 6bc4f1ad895..00000000000
--- a/test/jdk/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.logging.Filter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
-
-/**
- * @test
- * @bug 8026863
- * @summary checks that anonymous logger setters work as expected when a
- *          security manager is set, and checks that getters return expected
- *          values.
- * @run main/othervm -Djava.security.manager=allow TestAnonymousLogger
- */
-public class TestAnonymousLogger {
-
-    public static final class TestHandler extends Handler {
-        @Override
-        public void publish(LogRecord record) {
-            System.out.println(new SimpleFormatter().format(record));
-        }
-        @Override
-        public void flush() {
-            System.out.flush();
-        }
-        @Override
-        public void close() {
-            flush();
-        }
-    }
-
-    public static final class TestFilter implements Filter {
-        @Override
-        public boolean isLoggable(LogRecord record) {
-            return true;
-        }
-    }
-
-    public static final class TestBundle extends ResourceBundle {
-        Set<String> keys = Collections.synchronizedSet(new LinkedHashSet<>());
-        @Override
-        protected Object handleGetObject(String key) {
-            keys.add(key);
-            return "[LOCALIZED] "+key;
-        }
-        @Override
-        public Enumeration<String> getKeys() {
-            return Collections.enumeration(keys);
-        }
-    }
-
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        Logger anonymous = Logger.getAnonymousLogger();
-
-        final TestHandler handler = new TestHandler();
-        final TestFilter filter = new TestFilter();
-        final ResourceBundle bundle = ResourceBundle.getBundle(TestBundle.class.getName());
-        anonymous.setLevel(Level.FINEST);
-        anonymous.addHandler(handler);
-        anonymous.setFilter(filter);
-        anonymous.setUseParentHandlers(true);
-        anonymous.setResourceBundle(bundle);
-
-        if (anonymous.getLevel() != Level.FINEST) {
-            throw new RuntimeException("Unexpected level: " + anonymous.getLevel());
-        } else {
-            System.out.println("Got expected level: " + anonymous.getLevel());
-        }
-        if (!Arrays.asList(anonymous.getHandlers()).contains(handler)) {
-            throw new RuntimeException("Expected handler not found in: "
-                    + Arrays.asList(anonymous.getHandlers()));
-        } else {
-            System.out.println("Got expected handler in: " + Arrays.asList(anonymous.getHandlers()));
-        }
-        if (anonymous.getFilter() != filter) {
-            throw new RuntimeException("Unexpected filter: " + anonymous.getFilter());
-        } else {
-            System.out.println("Got expected filter: " + anonymous.getFilter());
-        }
-        if (!anonymous.getUseParentHandlers()) {
-            throw new RuntimeException("Unexpected flag: " + anonymous.getUseParentHandlers());
-        } else {
-            System.out.println("Got expected flag: " + anonymous.getUseParentHandlers());
-        }
-        if (anonymous.getResourceBundle() != bundle) {
-            throw new RuntimeException("Unexpected bundle: " + anonymous.getResourceBundle());
-        } else {
-            System.out.println("Got expected bundle: " + anonymous.getResourceBundle());
-        }
-        try {
-            anonymous.setParent(Logger.getLogger("foo.bar"));
-            throw new RuntimeException("Expected SecurityException not raised!");
-        } catch (SecurityException x) {
-            System.out.println("Got expected exception: " + x);
-        }
-        if (anonymous.getParent() != Logger.getLogger("")) {
-            throw new RuntimeException("Unexpected parent: " + anonymous.getParent());
-        } else {
-            System.out.println("Got expected parent: " + anonymous.getParent());
-        }
-    }
-
-}
diff --git a/test/jdk/java/util/logging/FileHandlerLongLimit.java b/test/jdk/java/util/logging/FileHandlerLongLimit.java
index 0cd836508a6..43594ad3df4 100644
--- a/test/jdk/java/util/logging/FileHandlerLongLimit.java
+++ b/test/jdk/java/util/logging/FileHandlerLongLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,59 +22,37 @@
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
  * @bug 8059767
  * @summary tests that FileHandler can accept a long limit.
  * @modules java.logging/java.util.logging:open
- * @run main/othervm FileHandlerLongLimit UNSECURE
- * @run main/othervm -Djava.security.manager=allow FileHandlerLongLimit SECURE
+ * @run main/othervm FileHandlerLongLimit
  * @author danielfuchs
  * @key randomness
  */
 public class FileHandlerLongLimit {
 
-    /**
-     * We will test handling of limit and overflow of MeteredStream.written in
-     * two configurations.
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(Properties propertyFile) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, propertyFile);
-            test(this.name() + " " + propertyFile.getProperty("test.name"), propertyFile,
-                    Long.parseLong(propertyFile.getProperty(FileHandler.class.getName()+".limit")));
-        }
+     // We will test handling of limit and overflow of MeteredStream.written
+    public static void run(Properties propertyFile) throws Exception {
+        setUp(propertyFile);
+        test(propertyFile.getProperty("test.name"), propertyFile,
+                Long.parseLong(propertyFile.getProperty(FileHandler.class.getName()+".limit")));
     }
 
 
@@ -144,99 +122,40 @@ public void flush() throws IOException {
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                for (Properties propertyFile : properties) {
-                    TestCase test = TestCase.valueOf(testName);
-                    test.run(propertyFile);
-                }
+            for (Properties propertyFile : properties) {
+                run(propertyFile);
             }
         } finally {
             if (userDirWritable) {
-                Configure.doPrivileged(() -> {
-                    // cleanup - delete files that have been created
-                    try {
-                        Files.list(Paths.get(userDir))
-                            .filter((f) -> f.toString().contains(PREFIX))
-                            .forEach((f) -> {
-                                try {
-                                    System.out.println("deleting " + f);
-                                    Files.delete(f);
-                                } catch(Throwable t) {
-                                    System.err.println("Failed to delete " + f + ": " + t);
-                                }
-                            });
-                    } catch(Throwable t) {
-                        System.err.println("Cleanup failed to list files: " + t);
-                        t.printStackTrace();
-                    }
-                });
-            }
-        }
-    }
-
-    static class Configure {
-        static Policy policy = null;
-        static final AtomicBoolean allowAll = new AtomicBoolean(false);
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
-            doPrivileged(() -> {
+                // cleanup - delete files that have been created
                 try {
-                    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                    propertyFile.store(bytes, propertyFile.getProperty("test.name"));
-                    ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
-                    LogManager.getLogManager().readConfiguration(bais);
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
+                    Files.list(Paths.get(userDir))
+                        .filter((f) -> f.toString().contains(PREFIX))
+                        .forEach((f) -> {
+                            try {
+                                System.out.println("deleting " + f);
+                                Files.delete(f);
+                            } catch(Throwable t) {
+                                System.err.println("Failed to delete " + f + ": " + t);
+                            }
+                        });
+                } catch(Throwable t) {
+                    System.err.println("Cleanup failed to list files: " + t);
+                    t.printStackTrace();
                 }
-            });
-        }
-        static void doPrivileged(Runnable run) {
-            allowAll.set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.set(false);
             }
         }
-        static <T> T callPrivileged(Callable<T> call) throws Exception {
-            allowAll.set(true);
-            try {
-                return call.call();
-            } finally {
-                allowAll.set(false);
-            }
+    }
+
+    static void setUp(Properties propertyFile) {
+        try {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            propertyFile.store(bytes, propertyFile.getProperty("test.name"));
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
+            LogManager.getLogManager().readConfiguration(bais);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
         }
     }
 
@@ -294,44 +213,32 @@ private static void assertEquals(long expected, long received, String msg) {
     }
 
     private static long getLimit(FileHandler handler) throws Exception {
-        return Configure.callPrivileged((Callable<Long>)() -> {
-            return limitField.getLong(handler);
-        });
+        return limitField.getLong(handler);
     }
     private static OutputStream getMeteredOutput(FileHandler handler) throws Exception {
-        return Configure.callPrivileged((Callable<OutputStream>)() -> {
-            final OutputStream metered = OutputStream.class.cast(meterField.get(handler));
-            return metered;
-        });
+        final OutputStream metered = OutputStream.class.cast(meterField.get(handler));
+        return metered;
     }
     private static TestOutputStream setTestOutputStream(OutputStream metered) throws Exception {
-        return Configure.callPrivileged((Callable<TestOutputStream>)() -> {
-            outField.set(metered, new TestOutputStream(OutputStream.class.cast(outField.get(metered))));
-            return TestOutputStream.class.cast(outField.get(metered));
-        });
+        outField.set(metered, new TestOutputStream(OutputStream.class.cast(outField.get(metered))));
+        return TestOutputStream.class.cast(outField.get(metered));
     }
     private static long getWritten(OutputStream metered) throws Exception {
-        return Configure.callPrivileged((Callable<Long>)() -> {
-            return writtenField.getLong(metered);
-        });
+        return writtenField.getLong(metered);
     }
 
     private static long setWritten(OutputStream metered, long newValue) throws Exception {
-        return Configure.callPrivileged((Callable<Long>)() -> {
-            writtenField.setLong(metered, newValue);
-            return writtenField.getLong(metered);
-        });
+        writtenField.setLong(metered, newValue);
+        return writtenField.getLong(metered);
     }
 
     public static FileHandler testFileHandlerLimit(FileHandlerSupplier supplier,
             long limit) throws Exception {
-        Configure.doPrivileged(() -> {
-            try {
-                Files.deleteIfExists(Paths.get(PREFIX));
-            } catch (IOException x) {
-                throw new RuntimeException(x);
-            }
-        });
+        try {
+            Files.deleteIfExists(Paths.get(PREFIX));
+        } catch (IOException x) {
+            throw new RuntimeException(x);
+        }
         final FileHandler fh = supplier.test();
         try {
             // verify we have the expected limit
@@ -439,73 +346,6 @@ public static void test(String name, Properties props, long limit) throws Except
                     () -> new FileHandler(PREFIX, Long.MAX_VALUE, 1, true),
                     Long.MAX_VALUE));
         }
+        System.out.println("Success for: " + name);
     }
-
-
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final AtomicBoolean allowAll;
-        public SimplePolicy(TestCase test, AtomicBoolean allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null));
-            permissions.add(new FilePermission(PREFIX+".lck", "read,write,delete"));
-            permissions.add(new FilePermission(PREFIX, "read,write"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/FileHandlerPath.java b/test/jdk/java/util/logging/FileHandlerPath.java
index f5466097f3f..85ec52a0619 100644
--- a/test/jdk/java/util/logging/FileHandlerPath.java
+++ b/test/jdk/java/util/logging/FileHandlerPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,56 +23,32 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FilePermission;
 import java.io.IOException;
-import java.nio.channels.FileChannel;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import static java.nio.file.StandardOpenOption.CREATE_NEW;
-import static java.nio.file.StandardOpenOption.WRITE;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
-import java.util.PropertyPermission;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.FileHandler;
 import java.util.logging.LogManager;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
  * @bug 8059269
  * @summary tests that using a simple (non composite) pattern does not lead
  *        to NPE when the lock file already exists.
- * @run main/othervm FileHandlerPath UNSECURE
- * @run main/othervm -Djava.security.manager=allow FileHandlerPath SECURE
+ * @run main/othervm FileHandlerPath
  * @author danielfuchs
  * @key randomness
  */
 public class FileHandlerPath {
 
-    /**
-     * We will test the simple pattern in two configurations.
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(Properties propertyFile) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, propertyFile);
-            test(this.name() + " " + propertyFile.getProperty("test.name"), propertyFile);
-        }
+    // We will test the simple pattern
+    public static void run(Properties propertyFile) throws Exception {
+        setUp(propertyFile);
+        test(propertyFile.getProperty("test.name"), propertyFile);
     }
 
 
@@ -102,13 +78,6 @@ public void run(Properties propertyFile) throws Exception {
 
     public static void main(String... args) throws Exception {
 
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         // Sanity checks
 
         if (!Files.isWritable(Paths.get(userDir))) {
@@ -140,89 +109,46 @@ public static void main(String... args) throws Exception {
         // Now start the real test
 
         try {
-            for (String testName : args) {
-                for (Properties propertyFile : properties) {
-                    TestCase test = TestCase.valueOf(testName);
-                    test.run(propertyFile);
-                }
+            for (Properties propertyFile : properties) {
+                run(propertyFile);
             }
         } finally {
             // Cleanup...
-            Configure.doPrivileged(() -> {
-                for(File log : files) {
-                    try {
-                        final boolean isLockFile = log.getName().endsWith(".lck");
-                        // lock file should already be deleted, except if the
-                        // test failed in exception.
-                        // log file should all be present, except if the test
-                        // failed in exception.
-                        if (log.exists()) {
-                            if (!isLockFile) {
-                                System.out.println("deleting "+log.toString());
-                            } else {
-                                System.err.println("deleting lock file "+log.toString());
-                            }
-                            log.delete();
+            for(File log : files) {
+                try {
+                    final boolean isLockFile = log.getName().endsWith(".lck");
+                    // lock file should already be deleted, except if the
+                    // test failed in exception.
+                    // log file should all be present, except if the test
+                    // failed in exception.
+                    if (log.exists()) {
+                        if (!isLockFile) {
+                            System.out.println("deleting "+log.toString());
                         } else {
-                            if (!isLockFile) {
-                                System.err.println(log.toString() + ": not found.");
-                            }
+                            System.err.println("deleting lock file "+log.toString());
+                        }
+                        log.delete();
+                    } else {
+                        if (!isLockFile) {
+                            System.err.println(log.toString() + ": not found.");
                         }
-                    } catch (Throwable t) {
-                        // should not happen
-                        t.printStackTrace();
                     }
+                } catch (Throwable t) {
+                    // should not happen
+                    t.printStackTrace();
                 }
-            });
+            }
         }
     }
 
-    static class Configure {
-        static Policy policy = null;
-        static final AtomicBoolean allowAll = new AtomicBoolean(false);
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
-            doPrivileged(() -> {
-                try {
-                    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                    propertyFile.store(bytes, propertyFile.getProperty("test.name"));
-                    ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
-                    LogManager.getLogManager().readConfiguration(bais);
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            });
-        }
-        static void doPrivileged(Runnable run) {
-            allowAll.set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.set(false);
-            }
+    static void setUp(Properties propertyFile) {
+        try {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            propertyFile.store(bytes, propertyFile.getProperty("test.name"));
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
+            LogManager.getLogManager().readConfiguration(bais);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
         }
     }
 
@@ -237,82 +163,6 @@ public static void test(String name, Properties props) throws Exception {
         final FileHandler f2 = new FileHandler();
         f1.close();
         f2.close();
-        System.out.println("Success for " + name);
+        System.out.println("Success for: " + name);
     }
-
-
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final AtomicBoolean allowAll;
-        public SimplePolicy(TestCase test, AtomicBoolean allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null)); // needed by new FileHandler()
-            permissions.add(new FilePermission("<<ALL FILES>>", "read")); // needed by new FileHandler()
-            permissions.add(new FilePermission(logFile, "write,delete")); // needed by new FileHandler()
-            permissions.add(new FilePermission(logFile+".lck", "write,delete")); // needed by FileHandler.close()
-            permissions.add(new FilePermission(logFile+".1", "write,delete")); // needed by new FileHandler()
-            permissions.add(new FilePermission(logFile+".1.lck", "write,delete")); // needed by FileHandler.close()
-            permissions.add(new FilePermission(tmpLogFile, "write,delete")); // needed by new FileHandler()
-            permissions.add(new FilePermission(tmpLogFile+".lck", "write,delete")); // needed by FileHandler.close()
-            permissions.add(new FilePermission(tmpLogFile+".1", "write,delete")); // needed by new FileHandler()
-            permissions.add(new FilePermission(tmpLogFile+".1.lck", "write,delete")); // needed by FileHandler.close()
-            permissions.add(new FilePermission(userDir, "write")); // needed by new FileHandler()
-            permissions.add(new FilePermission(tmpDir, "write")); // needed by new FileHandler()
-            permissions.add(new PropertyPermission("user.dir", "read"));
-            permissions.add(new PropertyPermission("java.io.tmpdir", "read"));
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/FileHandlerPatternExceptions.java b/test/jdk/java/util/logging/FileHandlerPatternExceptions.java
index 7fa901d4037..4fc1153c548 100644
--- a/test/jdk/java/util/logging/FileHandlerPatternExceptions.java
+++ b/test/jdk/java/util/logging/FileHandlerPatternExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.FileHandler;
 import java.util.logging.LogManager;
 
@@ -46,26 +37,16 @@
  * @test
  * @bug 8025690
  * @summary tests that an empty or null pattern always result in an exception.
- * @run main/othervm FileHandlerPatternExceptions UNSECURE
- * @run main/othervm -Djava.security.manager=allow FileHandlerPatternExceptions SECURE
+ * @run main/othervm FileHandlerPatternExceptions
  * @author danielfuchs
  * @key randomness
  */
 public class FileHandlerPatternExceptions {
 
-    /**
-     * We will test null/empty pattern in two configurations.
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(Properties propertyFile) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, propertyFile);
-            test(this.name() + " " + propertyFile.getProperty("test.name"));
-        }
+    // We will test null/empty pattern
+    public static void run(Properties propertyFile) throws Exception {
+        setUp(propertyFile);
+        test(propertyFile.getProperty("test.name"));
     }
 
 
@@ -91,91 +72,40 @@ public void run(Properties propertyFile) throws Exception {
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                for (Properties propertyFile : properties) {
-                    TestCase test = TestCase.valueOf(testName);
-                    test.run(propertyFile);
-                }
+            for (Properties propertyFile : properties) {
+                run(propertyFile);
             }
         } finally {
             if (userDirWritable) {
-                Configure.doPrivileged(() -> {
-                    // cleanup - delete files that have been created
-                    try {
-                        Files.list(Paths.get(userDir))
-                            .filter((f) -> f.toString().contains(PREFIX))
-                            .forEach((f) -> {
-                                try {
-                                    System.out.println("deleting " + f);
-                                    Files.delete(f);
-                                } catch(Throwable t) {
-                                    System.err.println("Failed to delete " + f + ": " + t);
-                                }
-                            });
-                    } catch(Throwable t) {
-                        System.err.println("Cleanup failed to list files: " + t);
-                        t.printStackTrace();
-                    }
-                });
+                // cleanup - delete files that have been created
+                try {
+                    Files.list(Paths.get(userDir))
+                        .filter((f) -> f.toString().contains(PREFIX))
+                        .forEach((f) -> {
+                            try {
+                                System.out.println("deleting " + f);
+                                Files.delete(f);
+                            } catch(Throwable t) {
+                                System.err.println("Failed to delete " + f + ": " + t);
+                            }
+                        });
+                } catch(Throwable t) {
+                    System.err.println("Cleanup failed to list files: " + t);
+                    t.printStackTrace();
+                }
             }
         }
     }
 
-    static class Configure {
-        static Policy policy = null;
-        static final AtomicBoolean allowAll = new AtomicBoolean(false);
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
-            doPrivileged(() -> {
-                try {
-                    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                    propertyFile.store(bytes, propertyFile.getProperty("test.name"));
-                    ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
-                    LogManager.getLogManager().readConfiguration(bais);
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            });
-        }
-        static void doPrivileged(Runnable run) {
-            allowAll.set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.set(false);
-            }
+    static void setUp(Properties propertyFile) {
+        try {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            propertyFile.store(bytes, propertyFile.getProperty("test.name"));
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes.toByteArray());
+            LogManager.getLogManager().readConfiguration(bais);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
         }
     }
 
@@ -245,90 +175,20 @@ public static void test(String name) throws Exception {
         checkException(IllegalArgumentException.class, () -> new FileHandler("", 0, 0, false));
         checkException(IllegalArgumentException.class, () -> new FileHandler("", -1, 1, false));
 
-        final Class<? extends Exception> expectedException =
-                System.getSecurityManager() != null ? AccessControlException.class : null;
-
-        if (userDirWritable || expectedException != null) {
+        if (userDirWritable) {
             // These calls will create files in user.dir in the UNSECURE case.
             // The file name contain a random UUID (PREFIX) which identifies them
             // and allow us to remove them cleanly at the end (see finally block
             // in main()).
-            checkException(expectedException,
+            checkException(null,
                            () -> new FileHandler(PREFIX, 0, 1, true));
-            checkException(expectedException,
+            checkException(null,
                            () -> new FileHandler(PREFIX, 1, 2, true));
-            checkException(expectedException,
+            checkException(null,
                            () -> new FileHandler(PREFIX, 0, 1, false));
-            checkException(expectedException,
+            checkException(null,
                            () -> new FileHandler(PREFIX, 1, 2, false));
         }
+        System.out.println("Success for: " + name);
     }
-
-
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final AtomicBoolean allowAll;
-        public SimplePolicy(TestCase test, AtomicBoolean allowAll) {
-            this.allowAll = allowAll;
-            // we don't actually need any permission to create our
-            // FileHandlers because we're passing invalid parameters
-            // which will make the creation fail...
-            permissions = new Permissions();
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/HandlersConfigTest.java b/test/jdk/java/util/logging/HandlersConfigTest.java
index 5a6e24e265a..44b88b3c845 100644
--- a/test/jdk/java/util/logging/HandlersConfigTest.java
+++ b/test/jdk/java/util/logging/HandlersConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,8 @@
  *          as specified in javadoc and that no special
  *          logging permission is required for instantiating them.
  * @modules java.logging/java.util.logging:open
- * @run main/othervm -Djava.security.manager=allow HandlersConfigTest default
- * @run main/othervm -Djava.security.manager=allow HandlersConfigTest configured
+ * @run main/othervm HandlersConfigTest default
+ * @run main/othervm HandlersConfigTest configured
  */
 
 import java.io.IOException;
@@ -100,14 +100,6 @@ public static void main(String[] args) {
             throw new AssertionError(e);
         }
 
-        // activate security
-        System.setSecurityManager(new SecurityManager() {
-            @Override
-            public void checkConnect(String host, int port) {
-                // allow socket connections
-            }
-        });
-
         // initialize logging system
         LogManager.getLogManager();
     }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java b/test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
index f7356cde64b..d3320e1f3c8 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,22 +22,14 @@
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -49,37 +41,24 @@
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
  * @bug 8060132
  * @summary tests that FileHandlers configured on abstract nodes in logging.properties
  *          will be closed by reset().
- * @run main/othervm ParentLoggerWithHandlerGC UNSECURE
- * @run main/othervm -Djava.security.manager=allow ParentLoggerWithHandlerGC SECURE
+ * @run main/othervm ParentLoggerWithHandlerGC
  * @author danielfuchs
  * @key randomness
  */
 public class ParentLoggerWithHandlerGC {
 
-    /**
-     * We will test the handling of abstract logger nodes with file handlers in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(Properties propertyFile) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, propertyFile);
-            test(this.name() + " " + propertyFile.getProperty("test.name"), propertyFile);
-        }
+    // We will test the handling of abstract logger nodes with file handlers
+    public static void run(Properties propertyFile) throws Exception {
+        Configure.setUp(propertyFile);
+        test(propertyFile.getProperty("test.name"), propertyFile);
     }
 
-
     private static final String PREFIX =
             "FileHandler-" + UUID.randomUUID() + ".log";
     private static final String userDir = System.getProperty("user.dir", ".");
@@ -127,20 +106,9 @@ static enum ConfigMode { DEFAULT, ENSURE_CLOSE_ON_RESET_TRUE, ENSURE_CLOSE_ON_RE
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                for (Properties propertyFile : properties) {
-                    TestCase test = TestCase.valueOf(testName);
-                    test.run(propertyFile);
-                }
+            for (Properties propertyFile : properties) {
+                run(propertyFile);
             }
         } finally {
             if (userDirWritable) {
@@ -167,33 +135,7 @@ public static void main(String... args) throws Exception {
     }
 
     static class Configure {
-        static Policy policy = null;
-        static final AtomicBoolean allowAll = new AtomicBoolean(false);
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
+        static void setUp(Properties propertyFile) {
             doPrivileged(() -> {
                 try {
                     ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -206,20 +148,10 @@ static void setUp(TestCase test, Properties propertyFile) {
             });
         }
         static void doPrivileged(Runnable run) {
-            allowAll.set(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.set(false);
-            }
+            run.run();
         }
         static <T> T callPrivileged(Callable<T> call) throws Exception {
-            allowAll.set(true);
-            try {
-                return call.call();
-            } finally {
-                allowAll.set(false);
-            }
+            return call.call();
         }
     }
 
@@ -449,72 +381,4 @@ public static void testCloseOnResetFalse(String name, Properties props)
         }
 
     }
-
-
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final AtomicBoolean allowAll;
-        public SimplePolicy(TestCase test, AtomicBoolean allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null));
-            permissions.add(new FilePermission(PREFIX+".lck", "read,write,delete"));
-            permissions.add(new FilePermission(PREFIX, "read,write"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java b/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
index 455febb7a64..3e6da724c44 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MonitorInfo;
 import java.lang.management.ThreadInfo;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -48,7 +45,7 @@
  *       todo: add at randomness
  * @modules java.logging
  *          java.management
- * @run main/othervm -Djava.security.manager=allow TestConfigurationLock
+ * @run main/othervm TestConfigurationLock
  * @author danielfuchs
  */
 // This test is a best effort to try & detect issues. The test itself will run
@@ -91,8 +88,6 @@ static Object fakeLogExternalLock() {
 
 
      /**
-     * This test will run both with and without a security manager.
-     *
      * The test starts a number of threads that will call
      *     LogManager.reset() concurrently (ResetConf), and a number of threads
      *     that will call readConfiguration() (ReadConf), and then starts a
@@ -103,11 +98,7 @@ static Object fakeLogExternalLock() {
      * If after 4secs no deadlock was detected and no exception was thrown
      * then the test is considered a success and passes.
      *
-     * This procedure is done twice: once without a security manager and once
-     * again with a security manager - which means the test takes ~8secs to
-     * run.
-     *
-     * Note that 8sec may not be enough to detect issues if there are some.
+     * Note that 4sec may not be enough to detect issues if there are some.
      * This is a best effort test.
      *
      * @param args the command line arguments
@@ -121,21 +112,6 @@ public static void main(String[] args) throws Exception {
             throw new IOException("Can't read config file: " + conf.getAbsolutePath());
         }
         System.setProperty("java.util.logging.config.file", conf.getAbsolutePath());
-        // test without security
-        System.out.println("No security");
-        test();
-
-        // test with security
-        System.out.println("\nWith security");
-        Policy.setPolicy(new Policy() {
-            @Override
-            public boolean implies(ProtectionDomain domain, Permission permission) {
-                if (super.implies(domain, permission)) return true;
-                // System.out.println("Granting " + permission);
-                return true; // all permissions
-            }
-        });
-        System.setSecurityManager(new SecurityManager());
         test();
     }
 
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/BadRootLoggerHandlers.java b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/BadRootLoggerHandlers.java
index 385ede7b7e7..1042b1b2ef0 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/BadRootLoggerHandlers.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/BadRootLoggerHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,10 +49,6 @@
  * @run main/othervm -Dlogging.properties=badlogging.properties -Dclz=1custom.DotHandler BadRootLoggerHandlers DEFAULT
  * @run main/othervm -Dlogging.properties=badglobal.properties -Dclz=1custom.GlobalHandler BadRootLoggerHandlers CUSTOM
  * @run main/othervm -Dlogging.properties=badglobal.properties -Dclz=1custom.GlobalHandler BadRootLoggerHandlers DEFAULT
- * @run main/othervm/java.security.policy==test.policy -Dlogging.properties=badlogging.properties -Dclz=1custom.DotHandler BadRootLoggerHandlers CUSTOM
- * @run main/othervm/java.security.policy==test.policy  -Dlogging.properties=badlogging.properties -Dclz=1custom.DotHandler BadRootLoggerHandlers DEFAULT
- * @run main/othervm/java.security.policy==test.policy  -Dlogging.properties=badglobal.properties -Dclz=1custom.GlobalHandler BadRootLoggerHandlers CUSTOM
- * @run main/othervm/java.security.policy==test.policy  -Dlogging.properties=badglobal.properties -Dclz=1custom.GlobalHandler BadRootLoggerHandlers DEFAULT
  * @author danielfuchs
  */
 public class BadRootLoggerHandlers {
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/RootLoggerHandlers.java b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/RootLoggerHandlers.java
index a9015b92d18..08c82e33167 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/RootLoggerHandlers.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/RootLoggerHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -39,7 +38,6 @@
  * @bug 8191033
  * @build custom.DotHandler custom.Handler
  * @run main/othervm RootLoggerHandlers
- * @run main/othervm/java.security.policy==test.policy RootLoggerHandlers
  * @author danielfuchs
  */
 public class RootLoggerHandlers {
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/test.policy b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/test.policy
deleted file mode 100644
index 1929792d426..00000000000
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/test.policy
+++ /dev/null
@@ -1,13 +0,0 @@
-grant {
-    // permissions for RootLoggerHandlers
-    permission java.util.PropertyPermission "*", "read";
-    permission java.util.PropertyPermission "java.util.logging.config.file", "write";
-    permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-    permission java.util.logging.LoggingPermission "control";
-
-    // additional permissions for BadRootLoggerHandlers
-    permission java.util.PropertyPermission "java.util.logging.manager", "write";
-    permission java.lang.RuntimePermission "setIO";
-    permission java.lang.RuntimePermission "shutdownHooks";
-    permission java.lang.RuntimePermission "setContextClassLoader";
-};
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java
index 032457aedb3..f24bb2e22ec 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java
@@ -22,22 +22,14 @@
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
@@ -48,7 +40,6 @@
 import java.util.logging.FileHandler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
@@ -58,26 +49,15 @@
  *          Test a complex reconfiguration where a logger with handlers
  *          suddenly appears in the hierarchy between a child logger and the
  *          root logger.
- * @run main/othervm HandlersOnComplexResetUpdate UNSECURE
- * @run main/othervm -Djava.security.manager=allow HandlersOnComplexResetUpdate SECURE
+ * @run main/othervm HandlersOnComplexResetUpdate
  * @author danielfuchs
  */
 public class HandlersOnComplexResetUpdate {
 
-    /**
-     * We will test the handling of abstract logger nodes with file handlers in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(List<Properties> properties) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, properties.get(0));
-            test(this.name(), properties);
-        }
+    // We will test the handling of abstract logger nodes with file handlers
+    public static void run(List<Properties> properties) throws Exception {
+        Configure.setUp(properties.get(0));
+        test(properties);
     }
 
     public static final double TIMEOUT_FACTOR;
@@ -191,14 +171,12 @@ static int adjustCount(int count) {
      * Finally releases the child logger after all configurations have been
      * applied.
      *
-     * @param name
      * @param properties
      * @throws Exception
      */
-    static void test(String name, List<Properties> properties)
+    static void test(List<Properties> properties)
             throws Exception {
 
-        System.out.println("\nTesting: " + name);
         if (!userDirWritable) {
             throw new RuntimeException("Not writable: "+userDir);
         }
@@ -364,19 +342,8 @@ static void test(String name, List<Properties> properties)
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                TestCase test = TestCase.valueOf(testName);
-                test.run(properties);
-            }
+            run(properties);
         } finally {
             if (userDirWritable) {
                 Configure.doPrivileged(() -> {
@@ -402,38 +369,7 @@ public static void main(String... args) throws Exception {
     }
 
     static class Configure {
-        static Policy policy = null;
-        static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return  new AtomicBoolean(false);
-            }
-        };
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
+        static void setUp(Properties propertyFile) {
             doPrivileged(() -> {
                 updateConfigurationWith(propertyFile, false);
             });
@@ -454,20 +390,10 @@ static void updateConfigurationWith(Properties propertyFile, boolean append) {
         }
 
         static void doPrivileged(Runnable run) {
-            final boolean old = allowAll.get().getAndSet(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.get().set(old);
-            }
+            run.run();
         }
         static <T> T callPrivileged(Callable<T> call) throws Exception {
-            final boolean old = allowAll.get().getAndSet(true);
-            try {
-                return call.call();
-            } finally {
-                allowAll.get().set(old);
-            }
+            return call.call();
         }
     }
 
@@ -491,71 +417,4 @@ private static void assertEquals(long expected, long received, String msg) {
             System.out.println("Got expected " + msg + ": " + received);
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-        public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null));
-            permissions.add(new FilePermission(PREFIX+".lck", "read,write,delete"));
-            permissions.add(new FilePermission(PREFIX, "read,write"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java
index 2f9f360d7d4..8735c34aa98 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java
@@ -22,22 +22,14 @@
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
@@ -48,7 +40,6 @@
 import java.util.logging.FileHandler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
@@ -58,26 +49,15 @@
  *          Test a complex reconfiguration where a logger with handlers
  *          suddenly appears in the hierarchy between a child logger and the
  *          root logger.
- * @run main/othervm HandlersOnComplexUpdate UNSECURE
- * @run main/othervm -Djava.security.manager=allow HandlersOnComplexUpdate SECURE
+ * @run main/othervm HandlersOnComplexUpdate
  * @author danielfuchs
  */
 public class HandlersOnComplexUpdate {
 
-    /**
-     * We will test the handling of abstract logger nodes with file handlers in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(List<Properties> properties) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this, properties.get(0));
-            test(this.name(), properties);
-        }
+    // We will test the handling of abstract logger nodes with file handlers
+    public static void run(List<Properties> properties) throws Exception {
+        Configure.setUp(properties.get(0));
+        test(properties);
     }
 
     public static final double TIMEOUT_FACTOR;
@@ -191,14 +171,12 @@ static int adjustCount(int count) {
      * Finally releases the child logger after all configurations have been
      * applied.
      *
-     * @param name
      * @param properties
      * @throws Exception
      */
-    static void test(String name, List<Properties> properties)
+    static void test(List<Properties> properties)
             throws Exception {
 
-        System.out.println("\nTesting: " + name);
         if (!userDirWritable) {
             throw new RuntimeException("Not writable: "+userDir);
         }
@@ -352,19 +330,8 @@ static void test(String name, List<Properties> properties)
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                TestCase test = TestCase.valueOf(testName);
-                test.run(properties);
-            }
+            run(properties);
         } finally {
             if (userDirWritable) {
                 Configure.doPrivileged(() -> {
@@ -390,38 +357,7 @@ public static void main(String... args) throws Exception {
     }
 
     static class Configure {
-        static Policy policy = null;
-        static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return  new AtomicBoolean(false);
-            }
-        };
-        static void setUp(TestCase test, Properties propertyFile) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
+        static void setUp(Properties propertyFile) {
             doPrivileged(() -> {
                 configureWith(propertyFile);
             });
@@ -453,20 +389,10 @@ static void updateConfigurationWith(Properties propertyFile, boolean append) {
         }
 
         static void doPrivileged(Runnable run) {
-            final boolean old = allowAll.get().getAndSet(true);
-            try {
-                run.run();
-            } finally {
-                allowAll.get().set(old);
-            }
+            run.run();
         }
         static <T> T callPrivileged(Callable<T> call) throws Exception {
-            final boolean old = allowAll.get().getAndSet(true);
-            try {
-                return call.call();
-            } finally {
-                allowAll.get().set(old);
-            }
+            return call.call();
         }
     }
 
@@ -490,71 +416,4 @@ private static void assertEquals(long expected, long received, String msg) {
             System.out.println("Got expected " + msg + ": " + received);
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-        public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null));
-            permissions.add(new FilePermission(PREFIX+".lck", "read,write,delete"));
-            permissions.add(new FilePermission(PREFIX, "read,write"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java
index 8c8bc35c24a..16d932d5c48 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,10 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -46,44 +38,30 @@
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
  * @bug 8033661 8189291
  * @summary tests LogManager.updateConfiguration(InputStream, Function) method
- * @run main/othervm SimpleUpdateConfigWithInputStreamTest UNSECURE
- * @run main/othervm -Djava.security.manager=allow SimpleUpdateConfigWithInputStreamTest SECURE
+ * @run main/othervm SimpleUpdateConfigWithInputStreamTest
  * @author danielfuchs
  */
 public class SimpleUpdateConfigWithInputStreamTest {
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
 
-    /**
-     * We will test updateConfiguration in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void execute(Runnable run) {
-            System.out.println("Running test case: " + name());
-            try {
-               Configure.setUp(this);
-               Configure.doPrivileged(run, SimplePolicy.allowControl);
-            } finally {
-               Configure.doPrivileged(() -> {
-                   try {
-                       setSystemProperty("java.util.logging.config.file", null);
-                       LogManager.getLogManager().readConfiguration();
-                       System.gc();
-                   } catch (Exception x) {
-                       throw new RuntimeException(x);
-                   }
-               }, SimplePolicy.allowAll);
-            }
+    // We will test updateConfiguration
+    public static void execute(Runnable run) {
+        try {
+           Configure.doPrivileged(run);
+        } finally {
+           Configure.doPrivileged(() -> {
+               try {
+                   setSystemProperty("java.util.logging.config.file", null);
+                   LogManager.getLogManager().readConfiguration();
+                   System.gc();
+               } catch (Exception x) {
+                   throw new RuntimeException(x);
+               }
+           });
         }
     }
 
@@ -119,7 +97,7 @@ static String storePropertyToFile(String name, Properties props)
                 props.store(fos, name);
             }
             return p.toString();
-        }, SimplePolicy.allowAll);
+        });
     }
 
     static void setSystemProperty(String name, String value)
@@ -129,7 +107,7 @@ static void setSystemProperty(String name, String value)
                 System.clearProperty(name);
             else
                 System.setProperty(name, value);
-        }, SimplePolicy.allowAll);
+        });
     }
 
     static String trim(String value) {
@@ -452,42 +430,10 @@ static void testUpdateConfiguration() {
     }
 
     public static void main(String[] args) throws Exception {
-        if (args == null || args.length == 0) {
-            args = new String[] { "UNSECURE", "SECURE" };
-        }
-        for (String test : args) {
-            TestCase.valueOf(test).execute(SimpleUpdateConfigWithInputStreamTest::testUpdateConfiguration);
-        }
+        execute(SimpleUpdateConfigWithInputStreamTest::testUpdateConfiguration);
     }
 
     static class Configure {
-        static Policy policy = null;
-        static void setUp(TestCase test) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    throw new InternalError("No such testcase: " + test);
-            }
-        }
 
         static void updateConfigurationWith(Properties propertyFile,
                 Function<String,BiFunction<String,String,String>> remapper) {
@@ -501,22 +447,11 @@ static void updateConfigurationWith(Properties propertyFile,
             }
         }
 
-        static void doPrivileged(Runnable run, ThreadLocal<AtomicBoolean> granter) {
-            final boolean old = granter.get().getAndSet(true);
-            try {
-                run.run();
-            } finally {
-                granter.get().set(old);
-            }
+        static void doPrivileged(Runnable run) {
+            run.run();
         }
-        static <T> T callPrivileged(Callable<T> call,
-                ThreadLocal<AtomicBoolean> granter) throws Exception {
-            final boolean old = granter.get().getAndSet(true);
-            try {
-                return call.call();
-            } finally {
-                granter.get().set(old);
-            }
+        static <T> T callPrivileged(Callable<T> call) throws Exception {
+            return call.call();
         }
     }
 
@@ -596,92 +531,4 @@ private static void assertDeepEquals(Object expected, Object received, String ms
             System.out.println("Got expected " + msg + ": " + deepToString(received));
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        final Permissions basic;
-        final Permissions control;
-        final Permissions all;
-        public final static ThreadLocal<AtomicBoolean> allowAll =
-                new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return new AtomicBoolean();
-            }
-        };
-        public final static ThreadLocal<AtomicBoolean> allowControl =
-                new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return new AtomicBoolean();
-            }
-        };
-        public SimplePolicy(TestCase test) {
-            basic = new Permissions();
-            control = new Permissions();
-            control.add(new LoggingPermission("control", null));
-
-            // these are used for configuring the test itself...
-            all = new Permissions();
-            all.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions(domain).implies(permission) ||
-                   DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        public PermissionCollection permissions() {
-            PermissionsBuilder builder = new PermissionsBuilder();
-            if (allowAll.get().get()) {
-                builder.addAll(all);
-            } else {
-                builder.addAll(basic);
-                if (allowControl.get().get()) {
-                    builder.addAll(control);
-                }
-            }
-            return builder.toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return permissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return permissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java
index a3aca7bb1a9..f35d2d83706 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,24 +23,14 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.Objects;
 import java.util.Properties;
-import java.util.PropertyPermission;
 import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -49,43 +39,30 @@
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
  * @bug 8033661
  * @summary tests LogManager.updateConfiguration(Function) method
- * @run main/othervm SimpleUpdateConfigurationTest UNSECURE
- * @run main/othervm -Djava.security.manager=allow SimpleUpdateConfigurationTest SECURE
+ * @run main/othervm SimpleUpdateConfigurationTest
  * @author danielfuchs
  */
 public class SimpleUpdateConfigurationTest {
 
-    /**
-     * We will test updateConfiguration in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void execute(Runnable run) {
-            System.out.println("Running test case: " + name());
-            try {
-               Configure.setUp(this);
-               Configure.doPrivileged(run, SimplePolicy.allowControl);
-            } finally {
-               Configure.doPrivileged(() -> {
-                   try {
-                       setSystemProperty("java.util.logging.config.file", null);
-                       LogManager.getLogManager().readConfiguration();
-                       System.gc();
-                   } catch (Exception x) {
-                       throw new RuntimeException(x);
-                   }
-               }, SimplePolicy.allowAll);
-            }
+    // We will test updateConfiguration
+    public static void execute(Runnable run) {
+        try {
+           Configure.doPrivileged(run);
+        } finally {
+           Configure.doPrivileged(() -> {
+               try {
+                   setSystemProperty("java.util.logging.config.file", null);
+                   LogManager.getLogManager().readConfiguration();
+                   System.gc();
+               } catch (Exception x) {
+                   throw new RuntimeException(x);
+               }
+           });
         }
     }
 
@@ -121,7 +98,7 @@ static String storePropertyToFile(String name, Properties props)
                 props.store(fos, name);
             }
             return p.toString();
-        }, SimplePolicy.allowAll);
+        });
     }
 
     static void setSystemProperty(String name, String value)
@@ -131,7 +108,7 @@ static void setSystemProperty(String name, String value)
                 System.clearProperty(name);
             else
                 System.setProperty(name, value);
-        }, SimplePolicy.allowAll);
+        });
     }
 
     static String trim(String value) {
@@ -472,49 +449,16 @@ static void testUpdateConfiguration() {
                     } catch (Exception x) {
                         throw new RuntimeException(x);
                     }
-                }, SimplePolicy.allowAll);
+                });
             }
         }
     }
 
     public static void main(String[] args) throws Exception {
-        if (args == null || args.length == 0) {
-            args = new String[] { "UNSECURE", "SECURE" };
-        }
-        for (String test : args) {
-            TestCase.valueOf(test).execute(SimpleUpdateConfigurationTest::testUpdateConfiguration);
-        }
+        execute(SimpleUpdateConfigurationTest::testUpdateConfiguration);
     }
 
     static class Configure {
-        static Policy policy = null;
-        static void setUp(TestCase test) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    throw new InternalError("No such testcase: " + test);
-            }
-        }
-
         static void updateConfigurationWith(Properties propertyFile,
                 Function<String,BiFunction<String,String,String>> remapper) {
             try {
@@ -527,22 +471,11 @@ static void updateConfigurationWith(Properties propertyFile,
             }
         }
 
-        static void doPrivileged(Runnable run, ThreadLocal<AtomicBoolean> granter) {
-            final boolean old = granter.get().getAndSet(true);
-            try {
-                run.run();
-            } finally {
-                granter.get().set(old);
-            }
+        static void doPrivileged(Runnable run) {
+            run.run();
         }
-        static <T> T callPrivileged(Callable<T> call,
-                ThreadLocal<AtomicBoolean> granter) throws Exception {
-            final boolean old = granter.get().getAndSet(true);
-            try {
-                return call.call();
-            } finally {
-                granter.get().set(old);
-            }
+        static <T> T callPrivileged(Callable<T> call) throws Exception {
+            return call.call();
         }
     }
 
@@ -622,101 +555,4 @@ private static void assertDeepEquals(Object expected, Object received, String ms
             System.out.println("Got expected " + msg + ": " + deepToString(received));
         }
     }
-
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions basic;
-        final Permissions control;
-        final Permissions all;
-        public final static ThreadLocal<AtomicBoolean> allowAll =
-                new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return new AtomicBoolean();
-            }
-        };
-        public final static ThreadLocal<AtomicBoolean> allowControl =
-                new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return new AtomicBoolean();
-            }
-        };
-        public SimplePolicy(TestCase test) {
-            basic = new Permissions();
-            control = new Permissions();
-            control.add(new LoggingPermission("control", null));
-
-            // These permissions are required to call updateConfiguration(Function)
-            control.add(new PropertyPermission("java.util.logging.config.file", "read"));
-            control.add(new PropertyPermission("java.home", "read"));
-            control.add(new FilePermission(
-                    Paths.get(System.getProperty("user.dir", "."),"-").toString(), "read"));
-            control.add(new FilePermission(
-                    Paths.get(System.getProperty("java.home"),"conf","-").toString(), "read"));
-
-            // these are used for configuring the test itself...
-            all = new Permissions();
-            all.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return getPermissions(domain).implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        public PermissionCollection permissions() {
-            PermissionsBuilder builder = new PermissionsBuilder();
-            if (allowAll.get().get()) {
-                builder.addAll(all);
-            } else {
-                builder.addAll(basic);
-                if (allowControl.get().get()) {
-                    builder.addAll(control);
-                }
-            }
-            return builder.toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return permissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return permissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java
index 629ff10ee1f..bd2fb60b095 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java
+++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -30,15 +29,8 @@
 import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -53,7 +45,6 @@
 import java.util.logging.FileHandler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -62,29 +53,14 @@
  * @bug 8033661 8189291
  * @summary tests LogManager.updateConfiguration(bin)
  * @modules java.logging/java.util.logging:open
- * @run main/othervm UpdateConfigurationTest UNSECURE
- * @run main/othervm -Djava.security.manager=allow UpdateConfigurationTest SECURE
+ * @run main/othervm UpdateConfigurationTest
  * @author danielfuchs
  */
 public class UpdateConfigurationTest {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-    /**
-     * We will test the handling of abstract logger nodes with file handlers in
-     * two configurations:
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         permissions granted.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE;
-        public void run(Properties propertyFile, boolean last) throws Exception {
-            System.out.println("Running test case: " + name());
-            Configure.setUp(this);
-            test(this.name() + " " + propertyFile.getProperty("test.name"),
-                    propertyFile, last);
-        }
+    // We will test the handling of abstract logger nodes with file handlers
+    public static void run(Properties propertyFile, boolean last) throws Exception {
+        test(propertyFile.getProperty("test.name"), propertyFile, last);
     }
 
 
@@ -377,21 +353,10 @@ private static void checkProperties(ConfigMode mode,
 
     public static void main(String... args) throws Exception {
 
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
         try {
-            for (String testName : args) {
-                TestCase test = TestCase.valueOf(testName);
-                for (int i=0; i<properties.size();i++) {
-                    Properties propertyFile = properties.get(i);
-                    test.run(propertyFile, i == properties.size() - 1);
-                }
+            for (int i=0; i<properties.size();i++) {
+                Properties propertyFile = properties.get(i);
+                run(propertyFile, i == properties.size() - 1);
             }
         } finally {
             if (userDirWritable) {
@@ -418,40 +383,6 @@ public static void main(String... args) throws Exception {
     }
 
     static class Configure {
-        static Policy policy = null;
-        static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-            @Override
-            protected AtomicBoolean initialValue() {
-                return  new AtomicBoolean(false);
-            }
-        };
-        static void setUp(TestCase test) {
-            switch (test) {
-                case SECURE:
-                    if (policy == null && System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    } else if (policy == null) {
-                        policy = new SimplePolicy(TestCase.SECURE, allowAll);
-                        Policy.setPolicy(policy);
-                        System.setSecurityManager(new SecurityManager());
-                    }
-                    if (System.getSecurityManager() == null) {
-                        throw new IllegalStateException("No SecurityManager.");
-                    }
-                    if (policy == null) {
-                        throw new IllegalStateException("policy not configured");
-                    }
-                    break;
-                case UNSECURE:
-                    if (System.getSecurityManager() != null) {
-                        throw new IllegalStateException("SecurityManager already set");
-                    }
-                    break;
-                default:
-                    new InternalError("No such testcase: " + test);
-            }
-        }
-
         static void updateConfigurationWith(Properties propertyFile,
                 Function<String,BiFunction<String,String,String>> remapper) {
             try {
@@ -465,37 +396,27 @@ static void updateConfigurationWith(Properties propertyFile,
         }
 
         static void doPrivileged(Runnable run) {
-            final boolean old = allowAll.get().getAndSet(true);
+            Properties before = getProperties();
             try {
-                Properties before = getProperties();
-                try {
-                    run.run();
-                } finally {
-                    Properties after = getProperties();
-                    if (before != after) {
-                        previous = before;
-                        current = after;
-                    }
-                }
+                run.run();
             } finally {
-                allowAll.get().set(old);
+                Properties after = getProperties();
+                if (before != after) {
+                    previous = before;
+                    current = after;
+                }
             }
         }
         static <T> T callPrivileged(Callable<T> call) throws Exception {
-            final boolean old = allowAll.get().getAndSet(true);
+            Properties before = getProperties();
             try {
-                Properties before = getProperties();
-                try {
-                    return call.call();
-                } finally {
-                    Properties after = getProperties();
-                    if (before != after) {
-                        previous = before;
-                        current = after;
-                    }
-                }
+                return call.call();
             } finally {
-                allowAll.get().set(old);
+                Properties after = getProperties();
+                if (before != after) {
+                    previous = before;
+                    current = after;
+                }
             }
         }
     }
@@ -548,69 +469,4 @@ public static void test(String name, Properties props, boolean last) throws Exce
         }
     }
 
-    final static class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        final Permissions permissions;
-        final Permissions allPermissions;
-        final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-        public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-            this.allowAll = allowAll;
-            permissions = new Permissions();
-            permissions.add(new LoggingPermission("control", null));
-            permissions.add(new FilePermission(PREFIX+".lck", "read,write,delete"));
-            permissions.add(new FilePermission(PREFIX, "read,write"));
-
-            // these are used for configuring the test itself...
-            allPermissions = new Permissions();
-            allPermissions.add(new java.security.AllPermission());
-
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (allowAll.get().get()) return allPermissions.implies(permission);
-            return permissions.implies(permission) ||
-                   DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(allowAll.get().get()
-                    ? allPermissions : permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java b/test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java
index 8f2a0f2cba4..918e5e733e4 100644
--- a/test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java
+++ b/test/jdk/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,8 @@
  * questions.
  */
 
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
-
-
 
 /**
  * @test
@@ -38,8 +31,7 @@
  * @modules java.base/sun.util.logging
  *          java.logging
  * @build TestRootLoggerLevel
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestRootLoggerLevel
- * @run main/othervm -Dtest.security=off TestRootLoggerLevel
+ * @run main/othervm TestRootLoggerLevel
  * @author danielfuchs
  */
 public class TestRootLoggerLevel {
@@ -67,15 +59,6 @@ public static void main(String[] args) throws Exception {
                     + ": " + Logger.getLogger(log.name).getLevel());
         }
 
-        if ("on".equals(System.getProperty("test.security","on"))) {
-            System.out.println("*** SecurityManager is ON");
-            Policy.setPolicy(new SimplePolicy());
-
-            System.setSecurityManager(new SecurityManager());
-        } else {
-            System.out.println("*** SecurityManager is OFF");
-        }
-
         // Before the fix, setting the root logger level here had only
         // a transient effect...
         for (Loggers log : Loggers.values()) {
@@ -117,36 +100,4 @@ public static void main(String[] args) throws Exception {
         }
 
      }
-
-    private static final class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        private final Permissions perms;
-
-        private static final Permissions permissions(Permission... perms) {
-            Permissions permissions = new Permissions();
-            for (Permission perm : perms) {
-                permissions.add(perm);
-            }
-            return permissions;
-        }
-
-        SimplePolicy() {
-            this(permissions(new LoggingPermission("control", null),
-                    new RuntimePermission("accessClassInPackage.sun.util.logging")
-            ));
-        }
-
-        SimplePolicy(Permissions perms) {
-            this.perms = perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return perms.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-    }
-
 }
diff --git a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java
index 907f70ab809..dcda0e396b9 100644
--- a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java
+++ b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,11 @@
  * @summary checks that java.util.logging.Logger.getGlobal().info() logs without configuration
  * @build TestGetGlobal testgetglobal.HandlerImpl testgetglobal.LogManagerImpl1 testgetglobal.LogManagerImpl2 testgetglobal.LogManagerImpl3 testgetglobal.BadLogManagerImpl testgetglobal.DummyLogManagerImpl
  * @run main/othervm TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager TestGetGlobal
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl1 TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl1 TestGetGlobal
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobal
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobal
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobal
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobal
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobal
  * @author danielfuchs
  */
 public class TestGetGlobal {
@@ -60,8 +54,6 @@ public static void main(String... args) {
         final String manager = System.getProperty("java.util.logging.manager", null);
 
         final String description = "TestGetGlobal"
-            + (System.getSecurityManager() == null ? " " :
-               " -Djava.security.manager ")
             + (manager == null ? "" : "-Djava.util.logging.manager=" + manager);
 
         Logger.global.info(messages[0]); // at this point LogManager is not
diff --git a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
index fe54a56f9a2..9a869f15a36 100644
--- a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
+++ b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,11 @@
  * @summary checks that java.util.logging.Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).info() logs without configuration
  * @build TestGetGlobalByName testgetglobal.HandlerImpl testgetglobal.LogManagerImpl1 testgetglobal.LogManagerImpl2 testgetglobal.LogManagerImpl3 testgetglobal.BadLogManagerImpl testgetglobal.DummyLogManagerImpl
  * @run main/othervm TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager TestGetGlobalByName
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl1 TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl TestGetGlobalByName
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobalByName
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobalByName
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobalByName
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobalByName
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobalByName
  * @author danielfuchs
  */
 public class TestGetGlobalByName {
diff --git a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
index 2a6e8725a96..c1d4490689f 100644
--- a/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
+++ b/test/jdk/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 import java.util.Arrays;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -31,17 +30,11 @@
  * @summary Test that the global logger can log with no configuration when accessed from multiple threads.
  * @build TestGetGlobalConcurrent testgetglobal.HandlerImpl testgetglobal.LogManagerImpl1 testgetglobal.LogManagerImpl2 testgetglobal.LogManagerImpl3 testgetglobal.BadLogManagerImpl testgetglobal.DummyLogManagerImpl
  * @run main/othervm TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager TestGetGlobalConcurrent
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl1 TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl1 TestGetGlobalConcurrent
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl2 TestGetGlobalConcurrent
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.LogManagerImpl3 TestGetGlobalConcurrent
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.BadLogManagerImpl TestGetGlobalConcurrent
  * @run main/othervm -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobalConcurrent
- * @run main/othervm/policy=policy -Djava.security.manager -Djava.util.logging.manager=testgetglobal.DummyLogManagerImpl TestGetGlobalConcurrent
  * @author danielfuchs
  */
 public class TestGetGlobalConcurrent {
@@ -155,8 +148,6 @@ public static void main(String... args) throws Exception {
         final String manager = System.getProperty("java.util.logging.manager", null);
 
         description = "TestGetGlobalConcurrent"
-            + (System.getSecurityManager() == null ? " " :
-               " -Djava.security.manager ")
             + (manager == null ? "" : "-Djava.util.logging.manager=" + manager);
 
         final Thread t1 = new Thread(new WaitAndRun(new Run1()), "test1");
diff --git a/test/jdk/java/util/logging/Logger/getGlobal/policy b/test/jdk/java/util/logging/Logger/getGlobal/policy
deleted file mode 100644
index fad24d0b814..00000000000
--- a/test/jdk/java/util/logging/Logger/getGlobal/policy
+++ /dev/null
@@ -1,8 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "java.util.logging.config.file", "write";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "java.util.logging.manager", "read";
-    permission java.lang.RuntimePermission "setContextClassLoader";
-    permission java.lang.RuntimePermission "shutdownHooks";
-    permission java.util.logging.LoggingPermission "control";
-};
diff --git a/test/jdk/java/util/logging/Logger/getLogger/TestLogger.java b/test/jdk/java/util/logging/Logger/getLogger/TestLogger.java
index 814f453f3d5..c511b02fcf6 100644
--- a/test/jdk/java/util/logging/Logger/getLogger/TestLogger.java
+++ b/test/jdk/java/util/logging/Logger/getLogger/TestLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @bug 8005899
  * @build TestLogger testlogger.MyResource
  * @run main/othervm TestLogger
- * @run main/othervm -Djava.security.manager=allow -Dsecurity=on TestLogger
  **/
 public class TestLogger {
 
@@ -41,11 +40,6 @@ public class TestLogger {
     public static final String GEE_GEE_LOGGER = GEE_LOGGER+".Gee";
 
     public static void main(String[] args) {
-        final String security = System.getProperty("security", "off");
-        System.out.println("Security is " + security);
-        if ("on".equals(security)) {
-           System.setSecurityManager(new SecurityManager());
-        }
 
         newLogger(FOO_LOGGER, RESOURCE_BUNDLE);
         newLogger(FOO_LOGGER);
diff --git a/test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java b/test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
index cf57efe1f89..a680e47a9c4 100644
--- a/test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
+++ b/test/jdk/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,21 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.PropertyPermission;
 import java.util.ResourceBundle;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 import resources.ListBundle;
 
 /**
@@ -42,14 +35,11 @@
  * @bug 8013839 8189291
  * @summary tests Logger.setResourceBundle;
  * @build TestSetResourceBundle resources.ListBundle resources.ListBundle_fr
- * @run main/othervm TestSetResourceBundle UNSECURE
- * @run main/othervm -Djava.security.manager=allow TestSetResourceBundle PERMISSION
- * @run main/othervm -Djava.security.manager=allow TestSetResourceBundle SECURE
+ * @run main/othervm TestSetResourceBundle
  * @author danielfuchs
  */
 public class TestSetResourceBundle {
 
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
     static final String LIST_BUNDLE_NAME = "resources.ListBundle";
     static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
 
@@ -75,116 +65,26 @@ public void close() throws SecurityException {
         }
     }
 
-    /**
-     * We will test setResourceBundle() in 3 configurations.
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         LoggingPermission("control") granted.
-     * PERMISSION: With the security manager present - and the required
-     *         LoggingPermission("control") *not* granted. Here we will
-     *         test that the expected security permission is thrown.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE, PERMISSION;
-        public void run(String name) throws Exception {
-            System.out.println("Running test case: " + name());
-            switch (this) {
-                case UNSECURE:
-                    testUnsecure(name);
-                    break;
-                case SECURE:
-                    testSecure(name);
-                    break;
-                case PERMISSION:
-                    testPermission(name);
-                    break;
-                default:
-                    throw new Error("Unknown test case: "+this);
-            }
-        }
-        public String loggerName(String name) {
-            return name().toLowerCase(Locale.ROOT) + "." + name;
-        }
-    }
-
     public static void main(String... args) throws Exception {
 
         Locale defaultLocale = Locale.getDefault();
 
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name()
-            };
-        }
-
-        for (String testName : args) {
-            TestCase test = TestCase.valueOf(testName);
-            try {
-                test.run(test.loggerName("foo.bar"));
-            } finally {
-                Locale.setDefault(defaultLocale);
-            }
+        try {
+            test("foo.bar");
+        } finally {
+            Locale.setDefault(defaultLocale);
         }
     }
 
-    /**
-     * Test without security manager.
-     * @param loggerName The logger to use.
-     * @throws Exception if the test fails.
-     */
-    public static void testUnsecure(String loggerName) throws Exception {
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is set");
-        }
-        test(loggerName);
+    static String getBaseName(ResourceBundle bundle) {
+        return bundle == null ? null : bundle.getBaseBundleName();
     }
 
     /**
-     * Test with security manager.
+     * Main test runner.
      * @param loggerName The logger to use.
      * @throws Exception if the test fails.
      */
-    public static void testSecure(String loggerName) throws Exception {
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is already set");
-        }
-        Policy.setPolicy(new SimplePolicy(TestCase.SECURE));
-        System.setSecurityManager(new SecurityManager());
-        test(loggerName);
-    }
-
-    /**
-     * Test the LoggingPermission("control") is required.
-     * @param loggerName The logger to use.
-     */
-    public static void testPermission(String loggerName) {
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is already set");
-        }
-        Policy.setPolicy(new SimplePolicy(TestCase.PERMISSION));
-        System.setSecurityManager(new SecurityManager());
-        final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME);
-        Logger foobar = Logger.getLogger(loggerName);
-        try {
-            foobar.setResourceBundle(bundle);
-            throw new RuntimeException("Permission not checked!");
-        } catch (AccessControlException x) {
-            if (x.getPermission() instanceof LoggingPermission) {
-                if ("control".equals(x.getPermission().getName())) {
-                    System.out.println("Got expected exception: " + x);
-                    return;
-                }
-            }
-            throw new RuntimeException("Unexpected exception: "+x, x);
-        }
-
-    }
-
-    static String getBaseName(ResourceBundle bundle) {
-        return bundle == null ? null : bundle.getBaseBundleName();
-    }
-
     public static void test(String loggerName) throws Exception {
 
         System.out.println("Starting test for " + loggerName);
@@ -465,24 +365,4 @@ static void debugLogger(Logger logger, Logger expectedParent, TestHandler handle
         System.err.println("    expected parent.getResourceBundle() is "
                 + expectedParent.getResourceBundle());
     }
-
-    public static class SimplePolicy extends Policy {
-
-        final Permissions permissions;
-        public SimplePolicy(TestCase test) {
-            permissions = new Permissions();
-            if (test != TestCase.PERMISSION) {
-                permissions.add(new LoggingPermission("control", null));
-            }
-            // required for calling Locale.setDefault in the test.
-            permissions.add(new PropertyPermission("user.language", "write"));
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return permissions.implies(permission) ||
-                   DEFAULT_POLICY.implies(domain, permission);
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java b/test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java
index 5ffba8250ac..109d7386b87 100644
--- a/test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java
+++ b/test/jdk/java/util/logging/RootLogger/RootLevelInConfigFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,10 @@
  */
 
 import java.io.File;
-import java.io.FilePermission;
 import java.io.IOException;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.util.PropertyPermission;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
-import jdk.internal.access.JavaAWTAccess;
-import jdk.internal.access.SharedSecrets;
 
 /**
  * @test
@@ -44,7 +34,7 @@
  *      configuration file does work.
  * @modules java.base/jdk.internal.access
  *          java.logging
- * @run main/othervm -Djava.security.manager=allow RootLevelInConfigFile
+ * @run main/othervm RootLevelInConfigFile
  *
  * @author danielfuchs
  */
@@ -66,29 +56,6 @@ public static void main(String[] args) throws IOException {
         final String configFile = System.getProperty(CONFIG_FILE_KEY);
 
         test("no security");
-
-        LogManager.getLogManager().readConfiguration();
-
-        Policy.setPolicy(new SimplePolicy(configFile));
-        System.setSecurityManager(new SecurityManager());
-
-        test("security");
-
-        LogManager.getLogManager().readConfiguration();
-
-        final JavaAWTAccessStub access = new JavaAWTAccessStub();
-        SharedSecrets.setJavaAWTAccess(access);
-
-        test("security and no context");
-
-        for (Context ctx : Context.values()) {
-
-            LogManager.getLogManager().readConfiguration();
-
-            access.setContext(ctx);
-
-            test("security and context " + ctx);
-        }
     }
 
     public static void test(String conf) throws IOException {
@@ -173,39 +140,4 @@ private static void testLoggableLevels() {
         }
 
     }
-
-    static final class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final PermissionCollection perms = new Permissions();
-        public SimplePolicy(String configFile) {
-            perms.add(new LoggingPermission("control", null));
-            perms.add(new PropertyPermission("java.util.logging.config.class","read"));
-            perms.add(new PropertyPermission("java.util.logging.config.file","read"));
-            perms.add(new FilePermission(configFile, "read"));
-            perms.add(new RuntimePermission("accessClassInPackage.jdk.internal.access"));
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return perms.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-    }
-
-    static enum Context { ONE, TWO };
-
-    static final class JavaAWTAccessStub implements JavaAWTAccess {
-        private Context context;
-
-        public void setContext(Context context) {
-            this.context = context;
-        }
-
-        @Override
-        public Object getAppletContext() {
-            return context;
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/SystemLoggerConfigTest.java b/test/jdk/java/util/logging/SystemLoggerConfigTest.java
index 20fe38248c4..9537573afca 100644
--- a/test/jdk/java/util/logging/SystemLoggerConfigTest.java
+++ b/test/jdk/java/util/logging/SystemLoggerConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.ref.Reference;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -43,14 +40,12 @@
 import java.util.stream.Stream;
 import sun.util.logging.PlatformLogger;
 
-
 /**
  * @test
  * @bug     8159245
  * @summary Tests configuration of loggers.
  * @modules java.logging/sun.util.logging.internal java.base/sun.util.logging
- * @run  main/othervm SystemLoggerConfigTest NOSECURITY
- * @run  main/othervm -Djava.security.manager=allow SystemLoggerConfigTest WITHSECURITY
+ * @run  main/othervm SystemLoggerConfigTest
  *
  * @author danielfuchs
  */
@@ -134,59 +129,36 @@ public TestHandler2() {
     static enum TestCase { WITHSECURITY, NOSECURITY }
 
     public static void main(String[] args) {
-        if (args == null || args.length == 0) {
-            args = Stream.of(TestCase.values())
-                    .map(String::valueOf)
-                    .collect(Collectors.toList())
-                    .toArray(new String[0]);
-        }
-        Stream.of(args)
-              .map(TestCase::valueOf)
-              .forEach(SystemLoggerConfigTest::launch);
+        launch();
     }
 
-    public static void launch(TestCase test) {
-        switch(test) {
-            case WITHSECURITY:
-                Policy.setPolicy(new Policy() {
-                    @Override
-                    public boolean implies(ProtectionDomain domain, Permission permission) {
-                        return true;
-                    }
-                });
-                System.setSecurityManager(new SecurityManager());
-                break;
-            case NOSECURITY:
-                break;
-            default:
-                throw new InternalError("Unexpected enum: " + test);
-        }
+    public static void launch() {
         try {
-            test(test.name(), ".1", ".child");
-            test(test.name(), ".2", "");
-            testUpdateConfiguration(test.name(), ".3");
-            testSetPlatformLevel(test.name(), ".4");
+            test("1", ".child");
+            test("2", "");
+            testUpdateConfiguration("3");
+            testSetPlatformLevel("4");
         } catch (IOException io) {
             throw new UncheckedIOException(io);
         }
     }
 
-    public static void test(String name, String step, String ext)
+    public static void test(String step, String ext)
             throws IOException {
 
-        System.out.println("\n*** Testing " + name + step + ext);
+        System.out.println("\n*** Testing " + step + ext);
 
-        final String systemName1a = "system.logger.one.a." + name + step + ext;
-        final String systemName1b = "system.logger.one.b." + name + step + ext;
-        final String appName1a = "system.logger.one.a." + name + step;
-        final String appName1b = "system.logger.one.b." + name + step;
+        final String systemName1a = "system.logger.one.a." + step + ext;
+        final String systemName1b = "system.logger.one.b." + step + ext;
+        final String appName1a = "system.logger.one.a." + step;
+        final String appName1b = "system.logger.one.b." + step;
         final String msg1a = "logger name: " + systemName1a;
         final String msg1b = "logger name: " + systemName1b;
-        final String systemName2 = "system.logger.two." + name + step + ext;
-        final String appName2 = "system.logger.two." + name + step;
+        final String systemName2 = "system.logger.two." + step + ext;
+        final String appName2 = "system.logger.two." + step;
         final String msg2 = "logger name: " + systemName2;
-        final String systemName3 = "system.logger.three." + name + step + ext;
-        final String appName3 = "system.logger.three." + name + step;
+        final String systemName3 = "system.logger.three." + step + ext;
+        final String appName3 = "system.logger.three." + step;
         final String msg3 = "logger name: " + systemName3;
         List<LogRecord> records;
 
@@ -277,16 +249,16 @@ static void setPlatformLevel(PlatformLogger logger, PlatformLogger.Level level)
         logger.setLevel(level);
     }
 
-    public static void testSetPlatformLevel(String name, String step) {
-        System.out.println("\n*** Testing PlatformLogger.setLevel " + name + step);
+    public static void testSetPlatformLevel(String step) {
+        System.out.println("\n*** Testing PlatformLogger.setLevel " + step);
 
-        System.out.println("\n[Case #5] Creating app logger: " + name + step);
+        System.out.println("\n[Case #5] Creating app logger: " + step);
         // this should return named logger in the global context
-        Logger foo = Logger.getLogger(name + step);
+        Logger foo = Logger.getLogger(step);
         foo.setLevel(Level.FINE);
 
-        System.out.println("    Creating platform logger: " + name + step);
-        PlatformLogger foo1 = PlatformLogger.getLogger(name + step);
+        System.out.println("    Creating platform logger: " + step);
+        PlatformLogger foo1 = PlatformLogger.getLogger(step);
         System.out.println("    Configuring platform logger...");
         setPlatformLevel(foo1, PlatformLogger.Level.INFO);
 
@@ -316,12 +288,12 @@ static void readConfiguration(Properties props) throws IOException {
     // Tests that though two loggers exist, only one handler is created for the
     // pair when reading configuration.
     //
-    public static void testUpdateConfiguration(String name, String step) throws IOException {
+    public static void testUpdateConfiguration(String step) throws IOException {
 
-        System.out.println("\n*** Testing LogManager.updateConfiguration " + name + step);
+        System.out.println("\n*** Testing LogManager.updateConfiguration " + step);
 
-        final String name1a = "system.logger.one.a." + name + step;
-        final String name1b = "system.logger.one.b." + name + step;
+        final String name1a = "system.logger.one.a." + step;
+        final String name1b = "system.logger.one.b." + step;
         final String msg1a = "logger name: " + name1a;
         final String msg1b = "logger name: " + name1b;
         List<LogRecord> records;
diff --git a/test/jdk/java/util/logging/TestConfigurationListeners.java b/test/jdk/java/util/logging/TestConfigurationListeners.java
index b9712b203a3..e42d1806168 100644
--- a/test/jdk/java/util/logging/TestConfigurationListeners.java
+++ b/test/jdk/java/util/logging/TestConfigurationListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,25 +21,13 @@
  * questions.
  */
 import java.io.ByteArrayInputStream;
-import java.io.FilePermission;
 import java.io.IOException;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.PropertyPermission;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.LogManager;
-import java.util.logging.LoggingPermission;
 
 /**
  * @test
@@ -47,151 +35,16 @@
  * @summary tests LogManager.addConfigurationListener and
  *                LogManager.removeConfigurationListener;
  * @build TestConfigurationListeners
- * @run main/othervm TestConfigurationListeners UNSECURE
- * @run main/othervm -Djava.security.manager=allow TestConfigurationListeners PERMISSION
- * @run main/othervm -Djava.security.manager=allow TestConfigurationListeners SECURE
+ * @run main/othervm TestConfigurationListeners
  * @author danielfuchs
  */
 public class TestConfigurationListeners {
 
-    /**
-     * We will test add and remove ConfigurationListeners in 3 configurations.
-     * UNSECURE: No security manager.
-     * SECURE: With the security manager present - and the required
-     *         LoggingPermission("control") granted.
-     * PERMISSION: With the security manager present - and the required
-     *         LoggingPermission("control") *not* granted. Here we will
-     *         test that the expected security permission is thrown.
-     */
-    public static enum TestCase {
-        UNSECURE, SECURE, PERMISSION;
-        public void run(String name) throws Exception {
-            System.out.println("Running test case: " + name());
-            switch (this) {
-                case UNSECURE:
-                    testUnsecure(name);
-                    break;
-                case SECURE:
-                    testSecure(name);
-                    break;
-                case PERMISSION:
-                    testPermission(name);
-                    break;
-                default:
-                    throw new Error("Unknown test case: "+this);
-            }
-        }
-        public String loggerName(String name) {
-            return name;
-        }
-    }
-
+    // We will test add and remove ConfigurationListeners
     public static void main(String... args) throws Exception {
-
-
-        if (args == null || args.length == 0) {
-            args = new String[] {
-                TestCase.UNSECURE.name(),
-                TestCase.SECURE.name(),
-            };
-        }
-
-        for (String testName : args) {
-            TestCase test = TestCase.valueOf(testName);
-            test.run(test.loggerName("foo.bar"));
-        }
-    }
-
-    /**
-     * Test without security manager.
-     * @param loggerName The logger to use.
-     * @throws Exception if the test fails.
-     */
-    public static void testUnsecure(String loggerName) throws Exception {
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is set");
-        }
-        test(loggerName);
-    }
-
-    /**
-     * Test with security manager.
-     * @param loggerName The logger to use.
-     * @throws Exception if the test fails.
-     */
-    public static void testSecure(String loggerName) throws Exception {
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is already set");
-        }
-        Policy.setPolicy(new SimplePolicy(TestCase.SECURE));
-        System.setSecurityManager(new SecurityManager());
-        test(loggerName);
+       test("foo.bar");
     }
 
-    /**
-     * Test the LoggingPermission("control") is required.
-     * @param loggerName The logger to use.
-     */
-    public static void testPermission(String loggerName) {
-        TestConfigurationListener run = new TestConfigurationListener(
-                TestCase.PERMISSION.toString());
-        if (System.getSecurityManager() != null) {
-            throw new Error("Security manager is already set");
-        }
-        Policy.setPolicy(new SimplePolicy(TestCase.PERMISSION));
-        System.setSecurityManager(new SecurityManager());
-
-        try {
-            LogManager.getLogManager().addConfigurationListener(run);
-            throw new RuntimeException("addConfigurationListener: Permission not checked!");
-        } catch (AccessControlException x) {
-            boolean ok = false;
-            if (x.getPermission() instanceof LoggingPermission) {
-                if ("control".equals(x.getPermission().getName())) {
-                    System.out.println("addConfigurationListener: Got expected exception: " + x);
-                    ok = true;
-                }
-            }
-            if (!ok) {
-                throw new RuntimeException("addConfigurationListener: Unexpected exception: "+x, x);
-            }
-        }
-
-        try {
-            LogManager.getLogManager().removeConfigurationListener(run);
-            throw new RuntimeException("removeConfigurationListener: Permission not checked!");
-        } catch (AccessControlException x) {
-            boolean ok = false;
-            if (x.getPermission() instanceof LoggingPermission) {
-                if ("control".equals(x.getPermission().getName())) {
-                    System.out.println("removeConfigurationListener: Got expected exception: " + x);
-                    ok = true;
-                }
-            }
-            if (!ok) {
-                throw new RuntimeException("removeConfigurationListener: Unexpected exception: "+x, x);
-            }
-        }
-        try {
-            LogManager.getLogManager().addConfigurationListener(null);
-            throw new RuntimeException(
-                    "addConfigurationListener(null): Expected NPE not thrown.");
-        } catch (NullPointerException npe) {
-            System.out.println("Got expected NPE: "+npe);
-        }
-
-        try {
-            LogManager.getLogManager().removeConfigurationListener(null);
-            throw new RuntimeException(
-                    "removeConfigurationListener(null): Expected NPE not thrown.");
-        } catch (NullPointerException npe) {
-            System.out.println("Got expected NPE: "+npe);
-        }
-
-
-    }
-
-
     static class TestConfigurationListener implements Runnable {
         final AtomicLong  count = new AtomicLong(0);
         final String name;
@@ -273,6 +126,11 @@ public void accept(LogManager t) throws IOException {
 
     }
 
+    /**
+     * Main test runner.
+     * @param loggerName The logger to use.
+     * @throws Exception if the test fails.
+     */
     public static void test(String loggerName) throws Exception {
         System.out.println("Starting test for " + loggerName);
         test("m.readConfiguration()", (m) -> m.readConfiguration());
@@ -427,65 +285,4 @@ public static void test(String testName,
         System.out.println("END " + testName+"\n");
 
     }
-
-
-    static final class PermissionsBuilder {
-        final Permissions perms;
-        public PermissionsBuilder() {
-            this(new Permissions());
-        }
-        public PermissionsBuilder(Permissions perms) {
-            this.perms = perms;
-        }
-        public PermissionsBuilder add(Permission p) {
-            perms.add(p);
-            return this;
-        }
-        public PermissionsBuilder addAll(PermissionCollection col) {
-            if (col != null) {
-                for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-                    perms.add(e.nextElement());
-                }
-            }
-            return this;
-        }
-        public Permissions toPermissions() {
-            final PermissionsBuilder builder = new PermissionsBuilder();
-            builder.addAll(perms);
-            return builder.perms;
-        }
-    }
-
-    public static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        final Permissions permissions;
-        public SimplePolicy(TestCase test) {
-            permissions = new Permissions();
-            if (test != TestCase.PERMISSION) {
-                permissions.add(new LoggingPermission("control", null));
-                permissions.add(new PropertyPermission("java.util.logging.config.class", "read"));
-                permissions.add(new PropertyPermission("java.util.logging.config.file", "read"));
-                permissions.add(new PropertyPermission("java.home", "read"));
-                permissions.add(new FilePermission("<<ALL FILES>>", "read"));
-            }
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return permissions.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return new PermissionsBuilder().addAll(permissions).toPermissions();
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return new PermissionsBuilder().addAll(permissions).toPermissions();
-        }
-    }
-
 }
diff --git a/test/jdk/java/util/logging/TestGetLoggerNPE.java b/test/jdk/java/util/logging/TestGetLoggerNPE.java
index bc204e8241c..02c57b75067 100644
--- a/test/jdk/java/util/logging/TestGetLoggerNPE.java
+++ b/test/jdk/java/util/logging/TestGetLoggerNPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 import java.io.PrintStream;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import jdk.internal.access.JavaAWTAccess;
@@ -38,8 +35,8 @@
  * @modules java.base/jdk.internal.access
  *          java.logging
  * @build TestGetLoggerNPE
- * @run main/othervm -Djava.security.manager=allow TestGetLoggerNPE getLogger
- * @run main/othervm -Djava.security.manager=allow TestGetLoggerNPE getLogManager
+ * @run main/othervm TestGetLoggerNPE getLogger
+ * @run main/othervm TestGetLoggerNPE getLogManager
  */
 public class TestGetLoggerNPE {
     static volatile Throwable thrown = null;
@@ -71,13 +68,6 @@ public void run() {
                 }
             }
         };
-        Policy.setPolicy(new Policy() {
-             public boolean implies(ProtectionDomain domain,
-                                    Permission permission) {
-                 return true; // all permissions
-             }
-        });
-        System.setSecurityManager(new SecurityManager());
         t.start();
         t.join();
         if (thrown == null) {
diff --git a/test/jdk/java/util/logging/TestLogConfigurationDeadLock.java b/test/jdk/java/util/logging/TestLogConfigurationDeadLock.java
index 3327b88d54b..4b63512292b 100644
--- a/test/jdk/java/util/logging/TestLogConfigurationDeadLock.java
+++ b/test/jdk/java/util/logging/TestLogConfigurationDeadLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  *       drainLoggerRefQueueBounded / readConfiguration
  * @modules java.logging
  *          java.management
- * @run main/othervm -Djava.security.manager=allow TestLogConfigurationDeadLock
+ * @run main/othervm TestLogConfigurationDeadLock
  * @author danielfuchs
  */
 // This test is a best effort to try & detect issues. The test itself will run
@@ -67,8 +67,6 @@ public class TestLogConfigurationDeadLock {
     static final AtomicLong checkCount = new AtomicLong(0);
 
     /**
-     * This test will run both with and without a security manager.
-     *
      * The test starts a number of threads that will call
      *     LogManager.readConfiguration() concurrently (ReadConf), then starts
      *     a number of threads that will create new loggers concurrently
@@ -78,32 +76,12 @@ public class TestLogConfigurationDeadLock {
      * If after 4secs no deadlock was detected and no exception was thrown
      * then the test is considered a success and passes.
      *
-     * This procedure is done twice: once without a security manager and once
-     * again with a security manager - which means the test takes ~8secs to
-     * run.
-     *
-     * Note that 8sec may not be enough to detect issues if there are some.
+     * Note that 4sec may not be enough to detect issues if there are some.
      * This is a best effort test.
      *
      * @param args the command line arguments
      */
     public static void main(String[] args) throws Exception {
-
-        // test without security
-        System.out.println("No security");
-        test();
-
-        // test with security
-        System.out.println("\nWith security");
-        Policy.setPolicy(new Policy() {
-            @Override
-            public boolean implies(ProtectionDomain domain, Permission permission) {
-                if (super.implies(domain, permission)) return true;
-                // System.out.println("Granting " + permission);
-                return true; // all permissions
-            }
-        });
-        System.setSecurityManager(new SecurityManager());
         test();
     }
 
diff --git a/test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java b/test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java
index a7d4c67e349..acd03e3f9e8 100644
--- a/test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java
+++ b/test/jdk/java/util/logging/TestLogConfigurationDeadLockWithConf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,6 @@
 import java.io.PrintStream;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -46,12 +43,12 @@
  *          caused by synchronization issues in Logger and LogManager.
  * @modules java.logging
  *          java.management
- * @run main/othervm -Djava.security.manager=allow TestLogConfigurationDeadLockWithConf
+ * @run main/othervm TestLogConfigurationDeadLockWithConf
  * @author danielfuchs
  * @key randomness
  */
 // This test is a best effort to try & detect issues. The test itself will run
-// for 8secs. This is usually sufficient to detect issues.
+// for 4secs. This is usually sufficient to detect issues.
 // However to get a greater confidence it is recommended to run this test in a loop:
 // e.g. use something like:
 // $ while jtreg -jdk:$JDK -verbose:all  \
@@ -74,8 +71,6 @@ public class TestLogConfigurationDeadLockWithConf {
     static final AtomicLong checkCount = new AtomicLong(0);
 
     /**
-     * This test will run both with and without a security manager.
-     *
      * The test starts a number of threads that will call
      *     LogManager.readConfiguration() concurrently (ReadConf), then starts
      *     a number of threads that will create new loggers concurrently
@@ -85,13 +80,6 @@ public class TestLogConfigurationDeadLockWithConf {
      * If after 4secs no deadlock was detected and no exception was thrown
      * then the test is considered a success and passes.
      *
-     * This procedure is done twice: once without a security manager and once
-     * again with a security manager - which means the test takes ~8secs to
-     * run.
-     *
-     * Note that 8sec may not be enough to detect issues if there are some.
-     * This is a best effort test.
-     *
      * @param args the command line arguments
      * @throws java.lang.Exception if the test fails.
      */
@@ -109,22 +97,6 @@ public static void main(String[] args) throws Exception {
 
         System.setProperty("java.util.logging.config.file",
                config.getAbsolutePath());
-
-        // test without security
-        System.out.println("No security");
-        test();
-
-        // test with security
-        System.out.println("\nWith security");
-        Policy.setPolicy(new Policy() {
-            @Override
-            public boolean implies(ProtectionDomain domain, Permission permission) {
-                if (super.implies(domain, permission)) return true;
-                // System.out.println("Granting " + permission);
-                return true; // all permissions
-            }
-        });
-        System.setSecurityManager(new SecurityManager());
         test();
     }
 
diff --git a/test/jdk/java/util/logging/TestLoggerBundleSync.java b/test/jdk/java/util/logging/TestLoggerBundleSync.java
index 6374ef4d261..95d37909b7f 100644
--- a/test/jdk/java/util/logging/TestLoggerBundleSync.java
+++ b/test/jdk/java/util/logging/TestLoggerBundleSync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,6 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListResourceBundle;
@@ -55,7 +52,7 @@
  *          reproduce intermittent issues can be a good idea.
  * @modules java.logging
  *          java.management
- * @run main/othervm -Djava.security.manager=allow TestLoggerBundleSync
+ * @run main/othervm TestLoggerBundleSync
  * @author danielfuchs
  */
 public class TestLoggerBundleSync {
@@ -107,8 +104,6 @@ public LoggerRB(String name, ResourceBundle bundle) {
 
 
     /**
-     * This test will run both with and without a security manager.
-     *
      * The test starts a number of threads that will attempt to concurrently
      * set resource bundles on Logger, and verifies the consistency of the
      * obtained results.
@@ -120,21 +115,6 @@ public LoggerRB(String name, ResourceBundle bundle) {
     public static void main(String[] args) throws Exception {
 
         try {
-            // test without security
-            System.out.println("No security");
-            test();
-
-            // test with security
-            System.out.println("\nWith security");
-            Policy.setPolicy(new Policy() {
-                @Override
-                public boolean implies(ProtectionDomain domain, Permission permission) {
-                    if (super.implies(domain, permission)) return true;
-                    // System.out.println("Granting " + permission);
-                    return true; // all permissions
-                }
-            });
-            System.setSecurityManager(new SecurityManager());
             test();
         } finally {
             SetRB.executor.shutdownNow();
diff --git a/test/jdk/java/util/logging/TestLoggingWithMainAppContext.java b/test/jdk/java/util/logging/TestLoggingWithMainAppContext.java
index c2c3ea8712f..b13cd494eb7 100644
--- a/test/jdk/java/util/logging/TestLoggingWithMainAppContext.java
+++ b/test/jdk/java/util/logging/TestLoggingWithMainAppContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  *          VM mode: it would not test the intended behavior.
  * @modules java.desktop
  *          java.logging
- * @run main/othervm -Djava.security.manager=allow TestLoggingWithMainAppContext
+ * @run main/othervm TestLoggingWithMainAppContext
  */
 public class TestLoggingWithMainAppContext {
 
@@ -48,10 +48,6 @@ public static void main(String[] args) throws IOException {
         }
         System.out.println("bar1.getParent() is the same as foo1");
 
-        // Set a security manager
-        System.setSecurityManager(new SecurityManager());
-        System.out.println("Now running with security manager");
-
         // Triggers the creation of the main AppContext
         ByteArrayInputStream is = new ByteArrayInputStream(new byte[] { 0, 1 });
         ImageIO.read(is); // triggers calls to system loggers & creation of main AppContext
diff --git a/test/jdk/java/util/logging/TestMainAppContext.java b/test/jdk/java/util/logging/TestMainAppContext.java
index 0bfcbbad9d8..83c6769b02d 100644
--- a/test/jdk/java/util/logging/TestMainAppContext.java
+++ b/test/jdk/java/util/logging/TestMainAppContext.java
@@ -33,7 +33,7 @@
  * @modules java.desktop/sun.awt
  *          java.logging
  * @build TestMainAppContext
- * @run main/othervm -Djava.security.manager=allow TestMainAppContext
+ * @run main/othervm TestMainAppContext
  * @author danielfuchs
  */
 public class TestMainAppContext {
@@ -74,14 +74,11 @@ public void run() {
             }
 
         };
-
-        System.setSecurityManager(new SecurityManager());
         t2.start();
         t2.join();
         if (thrown != null) {
             throw new RuntimeException("Test failed: " + thrown, thrown);
         }
-
     }
 
 }
diff --git a/test/jdk/java/util/logging/TestAppletLoggerContext.java b/test/jdk/java/util/logging/TestUILoggerContext.java
similarity index 76%
rename from test/jdk/java/util/logging/TestAppletLoggerContext.java
rename to test/jdk/java/util/logging/TestUILoggerContext.java
index b69497a626e..d5e170a1100 100644
--- a/test/jdk/java/util/logging/TestAppletLoggerContext.java
+++ b/test/jdk/java/util/logging/TestUILoggerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,18 +21,11 @@
  * questions.
  */
 
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import java.util.logging.LoggingPermission;
 import jdk.internal.access.JavaAWTAccess;
 import jdk.internal.access.SharedSecrets;
 
@@ -44,60 +37,23 @@
  *
  * @modules java.base/jdk.internal.access
  *          java.logging
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingApplet
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  LoadingApplet
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingMain
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  LoadingMain
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext One
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  One
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Two
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Two
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Three
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Three
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Four
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Four
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Five
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Five
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Six
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Six
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext Seven
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext  Seven
- * @run main/othervm -Dtest.security=off TestAppletLoggerContext
- * @run main/othervm -Djava.security.manager=allow -Dtest.security=on TestAppletLoggerContext
+ * @run main/othervm TestUILoggerContext LoadingUIContext
+ * @run main/othervm TestUILoggerContext LoadingMain
+ * @run main/othervm TestUILoggerContext One
+ * @run main/othervm TestUILoggerContext Two
+ * @run main/othervm TestUILoggerContext Three
+ * @run main/othervm TestUILoggerContext Four
+ * @run main/othervm TestUILoggerContext Five
+ * @run main/othervm TestUILoggerContext Six
+ * @run main/othervm TestUILoggerContext Seven
+ * @run main/othervm TestUILoggerContext
  */
 
-// NOTE: We run in other VM in order to 1. switch security manager and 2. cause
-// LogManager class to be loaded anew.
-public class TestAppletLoggerContext {
-
-    // Avoids the hassle of dealing with files and system props...
-    static class SimplePolicy extends Policy {
-
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-
-        private final Permissions perms;
-        public SimplePolicy(Permission... permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions) {
-                perms.add(permission);
-            }
-        }
-        @Override
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-        @Override
-        public boolean implies(ProtectionDomain pd, Permission p) {
-           return perms.implies(p) || DEFAULT_POLICY.implies(pd, p);
-        }
-    }
+// NOTE: We run in other VM in order to cause LogManager class to be loaded anew.
+public class TestUILoggerContext {
 
     // The bridge class initializes the logging system.
-    // It stubs the applet context in order to simulate context changes.
+    // It stubs the UI context in order to simulate context changes.
     //
     public static class Bridge {
 
@@ -123,23 +79,16 @@ public static TestExc exc(Object o) {
         static final JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
         public static void init() {
             SharedSecrets.setJavaAWTAccess(javaAwtAccess);
-            if (System.getProperty("test.security", "on").equals("on")) {
-                Policy p = new SimplePolicy(new LoggingPermission("control", null),
-                    new RuntimePermission("setContextClassLoader"),
-                    new RuntimePermission("shutdownHooks"));
-                Policy.setPolicy(p);
-                System.setSecurityManager(new SecurityManager());
-            }
         }
 
         public static void changeContext() {
-            System.out.println("... Switching to a new applet context ...");
+            System.out.println("... Switching to a new UI context ...");
             javaAwtAccess.active = true;
             javaAwtAccess.exc = new JavaAWTAccessStub.TestExc();
         }
 
         public static void desactivate() {
-            System.out.println("... Running with no applet context ...");
+            System.out.println("... Running with no UI context ...");
             javaAwtAccess.exc = null;
             javaAwtAccess.active = false;
         }
@@ -164,12 +113,12 @@ public static class CustomLogger extends Logger {
     }
 
     public static enum TestCase {
-        LoadingApplet, LoadingMain, One, Two, Three, Four, Five, Six, Seven;
+        LoadingUIContext, LoadingMain, One, Two, Three, Four, Five, Six, Seven;
         public void test() {
             switch(this) {
                 // When run - each of these two tests must be
                 // run before any other tests and before each other.
-                case LoadingApplet: testLoadingApplet(); break;
+                case LoadingUIContext: testLoadingUIContext(); break;
                 case LoadingMain:   testLoadingMain(); break;
                 case One:   testOne(); break;
                 case Two:   testTwo(); break;
@@ -182,9 +131,9 @@ public void test() {
         }
         public String describe() {
             switch(this) {
-                case LoadingApplet:
+                case LoadingUIContext:
                     return "Test that when the LogManager class is"
-                        + " loaded in  an applet thread first,"
+                        + " loaded with UI context first,"
                         + "\n all LoggerContexts are correctly initialized";
                 case LoadingMain:
                     return "Test that when the LogManager class is"
@@ -236,7 +185,7 @@ public static void main(String[] args) {
             tests = EnumSet.complementOf(EnumSet.of(TestCase.LoadingMain));
         }
         final EnumSet<TestCase> loadingTests =
-            EnumSet.of(TestCase.LoadingApplet, TestCase.LoadingMain);
+            EnumSet.of(TestCase.LoadingUIContext, TestCase.LoadingMain);
         int testrun = 0;
         for (TestCase test : tests) {
             if (loadingTests.contains(test)) {
@@ -251,8 +200,7 @@ public static void main(String[] args) {
                 test.test();
             } catch (Exception x) {
                throw new Error(String.valueOf(test)
-                   + (System.getSecurityManager() == null ? " without " : " with ")
-                   + "security failed: "+x+"\n "+"FAILED: "+test.describe()+"\n", x);
+                   + "failed: "+x+"\n "+"FAILED: "+test.describe()+"\n", x);
             } finally {
                 testrun++;
             }
@@ -261,7 +209,7 @@ public static void main(String[] args) {
         }
     }
 
-    public static void testLoadingApplet() {
+    public static void testLoadingUIContext() {
         Bridge.changeContext();
 
         Logger bar = new Bridge.CustomLogger("com.foo.Bar");
@@ -404,8 +352,7 @@ public static void testFive() {
     /**
      * This test is designed to test the behavior of additional LogManager instances.
      * It must be noted that if the security manager is off, then calling
-     * Bridge.changeContext() has actually no effect - which explains why we have
-     * some differences between the cases security manager on & security manager
+     * Bridge.changeContext() has actually no effect.
      * off.
      **/
     public static void testSix() {
@@ -431,12 +378,12 @@ public static void testSix() {
                 Bridge.changeContext();
 
                 // this is not a supported configuration:
-                // We are in an applet context with several log managers.
+                // We are in an UI context with several log managers.
                 // We however need to check our assumptions...
 
-                // Applet context => root logger and global logger should also be null.
+                // UI context => root logger and global logger should also be null.
 
-                Logger expected = (System.getSecurityManager() == null ? global : null);
+                Logger expected = global;
                 Logger logger3 = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
                 Logger logger3b = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
                 assertEquals(expected, logger3);
@@ -447,7 +394,7 @@ public static void testSix() {
                 Logger logger4b = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
                 assertNotNull(logger4);
                 assertNotNull(logger4b);
-                expected = (System.getSecurityManager() == null ? global : global2);
+                expected = global;
                 assertEquals(logger4,  expected);
                 assertEquals(logger4b, expected);
 
@@ -464,9 +411,7 @@ public static void testSix() {
     /**
      * This test is designed to test the behavior of additional LogManager instances.
      * It must be noted that if the security manager is off, then calling
-     * Bridge.changeContext() has actually no effect - which explains why we have
-     * some differences between the cases security manager on & security manager
-     * off.
+     * Bridge.changeContext() has actually no effect.
      **/
     public static void testSeven() {
         for (int i=0; i<3 ; i++) {
@@ -501,42 +446,34 @@ public static void testSeven() {
                 Bridge.changeContext();
 
                 // this is not a supported configuration:
-                // We are in an applet context with several log managers.
+                // We are in an UI context with several log managers.
                 // We however need to check our assumptions...
 
-                // Applet context => root logger and global logger should also be null.
+                // UI context => root logger and global logger should also be null.
 
                 Logger logger5 = manager.getLogger("");
                 Logger logger5b = manager.getLogger("");
-                Logger expectedRoot = (System.getSecurityManager() == null ? root : null);
+                Logger expectedRoot = root;
                 assertEquals(logger5, expectedRoot);
                 assertEquals(logger5b, expectedRoot);
 
-                if (System.getSecurityManager() != null) {
-                    assertNull(manager.getLogger(Logger.GLOBAL_LOGGER_NAME));
-                } else {
-                    assertEquals(global, manager.getLogger(Logger.GLOBAL_LOGGER_NAME));
-                }
+                assertEquals(global, manager.getLogger(Logger.GLOBAL_LOGGER_NAME));
 
                 Logger global2 = new Bridge.CustomLogger(Logger.GLOBAL_LOGGER_NAME);
                 manager.addLogger(global2);
                 Logger logger6 = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
                 Logger logger6b = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
-                Logger expectedGlobal = (System.getSecurityManager() == null ? global : global2);
+                Logger expectedGlobal = global;
 
                 assertNotNull(logger6);
                 assertNotNull(logger6b);
                 assertEquals(logger6, expectedGlobal);
                 assertEquals(logger6b, expectedGlobal);
-                if (System.getSecurityManager() != null) {
-                    assertNull(manager.getLogger(""));
-                } else {
-                    assertEquals(root, manager.getLogger(""));
-                }
+                assertEquals(root, manager.getLogger(""));
 
                 Logger root2 = new Bridge.CustomLogger("");
                 manager.addLogger(root2);
-                expectedRoot = (System.getSecurityManager() == null ? root : root2);
+                expectedRoot = root;
                 Logger logger7 = manager.getLogger("");
                 Logger logger7b = manager.getLogger("");
                 assertNotNull(logger7);
diff --git a/test/jdk/java/util/logging/modules/GetResourceBundleTest.java b/test/jdk/java/util/logging/modules/GetResourceBundleTest.java
index af7b4c9b945..f1f52401fc7 100644
--- a/test/jdk/java/util/logging/modules/GetResourceBundleTest.java
+++ b/test/jdk/java/util/logging/modules/GetResourceBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@ public void setup() throws Exception {
     }
 
     @Test
-    public void runWithoutSecurityManager() throws Exception {
+    public void run() throws Exception {
         int exitValue = executeTestJava(
                 "-cp", PKG_DEST_DIR.toString(),
                 "--module-path", MOD_DEST_DIR.toString(),
@@ -95,18 +95,4 @@ public void runWithoutSecurityManager() throws Exception {
                 .getExitValue();
         assertTrue(exitValue == 0);
     }
-
-    @Test
-    public void runWithSecurityManager() throws Exception {
-        int exitValue = executeTestJava(
-                "-Djava.security.manager",
-                "-cp", PKG_DEST_DIR.toString(),
-                "--module-path", MOD_DEST_DIR.toString(),
-                "--add-modules", String.join(",", modules),
-                "p3.test.ResourceBundleTest")
-                .outputTo(System.out)
-                .errorTo(System.err)
-                .getExitValue();
-        assertTrue(exitValue == 0);
-    }
 }
diff --git a/test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java b/test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java
index ff0a7954af4..60f1ac68ae5 100644
--- a/test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java
+++ b/test/jdk/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,10 @@
  * @library test
  * @build test/*
  * @build com.foo.UserControlProvider
- * @run main/othervm UserDefaultControlTest false
- * @run main/othervm -Djava.security.manager=allow UserDefaultControlTest true
+ * @run main/othervm UserDefaultControlTest
  */
 
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
+import java.io.IOException;
 import java.nio.file.*;
 import java.util.*;
 
@@ -41,16 +38,8 @@
 
 public class UserDefaultControlTest {
     public static void main(String... args) throws Exception {
-        boolean smExists = Boolean.valueOf(args[0]);
         initServices();
-        if (smExists) {
-            System.out.println("test with security manager present:");
-            System.setSecurityManager(new SecurityManager());
-        } else {
-            System.out.println("test without security manager present:");
-        }
-
-        test(smExists);
+        test();
     }
 
     private static void initServices() throws IOException {
@@ -68,24 +57,8 @@ private static void initServices() throws IOException {
             StandardCopyOption.REPLACE_EXISTING);
     }
 
-    private static void test(boolean smExists) {
-        ResourceBundle rb;
-
-        try {
-            rb = ResourceBundle.getBundle("com.foo.XmlRB", Locale.ROOT);
-            if (smExists) {
-                throw new RuntimeException("getBundle did not throw " +
-                    "MissingResourceException with a security manager");
-            }
-        } catch (MissingResourceException e) {
-            if (smExists) {
-                // failed successfully
-                return;
-            } else {
-                throw e;
-            }
-        }
-
+    private static void test() {
+        ResourceBundle rb = ResourceBundle.getBundle("com.foo.XmlRB", Locale.ROOT);
         String type = rb.getString("type");
         if (!type.equals("XML")) {
             throw new RuntimeException("Root Locale: type: got " + type
diff --git a/test/jdk/java/util/spi/ToolProviderTest.java b/test/jdk/java/util/spi/ToolProviderTest.java
index ebcd027af2b..95bbc150e06 100644
--- a/test/jdk/java/util/spi/ToolProviderTest.java
+++ b/test/jdk/java/util/spi/ToolProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8159855
  * @summary test ToolProvider SPI
- * @run main/othervm -Djava.security.manager=allow ToolProviderTest
+ * @run main/othervm ToolProviderTest
  */
 
 import java.io.IOException;
@@ -44,18 +44,8 @@ public static void main(String... args) throws Exception {
 
     void run() throws Exception {
         initServices();
-
-        System.out.println("Validate an NPE is thrown with null arguments");
-
-        testNullArgs();
-
-        System.out.println("test without security manager present:");
-        test();
-
-        System.setSecurityManager(new SecurityManager());
-
-        System.out.println("test with security manager present:");
         test();
+        testNullArgs();
     }
 
     private void test() throws Exception {
@@ -102,10 +92,6 @@ private void initServices() throws IOException {
     }
 
     public static class TestProvider implements ToolProvider {
-        public TestProvider() {
-            checkPrivileges();
-        }
-
         public String name() {
             return "test";
         }
@@ -114,22 +100,6 @@ public int run(PrintWriter out, PrintWriter err, String... args) {
             out.println("Test: " + Arrays.toString(args));
             return 0;
         }
-
-        private void checkPrivileges() {
-            boolean haveSecurityManager = (System.getSecurityManager() != null);
-            try {
-                // validate appropriate privileges by checking access to a
-                // system property
-                System.getProperty("java.home");
-                if (haveSecurityManager) {
-                    throw new Error("exception not thrown");
-                }
-            } catch (SecurityException e) {
-                if (!haveSecurityManager) {
-                    throw new Error("unexpected exception: " + e);
-                }
-            }
-        }
     }
 }
 
diff --git a/test/jdk/java/util/stream/GathererAPITest.java b/test/jdk/java/util/stream/GathererAPITest.java
index 4bcda85ccbc..364d3065acb 100644
--- a/test/jdk/java/util/stream/GathererAPITest.java
+++ b/test/jdk/java/util/stream/GathererAPITest.java
@@ -35,7 +35,6 @@
 /**
  * @test
  * @summary Testing public API of Gatherer
- * @enablePreview
  * @run junit GathererAPITest
  */
 
diff --git a/test/jdk/java/util/stream/GathererShortCircuitTest.java b/test/jdk/java/util/stream/GathererShortCircuitTest.java
index 059d90a6e7f..7e755dbe23c 100644
--- a/test/jdk/java/util/stream/GathererShortCircuitTest.java
+++ b/test/jdk/java/util/stream/GathererShortCircuitTest.java
@@ -32,7 +32,6 @@
  * @test
  * @bug 8328316
  * @summary Testing Gatherer behavior under short circuiting
- * @enablePreview
  * @run junit GathererShortCircuitTest
  */
 
diff --git a/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java
index 3d8e608cc6c..7a03c0b35ed 100644
--- a/test/jdk/java/util/stream/GathererTest.java
+++ b/test/jdk/java/util/stream/GathererTest.java
@@ -37,7 +37,6 @@
 /**
  * @test
  * @summary Testing the Gatherer contract
- * @enablePreview
  * @library /lib/testlibrary/bootlib
  * @build java.base/java.util.stream.DefaultMethodStreams
  * @run junit GathererTest
diff --git a/test/jdk/java/util/stream/GatherersFoldTest.java b/test/jdk/java/util/stream/GatherersFoldTest.java
index caecff19e3a..0e0535882f9 100644
--- a/test/jdk/java/util/stream/GatherersFoldTest.java
+++ b/test/jdk/java/util/stream/GatherersFoldTest.java
@@ -34,7 +34,6 @@
 /**
  * @test
  * @summary Tests the API and contract of Gatherers.fold
- * @enablePreview
  * @run junit GatherersFoldTest
  */
 
diff --git a/test/jdk/java/util/stream/GatherersMapConcurrentTest.java b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
index 5ff845f55b9..f7cc1c42a3c 100644
--- a/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
+++ b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
@@ -38,7 +38,6 @@
 /**
  * @test
  * @summary Tests the API and contract of Gatherers.mapConcurrent
- * @enablePreview
  * @run junit GatherersMapConcurrentTest
  */
 
diff --git a/test/jdk/java/util/stream/GatherersScanTest.java b/test/jdk/java/util/stream/GatherersScanTest.java
index 993a616233c..51b7c0ef0eb 100644
--- a/test/jdk/java/util/stream/GatherersScanTest.java
+++ b/test/jdk/java/util/stream/GatherersScanTest.java
@@ -35,7 +35,6 @@
 /**
  * @test
  * @summary Tests the API and contract of Gatherers.scan
- * @enablePreview
  * @run junit GatherersScanTest
  */
 
diff --git a/test/jdk/java/util/stream/GatherersWindowFixedTest.java b/test/jdk/java/util/stream/GatherersWindowFixedTest.java
index 69426dfd768..cddfee1b098 100644
--- a/test/jdk/java/util/stream/GatherersWindowFixedTest.java
+++ b/test/jdk/java/util/stream/GatherersWindowFixedTest.java
@@ -36,7 +36,6 @@
 /**
  * @test
  * @summary Tests the API and contract of Gatherers.windowFixed
- * @enablePreview
  * @run junit GatherersWindowFixedTest
  */
 
diff --git a/test/jdk/java/util/stream/GatherersWindowSlidingTest.java b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
index 27ed6ecc4dd..29ffa54e882 100644
--- a/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
+++ b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
@@ -36,7 +36,6 @@
 /**
  * @test
  * @summary Tests the API and contract of Gatherers.windowSliding
- * @enablePreview
  * @run junit GatherersWindowSlidingTest
  */
 
diff --git a/test/jdk/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp b/test/jdk/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp
deleted file mode 100644
index 71c05d1700f..00000000000
--- a/test/jdk/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp
+++ /dev/null
@@ -1,4 +0,0 @@
-grant { 
-    permission java.lang.RuntimePermission "accessibilityProvider";
-    permission java.io.FilePermission "*", "read,write,delete";
-};
diff --git a/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh b/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh
index a13e28f4a6c..a55589e6db7 100644
--- a/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh
+++ b/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ failures=0
 go() {
   CP="$TESTCLASSES$SEP$TESTD"
   echo ''
-  sh -xc "$JAVA $SECURITY_MANAGER -Djavax.accessibility.assistive_technologies=$PROVIDER1$COMMA$PROVIDER2 -cp $CP Load $1 $2 $3" 2>&1
+  sh -xc "$JAVA -Djavax.accessibility.assistive_technologies=$PROVIDER1$COMMA$PROVIDER2 -cp $CP Load $1 $2 $3" 2>&1
   if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
@@ -78,13 +78,6 @@ go() {
 PROVIDER1="FooProvider"
 go pass $PROVIDER1
 
-# start using security manager
-SECURITY_MANAGER="-Djava.security.manager -Djava.security.policy=$TESTSRC/accessibilityProvider.sp"
-
-# find one provider (with security manager)
-go pass $PROVIDER1
-SECURITY_MANAGER=
-
 # fail if no provider found
 PROVIDER1="NoProvider"
 go fail $PROVIDER1
diff --git a/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java b/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java
index 9a9da43b544..f4ddd726d0c 100644
--- a/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java
+++ b/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java
@@ -60,7 +60,7 @@ public void setUp() throws NoSuchAlgorithmException {
         kdfUnderTest = KDF.getInstance("HKDF-SHA256");
     }
 
-    @Test(threadPoolSize = 50, invocationCount = 100, timeOut = 150)
+    @Test(threadPoolSize = 50, invocationCount = 100)
     public void testDerive()
         throws InvalidAlgorithmParameterException, NoSuchAlgorithmException {
         SecretKey result = kdfUnderTest.deriveKey("Generic", derivationSpec);
diff --git a/test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java b/test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java
index c64b171a5ef..2f79310fa3f 100644
--- a/test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java
+++ b/test/jdk/javax/imageio/CachePremissionsTest/CachePermissionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,108 +24,53 @@
 /**
  * @test
  * @bug     6684104
- * @summary Test verifies that ImageIO checks all permissions required for
- *           the file cache usage:
- *
- *          no policy file: No security restrictions.
- *             Expected result: ImageIO creates file-cached stream.
- *
- *          w.policy: the case when we have read and write permissions
- *              for java.io.temp directory but have only write permission
- *              for a temp file.
- *             Expected result: ImageIO create a memory-cached stream
- *              image output stream.
- *
- *          rw.policy: the case when we  have read and write permissions
- *              for java.io.temp directory but have only read and write
- *              permission for a temp cache file.
- *             Expected result: ImageIO creates a memory-cached stream
- *              because temporary cache file can not be deleted.
- *
- *          rwd.policy: the case when we  have read and write permissions
- *              for java.io.temp directory and have all required permissions
- *             (read, write, and delete) for a temporary cache file.
- *             Expected result: ImageIO creates file-cached stream.
- *
- *           -Djava.security.debug=access can be used to verify file permissions.
- *
- * @run     main CachePermissionsTest true
- * @run     main/othervm -Djava.security.manager=allow CachePermissionsTest false w.policy
- * @run     main/othervm -Djava.security.manager=allow CachePermissionsTest false rw.policy
- * @run     main/othervm -Djava.security.manager=allow CachePermissionsTest true rwd.policy
+ * @summary Test verifies that ImageIO uses cache if requested.
+ * @run     main/othervm CachePermissionsTest true
+ * @run     main/othervm CachePermissionsTest false
  */
 
-import java.io.File;
 import java.io.IOException;
 import java.io.ByteArrayOutputStream;
 import javax.imageio.stream.ImageOutputStream;
-
 import javax.imageio.ImageIO;
 
-
 public class CachePermissionsTest {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         boolean isFileCacheExpected =
             Boolean.valueOf(args[0]).booleanValue();
         System.out.println("Is file cache expected: " + isFileCacheExpected);
 
-        ImageIO.setUseCache(true);
+        ImageIO.setUseCache(isFileCacheExpected);
 
         System.out.println("java.io.tmpdir is " + System.getProperty("java.io.tmpdir"));
 
-        if (args.length > 1) {
-            String testsrc = System.getProperty("test.src", ".");
-            String policy = testsrc + File.separator + args[1];
-
-            System.out.println("Policy file: " + policy);
-            System.setProperty("java.security.policy", policy);
-
-            System.out.println("Install security manager...");
-            System.setSecurityManager(new SecurityManager());
-        }
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        try {
-            ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
+        ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
 
-            boolean isFileCache = ios.isCachedFile();
-            System.out.println("Is file cache used: " + isFileCache);
+        boolean isFileCache = ios.isCachedFile();
+        System.out.println("Is file cache used: " + isFileCache);
 
-            if (isFileCache !=isFileCacheExpected) {
-                System.out.println("WARNING: file chace usage is not as expected!");
-            }
+        if (isFileCache != isFileCacheExpected) {
+            System.out.println("WARNING: file cache usage is not as expected!");
+        }
 
-            System.out.println("Verify data writing...");
+        System.out.println("Verify data writing...");
             for (int i = 0; i < 8192; i++) {
-                ios.writeInt(i);
-            }
+            ios.writeInt(i);
+        }
 
-            System.out.println("Verify data reading...");
-            ios.seek(0L);
+        System.out.println("Verify data reading...");
+        ios.seek(0L);
 
-            for (int i = 0; i < 8192; i++) {
-                int j = ios.readInt();
-                if (i != j) {
-                    throw new RuntimeException("Wrong data in the stream " + j + " instead of " + i);
-                }
+        for (int i = 0; i < 8192; i++) {
+            int j = ios.readInt();
+            if (i != j) {
+                throw new RuntimeException("Wrong data in the stream " + j + " instead of " + i);
             }
-
-            System.out.println("Verify stream closing...");
-            ios.close();
-        } catch (IOException e) {
-            /*
-             * Something went wrong?
-             */
-            throw new RuntimeException("Test FAILED.", e);
-        } catch (SecurityException e) {
-            /*
-             * We do not expect security execptions here:
-             * we there are any security restrition, ImageIO
-             * should swith to memory-cached streams, instead
-             * of using file cache.
-             */
-            throw new RuntimeException("Test FAILED.", e);
         }
+
+        System.out.println("Verify stream closing...");
+        ios.close();
     }
 }
diff --git a/test/jdk/javax/imageio/CachePremissionsTest/rw.policy b/test/jdk/javax/imageio/CachePremissionsTest/rw.policy
deleted file mode 100644
index 003c85b5784..00000000000
--- a/test/jdk/javax/imageio/CachePremissionsTest/rw.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-      permission java.util.PropertyPermission "test.classes", "read";
-      permission java.util.PropertyPermission "java.io.tmpdir", "read";
-      permission java.io.FilePermission "${java.io.tmpdir}${/}*", "read, write";
-};
diff --git a/test/jdk/javax/imageio/CachePremissionsTest/rwd.policy b/test/jdk/javax/imageio/CachePremissionsTest/rwd.policy
deleted file mode 100644
index f4d1f90a36e..00000000000
--- a/test/jdk/javax/imageio/CachePremissionsTest/rwd.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-      permission java.util.PropertyPermission "test.classes", "read";
-      permission java.util.PropertyPermission "java.io.tmpdir", "read";
-      permission java.io.FilePermission "${java.io.tmpdir}${/}*", "read, write, delete";
-};
diff --git a/test/jdk/javax/imageio/CachePremissionsTest/w.policy b/test/jdk/javax/imageio/CachePremissionsTest/w.policy
deleted file mode 100644
index ff354e9616b..00000000000
--- a/test/jdk/javax/imageio/CachePremissionsTest/w.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-      permission java.util.PropertyPermission "test.classes", "read";
-      permission java.util.PropertyPermission "java.io.tmpdir", "read";
-      permission java.io.FilePermission "${java.io.tmpdir}${/}*", "write";
-};
diff --git a/test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh b/test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh
index e11e0957b12..03444e96302 100644
--- a/test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh
+++ b/test/jdk/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 # @test
 # @bug 8081729 8140314
 # @summary Test external plugin as classpath jar and as a modular jar.
-#          Test both cases with and without a security manager.
 
 set -e
 
@@ -77,12 +76,6 @@ if [ $? -ne 0 ]; then
     exception=1
       echo "Classpath test failed: exception thrown!"
 fi
-echo "Test classpath jar with security manager .."
-$JAVA -Djava.security.manager -cp .${CPSEP}${TESTDIR}${CPSEP}${PLUGINDIR}/simp.jar simptest.TestSIMPPlugin
-if [ $? -ne 0 ]; then
-    exception=1
-    echo "Classpath + SecurityManager test failed: exception thrown!"
-fi
 
 # expect to find SimpReader on module path
 echo "Test modular jar .. "
@@ -93,13 +86,6 @@ if [ $? -ne 0 ]; then
     echo "modular jar test failed: exception thrown!"
 fi
 
-echo "Test modular jar with security manager .."
-$JAVA -Djava.security.manager --module-path $PLUGINDIR -cp $TESTDIR simptest.TestSIMPPlugin
-if [ $? -ne 0 ]; then
-    exception=1
-    echo "modular jar with security manager test failed: exception thrown!"
-fi
-
 if [ $exception -ne 0 ]; then
     echo "TEST FAILED"
     exit 1
diff --git a/test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh b/test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh
index eaf83b038c2..607e261aefd 100644
--- a/test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh
+++ b/test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh -p
-# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -255,23 +255,6 @@ case "$OS" in
       ;;
 esac
 
-
-# Update policy file to grant read permission
-echo "grant codeBase \"file:${TEST_CODEBASE}\" {" > classpath.policy
-echo " permission java.io.FilePermission \"${TEST_PLUGIN_JAR}\", \"read\";" >> classpath.policy
-echo " permission java.util.PropertyPermission \"test.5076692.property\", \"read\";" >> classpath.policy
-echo "};" >> classpath.policy
-echo "grant codeBase \"file:${TEST_PLUGIN_JAR}\" {" >> classpath.policy
-echo " permission java.util.PropertyPermission \"test.5076692.property\", \"read\";" >> classpath.policy
-echo "};" >> classpath.policy
-
-echo ---------------------
-echo --- Applet policy ---
-echo ---------------------
-cat classpath.policy
-echo ---------------------
-echo
-
 echo -------------------------------
 echo ---  Applet Classpath Test  ---
 echo -------------------------------
@@ -282,9 +265,7 @@ echo -------------------------------
 #  http://java.sun.com/j2se/1.5.0/docs/guide/security/PolicyFiles.html)
 #
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ".${PATHSEP}${TEST_PLUGIN_JAR}" \
-    -Djava.security.policy==classpath.policy \
-    -Djava.security.manager IIOPluginTest
+${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ".${PATHSEP}${TEST_PLUGIN_JAR}" IIOPluginTest
 
 status=$?
 
diff --git a/test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java b/test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java
index 3ce2d45a6a1..2d8653cc2e1 100644
--- a/test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java
+++ b/test/jdk/javax/imageio/spi/AppletContextTest/IIOPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 import javax.imageio.ImageIO;
+import java.util.ServiceConfigurationError;
 
 public class IIOPluginTest {
 
@@ -29,15 +30,16 @@ public class IIOPluginTest {
     public static String[] dummymimeType = {"image/test_5076692"};
 
     public static void main(String[] args) {
-        SecurityManager sm = System.getSecurityManager();
-        System.out.println("Sm is " + sm);
-
-        String formatNames[] = ImageIO.getReaderFormatNames();
-        String readerMimeTypes[] = ImageIO.getReaderMIMETypes();
-
-        if (!isPresent(dummyformatNames, formatNames) ||
-            !isPresent(dummymimeType, readerMimeTypes)) {
-            throw new RuntimeException("No test plugin available!");
+        try {
+            String formatNames[] = ImageIO.getReaderFormatNames();
+            String readerMimeTypes[] = ImageIO.getReaderMIMETypes();
+            if (!isPresent(dummyformatNames, formatNames) ||
+                !isPresent(dummymimeType, readerMimeTypes)) {
+                throw new RuntimeException("No test plugin available!");
+            }
+        } catch (ServiceConfigurationError sce) {
+            System.out.println("Expected ServiceConfigurationError \n" + sce);
+            System.out.println("Test Passed");
         }
     }
 
diff --git a/test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java b/test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java
index 16f0c8f262f..4b8f2dbcdbf 100644
--- a/test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java
+++ b/test/jdk/javax/management/ImplementationVersion/ImplVersionTest.java
@@ -25,9 +25,7 @@
  * @test
  * @bug 4842196
  * @summary Test that there is no difference between the JMX version and the
- * JDK version when the application is run with a security manager and the
- * test codebase has the java permission to read the "java.runtime.version"
- * system property.
+ * JDK version.
  * @author Luis-Miguel Alventosa
  *
  * @library /test/lib
@@ -53,8 +51,6 @@ public static void main(String[] args) throws Exception {
         // Get boot class path
         //
         String[] command = new String[] {
-            "-Djava.security.manager",
-            "-Djava.security.policy==" + testSrc + File.separator + "policy",
             "-Dtest.classes=" + testClasses,
             "ImplVersionCommand",
             System.getProperty("java.runtime.version")
diff --git a/test/jdk/javax/management/ImplementationVersion/policy b/test/jdk/javax/management/ImplementationVersion/policy
deleted file mode 100644
index 1d83b1a0f77..00000000000
--- a/test/jdk/javax/management/ImplementationVersion/policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant codebase "file:${test.classes}" {
-  permission java.util.PropertyPermission "java.runtime.version", "read";
-  permission javax.management.MBeanServerPermission "createMBeanServer";
-  permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#ImplementationVersion[JMImplementation:type=MBeanServerDelegate]", "getAttribute";
-};
diff --git a/test/jdk/javax/management/Introspector/AnnotationSecurityTest.java b/test/jdk/javax/management/Introspector/AnnotationSecurityTest.java
deleted file mode 100644
index f71427fd994..00000000000
--- a/test/jdk/javax/management/Introspector/AnnotationSecurityTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test AnnotationSecurityTest.java
- * @bug 6366543 6370080
- * @summary Test that having a security manager doesn't trigger a
- *          NotCompliantMBeanException
- * @author Daniel Fuchs, Yves Joan
- *
- * @modules java.desktop
- *          java.management
- *
- * @run clean AnnotationSecurityTest Described UnDescribed DescribedMBean
- *            UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean
- * @run build AnnotationSecurityTest Described UnDescribed DescribedMBean
- *            UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean
- * @run main/othervm -Djava.security.manager=allow AnnotationSecurityTest
- */
-// -Djava.security.debug=access,domain,policy
-
-import java.io.File;
-import java.io.IOException;
-
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Method;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-/**
- *
- * @author Sun Microsystems, 2005 - All rights reserved.
- */
-
-public class AnnotationSecurityTest {
-
-    /** Creates a new instance of AnnotationSecurityTest */
-    public AnnotationSecurityTest() {
-    }
-
-    public static void main(String[] argv) {
-        AnnotationSecurityTest test = new AnnotationSecurityTest();
-        test.run();
-    }
-
-
-    public void run() {
-        try {
-            final String testSrc = System.getProperty("test.src");
-            final String codeBase = System.getProperty("test.classes");
-            final String policy = testSrc + File.separator +
-                    "AnnotationSecurityTest.policy";
-            final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-            final File pf = new File(policy);
-            if (!pf.exists())
-                throw new IOException("policy file not found: " + policy);
-            if (!pf.canRead())
-                throw new IOException("policy file not readable: " + policy);
-
-            System.out.println("Policy="+policy);
-            System.setProperty("java.security.policy",policy);
-            System.setSecurityManager(new SecurityManager());
-
-            // We check that 6370080 is fixed.
-            //
-            try {
-                final Method m1 =
-                        DescribedMBean.class.getMethod("getStringProp");
-                final Method m2 =
-                        DescribedMBean.class.getMethod("setStringProp",
-                            String.class);
-                m1.getAnnotations();
-                m2.getAnnotations();
-            } catch (SecurityException x) {
-                System.err.println("ERROR: 6370080 not fixed.");
-                throw new IllegalStateException("ERROR: 6370080 not fixed.",x);
-            }
-
-            // Do the test: we should be able to register these 3 MBeans....
-            // We now test that the behaviour described in 6366543 does no
-            // longer appears now that 6370080 is fixed.
-            //
-
-            final ObjectName name1 =
-                    new ObjectName("defaultDomain:class=UnDescribed");
-            UnDescribed unDescribedMBean = new UnDescribed();
-            System.out.println("\nWe register an MBean where DescriptorKey is " +
-                    "not used at all");
-            mbs.registerMBean(unDescribedMBean, name1);
-            System.out.println("\n\tOK - The MBean "
-                    + name1 + " is registered = " + mbs.isRegistered(name1));
-
-            final ObjectName name2 =
-                    new ObjectName("defaultDomain:class=Described");
-            final Described describedMBean = new Described();
-
-            System.out.println("\nWe register an MBean with exactly the " +
-                    "same management"
-                    + " interface as above and where DescriptorKey is used.");
-            mbs.registerMBean(describedMBean, name2);
-            System.out.println("\n\tOK - The MBean "
-                    + name2 + " is registered = " + mbs.isRegistered(name2));
-
-            final ObjectName name3 =
-                    new ObjectName("defaultDomain:class=DescribedMX");
-            final DescribedMX describedMXBean = new DescribedMX();
-
-            System.out.println("\nWe register an MXBean with exactly the " +
-                    "same management"
-                    + " interface as above and where DescriptorKey is used.");
-            mbs.registerMBean(describedMXBean, name3);
-            System.out.println("\n\tOK - The MXBean "
-                    + name3 + " is registered = " + mbs.isRegistered(name3));
-
-            System.out.println("\nAll three MBeans correctly registered...");
-
-
-            // We check that we don't have getAttribute() permission - as
-            // it's been voluntarily omitted from our policy file.
-            // If we don't get the Security Exception there is probably
-            // a security configuration pb...
-            //
-            try {
-                // We don't have getAttribute() permission, so this must fail.
-                System.err.println("Trying getStringProp() - should fail");
-                mbs.getAttribute(name1,"StringProp");
-                System.err.println("ERROR: didn't get expected SecurityException"
-                        +"\n\t check security configuration & policy file: "+
-                        policy);
-                throw new RuntimeException("getStringProp() did not get a " +
-                        "SecurityException!");
-            } catch (SecurityException x) {
-                // OK!
-                System.err.println("getStringProp() - failed");
-            }
-
-         } catch (Exception t) {
-            t.printStackTrace();
-            if (t instanceof RuntimeException)
-                throw (RuntimeException)t;
-            else throw new RuntimeException(t);
-        }
-    }
-
-}
diff --git a/test/jdk/javax/management/Introspector/AnnotationSecurityTest.policy b/test/jdk/javax/management/Introspector/AnnotationSecurityTest.policy
deleted file mode 100644
index 25a59fe987a..00000000000
--- a/test/jdk/javax/management/Introspector/AnnotationSecurityTest.policy
+++ /dev/null
@@ -1,15 +0,0 @@
-grant {
-     // JMX permissions
-    permission javax.management.MBeanServerPermission "*";
-    // Add permission to create and register 1 specific Described MBean
-    permission javax.management.MBeanPermission "Described#-[defaultDomain:class=Described]", "instantiate";
-    permission javax.management.MBeanPermission "Described#-[defaultDomain:class=Described]", "registerMBean";
-    // Add permission to create and register 1 specific Described MXBean
-    permission javax.management.MBeanPermission "DescribedMX#-[defaultDomain:class=DescribedMX]", "instantiate";
-    permission javax.management.MBeanPermission "DescribedMX#-[defaultDomain:class=DescribedMX]", "registerMBean";
-    // Add permission to create and register 1 specific UnDescribed MBean
-    permission javax.management.MBeanPermission "UnDescribed#-[defaultDomain:class=UnDescribed]", "instantiate";
-    permission javax.management.MBeanPermission "UnDescribed#-[defaultDomain:class=UnDescribed]", "registerMBean";
-    //
-    permission javax.management.MBeanTrustPermission "*";
-};
diff --git a/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java b/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
index b0b24f6510d..762f9f09f6c 100644
--- a/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
+++ b/test/jdk/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
  *
  * @run clean GetAllDescriptorsTest
  * @run build GetAllDescriptorsTest
- * @run main/othervm/java.security.policy=policy  GetAllDescriptorsTest
+ * @run main/othervm GetAllDescriptorsTest
  */
 
 import java.lang.reflect.*;
diff --git a/test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java b/test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
index 5953935ef3c..77bd68fe609 100644
--- a/test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
+++ b/test/jdk/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *
  * @run clean SimpleModelMBeanCommand
  * @run build SimpleModelMBeanCommand
- * @run main/othervm/java.security.policy=policy  SimpleModelMBeanCommand
+ * @run main/othervm SimpleModelMBeanCommand
  */
 
 import java.lang.reflect.*;
diff --git a/test/jdk/javax/management/modelmbean/SimpleModelMBean/policy b/test/jdk/javax/management/modelmbean/SimpleModelMBean/policy
deleted file mode 100644
index 221dc5e69d9..00000000000
--- a/test/jdk/javax/management/modelmbean/SimpleModelMBean/policy
+++ /dev/null
@@ -1,14 +0,0 @@
-grant {
-  permission javax.management.MBeanServerPermission "createMBeanServer";
-  permission javax.management.MBeanPermission "javax.management.modelmbean.RequiredModelMBean#-[-]", "instantiate";
-  permission javax.management.MBeanPermission "javax.management.modelmbean.RequiredModelMBean#-[*:*]", "registerMBean";
-  permission javax.management.MBeanPermission "javax.management.modelmbean.RequiredModelMBean#*[*:*]", "getAttribute";
-  permission javax.management.MBeanPermission "javax.management.modelmbean.RequiredModelMBean#*[*:*]", "setAttribute";
-  permission javax.management.MBeanPermission "javax.management.modelmbean.RequiredModelMBean#*[*:*]", "invoke";
-  permission javax.management.MBeanPermission "SimpleModelMBeanCommand$Resource#-[*:*]", "registerMBean";
-  permission javax.management.MBeanPermission "SimpleModelMBeanCommand$Resource#*[*:*]", "invoke";
-  permission javax.management.MBeanPermission "SimpleModelMBeanCommand$Resource#*[*:*]", "getAttribute";
-  permission javax.management.MBeanPermission "SimpleModelMBeanCommand$Resource#*[*:*]", "setAttribute";
-  permission javax.management.MBeanPermission "SimpleModelMBeanCommand$Resource#*[*:*]", "getMBeanInfo";
-
-};
diff --git a/test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java b/test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java
index 36b9dd40b50..1452de5c3ce 100644
--- a/test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java
+++ b/test/jdk/javax/management/monitor/DerivedGaugeMonitorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that the initial derived gauge is (Integer)0
  * @author Daniel Fuchs
  *
+ * @library /test/lib
+ *
  * @run clean DerivedGaugeMonitorTest
  * @run build DerivedGaugeMonitorTest
  * @run main DerivedGaugeMonitorTest
@@ -40,9 +42,12 @@
 import javax.management.ObjectName;
 import javax.management.monitor.CounterMonitor;
 import javax.management.monitor.GaugeMonitor;
+import jdk.test.lib.Utils;
 
 public class DerivedGaugeMonitorTest {
 
+    public static final int WAIT_TIME = 1000;
+
     public static interface Things {
         public long getALong();
         public int getAnInt();
@@ -239,7 +244,7 @@ public static void test(String attr) throws Exception {
             mon1.setGranularityPeriod(5);
             mon2.setGranularityPeriod(5);
 
-            my.cdl.await(1000, TimeUnit.MILLISECONDS);
+            my.cdl.await(Utils.adjustTimeout(WAIT_TIME), TimeUnit.MILLISECONDS);
             if (my.cdl.getCount() > 0)
                 throw new Exception(attr+": Count down not reached!");
 
diff --git a/test/jdk/javax/management/monitor/StartStopTest.java b/test/jdk/javax/management/monitor/StartStopTest.java
index 4779f40cdc7..4efbb45e609 100644
--- a/test/jdk/javax/management/monitor/StartStopTest.java
+++ b/test/jdk/javax/management/monitor/StartStopTest.java
@@ -36,12 +36,6 @@
  * @run main/othervm/timeout=300 StartStopTest 1
  * @run main/othervm/timeout=300 StartStopTest 2
  * @run main/othervm/timeout=300 StartStopTest 3
- * @run main/othervm/timeout=300 -Djava.security.manager=allow StartStopTest 1
- * @run main/othervm/timeout=300 -Djava.security.manager=allow StartStopTest 2
- * @run main/othervm/timeout=300 -Djava.security.manager=allow StartStopTest 3
- * @run main/othervm/timeout=300/policy=all.policy StartStopTest 1
- * @run main/othervm/timeout=300/policy=all.policy StartStopTest 2
- * @run main/othervm/timeout=300/policy=all.policy StartStopTest 3
  *
  * @run main/othervm/timeout=300 -Djmx.x.monitor.maximum.pool.size=5 StartStopTest 1
  * @run main/othervm/timeout=300 -Djmx.x.monitor.maximum.pool.size=5 StartStopTest 2
diff --git a/test/jdk/javax/management/monitor/ThreadPoolAccTest.java b/test/jdk/javax/management/monitor/ThreadPoolAccTest.java
index 508cefddf94..d55e206ebd7 100644
--- a/test/jdk/javax/management/monitor/ThreadPoolAccTest.java
+++ b/test/jdk/javax/management/monitor/ThreadPoolAccTest.java
@@ -32,13 +32,8 @@
  * @run build ThreadPoolAccTest
  *
  * @run main/othervm ThreadPoolAccTest
- * @run main/othervm -Djava.security.manager=allow ThreadPoolAccTest
- * @run main/othervm -Djava.security.manager=allow -DThreadPoolAccTest.useGetSubjectACC=true ThreadPoolAccTest
- * @run main/othervm/policy=all.policy ThreadPoolAccTest
- * @run main/othervm/policy=all.policy -DThreadPoolAccTest.useGetSubjectACC=true ThreadPoolAccTest
  */
 
-import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Date;
 import java.util.Set;
@@ -73,9 +68,7 @@ public String getString() {
             return "";
         }
         private void setPrincipal() {
-            // Use Subject.current() unless test Property is set.
-            Subject subject = Boolean.getBoolean("ThreadPoolAccTest.useGetSubjectACC") ?
-                              Subject.getSubject(AccessController.getContext()) : Subject.current();
+            Subject subject = Subject.current();
             Set<JMXPrincipal> principals = subject.getPrincipals(JMXPrincipal.class);
             principal = principals.iterator().next().getName();
         }
diff --git a/test/jdk/javax/management/monitor/all.policy b/test/jdk/javax/management/monitor/all.policy
deleted file mode 100644
index cb9dbed32cc..00000000000
--- a/test/jdk/javax/management/monitor/all.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java b/test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java
index 0526f86b4a1..677341aacb1 100644
--- a/test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java
+++ b/test/jdk/javax/management/remote/mandatory/connection/DeadLockTest.java
@@ -27,6 +27,10 @@
  * @summary test on a client notification deadlock.
  * @author Shanliang JIANG
  *
+ * @requires vm.compMode != "Xcomp"
+ * @comment Running with -Xcomp is likely to cause a timeout while establishing the connection
+ *          (RMI: java.rmi.NoSuchObjectException: no such object in table).
+ *
  * @run clean DeadLockTest
  * @run build DeadLockTest
  * @run main DeadLockTest
@@ -139,7 +143,7 @@ public void handleNotification(Notification n, Object h) {
                     try {
                         conn.getDefaultDomain();
                     } catch (IOException ioe) {
-                        // Greate !
+                        // OK
                     }
 
                     synchronized(this) {
diff --git a/test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java b/test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java
index d702a78ad72..12bb53dd645 100644
--- a/test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java
+++ b/test/jdk/javax/management/remote/mandatory/loading/RMIDownloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,25 +24,30 @@
 /*
  * @test
  * @bug 5021246
- * @summary Check that class downloading is supported by RMI connector
+ * @summary Check that class downloading is NOT supported by RMI connector
  * @author Eamonn McManus
  *
- * @run main/othervm -Djava.security.manager=allow RMIDownloadTest receive without
- * @run main/othervm -Djava.security.manager=allow RMIDownloadTest send without
- * @run main/othervm -Djava.security.manager=allow RMIDownloadTest receive with
- * @run main/othervm -Djava.security.manager=allow RMIDownloadTest send with
+ * @run main/othervm RMIDownloadTest receive without
+ * @run main/othervm RMIDownloadTest send without
+ * @run main/othervm RMIDownloadTest receive with
+ * @run main/othervm RMIDownloadTest send with
  */
 
 /*
- * This test checks that class downloading is supported by the RMI connector.
+ * This test checks that class downloading is NOT supported by the RMI connector,
+ * after SM removal.
+ *
  * We copy a precompiled class file into the temporary directory (which we
  * assume is not in the classpath).  We also create an instance of that
  * class using a hardcoded ClassLoader.  Then we try to get a remote attribute
  * that returns that instance, and we try to set the remote attribute to the
- * instance.  In both cases, this will only work if the class can be downloaded
- * based on the codebase that we have set to the temporary directory.  We also
- * test that it does *not* work when the codebase is not set, in case the test
- * is succeeding for some other reason.
+ * instance.
+ *
+ * This used to only work if the class can be downloaded based on the codebase
+ * that we have set to the temporary directory.
+ *
+ * Post SM removal, we test that it does *not* work either when the codebase
+ * is set, or is not.
  *
  * We run the test four times, for each combination of (send, receive) x
  * (with-codebase, without-codebase).  Doing all four tests within the same
@@ -132,8 +137,6 @@ public static void main(String[] args) throws Exception {
         getSetInstance = new GetSet();
         pmbs.registerMBean(getSetInstance, getSetName);
 
-        System.setSecurityManager(new LaidBackSecurityManager());
-
 //        System.setProperty("sun.rmi.loader.logLevel", "VERBOSE");
 
         String tmpdir = System.getProperty("java.io.tmpdir");
@@ -159,13 +162,13 @@ public static void main(String[] args) throws Exception {
             System.out.println("Testing we can receive an object from server to client");
 
         if (with) {
-            // Test with the codebase property.  Downloading should work.
+            // Test with the codebase property.  Downloading should NOT work (after SM removal).
             URL zoobyURL = zoobyFile.getParentFile().toURI().toURL();
             System.setProperty("java.rmi.server.codebase", zoobyURL.toString());
-            System.out.println("Testing with codebase, should work");
+            System.out.println("Testing with codebase, should NOT work");
             System.out.println("Codebase is " +
                     System.getProperty("java.rmi.server.codebase"));
-            test(send, true);
+            test(send, false);
         } else {
             // Test without setting the codebase property.
             // This should not work; if it does it probably means java.io.tmpdir
@@ -246,10 +249,4 @@ public void setIt(Object x) {
 
         private Object what;
     }
-
-    public static class LaidBackSecurityManager extends SecurityManager {
-        public void checkPermission(Permission perm) {
-            // OK, dude
-        }
-    }
 }
diff --git a/test/jdk/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java b/test/jdk/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java
deleted file mode 100644
index b965c72250f..00000000000
--- a/test/jdk/javax/management/remote/mandatory/notif/NoPermToRemoveTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 6515161
- * @summary checks the behaviour of  mbeanServerConnection.removeNotificationListener
- * operation when there is a exception thrown during removal
- * @modules java.management
- * @run main/othervm -Djava.security.manager=allow NoPermToRemoveTest
- */
-
-import java.lang.management.ManagementFactory;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanPermission;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerConnection;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXConnectorServerFactory;
-import javax.management.remote.JMXServiceURL;
-
-public class NoPermToRemoveTest {
-    public static void main(String[] args) throws Exception {
-        Policy.setPolicy(new NoRemovePolicy());
-        System.setSecurityManager(new SecurityManager());
-
-        JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///");
-        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-        ObjectName name = new ObjectName("foo:type=Sender");
-        mbs.registerMBean(new Sender(), name);
-        JMXConnectorServer cs = JMXConnectorServerFactory.newJMXConnectorServer(
-                url, null, mbs);
-        cs.start();
-        try {
-            JMXServiceURL addr = cs.getAddress();
-            JMXConnector cc = JMXConnectorFactory.connect(addr);
-            MBeanServerConnection mbsc = cc.getMBeanServerConnection();
-            SnoopListener listener = new SnoopListener();
-            mbsc.addNotificationListener(name, listener, null, null);
-            mbsc.invoke(name, "send", null, null);
-            if (!listener.waitForNotification(60))
-                throw new Exception("Did not receive expected notification");
-
-            try {
-                mbsc.removeNotificationListener(name, listener);
-                throw new Exception("RemoveNL did not get SecurityException");
-            } catch (SecurityException e) {
-                System.out.println("removeNL got expected exception: " + e);
-            }
-            mbsc.invoke(name, "send", null, null);
-            if (!listener.waitForNotification(60)) {
-                int listenerCount =
-                        (Integer) mbsc.getAttribute(name, "ListenerCount");
-                System.out.println("Listener count: " + listenerCount);
-                if (listenerCount != 0)
-                    throw new Exception("TEST FAILED");
-                    /* We did not receive the notification, but the MBean still
-                     * has a listener coming from the connector server, which
-                     * means the connector server still thinks there is a
-                     * listener.  If we retained the listener after the failing
-                     * removeNL that would be OK, and if the listener were
-                     * dropped by both client and server that would be OK too,
-                     * but the inconsistency is not OK.
-                     */
-            }
-            cc.close();
-        } finally {
-            cs.stop();
-        }
-    }
-
-    private static class SnoopListener implements NotificationListener {
-        private Semaphore sema = new Semaphore(0);
-
-        public void handleNotification(Notification notification, Object handback) {
-            System.out.println("Listener got: " + notification);
-            sema.release();
-        }
-
-        boolean waitForNotification(int seconds) throws InterruptedException {
-            return sema.tryAcquire(seconds, TimeUnit.SECONDS);
-        }
-    }
-
-    private static class NoRemovePolicy extends Policy {
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            PermissionCollection pc = new Permissions();
-            pc.add(new AllPermission());
-            return pc;
-        }
-
-        public void refresh() {
-        }
-
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (!(permission instanceof MBeanPermission))
-                return true;
-            MBeanPermission jmxp = (MBeanPermission) permission;
-            if (jmxp.getActions().contains("removeNotificationListener")) {
-                System.out.println("DENIED");
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static interface SenderMBean {
-        public void send();
-        public int getListenerCount();
-    }
-
-    public static class Sender extends NotificationBroadcasterSupport
-            implements SenderMBean {
-        private AtomicInteger listenerCount = new AtomicInteger();
-
-        public void send() {
-            System.out.println("Sending notif");
-            sendNotification(new Notification("type", this, 0L));
-        }
-
-        public synchronized int getListenerCount() {
-            return listenerCount.get();
-        }
-
-        public void removeNotificationListener(
-                NotificationListener listener,
-                NotificationFilter filter,
-                Object handback) throws ListenerNotFoundException {
-            System.out.println("Sender.removeNL(3)");
-            super.removeNotificationListener(listener, filter, handback);
-            listenerCount.decrementAndGet();
-        }
-
-        public void addNotificationListener(
-                NotificationListener listener,
-                NotificationFilter filter,
-                Object handback) {
-            System.out.println("Sender.addNL(3)");
-            super.addNotificationListener(listener, filter, handback);
-            listenerCount.incrementAndGet();
-        }
-
-        public void removeNotificationListener(NotificationListener listener)
-        throws ListenerNotFoundException {
-            System.out.println("Sender.removeNL(1)");
-            super.removeNotificationListener(listener);
-            listenerCount.decrementAndGet();
-        }
-    }
-}
diff --git a/test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java
index 57db8588ed3..f43f40a772a 100644
--- a/test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java
+++ b/test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java
@@ -32,7 +32,6 @@
  * @run build NotificationAccessControllerTest
  *
  * @run main/othervm NotificationAccessControllerTest
- * @run main/othervm -Djava.security.manager=allow NotificationAccessControllerTest
  */
 
 import com.sun.jmx.remote.security.NotificationAccessController;
diff --git a/test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
index e57636c87f6..3163506ae67 100644
--- a/test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
+++ b/test/jdk/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
@@ -33,11 +33,6 @@
  * @run build NotificationEmissionTest
  *
  * @run main NotificationEmissionTest 1
- * @run main/othervm -Djava.security.manager=allow NotificationEmissionTest 1
- * @run main/othervm -Djava.security.manager=allow NotificationEmissionTest 2
- * @run main/othervm -Djava.security.manager=allow NotificationEmissionTest 3
- * @run main/othervm -Djava.security.manager=allow NotificationEmissionTest 4
- * @run main/othervm -Djava.security.manager=allow NotificationEmissionTest 5
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/remote/mandatory/notif/policy.negative b/test/jdk/javax/management/remote/mandatory/notif/policy.negative
deleted file mode 100644
index c6ca50a3790..00000000000
--- a/test/jdk/javax/management/remote/mandatory/notif/policy.negative
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.net.SocketPermission "*:*", "accept,connect,listen,resolve";
-    permission javax.management.MBeanServerPermission "*";
-    permission javax.management.MBeanPermission "*", "invoke";
-    permission javax.management.MBeanPermission "[domain:type=NB,name=2]", "addNotificationListener";
-    permission javax.management.MBeanPermission "*", "removeNotificationListener";
-};
diff --git a/test/jdk/javax/management/remote/mandatory/notif/policy.positive b/test/jdk/javax/management/remote/mandatory/notif/policy.positive
deleted file mode 100644
index ddd142de36f..00000000000
--- a/test/jdk/javax/management/remote/mandatory/notif/policy.positive
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.net.SocketPermission "*:*", "accept,connect,listen,resolve";
-    permission javax.management.MBeanServerPermission "*";
-    permission javax.management.MBeanPermission "*", "invoke";
-    permission javax.management.MBeanPermission "*", "addNotificationListener";
-    permission javax.management.MBeanPermission "*", "removeNotificationListener";
-};
diff --git a/test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java
index 796507eeff3..89b36aa472a 100644
--- a/test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java
+++ b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java
@@ -31,7 +31,6 @@
  * @run clean NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean
  * @run build NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean
  * @run main/othervm NonJMXPrincipalsTest
- * @run main/othervm -Djava.security.manager=allow NonJMXPrincipalsTest
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java
index ae3ec697b39..0ec4e874bef 100644
--- a/test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java
+++ b/test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java
@@ -32,7 +32,6 @@
  * @run build PasswordAccessFileTest SimpleStandard SimpleStandardMBean
  *
  * @run main/othervm PasswordAccessFileTest
- * @run main/othervm -Djava.security.manager=allow PasswordAccessFileTest
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java
index 13d94a87920..5a60e905208 100644
--- a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java
+++ b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java
@@ -32,8 +32,6 @@
  * @run build RMIAltAuthTest SimpleStandard SimpleStandardMBean
  *
  * @run main/othervm RMIAltAuthTest
- * @run main/othervm -Djava.security.manager=allow RMIAltAuthTest
- * @run main/othervm -Djava.security.manager=allow -DSimpleStandard.useGetSubjectACC=true RMIAltAuthTest
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java
index 8897d34c4e8..a4ffaddc4f3 100644
--- a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java
+++ b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java
@@ -32,8 +32,6 @@
  * @run build RMIPasswdAuthTest SimpleStandard SimpleStandardMBean
  *
  * @run main/othervm RMIPasswdAuthTest
- * @run main/othervm -Djava.security.manager=allow RMIPasswdAuthTest
- * @run main/othervm -Djava.security.manager=allow -DSimpleStandard.useGetSubjectACC=true RMIPasswdAuthTest
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java
index b5657498365..a10f884c94d 100644
--- a/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java
+++ b/test/jdk/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java
@@ -40,8 +40,6 @@
  *      - the "getNbResets()" method.
  */
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
 import java.security.Principal;
 import java.util.Set;
 import javax.management.AttributeChangeNotification;
@@ -152,8 +150,7 @@ public int getNbResets() {
      * type JMXPrincipal and refers to the "monitorRole" identity.
      */
     private void checkSubject() {
-        Subject subject = Boolean.getBoolean("SimpleStandard.useGetSubjectACC") ?
-                          Subject.getSubject(AccessController.getContext()) : Subject.current();
+        Subject subject = Subject.current();
         Set principals = subject.getPrincipals();
         Principal principal = (Principal) principals.iterator().next();
         if (!(principal instanceof JMXPrincipal))
diff --git a/test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java b/test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java
index 0a179358466..9ffbf44a74f 100644
--- a/test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java
+++ b/test/jdk/javax/management/remote/mandatory/version/ImplVersionTest.java
@@ -24,10 +24,7 @@
 /*
  * @test
  * @bug 5046815
- * @summary Test that RMIServer.getVersion() reflects the JDK version when
- * the Java platform and the application is run with a security manager and the
- * test codebase has the java permission to read the "java.runtime.version"
- * system property.
+ * @summary Test that RMIServer.getVersion() reflects the JDK version.
  * @author Luis-Miguel Alventosa, Joel Feraud
  *
  * @library /test/lib
@@ -53,8 +50,6 @@ public static void main(String[] args) throws Exception {
         // Build command string
 
         String[] command = new String[] {
-            "-Djava.security.manager",
-            "-Djava.security.policy==" + testSrc + File.separator + "policy",
             "-Dtest.classes=" + testClasses,
             "ImplVersionCommand",
             System.getProperty("java.runtime.version")
diff --git a/test/jdk/javax/management/remote/mandatory/version/policy b/test/jdk/javax/management/remote/mandatory/version/policy
deleted file mode 100644
index 8b99224583a..00000000000
--- a/test/jdk/javax/management/remote/mandatory/version/policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant codebase "file:${test.classes}" {
-  permission java.util.PropertyPermission "java.runtime.version", "read";
-};
diff --git a/test/jdk/javax/management/security/AuthorizationTest.java b/test/jdk/javax/management/security/AuthorizationTest.java
index cdb412e139b..5bfe8499ac0 100644
--- a/test/jdk/javax/management/security/AuthorizationTest.java
+++ b/test/jdk/javax/management/security/AuthorizationTest.java
@@ -33,20 +33,6 @@
  * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials
  * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username2 -Dpassword=password2 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedSetException -expectedInvokeException
  * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username6 -Dpassword=password6 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
- *
- * @run main/othervm/timeout=300 -Djava.security.manager=allow -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials
- * @run main/othervm/timeout=300 -Djava.security.manager=allow -DDEBUG_STANDARD -Dusername=username2 -Dpassword=password2 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedSetException -expectedInvokeException
- * @run main/othervm/timeout=300 -Djava.security.manager=allow -DDEBUG_STANDARD -Dusername=username6 -Dpassword=password6 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
- *
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.password.file -populate -client -mapType credentials
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username3 -Dpassword=password3 AuthorizationTest -server -mapType x.password.file -populate -client -mapType credentials -expectedGetException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username5 -Dpassword=password5 AuthorizationTest -server -mapType x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username6 -Dpassword=password6 AuthorizationTest -server -mapType x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username2 -Dpassword=password2 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedSetException -expectedInvokeException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username3 -Dpassword=password3 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username4 -Dpassword=password4 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedGetException -expectedSetException
- * @run main/othervm/timeout=300/policy=java.policy.authorization -DDEBUG_STANDARD -Dusername=username5 -Dpassword=password5 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedGetException -expectedSetException -expectedInvokeException
  */
 
 import java.io.File;
diff --git a/test/jdk/javax/management/security/java.policy.authorization b/test/jdk/javax/management/security/java.policy.authorization
deleted file mode 100644
index d7b21626f76..00000000000
--- a/test/jdk/javax/management/security/java.policy.authorization
+++ /dev/null
@@ -1,88 +0,0 @@
-// Standard extensions get all permissions by default
-
-grant codeBase "file:${java.home}/lib/ext/*" {
-	permission java.security.AllPermission;
-};
-
-// default permissions granted to all domains
-grant { 
-	// allows anyone to listen on un-privileged ports
-	permission java.net.SocketPermission "localhost:1024-", "listen";
-
-	// "standard" properies that can be read by anyone
-
-	permission java.util.PropertyPermission "java.version", "read";
-	permission java.util.PropertyPermission "java.vendor", "read";
-	permission java.util.PropertyPermission "java.vendor.url", "read";
-	permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "os.name", "read";
-	permission java.util.PropertyPermission "os.version", "read";
-	permission java.util.PropertyPermission "os.arch", "read";
-	permission java.util.PropertyPermission "file.separator", "read";
-	permission java.util.PropertyPermission "path.separator", "read";
-	permission java.util.PropertyPermission "line.separator", "read";
-
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-
-       permission java.io.FilePermission "*","read,write";
-
-};
-
-grant codeBase "file:/-" {
-	permission java.security.AllPermission;
-       permission java.io.FilePermission "*","read,write";
-};
-
-grant principal javax.management.remote.JMXPrincipal "SQE_username" {
-    permission javax.management.MBeanServerPermission "*";
-    permission javax.management.MBeanPermission "Simple", "instantiate";
-    permission javax.management.MBeanPermission "Simple", "registerMBean";
-};
-
-grant principal javax.management.remote.JMXPrincipal "username1" {
-    //
-    // JMXPrincipals "username1" has all permissions.
-    //
-    permission java.security.AllPermission;
-};
-
-grant principal javax.management.remote.JMXPrincipal "username2" {
-    //
-    // JMXPrincipals "username2" has all permissions.
-    //
-    permission java.security.AllPermission;
-};
-
-grant principal javax.management.remote.JMXPrincipal "username3" {
-    //
-    // JMXPrincipals "username3" has some permissions.
-    //
-    permission javax.management.MBeanPermission "Simple", "instantiate";
-    permission javax.management.MBeanPermission "Simple", "registerMBean";
-    permission javax.management.MBeanPermission "Simple", "setAttribute";
-    permission javax.management.MBeanPermission "Simple", "invoke";
-};
-
-grant principal javax.management.remote.JMXPrincipal "username4" {
-    //
-    // JMXPrincipals "username4" has all permissions.
-    //
-    permission javax.management.MBeanPermission "Simple", "instantiate";
-    permission javax.management.MBeanPermission "Simple", "registerMBean";
-    permission javax.management.MBeanPermission "Simple", "invoke";
-};
-
-grant principal javax.management.remote.JMXPrincipal "username5" {
-    //
-    // JMXPrincipals "username5" has no permissions.
-    //
-};
diff --git a/test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java b/test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java
index 69611763e32..7ffa34ec7b7 100644
--- a/test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java
+++ b/test/jdk/javax/net/ssl/finalize/SSLSessionFinalizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Test behavior related to finalize
  * @run main/othervm  SSLSessionFinalizeTest
- * @run main/othervm/policy=security.policy  SSLSessionFinalizeTest
  */
 
 import java.io.InputStream;
diff --git a/test/jdk/javax/net/ssl/finalize/security.policy b/test/jdk/javax/net/ssl/finalize/security.policy
deleted file mode 100644
index cec086d6031..00000000000
--- a/test/jdk/javax/net/ssl/finalize/security.policy
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 
- */
-grant {
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "javax.net.ssl.*", "write";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.ssl";
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/javax/print/PrintSE/PrintSE.java b/test/jdk/javax/print/PrintSE/PrintSE.java
deleted file mode 100644
index df4b2b4ff14..00000000000
--- a/test/jdk/javax/print/PrintSE/PrintSE.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.*;
-import java.awt.print.*;
-import javax.print.*;
-import javax.print.attribute.*;
-
-public class PrintSE implements Printable {
-
-    public static void main(String[] args) throws Exception {
-        GraphicsEnvironment.getLocalGraphicsEnvironment();
-
-        PrintService service = PrintServiceLookup.lookupDefaultPrintService();
-        if (service == null) {
-            System.out.println("No print service found.");
-            return;
-        }
-        SimpleDoc doc =
-             new SimpleDoc(new PrintSE(),
-                           DocFlavor.SERVICE_FORMATTED.PRINTABLE,
-                           new HashDocAttributeSet());
-        DocPrintJob job = service.createPrintJob();
-        job.print(doc, new HashPrintRequestAttributeSet());
-    }
-
-    public int print(Graphics g, PageFormat pf, int pg) {
-       if (pg > 0) return NO_SUCH_PAGE;
-       g.drawString("Test passes.", 100, 100);
-       return PAGE_EXISTS;
-   }
-}
diff --git a/test/jdk/javax/print/PrintSE/PrintSE.sh b/test/jdk/javax/print/PrintSE/PrintSE.sh
deleted file mode 100644
index 7d9144b959c..00000000000
--- a/test/jdk/javax/print/PrintSE/PrintSE.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @key printer
-# @bug 6662775
-# @summary Tests queuePrintJob is sufficient permission for printing. This test 
-#          prints a page to a printer. If a document printer is installed, a 
-#          popup can appear (to select the file location).
-# @run clean PrintSE
-# @run build PrintSE
-# @run compile PrintSE.java
-# @run shell/timeout=300 PrintSE.sh
-
-echo -------------------------------------------------------------
-echo Launching test for `basename $0 .sh`
-echo -------------------------------------------------------------
-
-createJavaPolicyFile()
-{
-   cat << EOF > ${TESTCLASSES}/print.policy
-grant {
- permission java.lang.RuntimePermission "queuePrintJob";
-};
-EOF
-}
-
-createJavaPolicyFile
-
-${TESTJAVA}/bin/java ${TESTVMOPTS} \
-    -Djava.security.manager \
-    -Djava.security.policy=${TESTCLASSES}/print.policy \
-    -cp ${TESTCLASSES} PrintSE
-
-exit $?
diff --git a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java b/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
index 36e3391be7f..97d8112e143 100644
--- a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
+++ b/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
  * @summary Verify that ScriptEngineManager can load BadFactory without throwing NPE
  * @build BadFactory BadFactoryTest
  * @run junit/othervm BadFactoryTest
- * @run junit/othervm -Djava.security.manager=allow BadFactoryTest
  */
 public class BadFactoryTest {
 
diff --git a/test/jdk/javax/script/ProviderTest.sh b/test/jdk/javax/script/ProviderTest.sh
index 24b4120912c..cd110e6afe5 100644
--- a/test/jdk/javax/script/ProviderTest.sh
+++ b/test/jdk/javax/script/ProviderTest.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,18 +43,13 @@ $JAR ${TESTTOOLVMOPTS} -cf ${TESTCLASSES}/dummy.jar \
     -C ${TESTCLASSES} DummyScriptEngineFactory.class \
     -C "${TESTSRC}" META-INF/services/javax.script.ScriptEngineFactory
 
-echo "Running test with security manager ..."
-$JAVA ${TESTVMOPTS} -Djava.security.manager -classpath \
-  "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
-  ProviderTest
-
 ret=$?
 if [ $ret -ne 0 ]
 then
   exit $ret
 fi
 
-echo "Running test without security manager ..."
+echo "Running test ..."
 $JAVA ${TESTVMOPTS} -classpath \
   "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java
deleted file mode 100644
index f08301bb119..00000000000
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.security.auth.NTUserPrincipal;
-import com.sun.security.auth.UnixPrincipal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import javax.security.auth.Subject;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @bug 8050409
- * @modules jdk.security.auth
- * @summary Tests with Subject.getPrivateCredentials to check permission checks with one or more principals.
- * @run testng/othervm/policy=MoreThenOnePrincipals.policy MoreThenOnePrincipals
- */
-public class MoreThenOnePrincipals {
-    private static final String[] CRED_VALUES =
-            new String[]{"testPrivateCredential-1", "testPrivateCredentials-2"};
-    private static final HashSet CREDS = new HashSet<>(Arrays.asList(CRED_VALUES));
-
-    /**
-     * Policy file grants access to the private Credential,belonging to a
-     * Subject with at least two associated Principals:"com.sun.security.auth
-     * .NTUserPrincipal", with the name,"NTUserPrincipal-1", and
-     * "com.sun.security.auth.UnixPrincipal", with the name, "UnixPrincipals-1".
-     *
-     * For test1 and test2, subjects are associated with none or only one of
-     * principals mentioned above, SecurityException is expected.
-     * For test 3 and test 4, subjects are associated with two or more
-     * Principals (above principals are included), no exception is expected.
-     *
-     */
-
-    @Test(dataProvider = "Provider1", expectedExceptions = SecurityException.class)
-    public void test1(Subject s) {
-        s.getPrivateCredentials(String.class);
-    }
-
-    @Test(dataProvider = "Provider1", expectedExceptions = SecurityException.class)
-    public void test2(Subject s) {
-        s.getPrivateCredentials().iterator().next();
-    }
-
-    @Test(dataProvider = "Provider2")
-    public void test3(Subject s) {
-        s.getPrivateCredentials(String.class);
-    }
-
-    @Test(dataProvider = "Provider2")
-    public void test4(Subject s) {
-        s.getPrivateCredentials().iterator().next();
-    }
-
-    @DataProvider
-    public Object[][] Provider1() {
-        Subject s1 = new Subject(false, Collections.EMPTY_SET, Collections.EMPTY_SET, CREDS);
-        s1.getPrincipals().add(new NTUserPrincipal("NTUserPrincipal-2"));
-        Subject s2 = new Subject(false, Collections.EMPTY_SET, Collections.EMPTY_SET, CREDS);
-        s2.getPrincipals().add(new NTUserPrincipal("NTUserPrincipal-1"));
-        return new Object[][]{{s1}, {s2}};
-    }
-
-    @DataProvider
-    public Object[][] Provider2() {
-        Subject s3 = new Subject(false, Collections.EMPTY_SET, Collections.EMPTY_SET, CREDS);
-        s3.getPrincipals().add(new NTUserPrincipal("NTUserPrincipal-1"));
-        s3.getPrincipals().add(new UnixPrincipal("UnixPrincipals-1"));
-        Subject s4 = new Subject(false, Collections.EMPTY_SET, Collections.EMPTY_SET, CREDS);
-        s4.getPrincipals().add(new NTUserPrincipal("NTUserPrincipal-1"));
-        s4.getPrincipals().add(new UnixPrincipal("UnixPrincipals-1"));
-        s4.getPrincipals().add(new UnixPrincipal("UnixPrincipals-2"));
-        return new Object[][]{{s3}, {s4}};
-    }
-
-}
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy
deleted file mode 100644
index 875690041e9..00000000000
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/MoreThenOnePrincipals.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant{
-// permissions for TestNG execution
-permission java.io.FilePermission "*","read,write";
-permission java.lang.RuntimePermission "accessDeclaredMembers";
-permission java.util.PropertyPermission "*","read";
-permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-// permissions for test itself
-permission javax.security.auth.AuthPermission "modifyPrincipals";
-permission javax.security.auth.PrivateCredentialPermission "* com.sun.security.auth.NTUserPrincipal \"NTUserPrincipal-1\" com.sun.security.auth.UnixPrincipal \"UnixPrincipals-1\"", "read";
-};
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java
index 3ae247dee5e..27c68722e6e 100644
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java
+++ b/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 4364855
  * @summary     PrivateCredentialPermission serialized set has
  *              implementation-dependent class
- * @run main/othervm/policy=Serial.policy Serial
  */
 
 import javax.security.auth.*;
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.policy
deleted file mode 100644
index 161d52ad616..00000000000
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/Serial.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.io.FilePermission "serial.tmp", "read,write";
-    permission java.io.FilePermission "serial2.tmp", "read,write";
-    permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
-};
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.java b/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.java
deleted file mode 100644
index fc942cd177b..00000000000
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @author  Ram Marti
- * @bug 4326852
- * @modules jdk.security.auth
- * @summary Retrive a subset of private credentials can be accessed
- * @run main/othervm/policy=Subset.policy Subset
- */
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import com.sun.security.auth.UnixPrincipal;
-import javax.security.auth.Subject;
-
-/*
- * Author : Ram Marti
- * This is a test program to verify the fix for Bug 4326852
- * (impossible to extract a subset of private credentials)
- * The policy file used allows read access only to String classes.
- * grant {
- *    permission javax.security.auth.AuthPermission \
- *              "modifyPrivateCredentials";
- *    permission javax.security.auth.PrivateCredentialPermission \
- * "java.lang.String com.sun.security.auth.UnixPrincipal \"user"", "read";
- * };
-
- * The test verifies the following:
- *      - String class creds can be retrieved by using
- *        getPrivateCredentials(String.class)
- *      - The above set is not backed internally
- *      - getPrivateCredentials(Boolean or Integer) returns an empty set
- *      - Set is returned by getPrivateCredentials() throws
- *        security exception when trying to access non-String
- *        class credentials
- *      - The above set is internally backed up and any changes in
- *        internal private creds are reflected in the set returned
- *      - When the above set throws security exception the iterator
- *      - is advanced to the next item in the list of creds.
- *      - equals,contains,containsAll,add,remove operations work correctly
- */
-
-public class Subset {
-    public static void main(String[] args) throws Exception {
-        int exceptionCounter =0;
-        Iterator iter1;
-        HashSet creds = new HashSet();
-        Subject emptys =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds);
-        /* Test principals */
-
-        Set princ= emptys.getPrincipals();
-        HashSet collp= new HashSet();
-        collp.add(new String("abc"));
-        collp.add(new String("def"));
-        collp.add(new String("Exists"));
-        collp.add(new String("Does not Exist"));
-        try {
-            if (princ.containsAll(collp)) {
-                throw new Exception ("Error: Contains the collection");
-            } else
-                System.out.println ("Does not Contain the collection");
-        } catch (SecurityException e) {
-            throw new Exception ("Error: Exception in containsAll (string coll)!!");
-        }
-
-
-        Set p1 = emptys.getPrivateCredentials();
-
-        if (p1.size() != 0) {
-              throw new Exception("Error:p1 size should have been 6 and was " +
-                         p1.size());
-        }
-
-        creds.add("abc");
-        creds.add(new Integer(3));
-        creds.add(Boolean.TRUE);
-        Subject sremove =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds);
-        Set p2 = sremove.getPrivateCredentials();
-
-        if (p2.size() !=3){
-              throw new Exception("Error: p2 size should have been 3 and was " +
-                         p2.size());
-        }
-        iter1 = p2.iterator();
-        exceptionCounter=0;
-        while (iter1.hasNext()) {
-            try {
-                Object o = iter1.next();
-                System.out.println(" private creds of class " +
-                        o.getClass() + "value is " + o.toString());
-            } catch (SecurityException e) {
-                System.out.println("Expected Exception occured");
-                exceptionCounter++;
-            }
-        }
-        if (exceptionCounter != 2) {
-            throw new Exception("Expected number of exceptions was 2 " +
-                        "The actual number was " + exceptionCounter);
-        }
-
-        // Verify that remove op was successful
-
-        iter1.remove();
-        if (p2.size() !=2) {
-           throw new RuntimeException("Error: p2 size should have been 2 and was " +
-                               p2.size());
-        }
-        System.out.println ("Checking the value after removal");
-        p2 = sremove.getPrivateCredentials();
-        try {
-                if (!p2.add(new String("XYZ"))) {
-
-                        throw new RuntimeException("Error in adding string");
-                }
-                if (!p2.add(new Integer(99))) {
-
-                        throw new RuntimeException("Error in adding Integer");
-                }
-                HashSet coll1 = new HashSet();
-                coll1.add(new String("RST"));
-                coll1.add(new Integer(1));
-                if (!p2.addAll(coll1)) {
-
-                        throw new RuntimeException("Error in addAll");
-                }
-
-        } catch (Exception e){
-                e.printStackTrace();
-                throw new RuntimeException("Unexpected exception in add");
-
-        }
-        iter1 = p2.iterator();
-
-        while (iter1.hasNext()) {
-            try {
-                Object o = iter1.next();
-                System.out.println(" private creds of class " +
-                        o.getClass() + "value is " + o.toString());
-            } catch (SecurityException e) {
-                // System.out.println("Exception!!");
-            }
-        }
-        iter1 = p2.iterator();
-
-        System.out.println ("Checked the value after removal");
-
-        HashSet creds1 = new HashSet();
-        creds1.add("abc");
-        creds1.add("def");
-        creds1.add(Boolean.TRUE);
-        creds1.add(new Integer(1));
-        creds1.add(new String("Exists"));
-        Subject scontain =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds1);
-        p2 = scontain.getPrivateCredentials();
-        try {
-            Object ObjAr = p2.toArray();
-        } catch (SecurityException e) {
-                System.out.println("Should get an Exception in toArray()");
-        }
-
-        HashSet creds3 = new HashSet();
-        creds3.add (new String("abc"));
-        p2 = scontain.getPrivateCredentials();
-
-        try {
-            Object ObjCred = (Object)creds3.clone();
-            System.out.println ("Size of p2 is " + p2.size() +
-                                "Size of ObjCred is " +
-                                        ((HashSet)ObjCred).size()
-                                );
-            if (p2.equals(ObjCred))
-                throw new RuntimeException("Error:Equals ObjCred  *** ");
-            else
-                System.out.println ("Does not Equal Objcred");
-        } catch (SecurityException e) {
-            throw new RuntimeException("Error:Should not get an Exception in equals of creds3");
-
-
-        }
-
-        try {
-            Object ObjCred = (Object)creds1.clone();
-            System.out.println ("Size of p2 is " + p2.size() +
-                                "Size of ObjCred is " +
-                                        ((HashSet)ObjCred).size()
-                                );
-            if (p2.equals(ObjCred))
-                throw new RuntimeException ("Error: Equals ObjCred");
-            else
-                throw new RuntimeException ("Error: Does not Equal Objcred");
-        } catch (SecurityException e) {
-            System.out.println("Should get an Exception in equals of creds1");
-        }
-        /* We can store only string types of creds
-         * Let us create a subject with only string type of creds
-         */
-
-        HashSet creds2 = new HashSet();
-        creds2.add("abc");
-        creds2.add("def");
-        creds2.add("ghi");
-        Subject sstring =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds2);
-        p2 = sstring.getPrivateCredentials();
-        try {
-            String[] selectArray = { "exits", "Does not exist"};
-            Object ObjAr = p2.toArray(selectArray);
-            System.out.println(" No Exception in ObjAr- String");
-
-        } catch (SecurityException e) {
-                throw new RuntimeException(" Error:  Exception in ObjAr- String!!");
-        }
-        /*
-         * New subject scontain1, set p3, creds4
-         */
-
-
-        HashSet creds4 = new HashSet();
-        creds4.add("abc");
-        creds4.add("def");
-        creds4.add("ghi");
-        creds4.add(new Integer(1));
-        creds4.add("Exists");
-        Subject scontain1 =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds4);
-        Set p3 = scontain1.getPrivateCredentials();
-        try {
-            Object Obj = new String("Exists");
-            if (p3.contains(Obj))
-                System.out.println ("Contains String cred");
-            else
-                throw new RuntimeException ("Error Does not Contain the stringcred exists");
-        } catch (SecurityException e) {
-            throw new RuntimeException("Error:Exception!!");
-
-        }
-        try {
-            Object ObjCred = (Object)creds4.clone();
-            if (p3.equals(ObjCred))
-                throw new RuntimeException ("Error:Equals ObjCred");
-            else
-                throw new RuntimeException ("Error:Does not Equal Objcred");
-        } catch (SecurityException e) {
-            System.out.println("Should  get an Exception in equals");
-        }
-
-        try {
-            Object Obj = new Integer(1);
-            if (p3.contains(Obj))
-                throw new RuntimeException ("Error:Contains integer cred");
-            else
-                throw new RuntimeException ("Error:Does not Contain integer cred");
-        } catch (SecurityException e) {
-            System.out.println("Should get an Exception in contains Integer cred");
-        }
-
-
-
-        HashSet coll = new HashSet();
-        coll.add(new String("abc"));
-        coll.add(new String("def"));
-        coll.add(new String("Exists"));
-        coll.add(new String("Does not Exist"));
-        try {
-        if (p3.containsAll(coll))
-                throw new RuntimeException ("Error: Contains the collection");
-        else
-                System.out.println ("Does not Contain the collection");
-        } catch (SecurityException e) {
-                throw new RuntimeException("Error: Exception in containsAll (string coll)!!");
-
-        }
-        coll.remove(new String("Exists"));
-        coll.remove(new String("Does not Exist"));
-        try {
-        if (p3.containsAll(coll))
-                System.out.println ("Contains the collection");
-        else
-                throw new RuntimeException ("Error:Does not Contain the collection");
-        } catch (SecurityException e) {
-                throw new RuntimeException("Error: Exception in containsAll (string coll)!!");
-        }
-
-        Object Obj = new String("Exists");
-        try {
-        if (p3.contains(Obj))
-                System.out.println ("Contains String cred exists");
-        else
-                System.out.println ("Does not Contain String cred exists");
-        } catch (SecurityException e) {
-                System.out.println("Exception in String cred!!");
-        }
-
-        Obj = new String("Does not exist");
-        try {
-        if (p3.contains(Obj))
-                throw new RuntimeException ("Error: Contains the String does not exist");
-        else
-                System.out.println ("Does not Contain the String cred Does not exist");
-        } catch (SecurityException e) {
-                throw new RuntimeException("Error: Exception in Contains!!");
-        }
-        p3.add(new Integer(2));
-        coll.add(new Integer(2));
-        p3.add("XYZ");
-
-        System.out.println ("Testing Retainall ");
-        exceptionCounter =0;
-        iter1 = p3.iterator();
-        while (iter1.hasNext())
-            {
-                try {
-                    Object o = iter1.next();
-                    System.out.println(" private creds of class " +
-                                       o.getClass() + "value is " + o.toString());
-                } catch (SecurityException e) {
-                    System.out.println(" We should get exception");
-                    System.out.println("Exception!!");
-                    exceptionCounter++;
-                }
-            }
-        System.out.println(" After the retainall Operation");
-        try {
-            if (p3.retainAll(coll))
-                System.out.println ("Retained the collection");
-            else
-                throw new RuntimeException ("Error: RetainAll did not succeed");
-        } catch (SecurityException e) {
-                e.printStackTrace();
-                throw new RuntimeException("Error: Unexpected Exception in retainAll!");
-        }
-        iter1 = p3.iterator();
-        while (iter1.hasNext())
-            {
-                try {
-                    Object o = iter1.next();
-                    System.out.println(" private creds of class " +
-                                       o.getClass() + "value is " + o.toString());
-                } catch (SecurityException e) {
-                    exceptionCounter++;
-                }
-            }
-        System.out.println ("Retainall collection");
-        p3.add(new Integer (3));
-        iter1 = p3.iterator();
-        while (iter1.hasNext()) {
-            try {
-                Object o = iter1.next();
-                System.out.println(" private creds of class " +
-                                   o.getClass() + "value is " + o.toString());
-            } catch (SecurityException e) {
-                System.out.println("Should get Exception ");
-            }
-        }
-        exceptionCounter=0;
-        HashSet coll2 = new HashSet();
-        coll2.add(new String("abc"));
-        coll2.add(new Integer (3));
-        System.out.println(" before removeall");
-        iter1 = p3.iterator();
-        exceptionCounter =0;
-        while (iter1.hasNext()) {
-            try {
-                Object o = iter1.next();
-                System.out.println(" private creds of class " +
-                                   o.getClass() + "value is " + o.toString());
-            } catch (SecurityException e) {
-                System.out.println("Expected Exception thrown ");
-                exceptionCounter++;
-            }
-        }
-        // We added two integer creds so there must be two exceptions only
-
-        if (exceptionCounter != 2) {
-                throw new RuntimeException("Expected 2 Exceptions; received " +
-                                   exceptionCounter + "exceptions ");
-        }
-
-        try {
-        p3.removeAll(coll2);
-        System.out.println(" removeall successful! ");
-        } catch (SecurityException e) {
-                throw new RuntimeException(" Error: removeAll Security Exception!!");
-        }
-
-        iter1 = p3.iterator();
-        System.out.println(" After removeall");
-        exceptionCounter = 0;
-        while (iter1.hasNext()) {
-            try {
-                Object o = iter1.next();
-                System.out.println (" private creds of class " +
-                                   o.getClass() + "value is " + o.toString());
-            } catch (SecurityException e) {
-                System.out.println("Expected Exception thrown ");
-                exceptionCounter++;
-            }
-        }
-        // We had two integer creds; removed one as  a part of coll2; so
-        // only one exception must have been thrown
-        if (exceptionCounter != 1) {
-                throw new RuntimeException("Expected 1 Exceptions; received " +
-                                   exceptionCounter + "exceptions ");
-        }
-        try {
-        p3.clear();
-        System.out.println(" Clear() successful! ");
-        } catch (SecurityException e) {
-                throw new RuntimeException(" Error: Clear Security Exception!!");
-        }
-
-
-         /*   New subject s with creds and privCredSet
-          *
-          */
-        creds.clear();
-        creds.add("abc");
-        creds.add("def");
-        creds.add("ghi");
-        creds.add(new Integer(1));
-        Subject s =
-            new Subject(false,  //readOnly
-                        Collections.singleton(new UnixPrincipal("user")),
-                        Collections.EMPTY_SET,
-                        creds);
-        try {
-           Set privCredSet = s.getPrivateCredentials(char.class);
-           if (privCredSet.size() != 0) {
-              throw new RuntimeException("Error:String Privcred size should have been 0 and was " +
-                                 privCredSet.size());
-            }
-
-        } catch (Exception e) {
-            throw new RuntimeException ("Error " + e.toString());
-        }
-
-
-        try {
-           Set privCredSet = s.getPrivateCredentials(String.class);
-           if (privCredSet.size() != 3) {
-              throw new RuntimeException("Error:String Privcred size should have been 2 and was " +
-                         privCredSet.size());
-           }
-           s.getPrivateCredentials().add("XYZ");
-           /*
-            * Since the privCredSet is not backed by internal private
-            * creds adding to it should not make any difference to
-            * privCredSet and theize should still be 3
-            */
-
-           if (privCredSet.size() != 3) {
-              throw new RuntimeException("Error:String Privcred size should have been 2 and was " +
-                         privCredSet.size());
-           }
-           s.getPrivateCredentials().remove("XYZ");
-                /*
-                 * Let us try to get the elements
-                 * No exception should occur
-                 */
-
-           Iterator iter = privCredSet.iterator();
-           while (iter.hasNext()) {
-             try {
-                Object o = iter.next();
-                System.out.println(" private creds of class " +
-                        o.getClass() + "value is " + o.toString());
-             } catch (SecurityException e) {
-             }
-           }
-        } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException("Unexcpected Exception");
-        }
-
-        /*
-         * Can we add and remove the creds
-         */
-        s.getPrivateCredentials().add("XYZ");
-        s.getPrivateCredentials().remove("XYZ");
-        s.getPrivateCredentials().add(new Integer(2));
-        s.getPrivateCredentials().remove(new Integer(2));
-
-
-        // We don't have permission to read Boolean creds
-        // SInce the creds have no boolean creds we should get an empty
-        // set
-        try {
-            Set privCredSet1 = s.getPrivateCredentials(Boolean.class);
-            if (privCredSet1.size() != 0){
-                  throw new RuntimeException("Error:String PrivcredSet1 of Boolean size should have been 0 and was " +
-                         privCredSet1.size());
-            }
-        } catch (SecurityException e) {
-                e.printStackTrace();
-                throw new RuntimeException("Unexcpected Exception");
-        }
-        System.out.println ("Checked Boolean Creds ");
-
-        /*
-         * We don't have permission to read Integer creds
-         * We should get an empty set even though the private creds
-         * has an integer cred. No security exception either !
-         */
-
-        try {
-            Set privCredSet1 = s.getPrivateCredentials(Integer.class);
-            if (privCredSet1.size() != 0){
-                  throw new RuntimeException("Error:String PrivcredSet1 of Integer size should have been 0 and was " +
-                         privCredSet1.size());
-            }
-        } catch (SecurityException e) {
-                System.out.println ("Expected exception");
-        }
-        System.out.println ("Checked Integer Creds ");
-
-        Set privCredSet2 = s.getPrivateCredentials();
-
-        if (privCredSet2.size() != 4){
-              throw new RuntimeException("Error:String PrivcredSet1 size should have been 4 and was " +
-                         privCredSet2.size());
-        }
-
-        /*
-         * Since the returned privCredSet2 is internally backed by the
-         * private creds, any additions to it should be reflected in
-         * privcredSet2
-         */
-        s.getPrivateCredentials().add("XYZ");
-        if (privCredSet2.size() != 5) {
-              throw new RuntimeException("Error:String PrivcredSet1 size should have been 5 and was " +
-                         privCredSet2.size());
-        }
-        s.getPrivateCredentials().remove("XYZ");
-        if (privCredSet2.size() != 4) {
-              throw new RuntimeException("String privCredSet2 size should have been  5 and was " +
-                         privCredSet2.size());
-        }
-        System.out.println("Checked remove(String) operation");
-        /* Let us add a couple of Boolean creds */
-        s.getPrivateCredentials().add(Boolean.TRUE);
-        s.getPrivateCredentials().add(new Integer(2));
-
-        exceptionCounter =0;
-        iter1 = privCredSet2.iterator();
-        while (iter1.hasNext())
-            {
-                try {
-                    Object o = iter1.next();
-                    System.out.println(" private creds of class " +
-                                       o.getClass() + "value is " + o.toString());
-                } catch (SecurityException e) {
-                    System.out.println(" We should get exception");
-                    System.out.println("Exception!!");
-                    exceptionCounter++;
-                }
-            }
-        if (exceptionCounter != 3) {
-            throw new RuntimeException("Expected number of exception was 3 " +
-                        "The actual number was " + exceptionCounter);
-        }
-        privCredSet2.add (new Integer(3));
-        try {
-        int hashCode = privCredSet2.hashCode();
-        } catch (SecurityException e) {
-                System.out.println ("hashCode Expected exception");
-        }
-        System.out.println ("Tests completed");
-    }
-
-}
diff --git a/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.policy b/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.policy
deleted file mode 100644
index 29aabe59e2d..00000000000
--- a/test/jdk/javax/security/auth/PrivateCredentialPermission/Subset.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-     permission java.security.SecurityPermission "getProperty.combiner.provider";
-     permission java.util.PropertyPermission "*", "read";
-     permission java.lang.RuntimePermission "*";
-};
-grant {
-     permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
-     permission javax.security.auth.AuthPermission "modifyPublicCredentials";
-     permission	javax.security.auth.PrivateCredentialPermission "java.lang.String com.sun.security.auth.UnixPrincipal \"user\"", "read";
-};
diff --git a/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java b/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java
index b1d80eb1705..ecf78b5ab7f 100644
--- a/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java
+++ b/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java
@@ -27,8 +27,7 @@
  * @enablePreview
  * @summary Implement Subject.current and Subject.callAs using scoped values.
  *      Need enablePreview to use StructuredTaskScope.
- * @run main/othervm -Djava.security.manager=allow CallAsWithScopedValue false
- * @run main/othervm -Djava.security.manager=disallow CallAsWithScopedValue true
+ * @run main/othervm CallAsWithScopedValue true
  */
 import com.sun.security.auth.UserPrincipal;
 
diff --git a/test/jdk/javax/security/auth/Subject/Compat.java b/test/jdk/javax/security/auth/Subject/Compat.java
deleted file mode 100644
index e95a9cba5ed..00000000000
--- a/test/jdk/javax/security/auth/Subject/Compat.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-import com.sun.security.auth.UserPrincipal;
-
-import javax.security.auth.Subject;
-import javax.security.auth.SubjectDomainCombiner;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.util.Objects;
-
-/*
- * @test
- * @bug 8296244
- * @run main/othervm -Djava.security.manager=allow Compat
- * @summary ensures the old implementation still works when SM is allowed
- */
-public class Compat {
-
-    static PrivilegedExceptionAction<AccessControlContext> action
-            = () -> AccessController.getContext();
-
-    static boolean failed = false;
-
-    public static void main(String[] args) throws Exception {
-        main0(null);
-        var t = new Thread(() -> {
-            try {
-                main0(null);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        t.start();
-        t.join();
-    }
-    public static void main0(String[] args) throws Exception {
-        System.out.println(">>> bare run");
-        run(null);
-        System.out.println(">>> run inside");
-        Subject subject = makeSubject("three");
-        Subject.doAs(subject, (PrivilegedExceptionAction<? extends Object>)
-                () -> run("three"));
-        if (failed) {
-            throw new RuntimeException();
-        }
-    }
-
-    public static Void run(String from) throws Exception {
-        Subject subject = makeSubject("one");
-        var a1 = Subject.doAs(subject, action);
-        Subject subject2 = makeSubject("two");
-        var a2 = Subject.doAs(subject2, action);
-
-        test("from ether", AccessController.getContext(), from);
-        test("from a1", a1, "one");
-        test("from a2", a2, "two");
-
-        var a3 = Subject.doAsPrivileged(subject, action, a1);
-        test("doAsPriv with one and a1", a3, "one");
-
-        var a4 = Subject.doAsPrivileged(subject, action, a2);
-        test("doAsPriv with one and a2", a4, "one");
-
-        var a5 = Subject.doAsPrivileged(null, action, a2);
-        test("doAsPriv with null and a2", a5, null);
-
-        var a6 = Subject.doAs(null, action);
-        test("doAsPriv with null and this", a6, null);
-
-        var ax = new AccessControlContext(a2, new SubjectDomainCombiner(subject));
-        test("a2 plus subject", ax, "one");
-
-            ax = AccessController.doPrivileged(action, a2);
-            test("doPriv on a2", ax, "two");
-
-        ax = AccessController.doPrivilegedWithCombiner(action);
-        test("doPrivWC", ax, from == null ? null : from);
-
-        ax = AccessController.doPrivilegedWithCombiner(action, a2);
-        test("doPrivWC on a2", ax, from == null ? "two" : from);
-        return null;
-    }
-
-    static Subject makeSubject(String name) {
-        Subject subject = new Subject();
-        subject.getPrincipals().add(new UserPrincipal(name));
-        return subject;
-    }
-
-    static String getSubject(AccessControlContext acc) {
-        var subj = Subject.getSubject(acc);
-        if (subj == null) return null;
-        var princ = subj.getPrincipals(UserPrincipal.class);
-        return (princ == null || princ.isEmpty())
-                ? null
-                : princ.iterator().next().getName();
-    }
-
-    static void test(String label, AccessControlContext acc, String expected) {
-        var actual = getSubject(acc);
-        System.out.println(label + ": " + actual);
-        if (!Objects.equals(actual, expected)) {
-            System.out.println("    Expect " + expected + ", but see " + actual);
-            failed = true;
-        }
-    }
-}
diff --git a/test/jdk/javax/security/auth/Subject/CurrentSubject.java b/test/jdk/javax/security/auth/Subject/CurrentSubject.java
index 295f8aa76f5..c659f799cac 100644
--- a/test/jdk/javax/security/auth/Subject/CurrentSubject.java
+++ b/test/jdk/javax/security/auth/Subject/CurrentSubject.java
@@ -30,8 +30,7 @@
  * @test
  * @bug 8267108
  * @summary confirm current subject specification
- * @run main/othervm -Djava.security.manager=allow CurrentSubject
- * @run main/othervm -Djava.security.manager=disallow CurrentSubject
+ * @run main/othervm CurrentSubject
  */
 public class CurrentSubject {
 
diff --git a/test/jdk/javax/security/auth/Subject/Exceptions.java b/test/jdk/javax/security/auth/Subject/Exceptions.java
index 9d65b36da8e..56608b11c36 100644
--- a/test/jdk/javax/security/auth/Subject/Exceptions.java
+++ b/test/jdk/javax/security/auth/Subject/Exceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8267108
  * @library /test/lib
  * @summary Check that callAs and doAs throw the specified exceptions
- * @run main/othervm -Djava.security.manager=allow Exceptions
+ * @run main/othervm Exceptions
  */
 import jdk.test.lib.Asserts;
 
diff --git a/test/jdk/javax/security/auth/Subject/FromACC.java b/test/jdk/javax/security/auth/Subject/FromACC.java
deleted file mode 100644
index 5bb45f0f923..00000000000
--- a/test/jdk/javax/security/auth/Subject/FromACC.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/*
- * @test
- * @bug 8267108
- * @summary confirm current installed subject specification
- * @run main/othervm -Djava.security.manager=allow FromACC
- */
-public class FromACC {
-    public static void main(String[] args) throws Exception {
-        var n = Subject.doAs(from("a"), (PrivilegedAction<AccessControlContext>)
-                () -> AccessController.getContext());
-        if (!get(Subject.getSubject(n)).equals("CN=a")) {
-            throw new RuntimeException();
-        }
-    }
-
-    static Subject from(String name) {
-        Subject s = new Subject();
-        s.getPrincipals().add(new X500Principal("CN=" + name));
-        return s;
-    }
-
-    static String get(Subject s) {
-        if (s == null) {
-            return "none";
-        }
-        var v = s.getPrincipals(X500Principal.class);
-        if (v == null || v.isEmpty()) {
-            return "none";
-        } else {
-            return v.iterator().next().getName();
-        }
-    }
-}
diff --git a/test/jdk/javax/security/auth/Subject/Serial.java b/test/jdk/javax/security/auth/Subject/Serial.java
index 001f8a9feba..5ab229e3177 100644
--- a/test/jdk/javax/security/auth/Subject/Serial.java
+++ b/test/jdk/javax/security/auth/Subject/Serial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @modules jdk.security.auth
  * @summary     Subject serialized principal set is
  *              implementation-dependent class
- * @run main/othervm/policy=Serial.policy Serial
  */
 
 import java.io.FileInputStream;
@@ -75,25 +74,6 @@ public static void main(String[] args) {
                                         "EQUALS TEST FAILED");
             }
 
-            // make sure private credentials are not serializable
-            // without permissions
-
-            Set privateCredentials = s.getPrivateCredentials();
-            privateCredentials.add(new Serial());
-
-            fos = new FileOutputStream("serial2.tmp");
-            oos = new ObjectOutputStream(fos);
-            try {
-                oos.writeObject(privateCredentials);
-                oos.flush();
-                fos.close();
-                throw new RuntimeException("Serial test failed: " +
-                        "allowed to serialize private credential set");
-            } catch (SecurityException se) {
-                // good
-                se.printStackTrace();
-            }
-
             System.out.println("Serial test succeeded");
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/test/jdk/javax/security/auth/Subject/Serial.policy b/test/jdk/javax/security/auth/Subject/Serial.policy
deleted file mode 100644
index 161d52ad616..00000000000
--- a/test/jdk/javax/security/auth/Subject/Serial.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.io.FilePermission "serial.tmp", "read,write";
-    permission java.io.FilePermission "serial2.tmp", "read,write";
-    permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
-};
diff --git a/test/jdk/javax/security/auth/Subject/Synch2.java b/test/jdk/javax/security/auth/Subject/Synch2.java
index 1fe6a437597..c007499c073 100644
--- a/test/jdk/javax/security/auth/Subject/Synch2.java
+++ b/test/jdk/javax/security/auth/Subject/Synch2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 4892913
  * @summary     Subject.getPrivateCredentials not thread-safe against changes to
  *              principals
- * @run main/othervm/policy=Synch2.policy Synch2
  */
 
 import java.util.Iterator;
@@ -37,7 +36,6 @@
 public class Synch2 {
     static volatile boolean finished = false;
     public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
         Subject subject = new Subject();
         final Set principals = subject.getPrincipals();
         principals.add(new X500Principal("CN=Alice"));
diff --git a/test/jdk/javax/security/auth/Subject/Synch2.policy b/test/jdk/javax/security/auth/Subject/Synch2.policy
deleted file mode 100644
index cb9dbed32cc..00000000000
--- a/test/jdk/javax/security/auth/Subject/Synch2.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/javax/security/auth/Subject/UnsupportedSV.java b/test/jdk/javax/security/auth/Subject/UnsupportedSV.java
deleted file mode 100644
index 6fb18e1e986..00000000000
--- a/test/jdk/javax/security/auth/Subject/UnsupportedSV.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8296244
- * @library /test/lib
- * @summary Implement Subject.current and Subject.callAs using scoped values
- * @run main/othervm -Djava.security.manager=disallow UnsupportedSV t1
- * @run main/othervm -Djava.security.manager=allow UnsupportedSV t2
- */
-import com.sun.security.auth.UserPrincipal;
-import jdk.test.lib.Utils;
-
-import javax.security.auth.Subject;
-import javax.security.auth.SubjectDomainCombiner;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class UnsupportedSV {
-    public static void main(String[] args) throws Exception {
-        switch (args[0]) {
-            case "t1" -> t1();
-            case "t2" -> t2();
-        }
-    }
-
-    // ScopedValue-based implementation is used
-    static void t1() throws Exception {
-        AccessControlContext acc = AccessController.getContext();
-        Utils.runAndCheckException(() -> Subject.getSubject(acc),
-                UnsupportedOperationException.class);
-
-        Subject s = new Subject();
-        s.getPrincipals().add(new UserPrincipal("Duke"));
-
-        // TODO: Still has no way to reject the following code.
-        // Here, AccessController::getContext returns a plain ACC without
-        // the subject inside.
-        AccessControlContext acc2 = Subject.callAs(s, AccessController::getContext);
-        Subject ns = AccessController.doPrivileged(
-                (PrivilegedAction<Subject>) Subject::current, acc2);
-        System.out.println(ns);
-    }
-
-    // When a security manager is set, ScopedValue-based implementation
-    // will not be used
-    static void t2() {
-        AccessControlContext acc = AccessController.getContext();
-        Subject.getSubject(acc);
-    }
-}
diff --git a/test/jdk/javax/security/auth/Subject/doAs/NestedActions.java b/test/jdk/javax/security/auth/Subject/doAs/NestedActions.java
deleted file mode 100644
index e3a9abb4581..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/NestedActions.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-import jdk.test.lib.process.ProcessTools;
-
-/**
- * @test
- * @bug 8048147
- * @summary Check if proper AccessControlException is thrown
- *          in case of nested Subject.doAs() invocations
- *          when one of protection domains doesn't have permissions
- *
- * @library /test/lib
- *
- * @run main NestedActions jar NestedActionsACE.jar
- *              NestedActionsACE.class Utils.class
- * @run main NestedActions jar NestedActionsPAE.jar
- *              NestedActionsPAE.class Utils.class
- * @run main NestedActions jar NestedActionsOnePrincipal.jar
- *              NestedActionsOnePrincipal.class Utils.class
- * @run main NestedActions jar NestedActionsTwoPrincipals.jar
- *              NestedActionsTwoPrincipals.class Utils.class
- * @run main NestedActions jar WriteToFileAction.jar
- *              WriteToFileAction.class
- * @run main NestedActions jar WriteToFileNegativeAction.jar
- *              WriteToFileNegativeAction.class
- * @run main NestedActions jar WriteToFileExceptionAction.jar
- *              WriteToFileExceptionAction.class
- * @run main NestedActions jar ReadFromFileAction.jar
- *              ReadFromFileAction.class
- * @run main NestedActions jar ReadFromFileNegativeAction.jar
- *              ReadFromFileNegativeAction.class
- * @run main NestedActions jar ReadFromFileExceptionAction.jar
- *              ReadFromFileExceptionAction.class
- * @run main NestedActions jar ReadPropertyAction.jar
- *              ReadPropertyAction.class
- * @run main NestedActions jar ReadPropertyNegativeAction.jar
- *              ReadPropertyNegativeAction.class
- * @run main NestedActions jar ReadPropertyExceptionAction.jar
- *              ReadPropertyExceptionAction.class ReadPropertyException.class
- *
- * @run main NestedActions NestedActionsACE policy.expect.ace
- *              NestedActionsACE.jar WriteToFileNegativeAction.jar
- *              ReadFromFileNegativeAction.jar ReadPropertyNegativeAction.jar
- * @run main NestedActions NestedActionsPAE policy.expect.pae
- *              NestedActionsPAE.jar WriteToFileExceptionAction.jar
- *              ReadFromFileExceptionAction.jar ReadPropertyExceptionAction.jar
- * @run main NestedActions NestedActionsOnePrincipal policy.one.principal
- *              NestedActionsOnePrincipal.jar WriteToFileAction.jar
- *              ReadFromFileAction.jar ReadPropertyAction.jar
- * @run main NestedActions NestedActionsTwoPrincipals policy.two.principals
- *              NestedActionsTwoPrincipals.jar WriteToFileAction.jar
- *              ReadFromFileAction.jar ReadPropertyAction.jar
- */
-public class NestedActions {
-
-    static final String file = "NestedActions.tmp";
-    static final String PS = System.getProperty("path.separator");
-    static final String FS = System.getProperty("file.separator");
-    static final String TEST_CLASSES = System.getProperty("test.classes");
-    static final String TEST_SOURCES = System.getProperty("test.src");
-    static final String JAVA_OPTS = System.getProperty("test.java.opts");
-    static final String JAVA = System.getProperty("java.home")
-            + FS + "bin" + FS + "java";
-
-    public static void main(String[] args) throws IOException {
-        if (args.length > 0) {
-            if ("jar".equals(args[0]) && args.length > 2) {
-                createJar(args[1],
-                    Arrays.copyOfRange(args, 2, args.length));
-            } else {
-                runJava(args);
-            }
-        } else {
-            throw new RuntimeException("Wrong parameters");
-        }
-    }
-
-    static void createJar(String dest, String... files) throws IOException {
-        System.out.println("Create " + dest + " with the following content:");
-        try (JarOutputStream jos = new JarOutputStream(
-                new FileOutputStream(dest), new Manifest())) {
-            for (String file : files) {
-                System.out.println("  " + file);
-                jos.putNextEntry(new JarEntry(file));
-                try (FileInputStream fis = new FileInputStream(
-                        TEST_CLASSES + FS + file)) {
-                    fis.transferTo(jos);
-                }
-            }
-        }
-    }
-
-    static void runJava(String[] args) {
-        if (args == null || args.length < 3) {
-            throw new IllegalArgumentException("wrong parameters");
-        }
-
-        List<String> cmds = new ArrayList<>();
-        cmds.add(JAVA);
-        StringBuilder sb = new StringBuilder();
-        cmds.add("-classpath");
-        for (int i=2; i<args.length; i++) {
-            sb.append(args[i]).append(PS);
-        }
-        cmds.add(sb.toString());
-        if (JAVA_OPTS != null && !JAVA_OPTS.isEmpty()) {
-            Collections.addAll(cmds, JAVA_OPTS.trim().split("\\s+"));
-        }
-        cmds.add("-Djava.security.manager");
-        cmds.add("-Djava.security.policy=" + TEST_SOURCES + FS + args[1]);
-        cmds.add(args[0]);
-        try {
-            ProcessTools.executeCommand(cmds.toArray(new String[cmds.size()]))
-                    .shouldHaveExitValue(0);
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
-
-/**
- * Test for nested Subject.doAs() invocation:
- *
- * WriteToFileAction (CN=Duke principal) ->
- *      ReadFromFileAction (CN=Duke principal) ->
- *          ReadPropertyAction (CN=Duke principal)
- *
- * The test expects AccessControllException.
- */
-class NestedActionsACE {
-
-    public static void main(String args[]) {
-        Subject subject = new Subject();
-        subject.getPrincipals().add(new X500Principal("CN=Duke"));
-        WriteToFileNegativeAction writeToFile
-                = new WriteToFileNegativeAction(NestedActions.file);
-        Subject.doAs(subject, writeToFile);
-    }
-}
-
-/**
- * Test for nested Subject.doAs() invocation:
- *
- * WriteToFileAction (CN=Duke principal) ->
- *      ReadFromFileAction (CN=Duke principal) ->
- *          ReadPropertyAction (CN=Duke principal)
- *
- * The test expects PrivilegedActionException
- * that caused by AccessControlEception.
- */
-class NestedActionsPAE {
-
-    public static void main(String args[]) {
-        Subject subject = new Subject();
-        subject.getPrincipals().add(new X500Principal("CN=Duke"));
-        try {
-            WriteToFileExceptionAction writeToFile =
-                    new WriteToFileExceptionAction(NestedActions.file);
-            Subject.doAs(subject, writeToFile);
-            throw new RuntimeException(
-                    "Test failed: no PrivilegedActionException thrown");
-        } catch (PrivilegedActionException pae) {
-            System.out.println(
-                    "PrivilegedActionException thrown as expected: "
-                    + pae);
-
-            // check if AccessControlException caused PrivilegedActionException
-            Throwable exception = pae.getException();
-            do {
-                if (!(exception instanceof PrivilegedActionException)) {
-                    break;
-                }
-                exception = ((PrivilegedActionException) exception).
-                        getException();
-            } while (true);
-
-            if (!(exception instanceof ReadPropertyException)) {
-                throw new RuntimeException(
-                        "Test failed: PrivilegedActionException "
-                        + "was not caused by ReadPropertyException");
-            }
-
-            exception = exception.getCause();
-            if (!(exception instanceof AccessControlException)) {
-                throw new RuntimeException(
-                        "Test failed: PrivilegedActionException "
-                        + "was not caused by ReadPropertyException");
-            }
-
-            System.out.println(
-                    "Test passed: PrivilegedActionException "
-                    + "was caused by AccessControlException");
-        }
-    }
-}
-
-/**
- * Test for nested Subject.doAs() invocation:
- *
- * WriteToFileAction (CN=Duke principal) ->
- *      ReadFromFileAction (CN=Duke principal) ->
- *          ReadPropertyAction (CN=Duke principal)
- */
-class NestedActionsOnePrincipal {
-
-    public static void main(String args[]) {
-        Subject subject = new Subject();
-        subject.getPrincipals().add(new X500Principal("CN=Duke"));
-        WriteToFileAction writeToFile =
-                new WriteToFileAction(NestedActions.file);
-        Subject.doAs(subject, writeToFile);
-    }
-}
-
-/**
- * Test for nested Subject.doAs() invocation:
- *
- * WriteToFileAction (CN=Duke principal) ->
- *      ReadFromFileAction (CN=Duke principal) ->
- *          ReadPropertyAction (CN=Java principal)
- */
-class NestedActionsTwoPrincipals {
-
-    public static void main(String args[]) {
-        Subject subject = new Subject();
-        subject.getPrincipals().add(new X500Principal("CN=Duke"));
-        Subject anotherSubject = new Subject();
-        anotherSubject.getPrincipals().add(new X500Principal("CN=Java"));
-        ReadFromFileAction readFromFile
-                = new ReadFromFileAction(NestedActions.file, anotherSubject);
-        WriteToFileAction writeToFile
-                = new WriteToFileAction(NestedActions.file, readFromFile);
-        Subject.doAs(subject, writeToFile);
-    }
-}
-
-/**
- * Helper class.
- */
-class Utils {
-
-    static void readFile(String filename) {
-        System.out.println("ReadFromFileAction: try to read " + filename);
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        System.out.println("principals = " + subject.getPrincipals());
-        try (FileInputStream fis = new FileInputStream(filename)) {
-            // do nothing
-        } catch (IOException e) {
-            throw new RuntimeException("Unexpected IOException", e);
-        }
-    }
-
-    static void writeFile(String filename) {
-        System.out.println("WriteToFileAction: try to write to " + filename);
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        System.out.println("principals = " + subject.getPrincipals());
-        try (BufferedOutputStream bos = new BufferedOutputStream(
-                new FileOutputStream(filename))) {
-            bos.write(0);
-            bos.flush();
-        } catch (IOException e) {
-            throw new RuntimeException("Unexpected IOException", e);
-        }
-    }
-
-}
-
-class WriteToFileAction implements PrivilegedAction {
-
-    private final String filename;
-    private final PrivilegedAction nextAction;
-
-    WriteToFileAction(String filename, PrivilegedAction nextAction) {
-        this.filename = filename;
-        this.nextAction = nextAction;
-    }
-
-    WriteToFileAction(String filename) {
-        this(filename, new ReadFromFileAction(filename));
-    }
-
-    @Override
-    public Object run() {
-        Utils.writeFile(filename);
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        return Subject.doAs(subject, nextAction);
-    }
-
-}
-
-class ReadFromFileAction implements PrivilegedAction {
-
-    private final String filename;
-    private final Subject anotherSubject;
-
-    ReadFromFileAction(String filename) {
-        this(filename, null);
-    }
-
-    ReadFromFileAction(String filename, Subject anotherSubject) {
-        this.filename = filename;
-        this.anotherSubject = anotherSubject;
-    }
-
-    @Override
-    public Object run() {
-        Utils.readFile(filename);
-
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        ReadPropertyAction readProperty = new ReadPropertyAction();
-        if (anotherSubject != null) {
-            return Subject.doAs(anotherSubject, readProperty);
-        } else {
-            return Subject.doAs(subject, readProperty);
-        }
-    }
-
-}
-
-class ReadPropertyAction implements PrivilegedAction {
-
-    @Override
-    public java.lang.Object run() {
-        System.out.println("ReadPropertyAction: "
-                + "try to read 'java.class.path' property");
-
-        AccessControlContext acc = AccessController.getContext();
-        Subject s = Subject.getSubject(acc);
-        System.out.println("principals = " + s.getPrincipals());
-        System.out.println("java.class.path = "
-                + System.getProperty("java.class.path"));
-
-        return null;
-    }
-
-}
-
-class WriteToFileNegativeAction implements PrivilegedAction {
-
-    private final String filename;
-
-    public WriteToFileNegativeAction(String filename) {
-        this.filename = filename;
-    }
-
-    @Override
-    public Object run() {
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        System.out.println("principals = " + subject.getPrincipals());
-
-        try {
-            Utils.writeFile(filename);
-            new File(filename).delete();
-            throw new RuntimeException(
-                    "Test failed: no AccessControlException thrown");
-        } catch (AccessControlException ace) {
-            System.out.println(
-                    "AccessControlException thrown as expected: "
-                    + ace.getMessage());
-        }
-
-        ReadFromFileNegativeAction readFromFile
-                = new ReadFromFileNegativeAction(filename);
-        return Subject.doAs(subject, readFromFile);
-    }
-
-}
-
-class ReadFromFileNegativeAction implements PrivilegedAction {
-
-    private final String filename;
-
-    public ReadFromFileNegativeAction(String filename) {
-        this.filename = filename;
-    }
-
-    @Override
-    public Object run() {
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        System.out.println("principals = " + subject.getPrincipals());
-
-        try {
-            Utils.readFile(filename);
-            throw new RuntimeException(
-                    "Test failed: no AccessControlException thrown");
-        } catch (AccessControlException ace) {
-            System.out.println(
-                    "AccessControlException thrown as expected: "
-                    + ace.getMessage());
-        }
-
-        ReadPropertyNegativeAction readProperty =
-                new ReadPropertyNegativeAction();
-        return Subject.doAs(subject, readProperty);
-    }
-
-}
-
-class ReadPropertyNegativeAction implements PrivilegedAction {
-
-    @Override
-    public java.lang.Object run() {
-        System.out.println("Try to read 'java.class.path' property");
-
-        AccessControlContext acc = AccessController.getContext();
-        Subject s = Subject.getSubject(acc);
-        System.out.println("principals = " + s.getPrincipals());
-
-        try {
-            System.out.println("java.class.path = "
-                    + System.getProperty("java.class.path"));
-            throw new RuntimeException(
-                    "Test failed: no AccessControlException thrown");
-        } catch (AccessControlException ace) {
-            System.out.println(
-                    "AccessControlException thrown as expected: "
-                    + ace.getMessage());
-        }
-
-        return null;
-    }
-
-}
-
-class WriteToFileExceptionAction implements PrivilegedExceptionAction {
-
-    private final String filename;
-
-    WriteToFileExceptionAction(String filename) {
-        this.filename = filename;
-    }
-
-    @Override
-    public Object run() throws Exception {
-        Utils.writeFile(filename);
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        ReadFromFileExceptionAction readFromFile =
-                new ReadFromFileExceptionAction(filename);
-        return Subject.doAs(subject, readFromFile);
-    }
-
-}
-
-class ReadFromFileExceptionAction implements PrivilegedExceptionAction {
-
-    private final String filename;
-
-    ReadFromFileExceptionAction(String filename) {
-        this.filename = filename;
-    }
-
-    @Override
-    public Object run() throws Exception {
-        Utils.readFile(filename);
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-        ReadPropertyExceptionAction readProperty =
-                new ReadPropertyExceptionAction();
-        return Subject.doAs(subject, readProperty);
-    }
-
-}
-
-class ReadPropertyExceptionAction implements PrivilegedExceptionAction {
-
-    @Override
-    public java.lang.Object run() throws Exception {
-        System.out.println("Try to read 'java.class.path' property");
-
-        AccessControlContext acc = AccessController.getContext();
-        Subject s = Subject.getSubject(acc);
-        System.out.println("principals = " + s.getPrincipals());
-
-        try {
-            System.out.println("java.class.path = "
-                    + System.getProperty("java.class.path"));
-            throw new RuntimeException(
-                    "Test failed: no AccessControlException thrown");
-        } catch (AccessControlException ace) {
-            System.out.println(
-                    "AccessControlException thrown as expected: "
-                    + ace.getMessage());
-            throw new ReadPropertyException(ace);
-        }
-    }
-
-}
-
-class ReadPropertyException extends Exception {
-
-    ReadPropertyException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/test/jdk/javax/security/auth/Subject/doAs/Test.java b/test/jdk/javax/security/auth/Subject/doAs/Test.java
deleted file mode 100644
index 24109150238..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/Test.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 4399067 8179880
- * @summary Subject.doAs(null, action) does not clear the executing subject
- * @run main/othervm/policy=policy Test
- */
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-import java.security.*;
-import java.util.*;
-
-public class Test {
-
-    public static Subject get(String name) {
-
-        return new Subject(true,
-                Collections.singleton(new X500Principal(name)),
-                new HashSet(),
-                Collections.singleton(Boolean.TRUE));
-    }
-
-    public static void main(String[] args) {
-
-        System.setSecurityManager(new SecurityManager());
-        try {
-            Subject.doAsPrivileged(get("CN=joe"), new PrivilegedAction() {
-                public Object run() {
-                    return Subject.doAs(null, new PrivilegedAction() {
-                        public Object run() {
-                            return System.getProperty("foobar");
-                        }
-                    });
-                }
-            }, null);
-            throw new RuntimeException(
-                    "AccessControlException should have occcured");
-        } catch (java.security.AccessControlException e) {
-            // Expected exception occurred
-            e.printStackTrace(System.out);
-            System.out.println("Expected exception occurred");
-        }
-    }
-}
diff --git a/test/jdk/javax/security/auth/Subject/doAs/policy b/test/jdk/javax/security/auth/Subject/doAs/policy
deleted file mode 100644
index 3a2eb628827..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-    permission javax.security.auth.AuthPermission "doAs";
-    permission javax.security.auth.AuthPermission "doAsPrivileged";
-    permission java.lang.RuntimePermission "createSecurityManager";
-    permission java.lang.RuntimePermission "setSecurityManager";
-};
-
-grant principal javax.security.auth.x500.X500Principal "CN=joe" {
-    permission java.util.PropertyPermission "foobar", "read";
-};
diff --git a/test/jdk/javax/security/auth/Subject/doAs/policy.expect.ace b/test/jdk/javax/security/auth/Subject/doAs/policy.expect.ace
deleted file mode 100644
index 606ea20f104..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/policy.expect.ace
+++ /dev/null
@@ -1,27 +0,0 @@
-// this code has limited permissions that should cause ACE
-grant codeBase "file:NestedActionsACE.jar" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "test.java.opts", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-};
-
-grant codeBase "file:WriteToFileNegativeAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:ReadFromFileNegativeAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:ReadPropertyNegativeAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/javax/security/auth/Subject/doAs/policy.expect.pae b/test/jdk/javax/security/auth/Subject/doAs/policy.expect.pae
deleted file mode 100644
index c37cd7ec132..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/policy.expect.pae
+++ /dev/null
@@ -1,19 +0,0 @@
-grant codeBase "file:NestedActionsPAE.jar" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:WriteToFileExceptionAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:ReadFromFileExceptionAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission java.security.AllPermission;
-};
-
-// this code has limited permissions that should cause ACE
-grant codeBase "file:ReadPropertyExceptionAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission javax.security.auth.AuthPermission "getSubject";
-};
diff --git a/test/jdk/javax/security/auth/Subject/doAs/policy.one.principal b/test/jdk/javax/security/auth/Subject/doAs/policy.one.principal
deleted file mode 100644
index 014a8f43c70..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/policy.one.principal
+++ /dev/null
@@ -1,36 +0,0 @@
-grant codeBase "file:NestedActionsOnePrincipal.jar" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "test.java.opts", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read,write";
-};
-
-grant codeBase "file:WriteToFileAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read,write";
-};
-
-grant codeBase "file:ReadFromFileAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read";
-};
-
-grant codeBase "file:ReadPropertyAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "java.class.path", "read";
-};
diff --git a/test/jdk/javax/security/auth/Subject/doAs/policy.two.principals b/test/jdk/javax/security/auth/Subject/doAs/policy.two.principals
deleted file mode 100644
index 375ce00196c..00000000000
--- a/test/jdk/javax/security/auth/Subject/doAs/policy.two.principals
+++ /dev/null
@@ -1,37 +0,0 @@
-grant codeBase "file:NestedActionsTwoPrincipals.jar" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "test.java.opts", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read,write,delete";
-};
-
-grant codeBase "file:WriteToFileAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read,write";
-};
-
-grant codeBase "file:ReadFromFileAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Duke"{
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "java.class.path", "read";
-    permission java.io.FilePermission "NestedActions.tmp", "read";
-};
-
-grant codeBase "file:ReadPropertyAction.jar"
-        Principal javax.security.auth.x500.X500Principal "cn=Java" {
-    permission javax.security.auth.AuthPermission "getSubject";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.util.PropertyPermission "java.class.path", "read";
-};
diff --git a/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java b/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java
index b2ee1894333..0e8599a88b0 100644
--- a/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java
+++ b/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @summary     performance regression and other bugs in
  *              SubjectDomainCombiner.combine
  *
- * @run main/othervm/policy=Regression.policy -Djava.security.auth.debug=combiner Regression
+ * @run main/othervm -Djava.security.auth.debug=combiner Regression
  */
 
 import java.security.ProtectionDomain;
@@ -101,8 +101,7 @@ public static void main(String[] args) {
 
         if (domains1.length != 4 ||
             domains1[0] == d1 || domains1[1] == d2 || domains1[2] == d3 ||
-            domains1[3] != d4 ||
-            !domains1[0].implies(new RuntimePermission("queuePrintJob"))) {
+            domains1[3] != d4) {
             throw new SecurityException("Test failed: combine test 1 failed");
         }
 
@@ -117,8 +116,7 @@ public static void main(String[] args) {
         if (domains2.length != 4 ||
             domains2[0] != domains1[0] || domains2[1] != domains1[1] ||
             domains2[2] != domains1[2] ||
-            domains2[3] != domains1[3] ||
-            !domains2[0].implies(new RuntimePermission("queuePrintJob"))) {
+            domains2[3] != domains1[3]) {
             throw new SecurityException("Test failed: combine test 2 failed");
         }
 
@@ -135,9 +133,7 @@ public static void main(String[] args) {
         if (domains3.length != 4 ||
             domains3[0] == domains1[0] || domains3[1] == domains1[1] ||
             domains3[2] == domains1[2] ||
-            domains3[3] != domains1[3] ||
-            !domains3[0].implies(new RuntimePermission("createClassLoader")) ||
-            domains3[0].implies(new RuntimePermission("queuePrintJob"))) {
+            domains3[3] != domains1[3]) {
             throw new SecurityException("Test failed: combine test 3 failed");
         }
 
diff --git a/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.policy b/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.policy
deleted file mode 100644
index ae29a1df449..00000000000
--- a/test/jdk/javax/security/auth/SubjectDomainCombiner/Regression.policy
+++ /dev/null
@@ -1,12 +0,0 @@
-grant {
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-};
-
-grant principal com.sun.security.auth.NTUserPrincipal "test1" {
-    permission java.lang.RuntimePermission "createClassLoader";
-};
-
-grant principal com.sun.security.auth.NTUserPrincipal "test1",
-      principal com.sun.security.auth.NTUserPrincipal "test2" {
-    permission java.lang.RuntimePermission "queuePrintJob";
-};
diff --git a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy
deleted file mode 100644
index f92b9fa63ad..00000000000
--- a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy
+++ /dev/null
@@ -1,8 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "test.provider.name", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.io.FilePermission "${test.src}${/}*", "read";
-
-    permission javax.security.auth.AuthPermission
-		"createLoginConfiguration.JavaLoginConfig";
-};
diff --git a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.java b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.java
deleted file mode 100644
index 68417a34bd9..00000000000
--- a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6268315
- * @modules jdk.security.auth
- * @summary Configuration should be provider-based
- * @build GetInstanceConfigSpi GetInstanceProvider
- * @run main/othervm/policy=GetInstanceSecurity.policy GetInstanceSecurity
- */
-
-import java.io.File;
-import java.net.URI;
-import java.security.Policy;
-import java.security.Security;
-import java.security.URIParameter;
-import javax.security.auth.login.Configuration;
-
-public class GetInstanceSecurity {
-
-    private static final String JAVA_CONFIG = "JavaLoginConfig";
-
-    public static void main(String[] args) throws Exception {
-        try {
-            Configuration c = Configuration.getInstance(JAVA_CONFIG, null);
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        try {
-            Configuration c = Configuration.getInstance
-                        (JAVA_CONFIG, null, System.getProperty("test.provider.name","SUN"));
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        try {
-            Configuration c = Configuration.getInstance
-                        (JAVA_CONFIG, null, Security.getProvider(
-                                System.getProperty("test.provider.name","SUN")));
-            throw new RuntimeException("did not catch security exception");
-        } catch (SecurityException se) {
-            // good
-        }
-
-        // set a new policy that grants the perms, and then re-check perms
-
-        File file = new File(System.getProperty("test.src", "."),
-                                "GetInstanceSecurity.grantedPolicy");
-        URI uri = file.toURI();
-        URIParameter param = new URIParameter(uri);
-        Policy p = Policy.getInstance("JavaPolicy", param,
-                System.getProperty("test.provider.name","SUN"));
-        Policy.setPolicy(p);
-
-        // retry operations
-
-        file = new File(System.getProperty("test.src", "."),
-                        "GetInstance.config");
-        URIParameter uriParam = new URIParameter(file.toURI());
-
-        try {
-            Configuration c = Configuration.getInstance(JAVA_CONFIG, uriParam);
-        } catch (SecurityException se) {
-            throw new RuntimeException("unexpected SecurityException");
-        }
-
-        try {
-            Configuration c = Configuration.getInstance
-                        (JAVA_CONFIG, uriParam, System.getProperty("test.provider.name","SUN"));
-            // good
-        } catch (SecurityException se) {
-            throw new RuntimeException("unexpected SecurityException");
-        }
-
-        try {
-            Configuration c = Configuration.getInstance
-                        (JAVA_CONFIG, uriParam, Security.getProvider(
-                                System.getProperty("test.provider.name","SUN")));
-            // good
-        } catch (SecurityException se) {
-            throw new RuntimeException("unexpected SecurityException");
-        }
-
-        System.out.println("test passed");
-    }
-}
diff --git a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.policy b/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.policy
deleted file mode 100644
index 162168a3ffd..00000000000
--- a/test/jdk/javax/security/auth/login/Configuration/GetInstanceSecurity.policy
+++ /dev/null
@@ -1,15 +0,0 @@
-
-grant {
-    permission java.util.PropertyPermission "test.provider.name", "read";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.io.FilePermission
-	"${test.src}${/}GetInstanceSecurity.grantedPolicy", "read";
-    permission java.security.SecurityPermission "createPolicy.JavaPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-
-    // do not grant this:
-    //
-    // permission javax.security.auth.AuthPermission
-    //			"createLoginConfiguration.JavaLoginConfig";
-};
diff --git a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java
index 0fc36c1b141..7907ad12bbe 100644
--- a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java
+++ b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @modules jdk.security.auth
  * @summary can not specify Configuration to LoginContext constructor
  *
- * @run main/othervm/policy=ConfigConstructor.policy -Djava.security.auth.login.config=file:${test.src}/ConfigConstructor.config ConfigConstructor
+ * @run main/othervm -Djava.security.auth.login.config=file:${test.src}/ConfigConstructor.config ConfigConstructor
  *
  */
 
@@ -91,49 +91,29 @@ public static void main(String[] args) throws Exception {
         lc4.login();
         System.out.println("Test 4 Passed");
 
-        // test security (without permission)
-        try {
-            LoginContext lc5 = new LoginContext
-                        ("module5",
-                        null,
-                        null,
-                        c);
-            lc5.login();
-            throw new SecurityException("test failed - security check failed");
-        } catch (LoginException le) {
-            if (le.getCause() instanceof SecurityException) {
-                // test passed
-            } else {
-                le.printStackTrace();
-                throw new SecurityException("test failed: " +
-                    "LoginException did not have chained SecurityException");
-            }
-        }
+        // general test
+        LoginContext lc5 = new LoginContext
+                    ("module5",
+                    null,
+                    null,
+                    c);
+        lc5.login();
         System.out.println("Test 5 Passed");
 
-        // test security (with permission)
+        // test other
         LoginContext lc6 = new LoginContext
-                        ("module6",
+                        ("goToOther",
                         null,
                         null,
                         c);
         lc6.login();
         System.out.println("Test 6 Passed");
 
-        // test other
+        // test other old constructor
         LoginContext lc7 = new LoginContext
-                        ("goToOther",
-                        null,
-                        null,
-                        c);
+                        ("goToOther");
         lc7.login();
         System.out.println("Test 7 Passed");
-
-        // test other old constructor
-        LoginContext lc8 = new LoginContext
-                        ("goToOther");
-        lc8.login();
-        System.out.println("Test 8 Passed");
     }
 
     private static class MyConfig extends Configuration {
@@ -172,12 +152,6 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
                     AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
                     map);
                 entries[0] = entry;
-            } else if (name.equals("module6")) {
-                AppConfigurationEntry entry = new AppConfigurationEntry
-                    ("ConfigConstructor$MyModule6",
-                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                    map);
-                entries[0] = entry;
             } else if (name.equalsIgnoreCase("other")) {
                 AppConfigurationEntry entry = new AppConfigurationEntry
                     ("ConfigConstructor$MyModule2",
@@ -273,25 +247,6 @@ public void initialize(Subject s, CallbackHandler ch,
                 Map<String,?> state, Map<String,?> options) { }
 
         public boolean login() throws LoginException {
-            // do something security-sensitive
-            System.out.println(System.getProperty("user.name"));
-            return true;
-        }
-        public boolean commit() throws LoginException { return true; }
-        public boolean abort() throws LoginException { return true; }
-        public boolean logout() throws LoginException { return true; }
-    }
-
-    public static class MyModule6 implements LoginModule {
-
-        public MyModule6() { }
-
-        public void initialize(Subject s, CallbackHandler ch,
-                Map<String,?> state, Map<String,?> options) { }
-
-        public boolean login() throws LoginException {
-            // do something security-sensitive
-            System.out.println(System.getProperty("user.home"));
             return true;
         }
         public boolean commit() throws LoginException { return true; }
diff --git a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.policy b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.policy
deleted file mode 100644
index 16d88ecd545..00000000000
--- a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructor.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "user.home", "read";
-    permission javax.security.auth.AuthPermission "createLoginContext.module3";
-    permission javax.security.auth.AuthPermission "createLoginContext.module4";
-    permission javax.security.auth.AuthPermission "createLoginContext.goToOther";
-    permission javax.security.auth.AuthPermission "createLoginContext.other";
-};
diff --git a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java
deleted file mode 100644
index 84287ba9863..00000000000
--- a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4703361
- * @modules jdk.security.auth
- * @summary can not specify Configuration to LoginContext constructor
- *
- * @run main/othervm/policy=ConfigConstructorNoPerm.policy -Djava.security.auth.login.config=file:${test.src}/ConfigConstructor.config ConfigConstructorNoPerm
- */
-
-/**
- * This test shares the login config with ConfigConstructor.
- * This test has no configured permissions
- * (ConfigConstructor tests code with perms configured).
- */
-
-import java.util.Map;
-import javax.security.auth.Subject;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.callback.CallbackHandler;
-
-public class ConfigConstructorNoPerm {
-
-    private static Subject s = new Subject();
-    private static CallbackHandler ch =
-                new com.sun.security.auth.callback.TextCallbackHandler();
-    private static Configuration c = new MyConfig();
-
-    public static void main(String[] args) throws Exception {
-
-        // test old constructor with no permission
-        try {
-            LoginContext lc1 = new LoginContext
-                        ("module1",
-                        s,
-                        ch);
-            throw new RuntimeException("Test 1 Failed");
-        } catch (SecurityException se) {
-            // test passed
-        }
-        System.out.println("Test 1 Succeeded");
-
-        // test new constructor (null config) with no permission
-        try {
-            LoginContext lc2 = new LoginContext
-                        ("module1",
-                        s,
-                        ch,
-                        null);
-            throw new RuntimeException("Test 2 Failed");
-        } catch (SecurityException se) {
-            // test passed
-        }
-        System.out.println("Test 2 Succeeded");
-
-        // test new constructor (config) - no permission needed
-        // (and none configured)
-        LoginContext lc3 = new LoginContext
-                        ("module1",
-                        s,
-                        ch,
-                        c);
-        System.out.println("Test 3 Succeeded");
-
-        // test old constructor with no permission for other
-        try {
-            LoginContext lc4 = new LoginContext
-                        ("goToOther",
-                        s,
-                        ch);
-            throw new RuntimeException("Test 4 Failed");
-        } catch (SecurityException se) {
-            // test passed
-        }
-        System.out.println("Test 4 Succeeded");
-
-        // test new constructor with no permission for other
-        try {
-            LoginContext lc5 = new LoginContext
-                        ("goToOther",
-                        s,
-                        ch,
-                        null);
-            throw new RuntimeException("Test 5 Failed");
-        } catch (SecurityException se) {
-            // test passed
-        }
-        System.out.println("Test 5 Succeeded");
-    }
-
-    private static class MyConfig extends Configuration {
-        public MyConfig() { }
-        public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
-            java.util.HashMap map = new java.util.HashMap();
-            AppConfigurationEntry[] entries = new AppConfigurationEntry[1];
-
-            if (name.equals("module1")) {
-                AppConfigurationEntry entry = new AppConfigurationEntry
-                        ("ConfigConstructor$MyModule1",
-                        AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                        map);
-                entries[0] = entry;
-            } else {
-                entries = null;
-            }
-            return entries;
-        }
-        public void refresh() { }
-    }
-}
diff --git a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy b/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy
deleted file mode 100644
index 88167dde7a4..00000000000
--- a/test/jdk/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission javax.security.auth.AuthPermission "createLoginContext.goToOther";
-};
diff --git a/test/jdk/javax/smartcardio/TerminalFactorySpiTest.java b/test/jdk/javax/smartcardio/TerminalFactorySpiTest.java
index a7414401644..5c7836e39c2 100644
--- a/test/jdk/javax/smartcardio/TerminalFactorySpiTest.java
+++ b/test/jdk/javax/smartcardio/TerminalFactorySpiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8049021
  * @summary Test if we can write new provider for smart card
- * @run main/othervm/java.security.policy=policy TerminalFactorySpiTest
+ * @run main TerminalFactorySpiTest
  */
 import java.security.Provider;
 import java.security.Security;
diff --git a/test/jdk/javax/smartcardio/policy b/test/jdk/javax/smartcardio/policy
deleted file mode 100644
index 1df892e4c7b..00000000000
--- a/test/jdk/javax/smartcardio/policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-        permission java.security.SecurityPermission "insertProvider.MyProvider";
-        permission java.security.SecurityPermission "putProviderProperty.MyProvider";
-};
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
index 7ffaf5d7ad0..35a7d2da2f6 100644
--- a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
+++ b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,8 @@
  * @bug 4776511 8201279
  * @summary RFE: Setting the default MixerProvider. Test the retrieving and
  *          parsing of properties. This is a part of the test for 4776511.
- * @run main/othervm DefaultProperties
- * @run main/othervm/policy=java.policy DefaultProperties
  * @modules java.desktop/com.sun.media.sound
+ * @run main/othervm DefaultProperties
  */
 public class DefaultProperties {
 
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java
deleted file mode 100644
index bf5c984f69f..00000000000
--- a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/DefaultPropertiesNegative.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Paths;
-
-import com.sun.media.sound.JDK13Services;
-
-/**
- * @test
- * @bug 8201279
- * @summary this test checks that "javax.sound.config.file" will be ignored if
- *          the user has no access to the properties file
- * @run main/othervm/policy=negative.policy DefaultPropertiesNegative
- * @modules java.desktop/com.sun.media.sound
- */
-public class DefaultPropertiesNegative {
-
-    private static final Class[] lineTypeClasses = {
-        javax.sound.midi.Receiver.class,
-        javax.sound.midi.Transmitter.class,
-        javax.sound.midi.Sequencer.class,
-        javax.sound.midi.Synthesizer.class,
-    };
-
-    public static void main(String[] args) throws Exception {
-        boolean allOk = true;
-        String path = Paths.get(System.getProperty("test.src", "."),
-                                "testdata", "conf", "sound.properties")
-                           .toAbsolutePath().normalize().toString();
-        System.setProperty("javax.sound.config.file", path);
-
-        for (int i = 0; i < lineTypeClasses.length; i++) {
-            Class cls = lineTypeClasses[i];
-            // properties file, both provider class name and instance name
-            String result = JDK13Services.getDefaultProviderClassName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: provider class should be 'null' "
-                            + "but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: instance name should be 'null' "
-                            + "but is '" + result + "'!");
-                allOk = false;
-            }
-        }
-        if (! allOk) {
-            throw new Exception("Test failed");
-        } else {
-            out("Test passed");
-        }
-    }
-
-    private static void out(String message) {
-        System.out.println(message);
-    }
-}
-
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy
deleted file mode 100644
index 4682e51106b..00000000000
--- a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/java.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "javax.sound.config.file", "write";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "javax.sound.midi.Receiver", "write";
-    permission java.util.PropertyPermission "javax.sound.midi.Transmitter", "write";
-    permission java.util.PropertyPermission "javax.sound.midi.Sequencer", "write";
-    permission java.util.PropertyPermission "javax.sound.midi.Synthesizer", "write";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
-    permission java.io.FilePermission "${test.src}/testdata/conf/sound.properties", "read";
-};
diff --git a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy b/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy
deleted file mode 100644
index 2c6f048a46a..00000000000
--- a/test/jdk/javax/sound/midi/MidiSystem/DefaultProperties/negative.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "javax.sound.config.file", "write";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
-};
diff --git a/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/GetSoundBankSecurityException.java b/test/jdk/javax/sound/midi/Soundbanks/EmptySoundBankTest.java
similarity index 89%
rename from test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/GetSoundBankSecurityException.java
rename to test/jdk/javax/sound/midi/Soundbanks/EmptySoundBankTest.java
index 53f0450f482..e3966a8b9a3 100644
--- a/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/GetSoundBankSecurityException.java
+++ b/test/jdk/javax/sound/midi/Soundbanks/EmptySoundBankTest.java
@@ -31,10 +31,11 @@
 /**
  * @test
  * @bug 8312535
- * @summary MidiSystem.getSoundbank() throws unexpected SecurityException
- * @run main/othervm/policy=security.policy GetSoundBankSecurityException
+ * @summary Check if MidiSystem.getSoundbank() throws
+ *          InvalidMidiDataException when provided with invalid soundbank data
+ * @run main EmptySoundBankTest
  */
-public final class GetSoundBankSecurityException {
+public final class EmptySoundBankTest {
 
     public static void main(String[] args) throws Exception {
         File tempFile = new File("sound.bank");
diff --git a/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/security.policy b/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/security.policy
deleted file mode 100644
index 6c9c2a26aaf..00000000000
--- a/test/jdk/javax/sound/midi/Soundbanks/GetSoundBankSecurityException/security.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.io.FilePermission "*", "read,write,delete";
-    permission java.util.PropertyPermission  "user.dir",  "read";
-};
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java
deleted file mode 100644
index d8e86392c47..00000000000
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultProperties.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Paths;
-
-import com.sun.media.sound.JDK13Services;
-
-/**
- * @test
- * @bug 4776511 8201279
- * @run main/othervm DefaultProperties
- * @run main/othervm/policy=java.policy DefaultProperties
- * @summary RFE: Setting the default MixerProvider. Test the retrieving and
- *          parsing of properties.
- * @modules java.desktop/com.sun.media.sound
- */
-public class DefaultProperties {
-
-    private static final Class[] lineTypeClasses = {
-        javax.sound.sampled.SourceDataLine.class,
-        javax.sound.sampled.TargetDataLine.class,
-        javax.sound.sampled.Clip.class,
-        javax.sound.sampled.Port.class,
-    };
-
-    public static void main(String[] args) throws Exception {
-        boolean allOk = true;
-        String path = Paths.get(System.getProperty("test.src", "."),
-                                "testdata", "conf", "sound.properties")
-                           .toAbsolutePath().normalize().toString();
-        System.setProperty("javax.sound.config.file", path);
-
-        for (int i = 0; i < lineTypeClasses.length; i++) {
-            Class cls = lineTypeClasses[i];
-            String propertyName = cls.getName();
-            String result;
-            String provClassName;
-            String instanceName;
-
-            // properties file, both provider class name and instance name
-            provClassName = "xyz";
-            instanceName = "123";
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (! provClassName.equals(result)) {
-                out("type " + cls + " failed: provider class should be '" +
-                    provClassName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (! instanceName.equals(result)) {
-                out("type " + cls + " failed: instance name should be '" +
-                    instanceName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-
-            // system property, provider class name only, no trailing hash
-            provClassName = "abc";
-            System.setProperty(propertyName, provClassName);
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (! provClassName.equals(result)) {
-                out("type " + cls + " failed: provider class should be '" +
-                    provClassName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: instance name should be " +
-                    "null but is '" + result + "'!");
-                allOk = false;
-            }
-
-            // system property, provider class name only, trailing hash
-            provClassName = "def";
-            System.setProperty(propertyName, provClassName + "#");
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (! provClassName.equals(result)) {
-                out("type " + cls + " failed: provider class should be '" +
-                    provClassName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: instance name should be " +
-                    "null but is '" + result + "'!");
-                allOk = false;
-            }
-
-            // system property, instance name only
-            instanceName = "ghi";
-            System.setProperty(propertyName, "#" + instanceName);
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: provider class should be " +
-                    "null but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (! instanceName.equals(result)) {
-                out("type " + cls + " failed: instance name should be '" +
-                    instanceName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-
-            // system property, both provider class and instance name
-            provClassName = "jkl";
-            instanceName = "mno";
-            System.setProperty(propertyName, provClassName + "#" + instanceName);
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (! provClassName.equals(result)) {
-                out("type " + cls + " failed: provider class should be '" +
-                    provClassName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (! instanceName.equals(result)) {
-                out("type " + cls + " failed: instance name should be '" +
-                    instanceName + "' but is '" + result + "'!");
-                allOk = false;
-            }
-
-            // system property, empty
-            System.setProperty(propertyName, "");
-            result = JDK13Services.getDefaultProviderClassName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: provider class should be " +
-                    "null but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: instance name should be " +
-                    "null but is '" + result + "'!");
-                allOk = false;
-            }
-        }
-        if (! allOk) {
-            throw new Exception("Test failed");
-        } else {
-            out("Test passed");
-        }
-    }
-
-    private static void out(String message) {
-        System.out.println(message);
-    }
-}
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java
deleted file mode 100644
index 5f4007d405c..00000000000
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/DefaultPropertiesNegative.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Paths;
-
-import com.sun.media.sound.JDK13Services;
-
-/**
- * @test
- * @bug 8201279
- * @run main/othervm/policy=negative.policy DefaultPropertiesNegative
- * @summary this test checks that "javax.sound.config.file" will be ignored if
- *          the user has no access to the properties file
- * @modules java.desktop/com.sun.media.sound
- */
-public class DefaultPropertiesNegative {
-
-    private static final Class[] lineTypeClasses = {
-        javax.sound.sampled.SourceDataLine.class,
-        javax.sound.sampled.TargetDataLine.class,
-        javax.sound.sampled.Clip.class,
-        javax.sound.sampled.Port.class,
-    };
-
-    public static void main(String[] args) throws Exception {
-        boolean allOk = true;
-        String path = Paths.get(System.getProperty("test.src", "."),
-                                "testdata", "conf", "sound.properties")
-                           .toAbsolutePath().normalize().toString();
-        System.setProperty("javax.sound.config.file", path);
-
-        for (int i = 0; i < lineTypeClasses.length; i++) {
-            Class cls = lineTypeClasses[i];
-            // properties file, both provider class name and instance name
-            String result = JDK13Services.getDefaultProviderClassName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: provider class should be 'null' "
-                            + "but is '" + result + "'!");
-                allOk = false;
-            }
-            result = JDK13Services.getDefaultInstanceName(cls);
-            if (result != null) {
-                out("type " + cls + " failed: instance name should be 'null' "
-                            + "but is '" + result + "'!");
-                allOk = false;
-            }
-        }
-        if (! allOk) {
-            throw new Exception("Test failed");
-        } else {
-            out("Test passed");
-        }
-    }
-
-    private static void out(String message) {
-        System.out.println(message);
-    }
-}
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy
deleted file mode 100644
index a1046c08867..00000000000
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/java.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "javax.sound.config.file", "write";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "javax.sound.sampled.SourceDataLine", "write";
-    permission java.util.PropertyPermission "javax.sound.sampled.TargetDataLine", "write";
-    permission java.util.PropertyPermission "javax.sound.sampled.Clip", "write";
-    permission java.util.PropertyPermission "javax.sound.sampled.Port", "write";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
-    permission java.io.FilePermission "${test.src}/testdata/conf/sound.properties", "read";
-};
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy
deleted file mode 100644
index 2c6f048a46a..00000000000
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/negative.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "javax.sound.config.file", "write";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.lang.RuntimePermission "accessClassInPackage.com.sun.media.sound";
-};
diff --git a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/testdata/conf/sound.properties b/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/testdata/conf/sound.properties
deleted file mode 100644
index 172428914fc..00000000000
--- a/test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties/testdata/conf/sound.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-javax.sound.sampled.SourceDataLine=xyz#123
-javax.sound.sampled.TargetDataLine=xyz#123
-javax.sound.sampled.Clip=xyz#123
-javax.sound.sampled.Port=xyz#123
diff --git a/test/jdk/javax/sql/permissionTests/SyncFactoryPermissionsTests.java b/test/jdk/javax/sql/permissionTests/SyncFactoryPermissionsTests.java
deleted file mode 100644
index 6433e3e21c9..00000000000
--- a/test/jdk/javax/sql/permissionTests/SyncFactoryPermissionsTests.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-import java.security.AccessControlException;
-import java.security.Policy;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.naming.Context;
-import javax.sql.rowset.spi.SyncFactory;
-import javax.sql.rowset.spi.SyncFactoryException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import util.BaseTest;
-import util.StubContext;
-import util.TestPolicy;
-/*
- * @test
- * @library /java/sql/testng
- * @library /javax/sql/testng
- * @run testng/othervm -Djava.security.manager=allow SyncFactoryPermissionsTests
- * @summary Tests SyncFactory permissions.
- */
-public class SyncFactoryPermissionsTests extends BaseTest {
-
-    Context ctx;
-    private static Policy policy;
-    private static SecurityManager sm;
-    private final Logger alogger = Logger.getLogger(this.getClass().getName());
-
-    /*
-     * Install a SeeurityManager along with a base Policy to allow testNG to run
-     */
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        setPolicy(new TestPolicy());
-        System.setSecurityManager(new SecurityManager());
-    }
-
-    /*
-     * Install the original Policy and SecurityManager
-     */
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        System.setSecurityManager(sm);
-        setPolicy(policy);
-    }
-
-    /*
-     * Initialize a Context to be used in our tests.
-     * Save off the original Policy and SecurityManager
-     */
-    public SyncFactoryPermissionsTests() {
-        policy = Policy.getPolicy();
-        sm = System.getSecurityManager();
-        ctx = new StubContext();
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if
-     * SQLPermission("setSyncFactory") has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test() throws Exception {
-        setPolicy(new TestPolicy());
-        SyncFactory.setJNDIContext(ctx);
-    }
-
-    /*
-     * Validate that a SyncFactoryException is thrown if the Logger is null
-     */
-    @Test(expectedExceptions = SyncFactoryException.class)
-    public void test00() throws SyncFactoryException {
-        Logger l = SyncFactory.getLogger();
-    }
-
-    /*
-     * Validate that setJNDIContext succeeds if SQLPermission("setSyncFactory")
-     * has been granted
-     */
-    @Test
-    public void test01() throws Exception {
-        setPolicy(new TestPolicy("setSyncFactory"));
-        SyncFactory.setJNDIContext(ctx);
-    }
-
-    /*
-     * Validate that setJNDIContext succeeds if AllPermissions has been granted
-     */
-    @Test
-    public void test02() throws Exception {
-        setPolicy(new TestPolicy("all"));
-        SyncFactory.setJNDIContext(ctx);
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if
-     * SQLPermission("setSyncFactory") has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test03() throws Exception {
-        setPolicy(new TestPolicy());
-        SyncFactory.setLogger(alogger);
-    }
-
-    /*
-     * Validate that setLogger succeeds if SQLPermission("setSyncFactory")
-     * has been granted
-     */
-    @Test
-    public void test04() throws Exception {
-        setPolicy(new TestPolicy("setSyncFactory"));
-        SyncFactory.setLogger(alogger);
-    }
-
-    /*
-     * Validate that setLogger succeeds if AllPermissions has been granted
-     */
-    @Test
-    public void test05() throws Exception {
-        setPolicy(new TestPolicy("all"));
-        SyncFactory.setLogger(alogger);
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if
-     * SQLPermission("setSyncFactory") has not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test06() throws Exception {
-        setPolicy(new TestPolicy());
-        SyncFactory.setLogger(alogger, Level.INFO);
-    }
-
-    /*
-     * Validate that AccessControlException is thrown if
-     * SQLPermission("setSyncFactory")  and LoggingPermission("control", null)
-     * have not been granted
-     */
-    @Test(expectedExceptions = AccessControlException.class)
-    public void test07() throws Exception {
-        setPolicy(new TestPolicy("setSyncFactory"));
-        SyncFactory.setLogger(alogger, Level.INFO);
-    }
-
-    /*
-     * Validate that setLogger succeeds if SQLPermission("setSyncFactory")
-     * has been granted
-     */
-    @Test
-    public void test08() throws Exception {
-        setPolicy(new TestPolicy("setSyncFactoryLogger"));
-        SyncFactory.setLogger(alogger, Level.INFO);
-    }
-
-    /*
-     * Validate that setLogger succeeds if AllPermissions has been granted
-     */
-    @Test
-    public void test09() throws Exception {
-        setPolicy(new TestPolicy("all"));
-        SyncFactory.setLogger(alogger, Level.INFO);
-    }
-}
diff --git a/test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java b/test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java
index 2fb2391116a..c1bcbd606bc 100644
--- a/test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java
+++ b/test/jdk/javax/swing/JComboBox/8080972/TestBasicComboBoxEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 /*
  * @test
  * @bug 8080972
- * @run main/othervm -Djava.security.manager=allow TestBasicComboBoxEditor
+ * @run main TestBasicComboBoxEditor
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
  */
 
 public class TestBasicComboBoxEditor {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestBasicComboBoxEditor::testBasicComboBoxEditor);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestBasicComboBoxEditor::testBasicComboBoxEditor);
     }
 
     private static void testBasicComboBoxEditor() {
@@ -50,7 +47,7 @@ private static void testBasicComboBoxEditor() {
         UserComboBoxEditorType item = (UserComboBoxEditorType) comboBoxEditor.getItem();
 
         if (!item.str.equals("200")) {
-            throw new RuntimeException("Wrong itme value!");
+            throw new RuntimeException("Wrong item value!");
         }
     }
 
diff --git a/test/jdk/javax/swing/JEditorPane/5076514/bug5076514.java b/test/jdk/javax/swing/JEditorPane/5076514/bug5076514.java
deleted file mode 100644
index 21ea57ab8d0..00000000000
--- a/test/jdk/javax/swing/JEditorPane/5076514/bug5076514.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
-   @bug 5076514 8025430 8198321
-   @summary Tests if SecurityManager.checkPermission()
-                  used for clipboard access with permission 'accessClipboard'
-   @run main/othervm -Djava.security.manager=allow bug5076514
-   @run main/othervm -Djava.security.manager=allow -Djava.awt.headless=true bug5076514
-*/
-
-import java.awt.GraphicsEnvironment;
-import java.security.Permission;
-
-import javax.swing.JEditorPane;
-
-public class bug5076514 {
-    private final static String ACCESS_CLIPBOARD = "accessClipboard";
-    private static boolean isCheckPermissionCalled = false;
-
-    public static void main(String[] args) {
-        System.setSecurityManager(new MySecurityManager());
-
-        // no system clipboard in the headless mode
-        boolean expected  = !GraphicsEnvironment.isHeadless();
-
-        JEditorPane editor = new JEditorPane();
-        editor.copy();
-        if (isCheckPermissionCalled != expected) {
-            throw new RuntimeException("JEditorPane's clipboard operations "
-                    + "didn't call SecurityManager.checkPermission() with "
-                    + "permission 'accessClipboard' when there is a security"
-                    + " manager installed");
-        }
-    }
-
-    private static class MySecurityManager extends SecurityManager {
-        @Override
-        public void checkPermission(Permission perm) {
-            if (ACCESS_CLIPBOARD.equals(perm.getName())) {
-                isCheckPermissionCalled = true;
-            }
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java b/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java
index 6c3a0d80b2e..52c7bcfda68 100644
--- a/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java
+++ b/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -39,30 +40,20 @@
  * @bug 8080972 8169887
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
- * @run main/othervm -Djava.security.manager=allow TestJEditor
+ * @run main TestJEditor
  */
 public class TestJEditor {
 
     public static void main(String[] args) throws Exception {
-
-        SwingUtilities.invokeAndWait(TestJEditor::testJEditorPane);
-        System.setSecurityManager(new SecurityManager());
         SwingUtilities.invokeAndWait(TestJEditor::testJEditorPane);
     }
 
     private static void testJEditorPane() {
+        JEditorPane.registerEditorKitForContentType("text/html", UserEditorKit.class.getName());
+        EditorKit editorKit = JEditorPane.createEditorKitForContentType("text/html");
 
-        try {
-
-            JEditorPane.registerEditorKitForContentType("text/html", UserEditorKit.class.getName());
-            EditorKit editorKit = JEditorPane.createEditorKitForContentType("text/html");
-
-            if (!(editorKit instanceof UserEditorKit)) {
-                throw new RuntimeException("Editor kit is not UserEditorKit!");
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        if (!(editorKit instanceof UserEditorKit)) {
+            throw new RuntimeException("Editor kit is not UserEditorKit!");
         }
     }
 
diff --git a/test/jdk/javax/swing/JFileChooser/6484091/bug6484091.java b/test/jdk/javax/swing/JFileChooser/6484091/bug6484091.java
deleted file mode 100644
index 51cd8d04093..00000000000
--- a/test/jdk/javax/swing/JFileChooser/6484091/bug6484091.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 6484091
- * @summary FileSystemView leaks directory info
- * @author Pavel Porvatov
-   @run main/othervm -Djava.security.manager=allow bug6484091
- */
-
-import javax.swing.filechooser.FileSystemView;
-import java.io.File;
-import java.security.AccessControlException;
-
-public class bug6484091 {
-    public static void main(String[] args) {
-        File dir = FileSystemView.getFileSystemView().getDefaultDirectory();
-
-        printDirContent(dir);
-
-        System.setSecurityManager(new SecurityManager());
-
-        // The next test cases use 'dir' obtained without SecurityManager
-
-        try {
-            printDirContent(dir);
-
-            throw new RuntimeException("Dir content was derived bypass SecurityManager");
-        } catch (AccessControlException e) {
-            // It's a successful situation
-        }
-    }
-
-    private static void printDirContent(File dir) {
-        System.out.println("Files in " + dir.getAbsolutePath() + ":");
-
-        for (File file : dir.listFiles()) {
-            System.out.println(file.getName());
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/6570445/bug6570445.java b/test/jdk/javax/swing/JFileChooser/6570445/bug6570445.java
deleted file mode 100644
index c5ed2b7365c..00000000000
--- a/test/jdk/javax/swing/JFileChooser/6570445/bug6570445.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6570445
- * @run main/othervm -Djava.security.manager=allow  bug6570445
- * @summary Checks if Win32ShellFolder2's COM-using methods work under a security manager
- * @author Leonid Popov
- */
-
-import javax.swing.filechooser.FileSystemView;
-
-public class bug6570445 {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-
-        // The next line of code forces FileSystemView to request data from Win32ShellFolder2,
-        // what causes an exception if a security manager installed (see the bug 6570445 description)
-        FileSystemView.getFileSystemView().getRoots();
-
-        System.out.println("Passed.");
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/6738668/bug6738668.java b/test/jdk/javax/swing/JFileChooser/6738668/bug6738668.java
deleted file mode 100644
index 98d98396cd5..00000000000
--- a/test/jdk/javax/swing/JFileChooser/6738668/bug6738668.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2009,2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
-   @key headful
-   @bug 6738668 6962725
-   @summary JFileChooser cannot be created under SecurityManager
-   @author Pavel Porvatov
-   @run main/othervm/policy=security.policy bug6738668
-*/
-
-import java.io.File;
-import javax.swing.JFileChooser;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-public class bug6738668 {
-    public static void main(String[] args) throws Exception {
-        for (UIManager.LookAndFeelInfo lookAndFeelInfo : UIManager.getInstalledLookAndFeels()) {
-            try {
-                UIManager.setLookAndFeel(lookAndFeelInfo.getClassName());
-            } catch (UnsupportedLookAndFeelException ignored) {
-                System.out.println("Unsupported L&F: " + lookAndFeelInfo.getClassName());
-                continue;
-            } catch (ClassNotFoundException | InstantiationException
-                 | IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-
-            String tmpdir = System.getProperty("java.io.tmpdir");
-            System.out.println("tmp dir " + tmpdir);
-            new JFileChooser(new File(tmpdir+"/temp"));
-
-
-            System.out.println("Test passed for LookAndFeel " + lookAndFeelInfo.getClassName());
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/6738668/security.policy b/test/jdk/javax/swing/JFileChooser/6738668/security.policy
deleted file mode 100644
index 29dc695da4d..00000000000
--- a/test/jdk/javax/swing/JFileChooser/6738668/security.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.io.FilePermission "${java.io.tmpdir}${/}temp${/}*", "read";
-    permission java.io.FilePermission "${java.io.tmpdir}${/}temp", "read";
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/javax/swing/JFileChooser/7036025/bug7036025.java b/test/jdk/javax/swing/JFileChooser/7036025/bug7036025.java
deleted file mode 100644
index dd7b003a01f..00000000000
--- a/test/jdk/javax/swing/JFileChooser/7036025/bug7036025.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
-   @bug 7036025
-   @summary java.security.AccessControlException when creating JFileChooser in signed applet
-   @author Pavel Porvatov
-   @run main/othervm/policy=security.policy bug7036025
-*/
-
-import javax.swing.*;
-import java.io.File;
-
-public class bug7036025 {
-    public static final String DIR = "c:/temp";
-
-    public static void main(String[] args) throws Exception {
-        String systemLookAndFeelClassName = UIManager.getSystemLookAndFeelClassName();
-
-        if (!systemLookAndFeelClassName.toLowerCase().contains("windows")) {
-            System.out.println("The test is only for Windows OS.");
-
-            return;
-        }
-
-        File file = new File(DIR);
-
-        if (!file.exists()) {
-            if (!file.mkdir()) {
-                throw new RuntimeException("Cannot create " + DIR);
-            }
-
-            file.deleteOnExit();
-        }
-
-        UIManager.setLookAndFeel(systemLookAndFeelClassName);
-
-        new JFileChooser(file);
-
-        System.out.println("Test passed for LookAndFeel " + UIManager.getLookAndFeel().getName());
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/7036025/security.policy b/test/jdk/javax/swing/JFileChooser/7036025/security.policy
deleted file mode 100644
index 57e0bd2af52..00000000000
--- a/test/jdk/javax/swing/JFileChooser/7036025/security.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.io.FilePermission "C:\\temp\\*", "read";
-    permission java.io.FilePermission "C:\\temp", "read,write,delete";
-    permission java.util.PropertyPermission "*", "read";
-};
diff --git a/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java b/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java
deleted file mode 100644
index 9aff965de5b..00000000000
--- a/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.lib.Platform;
-import java.awt.Robot;
-import java.awt.event.KeyEvent;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.concurrent.TimeUnit;
-import javax.swing.JFileChooser;
-import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileSystemView;
-
-/**
- * @test
- * @bug 8062561
- * @key headful
- * @requires (os.family == "windows")
- * @summary File system view returns null default directory
- * @library /test/lib
- * @modules java.desktop/sun.awt
- * @build jdk.test.lib.Platform
- * @run main/othervm bug8062561 GENERATE_POLICY
- * @run main/othervm/policy=security.policy bug8062561 CHECK_DEFAULT_DIR run
- */
-public class bug8062561 {
-
-    private static final String POLICY_FILE = "security2.policy";
-    private static volatile boolean fileChooserIsShown = false;
-
-    public static void main(String[] args) throws Exception {
-
-        String test = args[0];
-
-        switch (test) {
-            case "GENERATE_POLICY":
-                generatePolicyFile();
-                break;
-            case "CHECK_DEFAULT_DIR":
-                checkDefaultDirectory();
-                break;
-            case "CHECK_FILE_CHOOSER":
-                checkFileChooser();
-                break;
-            default:
-                throw new RuntimeException("Wrong argument!");
-        }
-    }
-
-    private static void checkDefaultDirectory() {
-        if (System.getSecurityManager() == null) {
-            throw new RuntimeException("Security manager is not set!");
-        }
-
-        File defaultDirectory = FileSystemView.getFileSystemView().
-                getDefaultDirectory();
-        if (defaultDirectory != null) {
-            throw new RuntimeException("File system default directory must be null! (FilePermission has not been granted in our policy file).");
-        }
-    }
-    private static volatile JFileChooser fileChooser;
-
-    private static void checkFileChooser() throws Exception {
-        if (System.getSecurityManager() == null) {
-            throw new RuntimeException("Security manager is not set!");
-        }
-
-        Robot robot = new Robot();
-        robot.setAutoDelay(50);
-
-        SwingUtilities.invokeLater(new Runnable() {
-
-            public void run() {
-                fileChooser = new JFileChooser();
-                fileChooser.showOpenDialog(null);
-                fileChooserIsShown = true;
-                System.out.println("Start file chooser: " + fileChooserIsShown);
-            }
-        });
-
-        long time = System.currentTimeMillis();
-        while (fileChooser == null) {
-            if (System.currentTimeMillis() - time >= 10000) {
-                throw new RuntimeException("FileChoser is not shown!");
-            }
-            Thread.sleep(500);
-        }
-
-        Thread.sleep(500);
-        robot.keyPress(KeyEvent.VK_ESCAPE);
-        robot.keyRelease(KeyEvent.VK_ESCAPE);
-        System.exit(0);
-    }
-
-    private static void generatePolicyFile() throws Exception {
-        if (System.getSecurityManager() != null) {
-            throw new RuntimeException("Security manager should be null!");
-        }
-
-        if (!Platform.isWindows()) {
-            return;
-        }
-
-        File defaultDirectory = FileSystemView.getFileSystemView().
-                getDefaultDirectory();
-
-        if (defaultDirectory == null) {
-            throw new RuntimeException("Default directory is null!");
-        }
-
-        File policyFile = new File(POLICY_FILE);
-        if (!policyFile.exists()) {
-            policyFile.createNewFile();
-        }
-
-        try (PrintWriter writer = new PrintWriter(policyFile, "UTF-8")) {
-            writer.println("grant {");
-            String documents = defaultDirectory.getCanonicalPath();
-            documents = documents.replace('\\', '/');
-            // Documents permission
-            writer.print("  permission java.io.FilePermission");
-            writer.print(" \"" + documents + "\",");
-            writer.println(" \"read\";");
-            // Desktop permission
-            writer.print("  permission java.io.FilePermission");
-            writer.print(" \"" + documents.replace("Documents", "Desktop") + "\",");
-            writer.println(" \"read\";");
-            // robot permission // "java.awt.AWTPermission" "createRobot"
-            writer.print("  permission java.awt.AWTPermission");
-            writer.println(" \"createRobot\";");
-            writer.println("};");
-        }
-
-        performTest();
-    }
-
-    private static void performTest() throws Exception {
-        String javaPath = System.getProperty("java.home", "");
-        String command = javaPath + File.separator + "bin" + File.separator + "java"
-                + "  -Djava.security.manager -Djava.security.policy=" + POLICY_FILE
-                + " bug8062561 CHECK_FILE_CHOOSER";
-        System.out.println(command);
-        boolean processExit = false;
-
-        Process process = Runtime.getRuntime().exec(command);
-
-        try {
-            processExit = process.waitFor(20, TimeUnit.SECONDS);
-        } catch (IllegalThreadStateException e) {
-            throw new RuntimeException(e);
-        }
-        System.out.println("[RESULT] : "
-                + "The sub process has cleanly exited : PASS");
-
-        InputStream errorStream = process.getErrorStream();
-        System.out.println("========= Child process stderr ========");
-        boolean exception = dumpStream(errorStream);
-        if (exception) {
-            throw new RuntimeException("[RESULT] :"
-                    + " Exception in child process : FAIL");
-        }
-        System.out.println("=======================================");
-
-        InputStream processInputStream = process.getInputStream();
-        System.out.println("========= Child process output ========");
-        dumpStream(processInputStream);
-        System.out.println("=======================================");
-
-        if (!processExit) {
-            process.destroy();
-            throw new RuntimeException("[RESULT] : "
-                    + "The sub process has not exited : FAIL");
-        }
-    }
-
-    public static boolean dumpStream(InputStream in) throws IOException {
-        String tempString;
-        int count = in.available();
-        boolean exception = false;
-        while (count > 0) {
-            byte[] b = new byte[count];
-            in.read(b);
-            tempString = new String(b);
-            if (!exception) {
-                exception = tempString.indexOf("Exception") != -1;
-            }
-            System.out.println(tempString);
-            count = in.available();
-        }
-
-        return exception;
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/8062561/security.policy b/test/jdk/javax/swing/JFileChooser/8062561/security.policy
deleted file mode 100644
index 1478c434293..00000000000
--- a/test/jdk/javax/swing/JFileChooser/8062561/security.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-
-    permission java.util.PropertyPermission  "user.home", "read";
-    permission java.util.PropertyPermission  "user.dir",  "read";
-};
diff --git a/test/jdk/javax/swing/JFileChooser/8062561/security2.policy b/test/jdk/javax/swing/JFileChooser/8062561/security2.policy
deleted file mode 100644
index 4d953776aee..00000000000
--- a/test/jdk/javax/swing/JFileChooser/8062561/security2.policy
+++ /dev/null
@@ -1 +0,0 @@
-// Autogenerated file
diff --git a/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesSecurityManagerTest.java b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesSecurityManagerTest.java
deleted file mode 100644
index 239f5317da3..00000000000
--- a/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesSecurityManagerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8182041
- * @summary Tests if the files(Shortcut Panle files, FileChooser ComboBox files)
- * are filtered out when run with SecurityManager enabled.
- * @run main/othervm/policy=shellfolderqueries.policy ShellFolderQueriesSecurityManagerTest
- */
-
-import javax.swing.filechooser.FileSystemView;
-import java.io.File;
-import java.util.Arrays;
-
-public class ShellFolderQueriesSecurityManagerTest {
-    static final FileSystemView fsv = FileSystemView.getFileSystemView();
-
-    public static void main(String[] args) throws Exception {
-        try {
-            File[] shortcuts = fsv.getChooserShortcutPanelFiles();
-            Arrays.asList(shortcuts).forEach(System.out::println);
-
-            if (shortcuts.length != 0) {
-                throw new RuntimeException("Shortcut panel files leaked from SecurityManager.");
-            }
-
-            File[] cbFiles = fsv.getChooserComboBoxFiles();
-            Arrays.asList(cbFiles).forEach(System.out::println);
-            if (cbFiles.length != 0) {
-                throw new RuntimeException("Combobox Files leaked from SecurityManager.");
-            }
-
-            System.out.println("ok");
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/shellfolderqueries.policy b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/shellfolderqueries.policy
deleted file mode 100644
index 56f31263c28..00000000000
--- a/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/shellfolderqueries.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "user.home", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-};
diff --git a/test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java b/test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java
index c912079f6e8..28613596a23 100644
--- a/test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java
+++ b/test/jdk/javax/swing/JFormattedTextField/8080972/TestDefaultFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,15 @@
 /*
  * @test
  * @bug 8080972
- * @run main/othervm -Djava.security.manager=allow  TestDefaultFormatter
+ * @run main TestDefaultFormatter
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
  */
 
 public class TestDefaultFormatter {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestDefaultFormatter::testDefaultFormatter);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestDefaultFormatter::testDefaultFormatter);
     }
     private static void testDefaultFormatter() {
         testDefaultFormatter(new DefaultFormatter() {
diff --git a/test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java b/test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java
index 2e86cc34cdc..faf509a5cf6 100644
--- a/test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java
+++ b/test/jdk/javax/swing/JOptionPane/8081019/bug8081019.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @key headful
  * @bug 8081019
  * @summary Check peer to null in CPlatformWindow.checkZoom() method
- * @author Alexandr Scherbatiy
  */
 public class bug8081019 {
 
@@ -57,8 +56,7 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    private static void runTest() throws Exception {
-        System.setSecurityManager(new SecurityManager());
+    private static void runTest() {
         Frame f = new Frame("Test frame");
         f.setVisible(true);
         f.setVisible(false);
@@ -68,7 +66,7 @@ private static void runTest() throws Exception {
     private static void runProcess() throws Exception {
         String javaPath = System.getProperty("java.home", "");
         String command = javaPath + File.separator + "bin" + File.separator + "java"
-                + " -Djava.security.manager=allow " + bug8081019.class.getName() + " " + RUN_TEST;
+                + " " + bug8081019.class.getName() + " " + RUN_TEST;
 
         Process process = Runtime.getRuntime().exec(command);
         boolean processExit = process.waitFor(20, TimeUnit.SECONDS);
@@ -93,8 +91,8 @@ public static void dumpStream(InputStream in, String name) throws IOException {
             in.read(b);
             tempString = new String(b);
             if (!exception) {
-                exception = tempString.indexOf("Exception") != -1
-                        || tempString.indexOf("Error") != -1;
+                exception = tempString.contains("Exception")
+                            || tempString.contains("Error");
             }
             System.out.println(tempString);
             count = in.available();
diff --git a/test/jdk/javax/swing/JPopupMenu/6675802/bug6675802.java b/test/jdk/javax/swing/JPopupMenu/6675802/bug6675802.java
deleted file mode 100644
index 849e1f82034..00000000000
--- a/test/jdk/javax/swing/JPopupMenu/6675802/bug6675802.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6675802
- * @summary Checks that there is no AccessControlException when
- * a heaviweight popup menu is shown from an applet.
- * @author Mikhail Lapshin
- * @run main/othervm -Djava.security.manager=allow  bug6675802
- */
-
-import javax.swing.*;
-
-public class bug6675802 {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        final JPopupMenu popupMenu = new JPopupMenu();
-        popupMenu.add(new JMenuItem("Click"));
-        popupMenu.show(null, 0, 0);
-        System.out.println("Test passed");
-    }
-}
diff --git a/test/jdk/javax/swing/JPopupMenu/6691503/bug6691503.java b/test/jdk/javax/swing/JPopupMenu/6691503/bug6691503.java
deleted file mode 100644
index e8dc909084b..00000000000
--- a/test/jdk/javax/swing/JPopupMenu/6691503/bug6691503.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 6691503
- * @summary Checks that there is no opportunity for a malicious applet
- * to show a popup menu which has whole screen size.
- * a heaviweight popup menu is shown from an applet.
- * @author Mikhail Lapshin
- * @run main/othervm -Djava.security.manager=allow bug6691503
- */
-
-import javax.swing.*;
-import java.awt.*;
-
-public class bug6691503 {
-    private JPopupMenu popupMenu;
-    private JFrame frame;
-    private boolean isAlwaysOnTop1 = false;
-    private boolean isAlwaysOnTop2 = true;
-
-    public static void main(String[] args) {
-        bug6691503 test = new bug6691503();
-        test.setupUI();
-        test.testApplication();
-        test.testApplet();
-        test.checkResult();
-        test.stopEDT();
-    }
-
-    private void setupUI() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                frame = new JFrame();
-                frame.setVisible(true);
-                popupMenu = new JPopupMenu();
-                JMenuItem click = new JMenuItem("Click");
-                popupMenu.add(click);
-            }
-        });
-    }
-
-    private void testApplication() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                popupMenu.show(frame, 0, 0);
-                Window popupWindow = (Window)
-                        (popupMenu.getParent().getParent().getParent().getParent());
-                isAlwaysOnTop1 = popupWindow.isAlwaysOnTop();
-                System.out.println(
-                        "Application: popupWindow.isAlwaysOnTop() = " + isAlwaysOnTop1);
-                popupMenu.setVisible(false);
-            }
-        });
-    }
-
-    private void testApplet() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                System.setSecurityManager(new SecurityManager());
-                popupMenu.show(frame, 0, 0);
-                Window popupWindow = (Window)
-                        (popupMenu.getParent().getParent().getParent().getParent());
-                isAlwaysOnTop2 = popupWindow.isAlwaysOnTop();
-                System.out.println(
-                        "Applet: popupWindow.isAlwaysOnTop() = " + isAlwaysOnTop2);
-                popupMenu.setVisible(false);
-            }
-        });
-    }
-
-    private void checkResult() {
-        try {
-            Robot robot = new Robot();
-            robot.waitForIdle();
-        }catch(Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException("Unexpected failure");
-        }
-        if (!isAlwaysOnTop1 || isAlwaysOnTop2) {
-            throw new RuntimeException("Malicious applet can show always-on-top " +
-                    "popup menu which has whole screen size");
-        }
-        System.out.println("Test passed");
-    }
-
-    private void stopEDT() {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                frame.dispose();
-            }
-        });
-    }
-}
diff --git a/test/jdk/javax/swing/JPopupMenu/6694823/bug6694823.java b/test/jdk/javax/swing/JPopupMenu/6694823/bug6694823.java
deleted file mode 100644
index 8cded311045..00000000000
--- a/test/jdk/javax/swing/JPopupMenu/6694823/bug6694823.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 6694823
- * @summary Checks that popup menu cannot be partially hidden
- * by the task bar in applets.
- * @author Mikhail Lapshin
- * @run main/othervm -Djava.security.manager=allow bug6694823
- */
-
-import javax.swing.*;
-import java.awt.*;
-import java.security.Permission;
-
-public class bug6694823 {
-    private static JFrame frame;
-    private static JPopupMenu popup;
-    private static Toolkit toolkit;
-    private static Insets screenInsets;
-    private static Robot robot;
-
-    public static void main(String[] args) throws Exception {
-        robot = new Robot();
-        toolkit = Toolkit.getDefaultToolkit();
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                createGui();
-            }
-        });
-
-        robot.waitForIdle();
-
-        // Get screen insets
-        screenInsets = toolkit.getScreenInsets(frame.getGraphicsConfiguration());
-        if (screenInsets.bottom == 0) {
-            // This test is only for configurations with taskbar on the bottom
-            return;
-        }
-
-        System.setSecurityManager(new SecurityManager(){
-
-            @Override
-            public void checkPermission(Permission perm) {
-                if (perm.getName().equals("setWindowAlwaysOnTop") ) {
-                    throw new SecurityException();
-                }
-            }
-
-        });
-
-        // Show popup as if from an applet
-        // The popup shouldn't overlap the task bar. It should be shifted up.
-        checkPopup();
-
-    }
-
-    private static void createGui() {
-        frame = new JFrame();
-        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        frame.setUndecorated(true);
-
-        popup = new JPopupMenu("Menu");
-        for (int i = 0; i < 7; i++) {
-            popup.add(new JMenuItem("MenuItem"));
-        }
-        JPanel panel = new JPanel();
-        panel.setComponentPopupMenu(popup);
-        frame.add(panel);
-
-        frame.setSize(200, 200);
-    }
-
-    private static void checkPopup() throws Exception {
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                // Place frame just above the task bar
-                Dimension screenSize = toolkit.getScreenSize();
-                frame.setLocation(screenSize.width / 2,
-                        screenSize.height - frame.getHeight() - screenInsets.bottom);
-                frame.setVisible(true);
-            }
-        });
-
-        // Ensure frame is visible
-        robot.waitForIdle();
-
-        final Point point = new Point();
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                // Place popup over the task bar
-                point.x = 0;
-                point.y = frame.getHeight() - popup.getPreferredSize().height + screenInsets.bottom;
-                popup.show(frame, point.x, point.y);
-            }
-        });
-
-        // Ensure popup is visible
-        robot.waitForIdle();
-
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-            public void run() {
-                Point frameLoc = frame.getLocationOnScreen();
-                if (popup.getLocationOnScreen().equals(new Point(frameLoc.x, frameLoc.y + point.y))) {
-                    throw new RuntimeException("Popup is not shifted");
-                }
-                popup.setVisible(false);
-                frame.dispose();
-            }
-        });
-    }
-}
diff --git a/test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java b/test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java
index e6ad98ba927..126a94d4214 100644
--- a/test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java
+++ b/test/jdk/javax/swing/JTable/8080972/TestJTableCellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,19 +27,15 @@
 /*
  * @test
  * @bug 8080972
- * @run main/othervm -Djava.security.manager=allow TestJTableCellEditor
-
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
+ * @run main TestJTableCellEditor
  */
 
 public class TestJTableCellEditor {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestJTableCellEditor::testJTableCellEditor);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestJTableCellEditor::testJTableCellEditor);
     }
 
     private static void testJTableCellEditor() {
diff --git a/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java b/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java
index a872f4c4a11..d214324189e 100644
--- a/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java
+++ b/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,43 +21,23 @@
  * questions.
  */
 
-/**
+import javax.swing.UIDefaults;
+
+/*
  * @test
  * @bug 6622002
- * @author Alexander Potochkin
  * @summary UIDefault.ProxyLazyValue has unsafe reflection usage
- * @run main/othervm -Djava.security.manager=allow bug6622002
+ * @run main bug6622002
  */
 
-import javax.swing.*;
-
 public class bug6622002 {
      public static void main(String[] args) {
 
-         if (createPrivateValue() == null) {
-             throw new RuntimeException("The private value unexpectedly wasn't created");
-         }
-
-         if (createPublicValue() == null) {
-             throw new RuntimeException("The public value unexpectedly wasn't created");
-         }
-
-         System.setSecurityManager(new SecurityManager());
-
-         if (createPrivateValue() != null) {
-             throw new RuntimeException("The private value was unexpectedly created");
-         }
-
          if (createPublicValue() == null) {
              throw new RuntimeException("The public value unexpectedly wasn't created");
          }
      }
 
-    private static Object createPrivateValue() {
-        return new UIDefaults.ProxyLazyValue(
-            "javax.swing.MultiUIDefaults").createValue(null);
-    }
-
     private static Object createPublicValue() {
         return new UIDefaults.ProxyLazyValue(
             "javax.swing.UIDefaults").createValue(null);
diff --git a/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java b/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java
index 234ec6a7187..a6f5ddff28b 100644
--- a/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java
+++ b/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,17 @@
  * @test
  * @bug 6795356
  * @summary Checks that SwingLazyValue class works correctly
- * @author Alexander Potochkin
- * @run main/othervm -Djava.security.manager=allow TableTest
+ * @run main TableTest
  */
 
-import javax.swing.*;
+import java.awt.KeyboardFocusManager;
+import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
-import java.awt.*;
 
 public class TableTest {
 
     public static void main(String[] args) throws Exception {
-
         KeyboardFocusManager.getCurrentKeyboardFocusManager();
-        System.setSecurityManager(new SecurityManager());
 
         JTable table = new JTable();
         TableCellEditor de = table.getDefaultEditor(Double.class);
@@ -47,4 +44,3 @@ public static void main(String[] args) throws Exception {
         }
     }
 }
-
diff --git a/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java b/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java
index cef4ce41bcb..a7a122bf065 100644
--- a/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java
+++ b/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @bug 8080972
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
- * @run main/othervm -Djava.security.manager=allow TestProxyLazyValue
+ * @run main TestProxyLazyValue
  */
 
 public class TestProxyLazyValue {
@@ -36,9 +35,6 @@ public class TestProxyLazyValue {
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestProxyLazyValue::testUserProxyLazyValue);
         SwingUtilities.invokeAndWait(TestProxyLazyValue::testProxyLazyValue);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestProxyLazyValue::testUserProxyLazyValue);
-        SwingUtilities.invokeAndWait(TestProxyLazyValue::testProxyLazyValue);
     }
 
     private static void testUserProxyLazyValue() {
diff --git a/test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java b/test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java
index 78d6879a9bf..2a902b9a642 100644
--- a/test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java
+++ b/test/jdk/javax/swing/dnd/8080972/TestTransferHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 /*
  * @test
  * @bug 8080972
- * @run main/othervm -Djava.security.manager=allow TestTransferHandler
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
+ * @run main TestTransferHandler
  */
 
 public class TestTransferHandler {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestTransferHandler::testTransferHandler);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestTransferHandler::testTransferHandler);
     }
 
     private static void testTransferHandler() {
diff --git a/test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java b/test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java
index ee0abaab166..08c6edd15d5 100644
--- a/test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java
+++ b/test/jdk/javax/swing/plaf/nimbus/8080972/TestAbstractRegionPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,15 @@
 /*
  * @test
  * @bug 8080972
- * @run main/othervm -Djava.security.manager=allow TestAbstractRegionPainter
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
+ * @run main TestAbstractRegionPainter
  */
 
 public class TestAbstractRegionPainter {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestAbstractRegionPainter::testAbstractRegionPainter);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestAbstractRegionPainter::testAbstractRegionPainter);
     }
 
     private static void testAbstractRegionPainter() {
diff --git a/test/jdk/javax/swing/plaf/synth/Test8043627.java b/test/jdk/javax/swing/plaf/synth/Test8043627.java
deleted file mode 100644
index 03ca4928f40..00000000000
--- a/test/jdk/javax/swing/plaf/synth/Test8043627.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import javax.swing.JButton;
-import javax.swing.plaf.synth.SynthButtonUI;
-
-/*
- * @test
- * @bug 8043627
- * @run main/othervm -Djava.security.manager=allow Test8043627
- * @summary Tests that SynthContext can be created with SecurityManager installed
- * @author Sergey Malenkov
- */
-
-public class Test8043627 {
-    public static void main(String[] args) {
-        System.setSecurityManager(new SecurityManager());
-        new SynthButtonUI().getContext(new JButton());
-    }
-}
diff --git a/test/jdk/javax/swing/text/View/8080972/TestObjectView.java b/test/jdk/javax/swing/text/View/8080972/TestObjectView.java
index 03b9dfa1b43..753c85fbf05 100644
--- a/test/jdk/javax/swing/text/View/8080972/TestObjectView.java
+++ b/test/jdk/javax/swing/text/View/8080972/TestObjectView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,16 +35,13 @@
  * @bug 8080972 8169887
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
- * @author Alexander Scherbatiy
- * @run main/othervm -Djava.security.manager=allow TestObjectView
+ * @run main TestObjectView
  */
 
 public class TestObjectView {
 
     public static void main(String[] args) throws Exception {
         SwingUtilities.invokeAndWait(TestObjectView::testObjectView);
-        System.setSecurityManager(new SecurityManager());
-        SwingUtilities.invokeAndWait(TestObjectView::testObjectView);
     }
 
     private static void testObjectView() {
diff --git a/test/jdk/javax/swing/text/rtf/bug4178276.java b/test/jdk/javax/swing/text/rtf/bug4178276.java
deleted file mode 100644
index fc6ea8e2963..00000000000
--- a/test/jdk/javax/swing/text/rtf/bug4178276.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4178276
- * @key headful
- * @summary  RTFEditorkit.write(...) doesn't throw NPE when used in SecurityManager
- * @run main/othervm/secure=allow bug4178276
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.nio.charset.StandardCharsets;
-import javax.swing.text.Document;
-import javax.swing.text.rtf.RTFEditorKit;
-
-public class bug4178276 {
-
-    public static void main(String[] argv) throws Exception {
-        System.setSecurityManager(new SecurityManager());
-
-        String test="{\\rtf1\\ansi\\deff0\\deftab720{\\fonttbl{\\f0\\f swiss MS Sans Serif;}}{\\colortbl\\red0\\green0\\blue0;}\\qc\\plain\\f0 Test 1 \\par \\ql\\plain\\f0 Test 2 \\par \\qr\\plain\\f0 Test 3 \\par \\qj\\plain\\f0 Test 4}";
-        RTFEditorKit c = new RTFEditorKit();
-        Document doc = c.createDefaultDocument();
-        try {
-            c.read(new ByteArrayInputStream(test.getBytes(
-                                        StandardCharsets.ISO_8859_1)), doc, 0);
-            ByteArrayOutputStream sw = new ByteArrayOutputStream();
-            c.write(sw, doc, 0, 0);
-        } catch (Exception e) {
-            throw new RuntimeException("Unexpected NPE exception...", e);
-        }
-    }
-}
diff --git a/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.java b/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.java
deleted file mode 100644
index 5ae366e82ab..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Base64;
-import javax.xml.XMLConstants;
-import javax.xml.crypto.Data;
-import javax.xml.crypto.KeySelector;
-import javax.xml.crypto.OctetStreamData;
-import javax.xml.crypto.URIDereferencer;
-import javax.xml.crypto.URIReference;
-import javax.xml.crypto.URIReferenceException;
-import javax.xml.crypto.XMLCryptoContext;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * @test
- * @bug 8079140
- * @summary Check if IgnoreAllErrorHandler doesn't require additional permission
- * @run main/othervm/java.security.policy=ErrorHandlerPermissions.policy
- *                                                      ErrorHandlerPermissions
- */
-public class ErrorHandlerPermissions {
-
-    private final static String FS = System.getProperty("file.separator");
-    private final static String DIR = System.getProperty("test.src", ".");
-    private final static String DATA_DIR = DIR + FS + "data";
-    private final static String SIGNATURE = DATA_DIR + FS +
-            "signature-external-rsa.xml";
-
-    private static final String validationKey =
-        "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnx4TdvPSA5vcsPi0OJZi9Ox0Z" +
-        "2FRz2oeUCtuWoyEg0kUCeFd+jJZMstDJUiZNSOeuCO3FWSpdJgAwI4zlveHvuU/o" +
-        "qHSa1eYTObOCvxfVYGGflWsSvGXyiANtRWVUrYODBeyL+2pWxDYh+Fi5EKizPfTG" +
-        "wRjBVRSkRZKTnSjnQwIDAQAB";
-
-    private static final URIDereferencer dereferencer =
-            new DummyURIDereferencer();
-
-    public static void main(String[] args) throws Exception {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-        dbf.setValidating(false);
-        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
-        Document doc = dbf.newDocumentBuilder().parse(new File(SIGNATURE));
-        NodeList nl = doc.getElementsByTagNameNS(XMLSignature.XMLNS,
-                "Signature");
-        if (nl.getLength() == 0) {
-            throw new RuntimeException("Couldn't find 'Signature' element");
-        }
-        Element element = (Element) nl.item(0);
-
-        byte[] keyBytes = Base64.getDecoder().decode(validationKey);
-        X509EncodedKeySpec spec = new X509EncodedKeySpec(keyBytes);
-        KeyFactory kf = KeyFactory.getInstance("RSA");
-        PublicKey key = kf.generatePublic(spec);
-        KeySelector ks = KeySelector.singletonKeySelector(key);
-
-        DOMValidateContext vc = new DOMValidateContext(ks, element);
-
-        // disable secure validation mode
-        vc.setProperty("org.jcp.xml.dsig.secureValidation", Boolean.FALSE);
-
-        // set a dummy dereferencer to be able to get content by references
-        vc.setURIDereferencer(dereferencer);
-
-        XMLSignatureFactory factory = XMLSignatureFactory.getInstance();
-        XMLSignature signature = factory.unmarshalXMLSignature(vc);
-
-        // run validation
-        signature.validate(vc);
-    }
-
-    /**
-     * This URIDereferencer returns a static XML document.
-     */
-    private static class DummyURIDereferencer implements URIDereferencer {
-
-        @Override
-        public Data dereference(final URIReference ref, XMLCryptoContext ctx)
-                throws URIReferenceException {
-            // return static content
-            return new OctetStreamData(new ByteArrayInputStream(
-                    "<test>test</test>".getBytes()), ref.getURI(),
-                    ref.getType());
-        }
-    }
-
-}
diff --git a/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy b/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy
deleted file mode 100644
index 8db9c01c3c8..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/ErrorHandlerPermissions.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.io.FilePermission "${test.src}/-", "read";
-};
diff --git a/test/jdk/javax/xml/crypto/dsig/FileSocketPermissions.java b/test/jdk/javax/xml/crypto/dsig/ResolveReferenceURIs.java
similarity index 75%
rename from test/jdk/javax/xml/crypto/dsig/FileSocketPermissions.java
rename to test/jdk/javax/xml/crypto/dsig/ResolveReferenceURIs.java
index 42b2d0c8adc..9dff1df97e8 100644
--- a/test/jdk/javax/xml/crypto/dsig/FileSocketPermissions.java
+++ b/test/jdk/javax/xml/crypto/dsig/ResolveReferenceURIs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @modules jdk.httpserver
  *          java.base/jdk.internal.misc
  * @requires os.family != "windows"
- * @summary check permissions for XML signature
+ * @summary check reference resolving for XML signature
  */
 
 import com.sun.net.httpserver.HttpServer;
@@ -37,9 +37,7 @@
 import jdk.test.lib.security.XMLUtils;
 
 import java.io.File;
-import java.io.FilePermission;
 import java.net.InetSocketAddress;
-import java.net.SocketPermission;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -50,7 +48,7 @@
 // Note: This test does not run fine on Windows because the format by
 // Path.toUri.toString (file:///c:/path/to/file) is not supported by
 // ResolverLocalFilesystem.translateUriToFilename.
-public class FileSocketPermissions    {
+public class ResolveReferenceURIs    {
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             Path plain = Files.writeString(
@@ -66,30 +64,12 @@ public static void main(String[] args) throws Exception {
                 String httpDoc = "http://localhost:" + server.getAddress().getPort() + "/b.xml";
                 System.out.println(httpDoc);
 
-                // No permission granted.
-                Proc p0 = Proc.create("FileSocketPermissions")
-                        .prop("java.security.manager", "")
-                        .debug("S")
-                        .args("sign", plain.toUri().toString(), httpDoc)
-                        .start();
-                Asserts.assertEQ(p0.readData(), "Error");
-                Asserts.assertEQ(p0.readData(), "Error");
-
-                // Permission to file and socket granted.
-                Proc p = Proc.create("FileSocketPermissions")
-                        .prop("java.security.manager", "")
-                        .grant(new File(System.getProperty("test.classes")))
-                        .perm(new FilePermission(plain.toString(), "read"))
-                        .perm(new SocketPermission("localhost", "resolve,connect"))
+                Proc p = Proc.create("ResolveReferenceURIs")
                         .debug("S2")
                         .args("sign", plain.toUri().toString(), httpDoc)
                         .start();
 
-                Proc p2 = Proc.create("FileSocketPermissions")
-                        .prop("java.security.manager", "")
-                        .grant(new File(System.getProperty("test.classes")))
-                        .perm(new FilePermission(plain.toString(), "read"))
-                        .perm(new SocketPermission("localhost", "resolve,connect"))
+                Proc p2 = Proc.create("ResolveReferenceURIs")
                         .debug("V")
                         .args("validate")
                         .start();
diff --git a/test/jdk/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java b/test/jdk/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java
deleted file mode 100644
index 98c0182a144..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 6436919 6460930
- * @summary check that XML Signatures can be generated and validated with
- *  SecurityManager enabled and default policy
- * @run main/othervm -Djava.security.manager=allow XMLDSigWithSecMgr
- * @author Sean Mullan
- */
-import java.io.*;
-import java.net.*;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.util.ArrayList;
-import java.util.Collections;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class XMLDSigWithSecMgr implements Runnable {
-
-    private XMLSignatureFactory fac;
-    private DigestMethod sha1;
-    private CanonicalizationMethod withoutComments;
-    private DocumentBuilder db;
-
-    private ServerSocket ss;
-
-    private void setup() throws Exception {
-        ss = new ServerSocket(0);
-        Thread thr = new Thread(this);
-        thr.start();
-
-        fac = XMLSignatureFactory.getInstance();
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-        db = dbf.newDocumentBuilder();
-        sha1 = fac.newDigestMethod(DigestMethod.SHA1, null);
-        withoutComments = fac.newCanonicalizationMethod
-            (CanonicalizationMethod.INCLUSIVE, (C14NMethodParameterSpec)null);
-    }
-
-    public void run() {
-        try {
-
-        for (int i=0; i<2; i++) {
-            Socket s = ss.accept();
-            s.setTcpNoDelay(true);
-
-            PrintStream out = new PrintStream(
-                                 new BufferedOutputStream(
-                                    s.getOutputStream() ));
-
-            out.print("HTTP/1.1 200 OK\r\n");
-            out.print("Content-Length: 11\r\n");
-            out.print("Content-Type: text/plain\r\n");
-            out.print("\r\n");
-            out.print("l;ajfdjafd\n");
-            out.flush();
-
-            // don't close the connection immediately as otherwise
-            // the http headers may not have been received and the
-            // http client will re-connect.
-            Thread.currentThread().sleep(2000);
-
-            s.close();
-        }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    XMLDSigWithSecMgr() throws Exception {
-        setup();
-        Document doc = db.newDocument();
-        Element envelope = doc.createElementNS
-            ("http://example.org/envelope", "Envelope");
-        envelope.setAttributeNS("http://www.w3.org/2000/xmlns/",
-            "xmlns", "http://example.org/envelope");
-        doc.appendChild(envelope);
-
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
-        KeyPair kp = kpg.genKeyPair();
-
-        // the policy only grants this test SocketPermission to accept, resolve
-        // and connect to localhost so that it can dereference 2nd reference
-        System.setProperty("java.security.policy",
-                System.getProperty("test.src", ".") + File.separator + "policy");
-        System.setSecurityManager(new SecurityManager());
-
-        try {
-            // generate a signature with SecurityManager enabled
-            ArrayList refs = new ArrayList();
-            refs.add(fac.newReference
-                ("", sha1,
-                 Collections.singletonList
-                    (fac.newTransform(Transform.ENVELOPED,
-                     (TransformParameterSpec) null)), null, null));
-            refs.add(fac.newReference("http://localhost:" + ss.getLocalPort()
-                + "/anything.txt", sha1));
-            SignedInfo si = fac.newSignedInfo(withoutComments,
-                fac.newSignatureMethod(SignatureMethod.RSA_SHA1, null), refs);
-            XMLSignature sig = fac.newXMLSignature(si, null);
-            DOMSignContext dsc = new DOMSignContext(kp.getPrivate(), envelope);
-            sig.sign(dsc);
-
-            // validate a signature with SecurityManager enabled
-            DOMValidateContext dvc = new DOMValidateContext
-                (kp.getPublic(), envelope.getFirstChild());
-
-            // disable secure validation mode so that http reference will work
-            dvc.setProperty("org.jcp.xml.dsig.secureValidation", Boolean.FALSE);
-
-            sig = fac.unmarshalXMLSignature(dvc);
-            if (!sig.validate(dvc)) {
-                throw new Exception
-                    ("XMLDSigWithSecMgr signature validation FAILED");
-            }
-        } catch (SecurityException se) {
-            throw new Exception("XMLDSigWithSecMgr FAILED", se);
-        }
-        ss.close();
-    }
-
-    public static void main(String[] args) throws Exception {
-        new XMLDSigWithSecMgr();
-    }
-}
diff --git a/test/jdk/javax/xml/crypto/dsig/SecurityManager/policy b/test/jdk/javax/xml/crypto/dsig/SecurityManager/policy
deleted file mode 100644
index 52565bfd8cf..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/SecurityManager/policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.net.SocketPermission "localhost", "accept,connect,resolve";
-};
diff --git a/test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java b/test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java
index 1205cce8beb..79029bd6570 100644
--- a/test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java
+++ b/test/jdk/javax/xml/crypto/dsig/TransformService/NullParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8022120
  * @summary check that the init and marshalParams methods throw
  *          NullPointerException when the parent parameter is null
- * @run main/othervm/java.security.policy==test.policy NullParent
  */
 
 import javax.xml.crypto.dsig.CanonicalizationMethod;
diff --git a/test/jdk/javax/xml/crypto/dsig/TransformService/test.policy b/test/jdk/javax/xml/crypto/dsig/TransformService/test.policy
deleted file mode 100644
index ccc41e5f1ab..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/TransformService/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-
-};
diff --git a/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java
index 159fc4ef627..4176819c8b6 100644
--- a/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java
+++ b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
  * @bug 6372500
  * @summary Test that KeyInfo.marshal works correctly
  * @modules java.xml.crypto/org.jcp.xml.dsig.internal.dom
- * @compile -XDignore.symbol.file Marshal.java
- * @run main/othervm/java.security.policy==test.policy Marshal
  * @author Sean Mullan
  */
 
diff --git a/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy b/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy
deleted file mode 100644
index a6a4709bbae..00000000000
--- a/test/jdk/javax/xml/crypto/dsig/keyinfo/KeyInfo/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "accessClassInPackage.org.jcp.xml.dsig.internal.dom";
-};
diff --git a/test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java b/test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java
index 890fba45058..3e9aca5e334 100644
--- a/test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java
+++ b/test/jdk/javax/xml/jaxp/common/8020430/JAXP15RegTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,43 +21,24 @@
  * questions.
  */
 
+import javax.xml.stream.XMLOutputFactory;
+import org.testng.annotations.Test;
+
 /**
  * @test
  * @bug 8020430
  * @summary test that setProperty for XMLOutputFactory works properly
- * @run main/othervm JAXP15RegTest
+ * @run testng JAXP15RegTest
  */
-import java.security.Policy;
-import javax.xml.stream.XMLOutputFactory;
-
-/**
- * @author huizhe.wang@oracle.com
- */
-public class JAXP15RegTest extends TestBase {
-
-    public JAXP15RegTest(String name) {
-        super(name);
-    }
-
-    private boolean hasSM;
-    private Policy _orig;
-
+public class JAXP15RegTest {
 
     /**
-     * @param args the command line arguments
+     * Verifies no Exception is thrown with the setProperty method.
+     * @throws Exception if the test fails
      */
-    public static void main(String[] args) {
-        JAXP15RegTest test = new JAXP15RegTest("JAXP 1.5 regression");
-        test.setUp();
-        test.testXMLOutputFactory();
-        test.tearDown();
-    }
-
-
-    public void testXMLOutputFactory() {
+    @Test
+    public void testXMLOutputFactory() throws Exception {
         XMLOutputFactory factory = XMLOutputFactory.newInstance();
         factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        success("testXMLOutputFactory passed");
     }
-
 }
diff --git a/test/jdk/javax/xml/jaxp/common/8020430/TestBase.java b/test/jdk/javax/xml/jaxp/common/8020430/TestBase.java
deleted file mode 100644
index c96a60aeb60..00000000000
--- a/test/jdk/javax/xml/jaxp/common/8020430/TestBase.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.Policy;
-
-/**
- *
- *
- * @author huizhe.wang@oracle.com
- */
-public class TestBase {
-    String filePath;
-    boolean hasSM;
-    String curDir;
-    Policy origPolicy;
-
-    String testName;
-    static String errMessage;
-
-    int passed = 0, failed = 0;
-
-    /**
-     * Creates a new instance of StreamReader
-     */
-    public TestBase(String name) {
-        testName = name;
-    }
-
-    //junit @Override
-    protected void setUp() {
-        if (System.getSecurityManager() != null) {
-            hasSM = true;
-            System.setSecurityManager(null);
-        }
-
-        filePath = System.getProperty("test.src");
-        if (filePath == null) {
-            //current directory
-            filePath = System.getProperty("user.dir");
-        }
-        origPolicy = Policy.getPolicy();
-
-    }
-
-    //junit @Override
-    public void tearDown() {
-        // turn off security manager and restore policy
-        System.setSecurityManager(null);
-        Policy.setPolicy(origPolicy);
-        if (hasSM) {
-            System.setSecurityManager(new SecurityManager());
-        }
-        System.out.println("\nNumber of tests passed: " + passed);
-        System.out.println("Number of tests failed: " + failed + "\n");
-
-        if (errMessage != null ) {
-            throw new RuntimeException(errMessage);
-        }
-    }
-
-    void fail(String errMsg) {
-        if (errMessage == null) {
-            errMessage = errMsg;
-        } else {
-            errMessage = errMessage + "\n" + errMsg;
-        }
-        failed++;
-    }
-
-    void success(String msg) {
-        passed++;
-        System.out.println(msg);
-    }
-
-}
diff --git a/test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java b/test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java
index 4184381a04e..f7ba6d61d53 100644
--- a/test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java
+++ b/test/jdk/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,6 @@
  * questions.
  */
 
-/**
- * @test
- * @bug 8021148
- * @summary test that JAXPSAXParser works even if referenced directly
- * @run main/othervm JAXPSAXParserTest
- */
 import java.io.StringReader;
 import java.io.StringWriter;
 import javax.xml.transform.Result;
@@ -34,31 +28,24 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import org.testng.annotations.Test;
 
 /**
- * test that JAXPSAXParser works even if referenced directly as
+ * @test
+ * @bug 8021148
+ * @run testng/othervm JAXPSAXParserTest
+ * @summary test that JAXPSAXParser works even if referenced directly as
  * NetBeans did. **Note that JAXPSAXParser is an internal implementation, this
  * may therefore change.
- *
- * @author huizhe.wang@oracle.com
  */
-public class JAXPSAXParserTest extends TestBase {
-
-    public JAXPSAXParserTest(String name) {
-        super(name);
-    }
+public class JAXPSAXParserTest {
 
     /**
-     * @param args the command line arguments
+     * Verifies that JAXPSAXParser can be directly instantiated.
+     * @throws Exception if the test fails
      */
-    public static void main(String[] args) {
-        JAXPSAXParserTest test = new JAXPSAXParserTest("JAXP 1.5 regression");
-        test.setUp();
-        test.testTransform();
-        test.tearDown();
-    }
-
-    public final void testTransform() {
+    @Test
+    public final void testTransform() throws Exception {
         String data =
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 + "<r>\n"
@@ -85,14 +72,13 @@ public final void testTransform() {
             Transformer t = tf.newTransformer(new StreamSource(new StringReader(IDENTITY_XSLT_WITH_INDENT)));
             Result result = new StreamResult(sw);
             t.transform(new StreamSource(new StringReader(data)), result);
-            success("JAXPSAXParserTest passed");
         } catch (Exception e) {
             /**
              * JAXPSAXParser throws NullPointerException since the jaxp 1.5 security
              * manager is not initialized when JAXPSAXParser is instantiated using
              * the default constructor.
             */
-            fail(e.toString());
+            throw e;
         } finally {
             System.clearProperty("org.xml.sax.driver");
         }
diff --git a/test/jdk/javax/xml/jaxp/parsers/8021148/TestBase.java b/test/jdk/javax/xml/jaxp/parsers/8021148/TestBase.java
deleted file mode 100644
index c96a60aeb60..00000000000
--- a/test/jdk/javax/xml/jaxp/parsers/8021148/TestBase.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.Policy;
-
-/**
- *
- *
- * @author huizhe.wang@oracle.com
- */
-public class TestBase {
-    String filePath;
-    boolean hasSM;
-    String curDir;
-    Policy origPolicy;
-
-    String testName;
-    static String errMessage;
-
-    int passed = 0, failed = 0;
-
-    /**
-     * Creates a new instance of StreamReader
-     */
-    public TestBase(String name) {
-        testName = name;
-    }
-
-    //junit @Override
-    protected void setUp() {
-        if (System.getSecurityManager() != null) {
-            hasSM = true;
-            System.setSecurityManager(null);
-        }
-
-        filePath = System.getProperty("test.src");
-        if (filePath == null) {
-            //current directory
-            filePath = System.getProperty("user.dir");
-        }
-        origPolicy = Policy.getPolicy();
-
-    }
-
-    //junit @Override
-    public void tearDown() {
-        // turn off security manager and restore policy
-        System.setSecurityManager(null);
-        Policy.setPolicy(origPolicy);
-        if (hasSM) {
-            System.setSecurityManager(new SecurityManager());
-        }
-        System.out.println("\nNumber of tests passed: " + passed);
-        System.out.println("Number of tests failed: " + failed + "\n");
-
-        if (errMessage != null ) {
-            throw new RuntimeException(errMessage);
-        }
-    }
-
-    void fail(String errMsg) {
-        if (errMessage == null) {
-            errMessage = errMsg;
-        } else {
-            errMessage = errMessage + "\n" + errMsg;
-        }
-        failed++;
-    }
-
-    void success(String msg) {
-        passed++;
-        System.out.println(msg);
-    }
-
-}
diff --git a/test/jdk/javax/xml/jaxp/parsers/8022548/TestBase.java b/test/jdk/javax/xml/jaxp/parsers/8022548/TestBase.java
deleted file mode 100644
index c395ff47214..00000000000
--- a/test/jdk/javax/xml/jaxp/parsers/8022548/TestBase.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-import java.security.Policy;
-
-/**
- *
- *
- * @author huizhe.wang@oracle.com
- */
-public class TestBase {
-    public String filePath;
-    boolean hasSM;
-    String curdir;
-    Policy origPolicy;
-
-    String testName;
-    String errMsg;
-
-    int passed = 0, failed = 0;
-
-    /**
-     * Creates a new instance of StreamReader
-     */
-    public TestBase(String name) {
-        testName = name;
-    }
-
-    //junit @Override
-    protected void setUp() {
-        if (System.getSecurityManager() != null) {
-            hasSM = true;
-            System.setSecurityManager(null);
-        }
-
-        filePath = System.getProperty("test.src");
-        if (filePath == null) {
-            //current directory
-            filePath = System.getProperty("user.dir");
-        }
-        origPolicy = Policy.getPolicy();
-
-    }
-
-    //junit @Override
-    public void tearDown() {
-        // turn off security manager and restore policy
-        System.setSecurityManager(null);
-        Policy.setPolicy(origPolicy);
-        if (hasSM) {
-            System.setSecurityManager(new SecurityManager());
-        }
-        System.out.println("\nNumber of tests passed: " + passed);
-        System.out.println("Number of tests failed: " + failed + "\n");
-
-        if (errMsg != null ) {
-            throw new RuntimeException(errMsg);
-        }
-    }
-
-    void fail(String msg) {
-        if (errMsg == null) {
-            errMsg = msg;
-        } else {
-            errMsg = errMsg + "\n" + msg;
-        }
-        failed++;
-    }
-
-    void success(String msg) {
-        passed++;
-        System.out.println(msg);
-    }
-
-}
diff --git a/test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java b/test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java
index ca039f7bba8..4cc124b2e4f 100644
--- a/test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java
+++ b/test/jdk/javax/xml/jaxp/parsers/8022548/XOMParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,50 +21,33 @@
  * questions.
  */
 
-/**
- * @test
- * @bug 8022548
- * @summary test that a parser can use DTDConfiguration
- * @modules java.xml/com.sun.org.apache.xerces.internal.impl
- *          java.xml/com.sun.org.apache.xerces.internal.parsers
- *          java.xml/com.sun.org.apache.xerces.internal.util
- *          java.xml/com.sun.org.apache.xerces.internal.xni.parser
- * @run main XOMParserTest
- */
 import com.sun.org.apache.xerces.internal.impl.Constants;
 import com.sun.org.apache.xerces.internal.parsers.*;
 import java.io.*;
 import javax.xml.transform.*;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 
 /**
- * <p>Test {@link javax.xml.transform.Transformer} for JDK-8022548: SPECJVM2008
- * has errors introduced in 7u40-b34
- *
- * Test XOM is supported after jaxp 1.5 </p>
- *
- * @author Joe Wang <huizhe.wang@oracle.com>
- *
+ * @test
+ * @bug 8022548
+ * @modules java.xml/com.sun.org.apache.xerces.internal.impl
+ *          java.xml/com.sun.org.apache.xerces.internal.parsers
+ *          java.xml/com.sun.org.apache.xerces.internal.util
+ *          java.xml/com.sun.org.apache.xerces.internal.xni.parser
+ * @summary tests that a parser can use DTDConfiguration; XOM is supported after jaxp 1.5.
+ * @run testng XOMParserTest
  */
-public class XOMParserTest extends TestBase {
-
-    public XOMParserTest(String name) {
-        super(name);
-    }
-
+public class XOMParserTest {
     /**
-     * @param args the command line arguments
+     * Verifies that a parser can use DTDConfiguration.
+     * @throws Exception if the test fails
      */
-    public static void main(String[] args) {
-        XOMParserTest test = new XOMParserTest("XOM parser test");
-        test.setUp();
-        test.testTransform();
-        test.tearDown();
-    }
-
-    public final void testTransform() {
+    @Test
+    public final void testTransform() throws Exception {
+        String filePath = System.getProperty("test.src");
         String inFilename = filePath + "/JDK8022548.xml";
         String xslFilename = filePath + "/JDK8022548.xsl";
         String outFilename = "JDK8022548.out";
@@ -96,22 +79,15 @@ public final void testTransform() {
              */
             String canonicalizedFileName = outFilename + ".canonicalized";
             canonicalize(outFilename, canonicalizedFileName);
-        } catch (Exception e) {
-            // unexpected failure
-            fail(e.getMessage());
         }
     }
 
-    public void canonicalize(String inName, String outName) {
+    public void canonicalize(String inName, String outName) throws Exception {
         try (//FileOutputStream outStream = new FileOutputStream(outName);
                 FileInputStream inputStream = new FileInputStream(inName);) {
             JDK15XML1_0Parser parser = new JDK15XML1_0Parser();
             parser.parse(new InputSource(inputStream));
-            success("test passed");
-        } catch (Exception e) {
-            fail(e.getMessage());
         }
-
     }
 
     class JDK15XML1_0Parser extends SAXParser {
diff --git a/test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java b/test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java
index 63c98ea22da..705c5465c78 100644
--- a/test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java
+++ b/test/jdk/javax/xml/jaxp/testng/validation/BaseTest.java
@@ -1,9 +1,37 @@
+/*
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package validation;
 
-import java.io.File;
+import com.sun.org.apache.xerces.internal.dom.PSVIElementNSImpl;
+import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.impl.xs.SchemaGrammar;
+import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
+import com.sun.org.apache.xerces.internal.xs.ItemPSVI;
+import com.sun.org.apache.xerces.internal.xs.XSElementDeclaration;
+import com.sun.org.apache.xerces.internal.xs.XSTypeDefinition;
 import java.io.FileNotFoundException;
 import java.net.URL;
-
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -14,17 +42,6 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
-
-import com.sun.org.apache.xerces.internal.dom.PSVIElementNSImpl;
-import com.sun.org.apache.xerces.internal.impl.Constants;
-import com.sun.org.apache.xerces.internal.impl.xs.SchemaGrammar;
-import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
-import com.sun.org.apache.xerces.internal.xs.ItemPSVI;
-import com.sun.org.apache.xerces.internal.xs.XSElementDeclaration;
-import com.sun.org.apache.xerces.internal.xs.XSTypeDefinition;
-import java.security.Policy;
-import javax.xml.transform.stream.StreamSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -75,8 +92,6 @@ public abstract class BaseTest {
     static String errMessage;
 
     int passed = 0, failed = 0;
-    private boolean hasSM;
-    private Policy orig;
 
     protected abstract String getSchemaFile();
 
@@ -87,12 +102,6 @@ public BaseTest(String name) {
     }
 
     protected void setUp() throws Exception {
-        if (System.getSecurityManager() != null) {
-            hasSM = true;
-            System.setSecurityManager(null);
-        }
-
-        orig = Policy.getPolicy();
 
         DocumentBuilderFactory docFactory = DocumentBuilderFactory
                 .newInstance();
@@ -132,12 +141,6 @@ protected void setUp() throws Exception {
     }
 
     protected void tearDown() throws Exception {
-        System.setSecurityManager(null);
-        Policy.setPolicy(orig);
-        if (hasSM) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         builder = null;
         schema = null;
         fRootNode = null;
diff --git a/test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java b/test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java
index 11333faa3ca..202dda81c04 100644
--- a/test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java
+++ b/test/jdk/javax/xml/jaxp/transform/8004476/TestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,9 @@
  * questions.
  */
 
-import java.security.Policy;
 
 /**
- *
- *
- * @author huizhe.wang@oracle.com
+ * Test base for the Extension Function tests.
  */
 public class TestBase {
     public static boolean isWindows = false;
@@ -37,9 +34,7 @@ public class TestBase {
     };
 
     String filepath;
-    boolean hasSM;
     String curDir;
-    Policy origPolicy;
     String testName;
     static String errMessage;
 
@@ -54,28 +49,15 @@ public TestBase(String name) {
 
     //junit @Override
     protected void setUp() {
-        if (System.getSecurityManager() != null) {
-            hasSM = true;
-            System.setSecurityManager(null);
-        }
-
         filepath = System.getProperty("test.src");
         if (filepath == null) {
             //current directory
             filepath = System.getProperty("user.dir");
         }
-        origPolicy = Policy.getPolicy();
-
     }
 
     //junit @Override
     public void tearDown() {
-        // turn off security manager and restore policy
-        System.setSecurityManager(null);
-        Policy.setPolicy(origPolicy);
-        if (hasSM) {
-            System.setSecurityManager(new SecurityManager());
-        }
         System.out.println("\nNumber of tests passed: " + passed);
         System.out.println("Number of tests failed: " + failed + "\n");
 
diff --git a/test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java b/test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
index bf254f6d33a..3599a8b8dc2 100644
--- a/test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
+++ b/test/jdk/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,21 +20,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
- * @test
- * @bug 8004476
- * @summary test XPath extension functions
- * @run main/othervm -Djava.security.manager=allow XPathExFuncTest
- */
+
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
 import java.util.Iterator;
 import java.util.List;
 import javax.xml.XMLConstants;
@@ -52,9 +40,10 @@
 import org.w3c.dom.Document;
 
 /**
- * test XPath extension functions
- *
- * @author huizhe.wang@oracle.com
+ * @test
+ * @bug 8004476
+ * @summary test XPath extension functions
+ * @run main/othervm XPathExFuncTest
  */
 public class XPathExFuncTest extends TestBase {
 
@@ -68,7 +57,7 @@ public class XPathExFuncTest extends TestBase {
     public XPathExFuncTest(String name) {
         super(name);
     }
-    boolean hasSM;
+
     String xslFile, xslFileId;
     String xmlFile, xmlFileId;
 
@@ -98,7 +87,7 @@ public static void main(String[] args) {
     public void testExtFunc() {
 
         try {
-            evaluate(false);
+            evaluate(false, false);
             System.out.println("testExtFunc: OK");
         } catch (XPathFactoryConfigurationException e) {
             fail(e.getMessage());
@@ -108,43 +97,32 @@ public void testExtFunc() {
     }
 
     /**
-     * Security is enabled, extension function not allowed
+     * Security is enabled, extension function not allowed.
+     * Note: removing Security Manager, use FEATURE_SECURE_PROCESSING instead.
      */
     public void testExtFuncNotAllowed() {
-        Policy p = new SimplePolicy(new AllPermission());
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
-
         try {
-            evaluate(false);
+            evaluate(true, false);
         } catch (XPathFactoryConfigurationException e) {
             fail(e.getMessage());
         } catch (XPathExpressionException ex) {
             //expected since extension function is disallowed
             System.out.println("testExtFuncNotAllowed: OK");
-        } finally {
-            System.setSecurityManager(null);
         }
     }
 
     /**
-     * Security is enabled, use new feature: enableExtensionFunctions
+     * Security is enabled, use new feature: enableExtensionFunctions.
+     * Note: removing Security Manager, use FEATURE_SECURE_PROCESSING instead.
      */
     public void testEnableExtFunc() {
-        Policy p = new SimplePolicy(new AllPermission());
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
-
-
         try {
-            evaluate(true);
+            evaluate(true, true);
             System.out.println("testEnableExt: OK");
         } catch (XPathFactoryConfigurationException e) {
             fail(e.getMessage());
         } catch (XPathExpressionException e) {
             fail(e.getMessage());
-        } finally {
-            System.setSecurityManager(null);
         }
     }
 
@@ -164,10 +142,17 @@ Document getDocument() {
         return document;
     }
 
-    void evaluate(boolean enableExt) throws XPathFactoryConfigurationException, XPathExpressionException {
+    void evaluate(boolean secureMode, boolean enableExt)
+            throws XPathFactoryConfigurationException, XPathExpressionException {
         Document document = getDocument();
 
         XPathFactory xPathFactory = XPathFactory.newInstance();
+        if (secureMode) {
+            xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        } else {
+            xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
+        }
+
         /**
          * Use of the extension function 'http://exslt.org/strings:tokenize' is
          * not allowed when the secure processing feature is set to true.
@@ -178,9 +163,6 @@ void evaluate(boolean enableExt) throws XPathFactoryConfigurationException, XPat
         }
 
         xPathFactory.setXPathFunctionResolver(new MyXPathFunctionResolver());
-        if (System.getSecurityManager() == null) {
-            xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
-        }
 
         XPath xPath = xPathFactory.newXPath();
         xPath.setNamespaceContext(new MyNamespaceContext());
@@ -252,36 +234,4 @@ boolean enableExtensionFunction(XPathFactory factory) {
         }
         return isSupported;
     }
-
-    class SimplePolicy extends Policy {
-
-        private final Permissions perms;
-
-        public SimplePolicy(Permission... permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions) {
-                perms.add(permission);
-            }
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p);
-        }
-
-        //for older jdk
-        @Override
-        public void refresh() {
-        }
-    }
 }
diff --git a/test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java b/test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
index 9a72cbe1a55..e23a0329bba 100644
--- a/test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
+++ b/test/jdk/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,30 +20,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
- * @test
- * @bug 8004476
- * @summary test XSLT extension functions
- * @run main/othervm -Djava.security.manager=allow XSLTExFuncTest
- */
 
 import java.io.StringWriter;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
+import javax.xml.XMLConstants;
 import javax.xml.transform.*;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 import org.xml.sax.InputSource;
 
 /**
- * test XSLT extension functions
- *
- * @author huizhe.wang@oracle.com
+ * @test
+ * @bug 8004476
+ * @summary test XSLT extension functions
+ * @run main/othervm XSLTExFuncTest
  */
 public class XSLTExFuncTest extends TestBase {
 
@@ -56,7 +45,7 @@ public class XSLTExFuncTest extends TestBase {
     public XSLTExFuncTest(String name) {
         super(name);
     }
-    boolean hasSM;
+
     String xslFile, xslFileId;
     String xmlFile, xmlFileId;
 
@@ -104,33 +93,29 @@ public void testExtFunc() {
     }
 
     /**
-     * Security is enabled, extension function not allowed
+     * Security is enabled, extension function not allowed.
+     * Note: removing Security Manager, use FEATURE_SECURE_PROCESSING instead.
      */
     public void testExtFuncNotAllowed() {
-        Policy p = new SimplePolicy(new AllPermission());
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
+
         TransformerFactory factory = TransformerFactory.newInstance();
 
         try {
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             transform(factory);
         } catch (TransformerConfigurationException e) {
             fail(e.getMessage());
         } catch (TransformerException ex) {
             //expected since extension function is disallowed
             System.out.println("testExtFuncNotAllowed: OK");
-        } finally {
-            System.setSecurityManager(null);
         }
     }
 
     /**
-     * Security is enabled, use new feature: enableExtensionFunctions
+     * Security is enabled, use new feature: enableExtensionFunctions.
+     * Note: removing Security Manager, use FEATURE_SECURE_PROCESSING instead.
      */
     public void testEnableExtFunc() {
-        Policy p = new SimplePolicy(new AllPermission());
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
         TransformerFactory factory = TransformerFactory.newInstance();
 
         /**
@@ -147,8 +132,6 @@ public void testEnableExtFunc() {
             fail(e.getMessage());
         } catch (TransformerException e) {
             fail(e.getMessage());
-        } finally {
-            System.setSecurityManager(null);
         }
     }
 
@@ -165,9 +148,6 @@ public void testEnableExtFunc() {
      * template to create a transformer
      */
     public void testTemplatesEnableExtFunc() {
-        Policy p = new SimplePolicy(new AllPermission());
-        Policy.setPolicy(p);
-        System.setSecurityManager(new SecurityManager());
         TransformerFactory factory = TransformerFactory.newInstance();
 
         /**
@@ -190,14 +170,13 @@ public void testTemplatesEnableExtFunc() {
             fail(e.getMessage());
         } catch (TransformerException e) {
             fail(e.getMessage());
-        } finally {
-            System.setSecurityManager(null);
         }
     }
 
     boolean enableExtensionFunction(TransformerFactory factory) {
         boolean isSupported = true;
         try {
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
         } catch (TransformerConfigurationException ex) {
             isSupported = false;
@@ -213,36 +192,4 @@ void transform(TransformerFactory factory) throws TransformerConfigurationExcept
         Result result = new StreamResult(stringResult);
         transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
     }
-
-    class SimplePolicy extends Policy {
-
-        private final Permissions perms;
-
-        public SimplePolicy(Permission... permissions) {
-            perms = new Permissions();
-            for (Permission permission : permissions) {
-                perms.add(permission);
-            }
-        }
-
-        @Override
-        public PermissionCollection getPermissions(CodeSource cs) {
-            return perms;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain pd) {
-            return perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain pd, Permission p) {
-            return perms.implies(p);
-        }
-
-        //for older jdk
-        @Override
-        public void refresh() {
-        }
-    }
 }
diff --git a/test/jdk/jdk/dynalink/BeanLinkerTest.java b/test/jdk/jdk/dynalink/BeanLinkerTest.java
index 0097902b298..be3bf1198ae 100644
--- a/test/jdk/jdk/dynalink/BeanLinkerTest.java
+++ b/test/jdk/jdk/dynalink/BeanLinkerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -57,7 +56,7 @@
 
 /**
  * @test
- * @run testng/othervm/java.security.policy=untrusted.security.policy BeanLinkerTest
+ * @run testng/othervm BeanLinkerTest
  */
 public class BeanLinkerTest {
 
@@ -497,55 +496,6 @@ public void staticMethodCallTest(final boolean publicLookup) {
         Assert.assertEquals(str, System.getProperty("os.name"));
     }
 
-    // try calling System.getenv and expect security exception
-    @Test(dataProvider = "flags")
-    public void systemGetenvTest(final boolean publicLookup) {
-        final CallSite cs1 = createGetMethodCallSite(publicLookup, "getenv");
-        final CallSite cs2 = createCallSite(publicLookup, CALL, MethodType.methodType(Object.class, Object.class, Object.class));
-
-        try {
-            final Object method = cs1.getTarget().invoke(StaticClass.forClass(System.class));
-            cs2.getTarget().invoke(method, StaticClass.forClass(System.class));
-            throw new RuntimeException("should not reach here in any case!");
-        } catch (final Throwable th) {
-            Assert.assertTrue(th instanceof SecurityException);
-        }
-    }
-
-    // try getting a specific sensitive System property and expect security exception
-    @Test(dataProvider = "flags")
-    public void systemGetPropertyTest(final boolean publicLookup) {
-        final CallSite cs1 = createGetMethodCallSite(publicLookup, "getProperty");
-        final CallSite cs2 = createCallSite(publicLookup, CALL, MethodType.methodType(String.class, Object.class, Object.class, String.class));
-
-        try {
-            final Object method = cs1.getTarget().invoke(StaticClass.forClass(System.class));
-            cs2.getTarget().invoke(method, StaticClass.forClass(System.class), "java.home");
-            throw new RuntimeException("should not reach here in any case!");
-        } catch (final Throwable th) {
-            Assert.assertTrue(th instanceof SecurityException);
-        }
-    }
-
-    // check a @CallerSensitive API and expect appropriate access check exception
-    @Test(dataProvider = "flags")
-    public void systemLoadLibraryTest(final boolean publicLookup) {
-        final CallSite cs1 = createGetMethodCallSite(publicLookup, "loadLibrary");
-        final CallSite cs2 = createCallSite(publicLookup, CALL, MethodType.methodType(void.class, Object.class, Object.class, String.class));
-
-        try {
-            final Object method = cs1.getTarget().invoke(StaticClass.forClass(System.class));
-            cs2.getTarget().invoke(method, StaticClass.forClass(System.class), "foo");
-            throw new RuntimeException("should not reach here in any case!");
-        } catch (final Throwable th) {
-            if (publicLookup) {
-                Assert.assertTrue(th instanceof IllegalAccessError);
-            } else {
-                Assert.assertTrue(th instanceof AccessControlException, "Expected AccessControlException, got " + th.getClass().getName());
-            }
-        }
-    }
-
     @Test(dataProvider = "flags")
     public void removeElementFromListTest(final boolean publicLookup) throws Throwable {
         final MethodType mt = MethodType.methodType(void.class, Object.class, int.class);
diff --git a/test/jdk/jdk/dynalink/TrustedDynamicLinkerFactoryTest.java b/test/jdk/jdk/dynalink/TrustedDynamicLinkerFactoryTest.java
index adf6bdc8a3b..6fc61c24392 100644
--- a/test/jdk/jdk/dynalink/TrustedDynamicLinkerFactoryTest.java
+++ b/test/jdk/jdk/dynalink/TrustedDynamicLinkerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
 /**
  * @test
  * @build TestGuardingDynamicLinkerExporter
- * @run testng/othervm/java.security.policy=trusted.security.policy TrustedDynamicLinkerFactoryTest
+ * @run testng/othervm TrustedDynamicLinkerFactoryTest
  */
 public class TrustedDynamicLinkerFactoryTest {
 
diff --git a/test/jdk/jdk/dynalink/UntrustedDynamicLinkerFactoryTest.java b/test/jdk/jdk/dynalink/UntrustedDynamicLinkerFactoryTest.java
deleted file mode 100644
index 890fa906a95..00000000000
--- a/test/jdk/jdk/dynalink/UntrustedDynamicLinkerFactoryTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-import java.util.List;
-import java.util.ServiceConfigurationError;
-import jdk.dynalink.DynamicLinkerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * @test
- * @build TestGuardingDynamicLinkerExporter
- * @run testng/othervm/java.security.policy=untrusted.security.policy UntrustedDynamicLinkerFactoryTest
- */
-public class UntrustedDynamicLinkerFactoryTest {
-    @Test
-    public void autoLoadedLinkerNegativeTest() {
-        final DynamicLinkerFactory factory = new DynamicLinkerFactory();
-        factory.createLinker();
-        // expect one error as we have one untrusted linker exporter in META-INF/services
-        final List<ServiceConfigurationError> autoLoadingErrors = factory.getAutoLoadingErrors();
-        // single error ...
-        Assert.assertEquals(autoLoadingErrors.size(), 1);
-        autoLoadingErrors.get(0).printStackTrace();
-        final Throwable cause = autoLoadingErrors.get(0).getCause();
-        // ..  due to permission check..
-        Assert.assertTrue(cause.toString().contains("dynalink.exportLinkersAutomatically"));
-    }
-}
diff --git a/test/jdk/jdk/dynalink/trusted.security.policy b/test/jdk/jdk/dynalink/trusted.security.policy
deleted file mode 100644
index 34bcd92e3bb..00000000000
--- a/test/jdk/jdk/dynalink/trusted.security.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-  permission java.io.FilePermission "${user.home}/-", "read";
-};
-
-grant codeBase "file:${test.classes}/-" {
-  permission java.lang.RuntimePermission "dynalink.exportLinkersAutomatically";
-};
diff --git a/test/jdk/jdk/dynalink/untrusted.security.policy b/test/jdk/jdk/dynalink/untrusted.security.policy
deleted file mode 100644
index e3ff71034d9..00000000000
--- a/test/jdk/jdk/dynalink/untrusted.security.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-  permission java.io.FilePermission "${user.home}/-", "read";
-};
diff --git a/test/jdk/jdk/incubator/vector/BasicFloat16ArithTests.java b/test/jdk/jdk/incubator/vector/BasicFloat16ArithTests.java
new file mode 100644
index 00000000000..4ed95f698cf
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/BasicFloat16ArithTests.java
@@ -0,0 +1,868 @@
+/*
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8329817 8334432 8339076 8341260
+ * @modules jdk.incubator.vector
+ * @summary Basic tests of Float16 arithmetic and similar operations
+ */
+
+import jdk.incubator.vector.Float16;
+import static jdk.incubator.vector.Float16.*;
+import java.util.HashSet;
+import java.util.List;
+
+public class BasicFloat16ArithTests {
+    private static float InfinityF = Float.POSITIVE_INFINITY;
+    private static float NaNf = Float.NaN;
+
+    private static final float MAX_VAL_FP16 = 0x1.ffcp15f;
+
+    public static void main(String... args) {
+        checkBitWise();
+        checkHash();
+        checkConstants();
+        checkNegate();
+        checkAbs();
+        checkIsNaN();
+        checkFiniteness();
+        checkMinMax();
+        checkArith();
+        checkSqrt();
+        checkGetExponent();
+        checkUlp();
+        checkValueOfDouble();
+        checkValueOfLong();
+        checkValueOfString();
+        checkBaseConversionRoundTrip();
+        FusedMultiplyAddTests.main();
+    }
+
+    /*
+     * The software implementation of Float16 delegates to float or
+     * double operations for most of the actual computation. This
+     * regression test takes that into account as it generally only
+     * has limited testing to probe whether or not the proper
+     * functionality is being delegated to.
+     *
+     * To make the test easier to read, float literals that are exact
+     * upon conversion to Float16 are used for the test data.
+     *
+     * The float <-> Float16 conversions are well-tested from prior
+     * work and are assumed to be correct by this regression test.
+     */
+
+    /**
+     * Verify handling of NaN representations
+     */
+    private static void checkBitWise() {
+        short nanImage = float16ToRawShortBits(Float16.NaN);
+
+        int exponent = 0x7c00;
+        int sign =     0x8000;
+
+        // All-zeros significand with a max exponent are infinite
+        // values, not NaN values.
+        for(int i = 0x1; i <= 0x03ff; i++) {
+            short  posNaNasShort = (short)(       exponent | i);
+            short  negNaNasShort = (short)(sign | exponent | i);
+
+            Float16 posf16 = shortBitsToFloat16(posNaNasShort);
+            Float16 negf16 = shortBitsToFloat16(negNaNasShort);
+
+            // Mask-off high-order 16 bits to avoid sign extension woes
+            checkInt(nanImage & 0xffff, float16ToShortBits(posf16) & 0xffff, "positive NaN");
+            checkInt(nanImage & 0xffff, float16ToShortBits(negf16) & 0xffff, "negative NaN");
+
+            checkInt(posNaNasShort & 0xffff, float16ToRawShortBits(posf16) & 0xffff , "positive NaN");
+            checkInt(negNaNasShort & 0xffff, float16ToRawShortBits(negf16) & 0xffff, "negative NaN");
+        }
+    }
+
+    /**
+     * Verify correct number of hashValue's from Float16's.
+     */
+    private static void checkHash() {
+        // Slightly over-allocate the HashSet.
+        HashSet<Integer> set = HashSet.newHashSet(Short.MAX_VALUE - Short.MIN_VALUE + 1);
+
+        // Each non-NaN value should have a distinct hashCode. All NaN
+        // values should share a single hashCode. Check the latter
+        // property by verifying the overall count of entries in the
+        // set.
+        for(int i = Short.MIN_VALUE; i <= Short.MAX_VALUE; i++) {
+            Float16 f16 = Float16.shortBitsToFloat16((short)i);
+            boolean addedToSet = set.add(f16.hashCode());
+
+            if (!Float16.isNaN(f16)) {
+                if (!addedToSet) {
+                    throwRE("Existing hash value for " + f16);
+                }
+            }
+        }
+
+        // There are 2^16 = 65,536 total short values. Each of these
+        // bit patterns is a valid representation of a Float16
+        // value. However, NaNs have multiple possible encodings.
+        // With an exponent = 0x7c00, each nonzero significand 0x1 to
+        // 0x3ff is a NaN, for both positive and negative sign bits.
+        //
+        // Therefore, the total number of distinct hash codes for
+        // Float16 values should be:
+        // 65_536 - 2*(1_023) + 1 = 63_491
+
+        int setSize = set.size();
+        if (setSize != 63_491) {
+            throwRE("Unexpected number of distinct hash values " + setSize);
+        }
+    }
+
+    private static void checkConstants() {
+        checkInt(BYTES,          2, "Float16.BYTES");
+        checkInt(MAX_EXPONENT,  15, "Float16.MAX_EXPONENT");
+        checkInt(MIN_EXPONENT, -14, "Float16.MIN_EXPONENT");
+        checkInt(PRECISION,     11, "Float16.PRECISION");
+        checkInt(SIZE,          16, "Float16.SIZE");
+
+        checkFloat16(MIN_VALUE,  0x1.0p-24f, "Float16.MIN_VALUE");
+        checkFloat16(MIN_NORMAL, 0x1.0p-14f, "Float16.MIN_NORMAL");
+        checkFloat16(MAX_VALUE,  65504.0f,  "Float16.MAX_VALUE");
+
+        checkFloat16(POSITIVE_INFINITY,   InfinityF,  "+infinity");
+        checkFloat16(NEGATIVE_INFINITY,  -InfinityF,  "-infinity");
+        checkFloat16(NaN,                 NaNf,            "NaN");
+    }
+
+    private static void checkInt(int value, int expected, String message) {
+        if (value != expected) {
+            throwRE(String.format("Didn't get expected value for %s;%nexpected %d, got %d",
+                                  message, expected, value));
+        }
+    }
+
+    private static void checkFloat16(Float16 value16, float expected, String message) {
+        float value = value16.floatValue();
+        if (Float.compare(value, expected) != 0) {
+            throwRE(String.format("Didn't get expected value for %s;%nexpected %g (%a), got %g (%a)",
+                                  message, expected, expected, value, value));
+        }
+    }
+
+    private static void checkNegate() {
+        float[][] testCases = {
+            {-0.0f,   0.0f},
+            { 0.0f,  -0.0f},
+
+            {-1.0f,   1.0f},
+            { 1.0f,  -1.0f},
+
+            { InfinityF, -InfinityF},
+            {-InfinityF,  InfinityF},
+
+            {NaNf,       NaNf},
+        };
+
+        for(var testCase : testCases) {
+            float arg =      testCase[0];
+            float expected = testCase[1];
+            Float16 result =  negate(valueOf(arg));
+
+            if (Float.compare(expected, result.floatValue()) != 0) {
+                checkFloat16(result, expected, "negate(" + arg + ")");
+            }
+        }
+
+        return;
+    }
+
+    private static void checkAbs() {
+        float[][] testCases = {
+            {-0.0f,   0.0f},
+            { 0.0f,   0.0f},
+
+            {-1.0f,   1.0f},
+            { 1.0f,   1.0f},
+
+            { InfinityF, InfinityF},
+            {-InfinityF, InfinityF},
+
+            {NaNf,       NaNf},
+        };
+
+        for(var testCase : testCases) {
+            float arg =      testCase[0];
+            float expected = testCase[1];
+            Float16 result =  abs(valueOf(arg));
+
+            if (Float.compare(expected, result.floatValue()) != 0) {
+                checkFloat16(result, expected, "abs(" + arg + ")");
+            }
+        }
+
+        return;
+    }
+
+    private static void checkIsNaN() {
+        if (!isNaN(NaN)) {
+            throwRE("Float16.isNaN() returns false for a NaN");
+        }
+
+        float[] testCases = {
+            -InfinityF,
+             InfinityF,
+            -0.0f,
+            +0.0f,
+             1.0f,
+            -1.0f,
+        };
+
+        for(var testCase : testCases) {
+            boolean result = isNaN(valueOf(testCase));
+            if (result) {
+                throwRE("isNaN returned true for " + testCase);
+            }
+        }
+
+        return;
+    }
+
+    private static void checkFiniteness() {
+        float[] infinities = {
+            -InfinityF,
+             InfinityF,
+        };
+
+        for(var infinity : infinities) {
+            boolean result1 = isFinite(valueOf(infinity));
+            boolean result2 = isInfinite(valueOf(infinity));
+
+            if (result1) {
+                throwRE("Float16.isFinite returned true for " + infinity);
+            }
+
+            if (!result2) {
+                throwRE("Float16.isInfinite returned false for " + infinity);
+            }
+        }
+
+        if (isFinite(NaN)) {
+            throwRE("Float16.isFinite() returns true for a NaN");
+        }
+
+        if (isInfinite(NaN)) {
+            throwRE("Float16.isInfinite() returns true for a NaN");
+        }
+
+        float[] finities = {
+            -0.0f,
+            +0.0f,
+             1.0f,
+            -1.0f,
+        };
+
+        for(var finity : finities) {
+            boolean result1 = isFinite(valueOf(finity));
+            boolean result2 = isInfinite(valueOf(finity));
+
+            if (!result1) {
+                throwRE("Float16.isFinite returned true for " + finity);
+            }
+
+            if (result2) {
+                throwRE("Float16.isInfinite returned true for " + finity);
+            }
+        }
+
+        return;
+    }
+
+    private static void checkMinMax() {
+        float small = 1.0f;
+        float large = 2.0f;
+
+        if (min(valueOf(small), valueOf(large)).floatValue() != small) {
+            throwRE(String.format("min(%g, %g) not equal to %g)",
+                                  small, large, small));
+        }
+
+        if (max(valueOf(small), valueOf(large)).floatValue() != large) {
+            throwRE(String.format("max(%g, %g) not equal to %g)",
+                                  small, large, large));
+        }
+    }
+
+    /*
+     * Cursory checks to make sure correct operation is being called
+     * with arguments in proper order.
+     */
+    private static void checkArith() {
+        float   a   = 1.0f;
+        Float16 a16 = valueOf(a);
+
+        float   b   = 2.0f;
+        Float16 b16 = valueOf(b);
+
+        if (add(a16, b16).floatValue() != (a + b)) {
+            throwRE("failure with " + a16 + " + " + b16);
+        }
+        if (add(b16, a16).floatValue() != (b + a)) {
+            throwRE("failure with " + b16 + " + " + a16);
+        }
+
+        if (subtract(a16, b16).floatValue() != (a - b)) {
+            throwRE("failure with " + a16 + " - " + b16);
+        }
+        if (subtract(b16, a16).floatValue() != (b - a)) {
+            throwRE("failure with " + b16 + " - " + a16);
+        }
+
+        if (multiply(a16, b16).floatValue() != (a * b)) {
+            throwRE("failure with " + a16 + " * " + b16);
+        }
+        if (multiply(b16, a16).floatValue() != (b * a)) {
+            throwRE("failure with " + b16 + " * " + a16);
+        }
+
+        if (divide(a16, b16).floatValue() != (a / b)) {
+            throwRE("failure with " + a16 + " / " + b16);
+        }
+        if (divide(b16, a16).floatValue() != (b / a)) {
+            throwRE("failure with " + b16 + " / " + a16);
+        }
+        return;
+    }
+
+    private static void checkSqrt() {
+        float[][] testCases = {
+            {-0.0f,   -0.0f},
+            { 0.0f,    0.0f},
+
+            {1.0f,   1.0f},
+            {4.0f,   2.0f},
+            {9.0f,   3.0f},
+
+            { InfinityF, InfinityF},
+            {-InfinityF, NaNf},
+
+            {NaNf,       NaNf},
+        };
+
+        for(var testCase : testCases) {
+            float arg =      testCase[0];
+            float expected = testCase[1];
+            Float16 result =  sqrt(valueOf(arg));
+
+            if (Float.compare(expected, result.floatValue()) != 0) {
+                checkFloat16(result, expected, "sqrt(" + arg + ")");
+            }
+        }
+
+        return;
+    }
+
+    private static void checkGetExponent() {
+        float[][] testCases = {
+            // Non-finite values
+            { InfinityF, MAX_EXPONENT + 1},
+            {-InfinityF, MAX_EXPONENT + 1},
+            { NaNf,      MAX_EXPONENT + 1},
+
+            // Subnormal and almost subnormal values
+            {-0.0f,       MIN_EXPONENT - 1},
+            {+0.0f,       MIN_EXPONENT - 1},
+            { 0x1.0p-24f, MIN_EXPONENT - 1}, // Float16.MIN_VALUE
+            {-0x1.0p-24f, MIN_EXPONENT - 1}, // Float16.MIN_VALUE
+            { 0x1.0p-14f, MIN_EXPONENT},     // Float16.MIN_NORMAL
+            {-0x1.0p-14f, MIN_EXPONENT},     // Float16.MIN_NORMAL
+
+            // Normal values
+            { 1.0f,       0},
+            { 2.0f,       1},
+            { 4.0f,       2},
+
+            {MAX_VAL_FP16*0.5f, MAX_EXPONENT - 1},
+            {MAX_VAL_FP16,      MAX_EXPONENT},
+        };
+
+        for(var testCase : testCases) {
+            float arg =      testCase[0];
+            float expected = testCase[1];
+            // Exponents are in-range for Float16
+            Float16 result =  valueOf(getExponent(valueOf(arg)));
+
+            if (Float.compare(expected, result.floatValue()) != 0) {
+                checkFloat16(result, expected, "getExponent(" + arg + ")");
+            }
+        }
+        return;
+    }
+
+    private static void checkUlp() {
+        float[][] testCases = {
+            { InfinityF, InfinityF},
+            {-InfinityF, InfinityF},
+            { NaNf,      NaNf},
+
+            // Zeros, subnormals, and MIN_VALUE all have MIN_VALUE as an ulp.
+            {-0.0f,       0x1.0p-24f},
+            {+0.0f,       0x1.0p-24f},
+            { 0x1.0p-24f, 0x1.0p-24f},
+            {-0x1.0p-24f, 0x1.0p-24f},
+            { 0x1.0p-14f, 0x1.0p-24f},
+            {-0x1.0p-14f, 0x1.0p-24f},
+
+            // ulp is 10 bits away
+            {0x1.0p0f,       0x0.004p0f}, // 1.0f
+            {0x1.0p1f,       0x0.004p1f}, // 2.0f
+            {0x1.0p2f,       0x0.004p2f}, // 4.0f
+
+            {MAX_VAL_FP16*0.5f, 0x0.004p14f},
+            {MAX_VAL_FP16,      0x0.004p15f},
+        };
+
+        for(var testCase : testCases) {
+            float arg =      testCase[0];
+            float expected = testCase[1];
+            // Exponents are in-range for Float16
+            Float16 result =  ulp(valueOf(arg));
+
+            if (Float.compare(expected, result.floatValue()) != 0) {
+                checkFloat16(result, expected, "ulp(" + arg + ")");
+            }
+        }
+        return;
+    }
+
+    private static void throwRE(String message) {
+        throw new RuntimeException(message);
+    }
+
+    private static void checkValueOfDouble() {
+        /*
+         * Check that double -> Float16 conversion rounds properly
+         * around the midway point for each finite Float16 value by
+         * looping over the positive values and checking the negations
+         * along the way.
+         */
+
+        String roundUpMsg   = "Didn't get half-way case rounding down";
+        String roundDownMsg = "Didn't get half-way case rounding up";
+
+        for(int i = 0; i <= Short.MAX_VALUE; i++ ) {
+            boolean isEven = ((i & 0x1) == 0);
+            Float16 f16 = Float16.shortBitsToFloat16((short)i);
+            Float16 f16Neg = negate(f16);
+
+            if (!isFinite(f16))
+                continue;
+
+            // System.out.println("\t" + toHexString(f16));
+
+            Float16 ulp = ulp(f16);
+            double halfWay = f16.doubleValue() + ulp.doubleValue() * 0.5;
+
+            // Under the round to nearest even rounding policy, the
+            // half-way case should round down to the starting value
+            // if the starting value is even; otherwise, it should round up.
+            float roundedBack = valueOf(halfWay).floatValue();
+            float roundedBackNeg = valueOf(-halfWay).floatValue();
+
+            if (isEven) {
+                checkFloat16(f16,    roundedBack,    roundDownMsg);
+                checkFloat16(f16Neg, roundedBackNeg, roundDownMsg);
+            } else {
+                checkFloat16(add(f16,         ulp), roundedBack,    roundUpMsg);
+                checkFloat16(subtract(f16Neg, ulp), roundedBackNeg, roundUpMsg);
+            }
+
+            // Should always round down
+            double halfWayNextDown = Math.nextDown(halfWay);
+            checkFloat16(f16,    valueOf(halfWayNextDown).floatValue(),  roundDownMsg);
+            checkFloat16(f16Neg, valueOf(-halfWayNextDown).floatValue(), roundDownMsg);
+
+            // Should always round up
+            double halfWayNextUp =   Math.nextUp(halfWay);
+            checkFloat16(add(f16, ulp),         valueOf( halfWayNextUp).floatValue(), roundUpMsg);
+            checkFloat16(subtract(f16Neg, ulp), valueOf(-halfWayNextUp).floatValue(), roundUpMsg);
+        }
+    }
+
+    private static void checkValueOfLong() {
+        checkFloat16(valueOf(-65_521),  Float.NEGATIVE_INFINITY, "-infinity");
+        checkFloat16(valueOf(-65_520),  Float.NEGATIVE_INFINITY, "-infinity");
+        checkFloat16(valueOf(-65_519), -MAX_VALUE.floatValue(), "-MAX_VALUE");
+        checkFloat16(valueOf(65_519),   MAX_VALUE.floatValue(), "MAX_VALUE");
+        checkFloat16(valueOf(65_520),   Float.POSITIVE_INFINITY, "+infinity");
+        checkFloat16(valueOf(65_521),   Float.POSITIVE_INFINITY, "+infinity");
+    }
+
+    private static void checkValueOfString() {
+        String2Float16Case[] testCases = {
+            new String2Float16Case( "NaN", NaNf),
+            new String2Float16Case("+NaN", NaNf),
+            new String2Float16Case("-NaN", NaNf),
+
+            new String2Float16Case("+Infinity", +InfinityF),
+            new String2Float16Case("-Infinity", -InfinityF),
+
+            new String2Float16Case( "0.0",  0.0f),
+            new String2Float16Case("+0.0",  0.0f),
+            new String2Float16Case("-0.0", -0.0f),
+
+            // Decimal signed integers are accepted as input; hex
+            // signed integers are not, see negative test cases below.
+            new String2Float16Case( "1",  1.0f),
+            new String2Float16Case("-1", -1.0f),
+
+            new String2Float16Case( "12",  12.0f),
+            new String2Float16Case("-12", -12.0f),
+
+            new String2Float16Case( "123",  123.0f),
+            new String2Float16Case("-123", -123.0f),
+
+            new String2Float16Case( "1.0",  1.0f),
+            new String2Float16Case("-1.0", -1.0f),
+
+            // Check for FloatTypeSuffix handling
+            new String2Float16Case( "1.5f", 1.5f),
+            new String2Float16Case( "1.5F", 1.5f),
+            new String2Float16Case( "1.5D", 1.5f),
+            new String2Float16Case( "1.5d", 1.5f),
+
+            new String2Float16Case("65504.0", 65504.0f),  // Float16.MAX_VALUE
+
+            new String2Float16Case("65520.0", InfinityF), // Float16.MAX_VALUE + 0.5*ulp
+
+            new String2Float16Case("65520.01", InfinityF), // Float16.MAX_VALUE + > 0.5*ulp
+            new String2Float16Case("65520.001", InfinityF), // Float16.MAX_VALUE + > 0.5*ulp
+            new String2Float16Case("65520.0001", InfinityF), // Float16.MAX_VALUE + > 0.5*ulp
+            new String2Float16Case("65520.00000000001", InfinityF), // Float16.MAX_VALUE + > 0.5*ulp
+
+            new String2Float16Case("65519.99999999999", 65504.0f), // Float16.MAX_VALUE +  < 0.5*ulp
+            new String2Float16Case("0x1.ffdffffffffffp15", 65504.0f),
+            new String2Float16Case("0x1.ffdfffffffffp15", 65504.0f),
+
+
+            new String2Float16Case("65519.999999999999", 65504.0f),
+            new String2Float16Case("65519.9999999999999", 65504.0f),
+            new String2Float16Case("65519.99999999999999", 65504.0f),
+            new String2Float16Case("65519.999999999999999", 65504.0f),
+
+            // Float16.MAX_VALUE +  < 0.5*ulp
+            new String2Float16Case("65519.9999999999999999999999999999999999999", 65504.0f),
+
+            // Near MAX_VALUE - 0.5 ulp
+            new String2Float16Case("65488.0", 65472.0f),
+            new String2Float16Case("65487.9999", 65472.0f),
+            new String2Float16Case("65487.99999999", 65472.0f),
+            new String2Float16Case("65487.9999999999999999", 65472.0f),
+
+            new String2Float16Case("65488.000001", MAX_VAL_FP16),
+
+            new String2Float16Case("65536.0", InfinityF), // Float16.MAX_VALUE + ulp
+
+            // Hex values
+            new String2Float16Case("0x1p2",   0x1.0p2f),
+            new String2Float16Case("0x1p2f",  0x1.0p2f),
+            new String2Float16Case("0x1p2d",  0x1.0p2f),
+            new String2Float16Case("0x1.0p1", 0x1.0p1f),
+
+            new String2Float16Case("-0x1p2",  -0x1.0p2f),
+            new String2Float16Case("0x3.45p12", 0x3.45p12f),
+
+            new String2Float16Case("0x3.4500000001p12", 0x3.45p12f),
+
+            // Near half-way double + float cases in hex
+            new String2Float16Case("0x1.ffdfffffffffffffffffffffffffffffffffffp15", 65504.0f),
+
+        };
+
+        for(String2Float16Case testCase : testCases) {
+            String input = testCase.input();
+            float expected = testCase.expected();
+            Float16 result = Float16.valueOf(input);
+            checkFloat16(result, expected, "Float16.valueOf(String) " + input);
+        }
+
+        List<String> negativeCases = List.of("0x1",
+                                       "-0x1",
+                                        "0x12",
+                                       "-0x12");
+
+        for(String negativeCase : negativeCases) {
+            try {
+                Float16 f16 = Float16.valueOf(negativeCase);
+                throwRE("Did not get expected exception for input " + negativeCase);
+            } catch (NumberFormatException nfe) {
+                ; // Expected
+            }
+        }
+
+        return;
+    }
+
+    private static record String2Float16Case(String input, float expected) {
+    }
+
+    private static void checkBaseConversionRoundTrip() {
+        checkFloat16(Float16.NaN,
+                     Float16.valueOf("NaN").floatValue(),
+                     "base conversion of NaN");
+
+        // For each non-NaN value, make sure
+        // value -> string -> value
+        // sequence of conversions gives the expected result.
+
+        for(int i = Short.MIN_VALUE; i <= Short.MAX_VALUE; i++) {
+            Float16 f16 = Float16.shortBitsToFloat16((short)i);
+            if (Float16.isNaN(f16))
+                continue;
+
+            checkFloat16(f16,
+                         Float16.valueOf(Float16.toString(f16)).floatValue(),
+                         "base conversion");
+        }
+        return;
+    }
+
+    private static class FusedMultiplyAddTests {
+        public static void main(String... args) {
+            testZeroNanInfCombos();
+            testNonFinite();
+            testZeroes();
+            testSimple();
+            testRounding();
+        }
+
+        private static void testZeroNanInfCombos() {
+            float [] testInputs = {
+                Float.NaN,
+                -InfinityF,
+                +InfinityF,
+                -0.0f,
+                +0.0f,
+            };
+
+            for (float i : testInputs) {
+                for (float j : testInputs) {
+                    for (float k : testInputs) {
+                        testFusedMacCase(i, j, k, Math.fma(i, j, k));
+                    }
+                }
+            }
+        }
+
+        private static void testNonFinite() {
+            float [][] testCases = {
+                {1.0f,       InfinityF,  2.0f,
+                 InfinityF},
+
+                {1.0f,       2.0f,       InfinityF,
+                 InfinityF},
+
+                {InfinityF,  1.0f,       InfinityF,
+                 InfinityF},
+
+                {0x1.ffcp14f, 2.0f,     -InfinityF,
+                 -InfinityF},
+
+                {InfinityF,  1.0f,      -InfinityF,
+                 NaNf},
+
+                {-InfinityF, 1.0f,       InfinityF,
+                 NaNf},
+
+                {1.0f,       NaNf,       2.0f,
+                 NaNf},
+
+                {1.0f,       2.0f,       NaNf,
+                 NaNf},
+
+                {InfinityF,  2.0f,       NaNf,
+                 NaNf},
+
+                {NaNf,       2.0f,       InfinityF,
+                 NaNf},
+            };
+
+            for (float[] testCase: testCases) {
+                testFusedMacCase(testCase[0], testCase[1], testCase[2], testCase[3]);
+            }
+        }
+
+        private static void testZeroes() {
+            float [][] testCases = {
+                {+0.0f, +0.0f, +0.0f,
+                 +0.0f},
+
+                {-0.0f, +0.0f, +0.0f,
+                 +0.0f},
+
+                {+0.0f, +0.0f, -0.0f,
+                 +0.0f},
+
+                {+0.0f, +0.0f, -0.0f,
+                 +0.0f},
+
+                {-0.0f, +0.0f, -0.0f,
+                 -0.0f},
+
+                {-0.0f, -0.0f, -0.0f,
+                 +0.0f},
+
+                {-1.0f, +0.0f, -0.0f,
+                 -0.0f},
+
+                {-1.0f, +0.0f, +0.0f,
+                 +0.0f},
+
+                {-2.0f, +0.0f, -0.0f,
+                 -0.0f},
+            };
+
+            for (float[] testCase: testCases) {
+                testFusedMacCase(testCase[0], testCase[1], testCase[2], testCase[3]);
+            }
+        }
+
+        private static void testSimple() {
+            final float ulpOneFp16 = ulp(valueOf(1.0f)).floatValue();
+
+            float [][] testCases = {
+                {1.0f, 2.0f, 3.0f,
+                 5.0f},
+
+                {1.0f, 2.0f, -2.0f,
+                 0.0f},
+
+                {5.0f, 5.0f, -25.0f,
+                 0.0f},
+
+                {0.5f*MAX_VAL_FP16, 2.0f, -0.5f*MAX_VAL_FP16,
+                 0.5f*MAX_VAL_FP16},
+
+                {MAX_VAL_FP16, 2.0f, -MAX_VAL_FP16,
+                 MAX_VAL_FP16},
+
+                {MAX_VAL_FP16, 2.0f, 1.0f,
+                 InfinityF},
+
+                {(1.0f + ulpOneFp16),
+                 (1.0f + ulpOneFp16),
+                 -1.0f - 2.0f*ulpOneFp16,
+                 ulpOneFp16 * ulpOneFp16},
+
+            };
+
+            for (float[] testCase: testCases) {
+                testFusedMacCase(testCase[0], testCase[1], testCase[2], testCase[3]);
+            }
+        }
+
+        private static void testRounding() {
+            final float ulpOneFp16 = ulp(valueOf(1.0f)).floatValue();
+
+            float [][] testCases = {
+                // The product is equal to
+                // (MAX_VALUE + 1/2 * ulp(MAX_VALUE) + MAX_VALUE = (0x1.ffcp15 + 0x0.002p15)+ 0x1.ffcp15
+                // so overflows.
+                {0x1.3p1f, 0x1.afp15f, -MAX_VAL_FP16,
+                 InfinityF},
+
+                // Product exactly equals 0x1.ffep15, the overflow
+                // threshold; subtracting a non-zero finite value will
+                // result in MAX_VALUE, adding zero or a positive
+                // value will overflow.
+                {0x1.2p10f, 0x1.c7p5f, -0x1.0p-14f,
+                 MAX_VAL_FP16},
+
+                {0x1.2p10f, 0x1.c7p5f, -0.0f,
+                 InfinityF},
+
+                {0x1.2p10f, 0x1.c7p5f, +0.0f,
+                 InfinityF},
+
+                {0x1.2p10f, 0x1.c7p5f, +0x1.0p-14f,
+                 InfinityF},
+
+                {0x1.2p10f, 0x1.c7p5f, InfinityF,
+                 InfinityF},
+
+                // PRECISION bits in the subnormal intermediate product
+                {0x1.ffcp-14f, 0x1.0p-24f, 0x1.0p13f, // Can be held exactly
+                 0x1.0p13f},
+
+                {0x1.ffcp-14f, 0x1.0p-24f, 0x1.0p14f, // *Cannot* be held exactly
+                 0x1.0p14f},
+
+                // Check values where the exact result cannot be
+                // exactly stored in a double.
+                {0x1.0p-24f, 0x1.0p-24f, 0x1.0p10f,
+                 0x1.0p10f},
+
+                {0x1.0p-24f, 0x1.0p-24f, 0x1.0p14f,
+                 0x1.0p14f},
+
+                // Check subnormal results, underflow to zero
+                {0x1.0p-24f, -0.5f, 0x1.0p-24f,
+                 0.0f},
+
+                // Check subnormal results, underflow to zero
+                {0x1.0p-24f, -0.5f, 0.0f,
+                 -0.0f},
+            };
+
+            for (float[] testCase: testCases) {
+                testFusedMacCase(testCase[0], testCase[1], testCase[2], testCase[3]);
+            }
+        }
+
+        private static void testFusedMacCase(float input1, float input2, float input3, float expected) {
+            Float16 a = valueOf(input1);
+            Float16 b = valueOf(input2);
+            Float16 c = valueOf(input3);
+            Float16 d = valueOf(expected);
+
+            test("Float16.fma(float)", a, b, c, Float16.fma(a, b, c), d);
+
+            // Permute first two inputs
+            test("Float16.fma(float)", b, a, c, Float16.fma(b, a, c), d);
+            return;
+        }
+    }
+
+    private static void test(String testName,
+                           Float16 input1, Float16 input2, Float16 input3,
+                           Float16 result, Float16 expected) {
+        if (Float16.compare(expected, result ) != 0) {
+            System.err.println("Failure for "  + testName + ":\n" +
+                               "\tFor inputs " + input1   + "\t(" + toHexString(input1) + ") and "
+                                               + input2   + "\t(" + toHexString(input2) + ") and"
+                                               + input3   + "\t(" + toHexString(input3) + ")\n"  +
+                               "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
+                               "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
+            throw new RuntimeException();
+        }
+    }
+}
diff --git a/test/jdk/jdk/incubator/vector/VectorRuns.java b/test/jdk/jdk/incubator/vector/VectorRuns.java
index c9d9889a714..6dbd9bf31a0 100644
--- a/test/jdk/jdk/incubator/vector/VectorRuns.java
+++ b/test/jdk/jdk/incubator/vector/VectorRuns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @bug 8309727
  * @modules jdk.incubator.vector
  * @run main VectorRuns
- * @run main/othervm/java.security.policy=empty_security.policy VectorRuns
  */
 
 public class VectorRuns {
diff --git a/test/jdk/jdk/incubator/vector/empty_security.policy b/test/jdk/jdk/incubator/vector/empty_security.policy
deleted file mode 100644
index f7ec7b5990b..00000000000
--- a/test/jdk/jdk/incubator/vector/empty_security.policy
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-// This policy is used by tests not requiring permissions, to assert that the
-// JDK implementation has the correct privileged blocks.
diff --git a/test/jdk/jdk/internal/jrtfs/WithSecurityManager.java b/test/jdk/jdk/internal/jrtfs/WithSecurityManager.java
deleted file mode 100644
index 8078fbc495a..00000000000
--- a/test/jdk/jdk/internal/jrtfs/WithSecurityManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager allow
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager deny
- */
-
-import java.net.URI;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-
-public class WithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        Path modulesPath = Paths.get(System.getProperty("java.home"),
-                "lib", "modules");
-        if (Files.notExists(modulesPath)) {
-            System.out.printf("%s doesn't exist.", modulesPath.toString());
-            System.out.println();
-            System.out.println("It is most probably an exploded build."
-                    + " Skip the test.");
-            return;
-        }
-
-        boolean allow = args[0].equals("allow");
-
-        // set security policy to allow access
-        if (allow) {
-
-            String testSrc = System.getProperty("test.src");
-            if (testSrc == null)
-                testSrc = ".";
-            Path policyFile = Paths.get(testSrc, "java.policy");
-            System.setProperty("java.security.policy", policyFile.toString());
-        }
-
-        // make sure that jrt:/ has been created before we have a security manager
-        FileSystems.getFileSystem(URI.create("jrt:/"));
-
-        System.setSecurityManager(new SecurityManager());
-
-        // check FileSystems.getFileSystem
-        try {
-            FileSystems.getFileSystem(URI.create("jrt:/"));
-            if (!allow) throw new RuntimeException("access not expected");
-        } catch (SecurityException se) {
-            if (allow)
-                throw se;
-        }
-
-        // check FileSystems.newFileSystem
-        try {
-            FileSystems.newFileSystem(URI.create("jrt:/"), Collections.emptyMap());
-            if (!allow) throw new RuntimeException("access not expected");
-        } catch (SecurityException se) {
-            if (allow)
-                throw se;
-        }
-
-        // check Paths.get
-        try {
-            Paths.get(URI.create("jrt:/java.base/java/lang/Object.class"));
-            if (!allow) throw new RuntimeException("access not expected");
-        } catch (SecurityException se) {
-            if (allow)
-                throw se;
-        }
-    }
-}
diff --git a/test/jdk/jdk/internal/jrtfs/java.policy b/test/jdk/jdk/internal/jrtfs/java.policy
deleted file mode 100644
index 276543b8208..00000000000
--- a/test/jdk/jdk/internal/jrtfs/java.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "accessSystemModules";
-};
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
index 6dff95000f0..ee4d2021b87 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
@@ -73,7 +73,6 @@ public class CheckCSMs {
         Set.of("java/io/ObjectStreamField#getType ()Ljava/lang/Class;",
                "java/lang/Runtime#load (Ljava/lang/String;)V",
                "java/lang/Runtime#loadLibrary (Ljava/lang/String;)V",
-               "java/lang/Thread#getContextClassLoader ()Ljava/lang/ClassLoader;",
                "javax/sql/rowset/serial/SerialJavaObject#getFields ()[Ljava/lang/reflect/Field;"
         );
 
@@ -81,7 +80,6 @@ public class CheckCSMs {
     // methods that takes an additional caller class parameter.
     private static Set<String> UNSUPPORTED_VIRTUAL_METHODS =
         Set.of("java/io/ObjectStreamField#getType (Ljava/lang/Class;)Ljava/lang/Class;",
-               "java/lang/Thread#getContextClassLoader (Ljava/lang/Class;)Ljava/lang/ClassLoader;",
                "javax/sql/rowset/serial/SerialJavaObject#getFields (Ljava/lang/Class;)[Ljava/lang/reflect/Field;"
         );
 
diff --git a/test/jdk/jdk/internal/vm/Continuation/Basic.java b/test/jdk/jdk/internal/vm/Continuation/Basic.java
index 14a7058f2a6..e13fa175ad5 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Basic.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Basic.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 * @summary Basic tests for jdk.internal.vm.Continuation
 * @requires vm.continuations
 * @modules java.base/jdk.internal.vm
+* @library /test/lib
 * @build java.base/java.lang.StackWalkerHelper
 *
 * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xint Basic
@@ -44,6 +45,7 @@
 * @requires vm.continuations
 * @requires vm.debug
 * @modules java.base/jdk.internal.vm
+* @library /test/lib
 * @build java.base/java.lang.StackWalkerHelper
 *
 * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+VerifyStack -Xint Basic
@@ -54,12 +56,17 @@
 import jdk.internal.vm.Continuation;
 import jdk.internal.vm.ContinuationScope;
 
+import jdk.test.lib.Platform;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import com.sun.management.HotSpotDiagnosticMXBean;
+import java.lang.management.ManagementFactory;
+
 import org.testng.annotations.Test;
 import org.testng.annotations.DataProvider;
 import static org.testng.Assert.*;
@@ -276,6 +283,8 @@ static String barMany(long b,
 
     @Test
     public void testPinnedMonitor() {
+        if (!legacyLockingMode()) return;
+
         // Test pinning due to held monitor
         final AtomicReference<Continuation.Pinned> res = new AtomicReference<>();
 
@@ -410,4 +419,9 @@ static int nativeBaz(int b) {
     static {
         System.loadLibrary("BasicJNI");
     }
+
+    static boolean legacyLockingMode() {
+        return ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                    .getVMOption("LockingMode").getValue().equals("1");
+    }
 }
diff --git a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
index b6b936078c9..52730c9523b 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,9 @@
 import jdk.test.lib.Platform;
 import jtreg.SkippedException;
 
+import com.sun.management.HotSpotDiagnosticMXBean;
+import java.lang.management.ManagementFactory;
+
 public class Fuzz implements Runnable {
     static final boolean VERIFY_STACK = true; // could add significant time
     static final boolean FILE    = true;
@@ -470,7 +473,7 @@ void verifyResult(int result) {
     }
 
     boolean shouldPin() {
-        return traceHas(Op.PIN::contains);
+        return traceHas(Op.PIN::contains) && legacyLockingMode();
     }
 
     void verifyPin(boolean yieldResult) {
@@ -1029,4 +1032,9 @@ int com_mny(int depth,
 
         return log((int)res);
     }
+
+    static boolean legacyLockingMode() {
+        return ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                    .getVMOption("LockingMode").getValue().equals("1");
+    }
 }
diff --git a/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java b/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java
index f1eeac58362..ad68e016a1a 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 import static jdk.test.lib.Asserts.assertFalse;
 import static jdk.test.lib.Asserts.assertTrue;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.time.Duration;
 import java.util.List;
 
@@ -51,37 +49,38 @@
  */
 public final class TestHiddenMethod {
 
-    // Must call in separate thread because JTREG uses reflection
+    // Must emit events in separate threads, because JTREG uses reflection
     // to invoke main method, which uses hidden methods.
-    public static class TestThread extends Thread {
-        public void run() {
-            // doPrivileged calls a method that has the @Hidden
-            // annotation
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                @Override
-                public Void run() {
-                    MyEvent event = new MyEvent();
-                    event.commit();
-                    return null;
-                }
-            });
-
-            MyEvent event = new MyEvent();
-            event.commit();
-        }
-    }
-
     public static void main(String[] args) throws Throwable {
         try (Recording recording = new Recording()) {
             recording.enable(MyEvent.class).withThreshold(Duration.ofMillis(0));
             recording.start();
-            Thread t = new TestThread();
-            t.start();
-            t.join();
+            Thread t1 = new Thread(() -> {
+                // Runs in hidden lambda frame
+                MyEvent event = new MyEvent();
+                event.hidden = true;
+                event.commit();
+            });
+            t1.start();
+            t1.join();
+            Thread t2 = new Thread() {
+                public void run() {
+                    MyEvent event = new MyEvent();
+                    event.hidden = false;
+                    event.commit();
+                }
+            };
+            t2.start();
+            t2.join();
             recording.stop();
 
             List<RecordedEvent> events = Events.fromRecording(recording);
             assertEquals(2, events.size(), "Expected two events");
+            // Swap events if they come out of order.
+            boolean hidden = events.get(0).getBoolean("hidden");
+            if (!hidden) {
+                events = events.reversed();
+            }
             RecordedEvent hiddenEvent = events.get(0);
             RecordedEvent visibleEvent = events.get(1);
 
@@ -106,5 +105,6 @@ private static boolean hasHiddenStackFrame(RecordedEvent event) throws Throwable
     }
 
     public static class MyEvent extends Event {
+        public boolean hidden;
     }
 }
diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorAsync.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorAsync.java
index 87b63d42062..7939a634d4d 100644
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorAsync.java
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import jdk.jfr.Event;
 import jdk.jfr.api.consumer.recordingstream.TestUtils.TestError;
 import jdk.jfr.api.consumer.recordingstream.TestUtils.TestException;
-import jdk.jfr.api.consumer.security.TestStreamingRemote.TestEvent;
 import jdk.jfr.consumer.RecordingStream;
 
 /**
@@ -42,6 +42,8 @@
  * @run main/othervm jdk.jfr.api.consumer.recordingstream.TestOnErrorAsync
  */
 public class TestOnErrorAsync {
+    private static class TestEvent extends Event {
+    }
     public static void main(String... args) throws Exception {
         testDefaultError();
         testCustomError();
diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorSync.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorSync.java
index b732c71a02a..2936070c3bf 100644
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorSync.java
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnErrorSync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import jdk.jfr.Event;
 import jdk.jfr.api.consumer.recordingstream.TestUtils.TestError;
 import jdk.jfr.api.consumer.recordingstream.TestUtils.TestException;
-import jdk.jfr.api.consumer.security.TestStreamingRemote.TestEvent;
 import jdk.jfr.consumer.RecordingStream;
 
 /**
@@ -42,6 +42,8 @@
  * @run main/othervm jdk.jfr.api.consumer.recordingstream.TestOnErrorSync
  */
 public class TestOnErrorSync {
+    private static class TestEvent extends Event {
+    }
     public static void main(String... args) throws Exception {
         testDefaultError();
         testCustomError();
diff --git a/test/jdk/jdk/jfr/api/consumer/security/DriverRecordingDumper.java b/test/jdk/jdk/jfr/api/consumer/security/DriverRecordingDumper.java
deleted file mode 100644
index 90d20f3fff8..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/DriverRecordingDumper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.nio.file.Paths;
-
-import jdk.jfr.Recording;
-import jdk.test.lib.jfr.EventNames;
-
-/**
- * Driver that dumps a recording with a JVMInformation event
- *
- * Usage:
- *
- * @run driver jdk.jfr.api.consumer.security.RecordingDumper <filename>
- */
-public class DriverRecordingDumper {
-    public static void main(String... args) throws Exception {
-        try (Recording r = new Recording()) {
-            r.enable(EventNames.JVMInformation);
-            r.start();
-            r.stop();
-            r.dump(Paths.get(args[0]));
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestMissingPermission.java b/test/jdk/jdk/jfr/api/consumer/security/TestMissingPermission.java
deleted file mode 100644
index f07f7147715..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestMissingPermission.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.io.IOException;
-
-import jdk.jfr.consumer.EventStream;
-import jdk.jfr.consumer.RecordingStream;
-
-/**
- * @test
- * @summary Tests that streaming doesn't work if
- *          FlightRecordingPermission("accessFlightRecorder") is missing
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=no-permission.policy
- *      jdk.jfr.api.consumer.security.TestMissingPermission
- */
-public class TestMissingPermission {
-
-    public static void main(String... args) throws Exception {
-        testOpenRepository();
-        testRecordingStream();
-    }
-
-    private static void testRecordingStream() throws IOException {
-        try {
-            try (EventStream es = EventStream.openRepository()) {
-                throw new AssertionError("Should not be able to create EventStream without FlightRecorderPermission");
-            }
-        } catch (SecurityException se) {
-            // OK, as expected
-        }
-    }
-
-    private static void testOpenRepository() throws IOException {
-        try {
-            try (RecordingStream es = new RecordingStream()) {
-                throw new AssertionError("Should not be able to create RecordingStream without FlightRecorderPermission");
-            }
-        } catch (SecurityException se) {
-            // OK, as expected
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestRecordingFile.java b/test/jdk/jdk/jfr/api/consumer/security/TestRecordingFile.java
deleted file mode 100644
index d500eb97732..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestRecordingFile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.nio.file.Paths;
-
-import jdk.jfr.consumer.RecordingFile;
-
-/**
- * @test
- * @summary Test that a recording file can't be opened without permissions
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run driver jdk.jfr.api.consumer.security.DriverRecordingDumper
- *      test-recording-file.jfr
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=no-permission.policy
- *      jdk.jfr.api.consumer.security.TestRecordingFile
- *      test-recording-file.jfr
- */
-public class TestRecordingFile {
-    public static void main(String... args) throws Exception {
-        try {
-            RecordingFile.readAllEvents(Paths.get(args[0]));
-            throw new AssertionError("Expected SecurityException");
-        } catch (SecurityException se) {
-            // OK, as expected
-            return;
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestRecordingStream.java b/test/jdk/jdk/jfr/api/consumer/security/TestRecordingStream.java
deleted file mode 100644
index 3166b24f1b7..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestRecordingStream.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.time.Instant;
-import java.util.concurrent.CountDownLatch;
-
-import jdk.jfr.consumer.RecordingStream;
-import jdk.test.lib.jfr.EventNames;
-
-/**
- * @test
- * @summary Tests that a RecordingStream works using only
- *          FlightRecordingPermission("accessFlightRecorder")
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=local-streaming.policy
- *      jdk.jfr.api.consumer.security.TestStreamingLocal
- */
-public class TestRecordingStream {
-
-    public static void main(String... args) throws Exception {
-        CountDownLatch latch = new CountDownLatch(1);
-        try (RecordingStream r = new RecordingStream()) {
-            // Enable JVM event, no write permission needed
-            r.enable(EventNames.JVMInformation);
-            r.setStartTime(Instant.EPOCH);
-            r.onEvent(EventNames.JVMInformation, e -> {
-                latch.countDown();
-            });
-            r.startAsync();
-            latch.await();
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingFile.java b/test/jdk/jdk/jfr/api/consumer/security/TestStreamingFile.java
deleted file mode 100644
index 6c6e17cca94..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingFile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.nio.file.Paths;
-
-import jdk.jfr.consumer.EventStream;
-
-/**
- * @test
- * @summary Test that an event file stream can't be opened without permissions
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run driver jdk.jfr.api.consumer.security.DriverRecordingDumper
- *      test-streaming-file.jfr
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=no-permission.policy
- *      jdk.jfr.api.consumer.security.TestStreamingFile
- *      test-streaming-file.jfr
- */
-public class TestStreamingFile {
-
-    public static void main(String... args) throws Exception {
-        try (EventStream es = EventStream.openFile(Paths.get(args[0]))) {
-            throw new AssertionError("Expected SecurityException");
-        } catch (SecurityException se) {
-            // OK, as expected
-            return;
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingLocal.java b/test/jdk/jdk/jfr/api/consumer/security/TestStreamingLocal.java
deleted file mode 100644
index 673275abe79..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingLocal.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.time.Instant;
-import java.util.concurrent.CountDownLatch;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.EventStream;
-import jdk.test.lib.jfr.EventNames;
-
-/**
- * @test
- * @summary Tests that local streaming works using only
- *          FlightRecordingPermission("accessFlightRecorder")
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=local-streaming.policy
- *      jdk.jfr.api.consumer.security.TestStreamingLocal
- */
-public class TestStreamingLocal {
-
-    public static void main(String... args) throws Exception {
-        CountDownLatch latch = new CountDownLatch(1);
-        try (Recording r = new Recording()) {
-            // Enable JVM event, no write permission needed
-            r.enable(EventNames.JVMInformation);
-            r.start();
-            try (Recording r2 = new Recording()){
-                r2.start();
-                r2.stop();
-            }
-            r.stop();
-            try (EventStream es = EventStream.openRepository()) {
-                es.setStartTime(Instant.EPOCH);
-                es.onEvent("jdk.JVMInformation", e -> {
-                    latch.countDown();
-                });
-                es.startAsync();
-                latch.await();
-            }
-        }
-
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingRemote.java b/test/jdk/jdk/jfr/api/consumer/security/TestStreamingRemote.java
deleted file mode 100644
index f5a32e0b45a..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/TestStreamingRemote.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.api.consumer.security;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Instant;
-
-import jdk.jfr.Event;
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.EventStream;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-/**
- * @test
- * @summary Test that a stream can be opened against a remote repository using
- *          only file permission
- * @key jfr
- * @requires vm.hasJFR
- * @library /test/lib
- *
- * @run main/othervm jdk.jfr.api.consumer.security.TestStreamingRemote
- */
-public class TestStreamingRemote {
-
-    private static final String SUCCESS = "Success!";
-
-    public static class TestEvent extends Event {
-    }
-
-    public static class Test {
-        public static void main(String... args) throws Exception {
-            Path repo = Paths.get(args[0]);
-            System.out.println("Repository: " + repo);
-            try (EventStream es = EventStream.openRepository(repo)) {
-                es.setStartTime(Instant.EPOCH);
-                es.onEvent(e -> {
-                    System.out.println(SUCCESS);
-                    es.close();
-                });
-                es.start();
-            }
-        }
-    }
-
-    public static void main(String... args) throws Exception {
-        try (Recording r = new Recording()) {
-            r.start();
-            String repository = System.getProperty("jdk.jfr.repository");
-            Path policy = createPolicyFile(repository);
-            TestEvent e = new TestEvent();
-            e.commit();
-            String[] c = new String[4];
-            c[0] = "-Djava.security.manager";
-            c[1] = "-Djava.security.policy=" + escapeBackslashes(policy.toString());
-            c[2] = Test.class.getName();
-            c[3] = repository;
-            OutputAnalyzer oa = ProcessTools.executeTestJava(c);
-            oa.shouldContain(SUCCESS);
-        }
-    }
-
-    private static Path createPolicyFile(String repository) throws IOException {
-        Path policy = Paths.get("permission.policy").toAbsolutePath();
-        try (PrintWriter pw = new PrintWriter(policy.toFile())) {
-            pw.println("grant {");
-            // All the files and directories the contained in path
-            String dir = escapeBackslashes(repository);
-            String contents = escapeBackslashes(repository + File.separatorChar + "-");
-            pw.println("  permission java.io.FilePermission \"" + dir + "\", \"read\";");
-            pw.println("  permission java.io.FilePermission \"" + contents + "\", \"read\";");
-            pw.println("};");
-            pw.println();
-        }
-        System.out.println("Permission file: " + policy);
-        for (String line : Files.readAllLines(policy)) {
-            System.out.println(line);
-        }
-        System.out.println();
-        return policy;
-    }
-
-    // Needed for Windows
-    private static String escapeBackslashes(String text) {
-        return text.replace("\\", "\\\\");
-    }
-}
diff --git a/test/jdk/jdk/jfr/api/consumer/security/local-streaming.policy b/test/jdk/jdk/jfr/api/consumer/security/local-streaming.policy
deleted file mode 100644
index 66b04ece4ee..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/local-streaming.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-// Minimum policy to stream locally
-grant {
-permission jdk.jfr.FlightRecorderPermission "accessFlightRecorder";
-};
diff --git a/test/jdk/jdk/jfr/api/consumer/security/no-permission.policy b/test/jdk/jdk/jfr/api/consumer/security/no-permission.policy
deleted file mode 100644
index 9b4355bdd3c..00000000000
--- a/test/jdk/jdk/jfr/api/consumer/security/no-permission.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-// No permission
-grant {
-};
diff --git a/test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java b/test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java
deleted file mode 100644
index 1bf2c930dc7..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.jmx.security;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-
-import jdk.jfr.jmx.JmxHelper;
-
-import jdk.management.jfr.ConfigurationInfo;
-import jdk.management.jfr.FlightRecorderMXBean;
-import jdk.test.lib.Asserts;
-
-/**
- * @test
- * @key jfr
- * @summary Test with minimal needed permissions. All functions should work.
- * @requires vm.hasJFR
- * @library /test/lib /test/jdk
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=enough.policy jdk.jfr.jmx.security.TestEnoughPermission
- */
-public class TestEnoughPermission {
-
-    public static void main(String[] args) throws Throwable {
-        try {
-            FlightRecorderMXBean bean = JmxHelper.getFlighteRecorderMXBean();
-
-            System.out.println("AAAAAAAAAAAAAAAAAA");
-            Asserts.assertFalse(bean.getEventTypes().isEmpty(), "No EventTypes");
-            System.out.println("BBBBBBBBBBBBBBB");
-            List<ConfigurationInfo> configs = bean.getConfigurations();
-            System.out.println("CCCCCCCCCCCCCCCCC");
-            for (ConfigurationInfo config : configs) {
-                System.out.println("config.name=" + config.getName() + ": " + config.getContents());
-            }
-
-            long recId = testRecording(bean);
-            testStream(bean, recId);
-            bean.closeRecording(recId);
-
-            //*************** verifySecurityException(() -> bean.getRecordingOptions(dummyId), "getRecordingOptions()");
-            //*************** verifySecurityException(() -> bean.getRecordingSettings(dummyId), "getRecordingSettings()");
-            //*********** verifySecurityException(() -> bean.setConfiguration(dummyId, "<>"), "setConfiguration()");
-            //************* verifySecurityException(() -> bean.setRecordingSettings(dummyId, dummyMap), "setRecordingSettings()");
-            //************* verifySecurityException(() -> bean.setRecordingOptions(dummyId, dummyMap), "setRecordingOptions()");
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw t;
-        }
-    }
-
-    private static long testRecording(FlightRecorderMXBean bean) throws Exception {
-        System.out.println("A");
-        long recId = bean.newRecording();
-        System.out.println("B");
-        bean.setPredefinedConfiguration(recId, "profile");
-        System.out.println("C");
-        bean.startRecording(recId);
-        System.out.println("D");
-        Asserts.assertTrue(bean.getRecordings().stream().anyMatch(r -> { return r.getId() == recId; }), "recId not found");
-        System.out.println("E");
-        bean.stopRecording(recId);
-
-        final Path path = Paths.get(".", "rec" + recId + ".jfr");
-        bean.copyTo(recId, path.toString());
-        //EventSet events = EventSet.fromFile(path);
-        return recId;
-    }
-
-    private static void testStream(FlightRecorderMXBean bean, long recId) throws Exception {
-        long streamId = bean.openStream(recId, null);
-        byte[] buff = bean.readStream(streamId);
-        Asserts.assertNotNull(buff, "Stream data was empty");
-        while (buff != null) {
-            // TODO: write to file and parse.
-            System.out.println("buff.length=" + buff.length);
-            buff = bean.readStream(streamId);
-        }
-        bean.closeStream(streamId);
-    }
-}
diff --git a/test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java b/test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java
deleted file mode 100644
index 04ba8ec6eb1..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.jmx.security;
-
-import jdk.jfr.jmx.JmxHelper;
-
-import jdk.management.jfr.FlightRecorderMXBean;
-import jdk.test.lib.jfr.CommonHelper;
-import jdk.test.lib.jfr.VoidFunction;
-
-/**
- * @test
- * @key jfr
- * @summary Verify we get SecurityExceptions when missing management permission "control".
- * @requires vm.hasJFR
- * @library /test/lib /test/jdk
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nocontrol.policy jdk.jfr.jmx.security.TestNoControlPermission
- */
-public class TestNoControlPermission {
-
-    public static void main(String[] args) throws Throwable {
-        try {
-            FlightRecorderMXBean bean = JmxHelper.getFlighteRecorderMXBean();
-
-            int dummyId = 1;
-            java.util.Map<String, String> dummyMap = new java.util.HashMap<>();
-
-            verifySecurityException(() -> bean.takeSnapshot(), "takeSnapshot()");
-            verifySecurityException(() -> bean.newRecording(), "newRecording()");
-            verifySecurityException(() -> bean.startRecording(dummyId), "startRecording()");
-            verifySecurityException(() -> bean.stopRecording(dummyId), "stopRecording()");
-            verifySecurityException(() -> bean.closeRecording(dummyId), "closeRecording()");
-            verifySecurityException(() -> bean.openStream(dummyId, null), "openStream()");
-            verifySecurityException(() -> bean.closeStream(dummyId), "closeStream()");
-            verifySecurityException(() -> bean.setConfiguration(dummyId, "dummy"), "setConfiguration()");
-            verifySecurityException(() -> bean.setPredefinedConfiguration(dummyId, "dummy"), "setPredefinedConfiguration()");
-            verifySecurityException(() -> bean.setRecordingSettings(dummyId, dummyMap), "setRecordingSettings()");
-            verifySecurityException(() -> bean.setRecordingOptions(dummyId, dummyMap), "setRecordingOptions()");
-            verifySecurityException(() -> bean.copyTo(dummyId, "."), "dumpRecording()");
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw t;
-        }
-    }
-
-
-    private static void verifySecurityException(VoidFunction f, String msg) throws Throwable {
-        CommonHelper.verifyException(f, msg, java.lang.SecurityException.class);
-    }
-}
diff --git a/test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java b/test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java
deleted file mode 100644
index eebfee7cf5f..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.jmx.security;
-
-import jdk.jfr.jmx.JmxHelper;
-
-import jdk.management.jfr.FlightRecorderMXBean;
-import jdk.test.lib.jfr.CommonHelper;
-import jdk.test.lib.jfr.VoidFunction;
-
-/**
- * @test
- * @key jfr
- * @summary Verify we get SecurityExceptions when missing management permission "monitor".
- * @requires vm.hasJFR
- * @library /test/lib /test/jdk
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nomonitor.policy jdk.jfr.jmx.security.TestNoMonitorPermission
- */
-public class TestNoMonitorPermission {
-
-    public static void main(String[] args) throws Throwable {
-        try {
-            FlightRecorderMXBean bean = JmxHelper.getFlighteRecorderMXBean();
-
-            int dummyId = 1;
-            verifySecurityException(() -> bean.getRecordings(), "getRecordings()");
-            verifySecurityException(() -> bean.getConfigurations(), "getConfigurations()");
-            verifySecurityException(() -> bean.getEventTypes(), "getEventTypes()");
-            verifySecurityException(() -> bean.getRecordingOptions(dummyId), "getRecordingOptions()");
-            verifySecurityException(() -> bean.getRecordingSettings(dummyId), "getRecordingSettings()");
-            verifySecurityException(() -> bean.readStream(dummyId), "readStream()");
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw t;
-        }
-    }
-
-
-    private static void verifySecurityException(VoidFunction f, String msg) throws Throwable {
-        CommonHelper.verifyException(f, msg, java.lang.SecurityException.class);
-    }
-}
diff --git a/test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java b/test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java
deleted file mode 100644
index db42f3427f4..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.jmx.security;
-
-import java.lang.management.ManagementFactory;
-import java.util.concurrent.CountDownLatch;
-
-import javax.management.Notification;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-
-import jdk.management.jfr.FlightRecorderMXBean;
-import jdk.test.lib.Asserts;
-
-import jdk.jfr.jmx.JmxHelper;
-
-/**
- * @test
- * @key jfr
- * @summary Test with minimal needed permissions. All functions should work.
- * @requires vm.hasJFR
- * @library /test/lib /test/jdk
- * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=listener.policy jdk.jfr.jmx.security.TestNotificationListenerPermission
- */
-public class TestNotificationListenerPermission {
-    private static boolean gotSecurityException;
-
-    static class TestListener implements NotificationListener {
-        private final CountDownLatch latch = new CountDownLatch(1);
-
-        @Override
-        public void handleNotification(Notification arg0, Object arg1) {
-            try {
-                System.getProperty("user.name");
-            } catch (SecurityException se) {
-                se.printStackTrace();
-                gotSecurityException = true;
-            }
-            latch.countDown();
-        }
-
-        public void awaitNotication() throws InterruptedException {
-            latch.await();
-        }
-    }
-
-    public static void main(String[] args) throws Throwable {
-        try {
-            System.getProperty("user.name");
-            Asserts.fail("Didn't get security exception. Test not configured propertly?");
-        } catch (SecurityException se) {
-            // as expected
-        }
-        FlightRecorderMXBean bean = JmxHelper.getFlighteRecorderMXBean();
-        TestListener testListener = new TestListener();
-        ManagementFactory.getPlatformMBeanServer().addNotificationListener(new ObjectName(FlightRecorderMXBean.MXBEAN_NAME), testListener, null, null);
-        long id = bean.newRecording();
-        bean.startRecording(id);
-        testListener.awaitNotication();
-        Asserts.assertTrue(gotSecurityException, "Should not get elevated privileges in notification handler!");
-        bean.stopRecording(id);
-        bean.closeRecording(id);
-    }
-}
diff --git a/test/jdk/jdk/jfr/jmx/security/enough.policy b/test/jdk/jdk/jfr/jmx/security/enough.policy
deleted file mode 100644
index 85c31cd16cd..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/enough.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-// Minimum policy for JMX to activate JFR and create a recording.
-
-grant {
-
-permission java.lang.management.ManagementPermission "control";
-permission java.lang.management.ManagementPermission "monitor";
-
-// in order for the test to accomplish dump/copyto on a user defined recording
-permission "java.io.FilePermission" "<<ALL FILES>>", "read,write,delete";
-permission "java.util.PropertyPermission" "user.dir", "read";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#-[jdk.jfr.management:type=FlightRecorder]", "addNotificationListener";
-
-permission "javax.management.MBeanServerPermission" "createMBeanServer";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#Recordings[jdk.jfr:type=FlightRecorder]", "getAttribute";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#EventTypes[jdk.jfr:type=FlightRecorder]", "getAttribute";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#Configurations[jdk.jfr:type=FlightRecorder]", "getAttribute";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#newRecording[jdk.jfr:type=FlightRecorder]", "invoke";
-
-};
diff --git a/test/jdk/jdk/jfr/jmx/security/listener.policy b/test/jdk/jdk/jfr/jmx/security/listener.policy
deleted file mode 100644
index 0ce55c8e444..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/listener.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-// Minimum policy for JMX to activate JFR and create a recording.
-
-grant {
-
-permission java.lang.management.ManagementPermission "control";
-permission java.lang.management.ManagementPermission "monitor";
-permission "javax.management.MBeanPermission" "*", "addNotificationListener";
-permission "javax.management.MBeanPermission" "*", "invoke";
-permission "javax.management.MBeanServerPermission" "createMBeanServer";
-
-};
\ No newline at end of file
diff --git a/test/jdk/jdk/jfr/jmx/security/nocontrol.policy b/test/jdk/jdk/jfr/jmx/security/nocontrol.policy
deleted file mode 100644
index dd080c6f892..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/nocontrol.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-// Removed security "ManagementPermission control". Should cause SecurityExceptions.
-
-grant {
-
-// Removed permission: permission java.lang.management.ManagementPermission "control";
-permission java.lang.management.ManagementPermission "monitor";
-
-permission javax.management.MBeanServerPermission "createMBeanServer";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#Recordings[jdk.jfr:type=FlightRecorder]", "getAttribute";
-
-};
diff --git a/test/jdk/jdk/jfr/jmx/security/nomonitor.policy b/test/jdk/jdk/jfr/jmx/security/nomonitor.policy
deleted file mode 100644
index 52eedde40ff..00000000000
--- a/test/jdk/jdk/jfr/jmx/security/nomonitor.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-// Removed security "ManagementPermission monitor". Should cause SecurityExceptions.
-
-grant {
-
-permission java.lang.management.ManagementPermission "control";
-// Removed permission: permission java.lang.management.ManagementPermission "monitor";
-
-permission javax.management.MBeanServerPermission "createMBeanServer";
-permission "javax.management.MBeanPermission" "jdk.management.jfr.FlightRecorderMXBeanImpl#Recordings[jdk.jfr:type=FlightRecorder]", "getAttribute";
-
-};
diff --git a/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java b/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java
index eaf325a779d..bca93044fc9 100644
--- a/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java
+++ b/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,33 +49,18 @@ public class TestDumpOnExit {
     public static void main(String[] args) throws Exception {
         Path dumpPath = Paths.get(".", "dumped.jfr");
 
-        // Test without security manager and a file name relative to current directory
+        // Test with file name relative to current directory
         testDumponExit(() -> dumpPath,
                 "-Xlog:jfr=trace",
                 "-XX:StartFlightRecording:filename=./dumped.jfr,dumponexit=true,settings=profile",
                 "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
         );
-        // Test a memory recording without a security manager
+        // Test a memory recording
         testDumponExit(() -> findJFRFileInCurrentDirectory(),
                 "-Xlog:jfr=trace",
                 "-XX:StartFlightRecording:dumponexit=true,disk=false",
                 "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
         );
-
-        // Test with security manager and a file name relative to current directory
-        testDumponExit(() -> dumpPath,
-                "-Xlog:jfr=trace",
-                "-XX:StartFlightRecording:filename=./dumped.jfr,dumponexit=true,settings=profile",
-                "-Djava.security.manager",
-                "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
-        );
-        // Test with security manager but without a name
-        testDumponExit(() -> findJFRFileInCurrentDirectory(),
-                "-Xlog:jfr=trace",
-                "-XX:StartFlightRecording:dumponexit=true,settings=profile",
-                "-Djava.security.manager",
-                "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
-        );
     }
 
     private static Path findJFRFileInCurrentDirectory() {
diff --git a/test/jdk/jdk/modules/etc/JmodExcludedFiles.java b/test/jdk/jdk/modules/etc/JmodExcludedFiles.java
index 6c338a25b4f..90ca6840d52 100644
--- a/test/jdk/jdk/modules/etc/JmodExcludedFiles.java
+++ b/test/jdk/jdk/modules/etc/JmodExcludedFiles.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8159927
  * @modules java.base/jdk.internal.util
+ * @requires jlink.packagedModules
  * @run main JmodExcludedFiles
  * @summary Test that JDK JMOD files do not include native debug symbols
  */
diff --git a/test/jdk/jdk/nio/zipfs/Basic.java b/test/jdk/jdk/nio/zipfs/Basic.java
index 6956f9185ee..faaf634f93c 100644
--- a/test/jdk/jdk/nio/zipfs/Basic.java
+++ b/test/jdk/jdk/nio/zipfs/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
  *
  * @modules jdk.zipfs
  * @run main Basic
- * @run main/othervm/java.security.policy=test.policy Basic
  */
 
 public class Basic {
diff --git a/test/jdk/jdk/nio/zipfs/DirectoryStreamTests.java b/test/jdk/jdk/nio/zipfs/DirectoryStreamTests.java
index a8fc0ebad47..0a255caa812 100644
--- a/test/jdk/jdk/nio/zipfs/DirectoryStreamTests.java
+++ b/test/jdk/jdk/nio/zipfs/DirectoryStreamTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
  * @modules jdk.zipfs
  * @compile DirectoryStreamTests.java
  * @run testng DirectoryStreamTests
- * @run testng/othervm/java.security.policy=test.policy  DirectoryStreamTests
  */
 public class DirectoryStreamTests {
 
diff --git a/test/jdk/jdk/nio/zipfs/InvalidZipHeaderTests.java b/test/jdk/jdk/nio/zipfs/InvalidZipHeaderTests.java
index d89494e3125..92acc98eb84 100644
--- a/test/jdk/jdk/nio/zipfs/InvalidZipHeaderTests.java
+++ b/test/jdk/jdk/nio/zipfs/InvalidZipHeaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
  * @modules jdk.zipfs
  * @compile InvalidZipHeaderTests.java
  * @run testng InvalidZipHeaderTests
- * @run testng/othervm/java.security.policy=test.policy  InvalidZipHeaderTests
  */
 public class InvalidZipHeaderTests {
 
diff --git a/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java b/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java
index b979b01b89f..44fe2686aba 100644
--- a/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java
+++ b/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
  * @modules jdk.zipfs
  * @compile NewFileSystemTests.java
  * @run testng NewFileSystemTests
- * @run testng/othervm/java.security.policy=test.policy  NewFileSystemTests
  */
 public class NewFileSystemTests {
 
diff --git a/test/jdk/jdk/nio/zipfs/PathOps.java b/test/jdk/jdk/nio/zipfs/PathOps.java
index c79ce86af66..0fefd16fa0f 100644
--- a/test/jdk/jdk/nio/zipfs/PathOps.java
+++ b/test/jdk/jdk/nio/zipfs/PathOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  *
  * @modules jdk.zipfs
  * @run main PathOps
- * @run main/othervm/java.security.policy=test.policy PathOps
+ * @run main/othervm PathOps
  */
 
 public class PathOps {
diff --git a/test/jdk/jdk/nio/zipfs/PropertyPermissionTests.java b/test/jdk/jdk/nio/zipfs/PropertyPermissionTests.java
index cf77241db42..de8992bce74 100644
--- a/test/jdk/jdk/nio/zipfs/PropertyPermissionTests.java
+++ b/test/jdk/jdk/nio/zipfs/PropertyPermissionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
  * @summary Verify ZIP FileSystem works with a Security Manager
  * @modules jdk.zipfs
  * @compile PropertyPermissionTests.java
- * @run testng/othervm/java.security.policy=PropertyPermissions.policy  PropertyPermissionTests
+ * @run testng/othervm PropertyPermissionTests
  */
 public class PropertyPermissionTests {
 
diff --git a/test/jdk/jdk/nio/zipfs/PropertyPermissions.policy b/test/jdk/jdk/nio/zipfs/PropertyPermissions.policy
deleted file mode 100644
index 0320638713f..00000000000
--- a/test/jdk/jdk/nio/zipfs/PropertyPermissions.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-
-};
diff --git a/test/jdk/jdk/nio/zipfs/TestPosix.java b/test/jdk/jdk/nio/zipfs/TestPosix.java
index bd9ff43be10..f63f091c32e 100644
--- a/test/jdk/jdk/nio/zipfs/TestPosix.java
+++ b/test/jdk/jdk/nio/zipfs/TestPosix.java
@@ -66,7 +66,7 @@
  * @modules jdk.zipfs
  *          jdk.jartool
  * @run junit TestPosix
- * @run junit/othervm/java.security.policy=test.policy.posix TestPosix
+ * @run junit/othervm TestPosix
  */
 public class TestPosix {
     private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
diff --git a/test/jdk/jdk/nio/zipfs/ZFSTests.java b/test/jdk/jdk/nio/zipfs/ZFSTests.java
index 15f6fa36a76..f00ff58f877 100644
--- a/test/jdk/jdk/nio/zipfs/ZFSTests.java
+++ b/test/jdk/jdk/nio/zipfs/ZFSTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @modules jdk.zipfs
  * @run main ZFSTests
- * @run main/othervm/java.security.policy=test.policy ZFSTests
+ * @run main/othervm ZFSTests
  */
 
 
diff --git a/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.java b/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.java
index 487e21b89e7..d5e0a03a9fa 100644
--- a/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.java
+++ b/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
  * @library /test/lib
  * @modules jdk.zipfs
  * @run testng/othervm ZipFSPermissionsTest
- * @run testng/othervm/java.security.policy=ZipFSPermissionsTest.policy ZipFSPermissionsTest
  */
 public class ZipFSPermissionsTest {
 
diff --git a/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.policy b/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.policy
deleted file mode 100644
index 8bd0028ca85..00000000000
--- a/test/jdk/jdk/nio/zipfs/ZipFSPermissionsTest.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-    permission java.util.PropertyPermission "user.dir","read";
-    permission java.lang.RuntimePermission "accessUserInformation";
-};
diff --git a/test/jdk/jdk/nio/zipfs/ZipFSTester.java b/test/jdk/jdk/nio/zipfs/ZipFSTester.java
index 64362d263ab..e6300a90004 100644
--- a/test/jdk/jdk/nio/zipfs/ZipFSTester.java
+++ b/test/jdk/jdk/nio/zipfs/ZipFSTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@
  * @summary Test Zip filesystem provider
  * @modules jdk.zipfs
  * @run main ZipFSTester
- * @run main/othervm/java.security.policy=test.policy ZipFSTester
+ * @run main/othervm ZipFSTester
  */
 
 public class ZipFSTester {
diff --git a/test/jdk/jdk/nio/zipfs/test.policy b/test/jdk/jdk/nio/zipfs/test.policy
deleted file mode 100644
index d0492d0fc7a..00000000000
--- a/test/jdk/jdk/nio/zipfs/test.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-    permission java.util.PropertyPermission "test.jdk","read";
-    permission java.util.PropertyPermission "test.src","read";
-    permission java.util.PropertyPermission "user.dir","read";
-    permission java.lang.RuntimePermission "accessUserInformation";
-};
diff --git a/test/jdk/jdk/nio/zipfs/test.policy.posix b/test/jdk/jdk/nio/zipfs/test.policy.posix
deleted file mode 100644
index 77415b0f4ba..00000000000
--- a/test/jdk/jdk/nio/zipfs/test.policy.posix
+++ /dev/null
@@ -1,9 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-    permission java.util.PropertyPermission "sun.tools.jar.useExtractionTime","read";
-    permission java.util.PropertyPermission "test.jdk","read";
-    permission java.util.PropertyPermission "test.src","read";
-    permission java.util.PropertyPermission "user.dir","read";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.module";
-    permission java.lang.RuntimePermission "accessUserInformation";
-};
diff --git a/test/jdk/jdk/nio/zipfs/test.policy.readonly b/test/jdk/jdk/nio/zipfs/test.policy.readonly
deleted file mode 100644
index 00a8c6a52fd..00000000000
--- a/test/jdk/jdk/nio/zipfs/test.policy.readonly
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission java.io.FilePermission "<<ALL FILES>>","read";
-    permission java.util.PropertyPermission "test.jdk","read";
-    permission java.util.PropertyPermission "test.src","read";
-    permission java.util.PropertyPermission "user.dir","read";
-};
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
index 09e32174c74..2a99c5e7d52 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
@@ -62,7 +62,6 @@
  * @library /test/lib
  *
  * @run main/othervm/timeout=300 RmiBootstrapTest .*_test.*.in
- * @run main/othervm/timeout=300 -Djava.security.manager=allow RmiBootstrapTest .*_test.*.in
  * */
 
 /*
@@ -74,7 +73,6 @@
  * @library /test/lib
  *
  * @run main/othervm/timeout=300 RmiBootstrapTest .*_ssltest.*.in
- * @run main/othervm/timeout=300 -Djava.security.manager=allow RmiBootstrapTest .*_ssltest.*.in
  * */
 
 /**
diff --git a/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.java b/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.java
deleted file mode 100644
index 07ef1a62f1a..00000000000
--- a/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test 1.5 99/07/29
- * @bug 4277155
- * @summary Make sure HttpClient.getHttpKeepAliveSet() has
- *    doPrivileged() call at appropriate places.
- * @modules java.base/sun.net
- *          java.base/sun.net.www.http
- * @library /test/lib
- * @run main/othervm/policy=IsKeepingAlive.policy IsKeepingAlive
- */
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.net.ServerSocket;
-import sun.net.www.http.HttpClient;
-import java.security.*;
-import jdk.test.lib.net.URIBuilder;
-
-public class IsKeepingAlive {
-
-    public static void main(String[] args) throws Exception {
-
-        ServerSocket ss = new ServerSocket();
-        InetAddress loopback = InetAddress.getLoopbackAddress();
-        ss.bind(new InetSocketAddress(loopback, 0));
-
-        try (ServerSocket toClose = ss) {
-            SecurityManager security = System.getSecurityManager();
-            if (security == null) {
-                security = new SecurityManager();
-                System.setSecurityManager(security);
-            }
-
-            URL url1 = URIBuilder.newBuilder()
-                .scheme("http")
-                .loopback()
-                .port(ss.getLocalPort())
-                .toURL();
-
-            HttpClient c1 = HttpClient.New(url1);
-
-            boolean keepAlive = c1.isKeepingAlive();
-        }
-    }
-}
diff --git a/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.policy b/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.policy
deleted file mode 100644
index c3915f1f84c..00000000000
--- a/test/jdk/sun/net/www/http/HttpClient/IsKeepingAlive.policy
+++ /dev/null
@@ -1,37 +0,0 @@
-// Permissions need to the test
-grant {
-	permission java.net.SocketPermission "localhost", "resolve";
-	permission java.net.SocketPermission "localhost", "connect";
-	permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-};
-
-// default permissions granted to all domains
-
-grant { 
-	// allows anyone to listen on un-privileged ports
-	permission java.net.SocketPermission "localhost:1024-", "listen";
-
-	// "standard" properies that can be read by anyone
-
-	permission java.util.PropertyPermission "java.version", "read";
-	permission java.util.PropertyPermission "java.vendor", "read";
-	permission java.util.PropertyPermission "java.vendor.url", "read";
-	permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "os.name", "read";
-	permission java.util.PropertyPermission "os.version", "read";
-	permission java.util.PropertyPermission "os.arch", "read";
-	permission java.util.PropertyPermission "file.separator", "read";
-	permission java.util.PropertyPermission "path.separator", "read";
-	permission java.util.PropertyPermission "line.separator", "read";
-
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-};
diff --git a/test/jdk/sun/net/www/http/HttpClient/OpenServer.java b/test/jdk/sun/net/www/http/HttpClient/OpenServer.java
deleted file mode 100644
index 69755208080..00000000000
--- a/test/jdk/sun/net/www/http/HttpClient/OpenServer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4154481
- * @summary Make sure HttpClient has
- *    doPrivileged() calls at appropriate places.
- * @modules java.base/sun.net.www.http
- * @library /test/lib
- * @run main/othervm/policy=OpenServer.policy OpenServer
- */
-
-import java.net.*;
-import sun.net.www.http.HttpClient;
-import jdk.test.lib.net.URIBuilder;
-
-public class OpenServer {
-
-    OpenServer() throws Exception {
-
-        ServerSocket ss = new ServerSocket();
-        InetAddress loopback = InetAddress.getLoopbackAddress();
-        ss.bind(new InetSocketAddress(loopback, 0));
-
-        try (ServerSocket toClose = ss) {
-            URL myURL = URIBuilder.newBuilder()
-                .scheme("http")
-                .loopback()
-                .port(ss.getLocalPort())
-                .toURL();
-
-            HttpClient httpC = new HttpClient(myURL, null, -1);
-        }
-    }
-
-    public static void main(String [] args) throws Exception {
-        SecurityManager security = System.getSecurityManager();
-        if (security == null) {
-            security = new SecurityManager();
-            System.setSecurityManager(security);
-        }
-        // Note: we need to have some
-        // permissions in place for this
-        // test.
-        new OpenServer();
-    }
-}
diff --git a/test/jdk/sun/net/www/http/HttpClient/OpenServer.policy b/test/jdk/sun/net/www/http/HttpClient/OpenServer.policy
deleted file mode 100644
index c3915f1f84c..00000000000
--- a/test/jdk/sun/net/www/http/HttpClient/OpenServer.policy
+++ /dev/null
@@ -1,37 +0,0 @@
-// Permissions need to the test
-grant {
-	permission java.net.SocketPermission "localhost", "resolve";
-	permission java.net.SocketPermission "localhost", "connect";
-	permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
-};
-
-// default permissions granted to all domains
-
-grant { 
-	// allows anyone to listen on un-privileged ports
-	permission java.net.SocketPermission "localhost:1024-", "listen";
-
-	// "standard" properies that can be read by anyone
-
-	permission java.util.PropertyPermission "java.version", "read";
-	permission java.util.PropertyPermission "java.vendor", "read";
-	permission java.util.PropertyPermission "java.vendor.url", "read";
-	permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "os.name", "read";
-	permission java.util.PropertyPermission "os.version", "read";
-	permission java.util.PropertyPermission "os.arch", "read";
-	permission java.util.PropertyPermission "file.separator", "read";
-	permission java.util.PropertyPermission "path.separator", "read";
-	permission java.util.PropertyPermission "line.separator", "read";
-
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-};
diff --git a/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java b/test/jdk/sun/net/www/http/HttpURLConnection/BasicNTLMAuthTest.java
similarity index 94%
rename from test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java
rename to test/jdk/sun/net/www/http/HttpURLConnection/BasicNTLMAuthTest.java
index 856ff506620..ab2d57b6cca 100644
--- a/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java
+++ b/test/jdk/sun/net/www/http/HttpURLConnection/BasicNTLMAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,16 +42,12 @@
  * @bug 8137174
  * @modules java.base/sun.net.www.protocol.http.ntlm
  *          jdk.httpserver
- * @summary Checks if NTLM auth works fine if security manager set
- * @run main/othervm/java.security.policy=NTLMAuthWithSM.policy NTLMAuthWithSM
+ * @summary Basic test for NTLM auth
+ * @run main/othervm BasicNTLMAuthTest
  */
-public class NTLMAuthWithSM {
+public class BasicNTLMAuthTest {
 
     public static void main(String[] args) throws Exception {
-        // security manager is required
-        if (System.getSecurityManager() == null) {
-            throw new RuntimeException("Security manager not specified");
-        }
 
         if (System.getProperty("os.name").startsWith("Windows")) {
             // disable transparent NTLM authentication on Windows
diff --git a/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy b/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy
deleted file mode 100644
index 8b024f3a871..00000000000
--- a/test/jdk/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.net.NetPermission "setDefaultAuthenticator";
-    permission java.net.SocketPermission "localhost:*",
-            "connect,resolve,listen,accept";
-    permission java.lang.RuntimePermission
-            "accessClassInPackage.sun.net.www.protocol.http.ntlm";
-};
diff --git a/test/jdk/sun/net/www/protocol/jrt/WithSecurityManager.java b/test/jdk/sun/net/www/protocol/jrt/WithSecurityManager.java
deleted file mode 100644
index 4a00dd206db..00000000000
--- a/test/jdk/sun/net/www/protocol/jrt/WithSecurityManager.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Test that the jimage protocol handler works with a security manager
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager allow
- * @run main/othervm -Djava.security.manager=allow WithSecurityManager deny
- */
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class WithSecurityManager {
-    public static void main(String[] args) throws Exception {
-        String home = System.getProperty("java.home");
-        Path modules = Paths.get(home, "lib", "modules");
-        if (!Files.isRegularFile(modules)) {
-            System.out.println("This runtime is not jimage, test skipped");
-            return;
-        }
-
-        boolean allow = args[0].equals("allow");
-
-        // set security policy to allow access
-        if (allow) {
-            String testSrc = System.getProperty("test.src");
-            if (testSrc == null)
-                testSrc = ".";
-            Path policyFile = Paths.get(testSrc, "java.policy");
-            System.setProperty("java.security.policy", policyFile.toString());
-        }
-
-        System.setSecurityManager(new SecurityManager());
-
-        InputStream in = null;
-        URL url = new URL("jrt:/java.base/java/lang/Object.class");
-        if (url != null) {
-            try {
-                in = url.openStream();
-            } catch (IOException ignore) { }
-        }
-        if (in == null && allow)
-            throw new RuntimeException("access expected");
-        if (in != null && !allow)
-            throw new RuntimeException("access not expected");
-    }
-}
diff --git a/test/jdk/sun/net/www/protocol/jrt/java.policy b/test/jdk/sun/net/www/protocol/jrt/java.policy
deleted file mode 100644
index 276543b8208..00000000000
--- a/test/jdk/sun/net/www/protocol/jrt/java.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "accessSystemModules";
-};
diff --git a/test/jdk/sun/nio/cs/StrCodingBenchmark.java b/test/jdk/sun/nio/cs/StrCodingBenchmark.java
index 42c66bf77ae..66a881fc282 100644
--- a/test/jdk/sun/nio/cs/StrCodingBenchmark.java
+++ b/test/jdk/sun/nio/cs/StrCodingBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 /**
  * Usage: java StringCodingBenchmark
  * [-Diterations=N] [-Dsize=N] [-Dsubsize=N] [-Dmaxchar=N]
- * [-Dfilter=REGEXP] [-DSecurityManager=true]
+ * [-Dfilter=REGEXP]
  */
 public class StrCodingBenchmark {
     abstract static class Job {
@@ -126,11 +126,6 @@ public static Job[] filter(Pattern filter, Job[] jobs) {
         return ret;
     }
 
-    static class PermissiveSecurityManger extends SecurityManager {
-        @Override public void checkPermission(java.security.Permission p) {
-        }
-    }
-
     public static void main(String[] args) throws Throwable {
         final int itrs = Integer.getInteger("iterations", 100000);
         final int size       = Integer.getInteger("size", 2048);
@@ -138,9 +133,6 @@ public static void main(String[] args) throws Throwable {
         final int maxchar    = Integer.getInteger("maxchar", 128);
         final String regex = System.getProperty("filter");
         final Pattern filter = (regex == null) ? null : Pattern.compile(regex);
-        final boolean useSecurityManager = Boolean.getBoolean("SecurityManager");
-        if (useSecurityManager)
-            System.setSecurityManager(new PermissiveSecurityManger());
         final Random rnd = new Random();
 
         for (Charset charset:  Charset.availableCharsets().values()) {
diff --git a/test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java b/test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java
index 988c10addb7..d07f23cbad2 100644
--- a/test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java
+++ b/test/jdk/sun/nio/cs/StrCodingBenchmarkDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,6 @@ public static void main(String[] args) throws Throwable {
         final int maxchar    = Integer.getInteger("maxchar", 128);
         final String regex = System.getProperty("filter");
         final Pattern filter = (regex == null) ? null : Pattern.compile(regex);
-        final boolean useSecurityManager = Boolean.getBoolean("SecurityManager");
-        if (useSecurityManager)
-            System.setSecurityManager(new PermissiveSecurityManger());
         final Random rnd = new Random();
 
         String[] csns = new String[] {
diff --git a/test/jdk/sun/nio/cs/TestSJIS0213_SM.java b/test/jdk/sun/nio/cs/TestSJIS0213_SM.java
deleted file mode 100644
index ef61fbc3382..00000000000
--- a/test/jdk/sun/nio/cs/TestSJIS0213_SM.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 7152690
- * @summary Initialize SJIS_0213 charset with SecurityManager enabled
- * @modules jdk.charsets
- * @run main/othervm -Djava.security.manager=allow TestSJIS0213_SM
- */
-public class TestSJIS0213_SM {
-    public static void main(String[] args) throws Throwable {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            System.setSecurityManager(new SecurityManager());
-        }
-        java.nio.charset.Charset.forName("SJIS_0213");
-    }
-}
diff --git a/test/jdk/sun/nio/cs/TestStringCoding.java b/test/jdk/sun/nio/cs/TestStringCoding.java
index efa7f75314f..d27efc35ada 100644
--- a/test/jdk/sun/nio/cs/TestStringCoding.java
+++ b/test/jdk/sun/nio/cs/TestStringCoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @bug 6636323 6636319 7040220 7096080 7183053 8080248 8054307
  * @summary Test if StringCoding and NIO result have the same de/encoding result
  * @modules java.base/sun.nio.cs
- * @run main/othervm/timeout=2000 -Djava.security.manager=allow TestStringCoding
+ * @run main/othervm/timeout=2000 TestStringCoding
  * @key randomness
  */
 
@@ -50,50 +50,46 @@ public static void main(String[] args) throws Throwable {
         }
         byte[] asciiBA =  Arrays.copyOf(latinBA, 0x80);
 
-        for (Boolean hasSM: new boolean[] { false, true }) {
-            if (hasSM) {
-                System.setSecurityManager(new PermissiveSecurityManger());
-            }
-            for (Charset cs:  Charset.availableCharsets().values()) {
-                if ("ISO-2022-CN".equals(cs.name()) ||
-                    "x-COMPOUND_TEXT".equals(cs.name()) ||
-                    "x-JISAutoDetect".equals(cs.name()))
-                    continue;
-                System.out.printf("Testing(sm=%b) " + cs.name() + "....", hasSM);
-
-                testNewString(cs, testGetBytes(cs, new String(bmp)));
-                testNewString(cs, testGetBytes(cs, new String(latin)));
-                testNewString(cs, testGetBytes(cs, new String(ascii)));
-                testGetBytes(cs, testNewString(cs, latinBA));
-                testGetBytes(cs, testNewString(cs, asciiBA));
-
-                // "randomed" sizes
-                Random rnd = new Random();
-                for (int i = 0; i < 10; i++) {
-                    //System.out.printf("    blen=%d, clen=%d%n", blen, clen);
-                    char[] bmp0 = Arrays.copyOf(bmp, rnd.nextInt(0x10000));
-                    testNewString(cs, testGetBytes(cs, new String(bmp0)));
-                    //add a pair of surrogates
-                    int pos = bmp0.length / 2;
-                    if ((pos + 1) < bmp0.length) {
-                        bmp0[pos] = '\uD800';
-                        bmp0[pos+1] = '\uDC00';
-                    }
-                    testNewString(cs, testGetBytes(cs, new String(bmp0)));
-
-                    char[] latin0 = Arrays.copyOf(latin, rnd.nextInt(0x100));
-                    char[] ascii0 = Arrays.copyOf(ascii, rnd.nextInt(0x80));
-                    byte[] latinBA0 = Arrays.copyOf(latinBA, rnd.nextInt(0x100));
-                    byte[] asciiBA0 = Arrays.copyOf(asciiBA, rnd.nextInt(0x80));
-                    testNewString(cs, testGetBytes(cs, new String(latin0)));
-                    testNewString(cs, testGetBytes(cs, new String(ascii0)));
-                    testGetBytes(cs, testNewString(cs, latinBA0));
-                    testGetBytes(cs, testNewString(cs, asciiBA0));
+
+        for (Charset cs:  Charset.availableCharsets().values()) {
+            if ("ISO-2022-CN".equals(cs.name()) ||
+                "x-COMPOUND_TEXT".equals(cs.name()) ||
+                "x-JISAutoDetect".equals(cs.name()))
+                continue;
+            System.out.println("Testing " + cs.name() + "....");
+
+            testNewString(cs, testGetBytes(cs, new String(bmp)));
+            testNewString(cs, testGetBytes(cs, new String(latin)));
+            testNewString(cs, testGetBytes(cs, new String(ascii)));
+            testGetBytes(cs, testNewString(cs, latinBA));
+            testGetBytes(cs, testNewString(cs, asciiBA));
+
+            // "randomed" sizes
+            Random rnd = new Random();
+            for (int i = 0; i < 10; i++) {
+                //System.out.printf("    blen=%d, clen=%d%n", blen, clen);
+                char[] bmp0 = Arrays.copyOf(bmp, rnd.nextInt(0x10000));
+                testNewString(cs, testGetBytes(cs, new String(bmp0)));
+                //add a pair of surrogates
+                int pos = bmp0.length / 2;
+                if ((pos + 1) < bmp0.length) {
+                    bmp0[pos] = '\uD800';
+                    bmp0[pos+1] = '\uDC00';
                 }
-                testSurrogates(cs);
-                testMixed(cs);
-                System.out.println("done!");
+                testNewString(cs, testGetBytes(cs, new String(bmp0)));
+
+                char[] latin0 = Arrays.copyOf(latin, rnd.nextInt(0x100));
+                char[] ascii0 = Arrays.copyOf(ascii, rnd.nextInt(0x80));
+                byte[] latinBA0 = Arrays.copyOf(latinBA, rnd.nextInt(0x100));
+                byte[] asciiBA0 = Arrays.copyOf(asciiBA, rnd.nextInt(0x80));
+                testNewString(cs, testGetBytes(cs, new String(latin0)));
+                testNewString(cs, testGetBytes(cs, new String(ascii0)));
+                testGetBytes(cs, testNewString(cs, latinBA0));
+                testGetBytes(cs, testNewString(cs, asciiBA0));
             }
+            testSurrogates(cs);
+            testMixed(cs);
+            System.out.println("done!");
         }
     }
 
@@ -246,8 +242,4 @@ static void testSurrogates(Charset cs) throws Throwable {
             }
         }
     }
-
-    static class PermissiveSecurityManger extends SecurityManager {
-        @Override public void checkPermission(java.security.Permission p) {}
-    }
 }
diff --git a/test/jdk/sun/nio/cs/TestStringCodingUTF8.java b/test/jdk/sun/nio/cs/TestStringCodingUTF8.java
index 2468ccdfc7f..50d68f408d5 100644
--- a/test/jdk/sun/nio/cs/TestStringCodingUTF8.java
+++ b/test/jdk/sun/nio/cs/TestStringCodingUTF8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
    @bug 7040220 8054307
    @summary Test if StringCoding and NIO result have the same de/encoding result for UTF-8
- * @run main/othervm/timeout=2000 -Djava.security.manager=allow TestStringCodingUTF8
+ * @run main/othervm/timeout=2000 TestStringCodingUTF8
  * @key randomness
  */
 
@@ -36,10 +36,6 @@ public class TestStringCodingUTF8 {
     public static void main(String[] args) throws Throwable {
         test("UTF-8");
         test("CESU-8");
-        // security manager on
-        System.setSecurityManager(new PermissiveSecurityManger());
-        test("UTF-8");
-        test("CESU-8");
     }
 
     static void test(String csn) throws Throwable {
@@ -174,8 +170,4 @@ static byte[] encode(Charset cs, char[] ca, int off, int len) {
         }
         return Arrays.copyOf(ba, bb.position());
     }
-
-    static class PermissiveSecurityManger extends SecurityManager {
-        @Override public void checkPermission(java.security.Permission p) {}
-    }
 }
diff --git a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
index ebeebc1e19e..03dade05b14 100644
--- a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
+++ b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@
  * @summary Basic test for the unsupported ReflectionFactory
  * @modules jdk.unsupported
  * @run testng ReflectionFactoryTest
- * @run testng/othervm/policy=security.policy ReflectionFactoryTest
  */
 
 public class ReflectionFactoryTest {
diff --git a/test/jdk/sun/reflect/ReflectionFactory/security.policy b/test/jdk/sun/reflect/ReflectionFactory/security.policy
deleted file mode 100644
index 8c30f3b278c..00000000000
--- a/test/jdk/sun/reflect/ReflectionFactory/security.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-// Individual Permissions for ReflectionFactoryTest
-grant {
-        // Permissions needed to run the test
-        permission java.util.PropertyPermission "*", "read";
-        permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete,execute";
-
-        permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-        permission java.lang.RuntimePermission "accessDeclaredMembers";
-        permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
-        permission java.lang.RuntimePermission "reflectionFactoryAccess";
-};
diff --git a/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java b/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java
index 333422ee5ce..86889b627d8 100644
--- a/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java
+++ b/test/jdk/sun/rmi/runtime/Log/checkLogging/CheckLogging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
- * @run main/othervm -Djava.security.manager=allow CheckLogging
+ * @run main/othervm CheckLogging
  */
 
 import java.util.logging.Level;
@@ -192,28 +192,12 @@ private static void checkServerCallLog() throws Exception {
         verifyLog(serverCallLog, "bingo");
     }
 
-    private static void checkPermissions() {
-        SecurityException ex = null;
-        try {
-            // should fail for lack of LoggingPermission "control"
-            RemoteServer.setLog(System.err);
-        } catch (SecurityException e) {
-            System.err.println("security excepton caught correctly");
-            ex = e;
-        }
-        if (ex == null) {
-            TestLibrary.bomb("able to set log without permission");
-        }
-    }
-
     public static void main(String[] args) {
         try {
             checkServerCallLog();
 
             if (!usingOld) {
                 verifyLog(clientCallOut, "outbound call");
-                System.setSecurityManager(new java.lang.SecurityManager());
-                checkPermissions();
             }
             System.err.println("TEST PASSED");
 
diff --git a/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java
index a6425c2260d..3f6131cdb79 100644
--- a/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java
+++ b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Receiver MarshalForeignStub_Stub
- * @run main/othervm/policy=security.policy MarshalForeignStub
+ * @run main/othervm MarshalForeignStub
  */
 
 import java.io.Serializable;
@@ -62,8 +62,6 @@ public static void main(String[] args) {
 
         System.err.println("\nRegression test for bug 4117427\n");
 
-        TestLibrary.suggestSecurityManager(null);
-
         System.err.println("Creating remote object.");
         MarshalForeignStub obj = null;
         try {
diff --git a/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy b/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy
deleted file mode 100644
index 8bfb6ade3af..00000000000
--- a/test/jdk/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * security policy used by MarshalForeignStub test
- */
-
-grant {
-
-    // used by TestLibrary to determine test environment
-    permission java.util.PropertyPermission "test.*", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-    permission java.util.PropertyPermission "java.home", "read";
-
-    // allow exporting of remote objects on an arbitrary port
-    permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-};
diff --git a/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java b/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java
deleted file mode 100644
index 253f166cae4..00000000000
--- a/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4183204
- * @summary The RMI runtime should fail to export a remote object on a TCP
- * port for an application that does not have permission to listen
- * on that port, rather than engage in the deprecated "multiplexing protocol".
- * @author Peter Jones
- *
- * @build DisableMultiplexing_Stub
- * @run main/othervm -Djava.security.manager=allow DisableMultiplexing
- */
-
-import java.rmi.*;
-import java.rmi.server.*;
-
-public class DisableMultiplexing implements Remote {
-
-    public static void main(String[] args) {
-
-        System.err.println("\nRegression test for bug 4183204\n");
-
-        System.err.println("Setting draconian security manager.");
-        System.setSecurityManager(new SecurityManager() {
-            public void checkListen(int port) {
-                throw new SecurityException("THOU SHALT NOT LISTEN");
-            }
-        });
-
-        System.err.println("Creating remote object.");
-        DisableMultiplexing obj = new DisableMultiplexing();
-
-        try {
-            System.err.println("Attempting to export remote object.");
-            UnicastRemoteObject.exportObject(obj);
-            try {
-                UnicastRemoteObject.unexportObject(obj, true);
-            } catch (NoSuchObjectException e) {
-            }
-            throw new RuntimeException(
-                "TEST FAILED: remote object successfully exported");
-        } catch (SecurityException e) {
-            System.err.println("TEST PASSED: ");
-            e.printStackTrace();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("TEST FAILED: " + e.toString());
-        }
-    }
-}
diff --git a/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java b/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java
deleted file mode 100644
index 8959c43c2d4..00000000000
--- a/test/jdk/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-public final class DisableMultiplexing_Stub
-    extends java.rmi.server.RemoteStub
-    implements java.rmi.Remote
-{
-    private static final long serialVersionUID = 2;
-
-    // constructors
-    public DisableMultiplexing_Stub(java.rmi.server.RemoteRef ref) {
-        super(ref);
-    }
-
-}
diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
index dacb67ce892..8b7f4618d54 100644
--- a/test/jdk/sun/security/ec/TestEC.java
+++ b/test/jdk/sun/security/ec/TestEC.java
@@ -38,8 +38,6 @@
  * @library ../../../javax/net/ssl/TLSCommon
  * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
  * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
- * @run main/othervm -Djava.security.policy=TestEC.policy
- *    -Djdk.tls.namedGroups="secp256r1" TestEC
  */
 
 import java.security.NoSuchProviderException;
diff --git a/test/jdk/sun/security/ec/TestEC.policy b/test/jdk/sun/security/ec/TestEC.policy
deleted file mode 100644
index de20d3b7bd1..00000000000
--- a/test/jdk/sun/security/ec/TestEC.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant codebase "file:${test.classes}/*" {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/sun/security/krb5/auto/AcceptPermissions.java b/test/jdk/sun/security/krb5/auto/AcceptPermissions.java
deleted file mode 100644
index 172d3ede9ba..00000000000
--- a/test/jdk/sun/security/krb5/auto/AcceptPermissions.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8005447 8194486
- * @summary default principal can act as anyone
- * @library /test/lib
- * @compile -XDignore.symbol.file AcceptPermissions.java
- * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
- * @run main/othervm -Djava.security.manager=allow -Djdk.net.hosts.file=TestHosts AcceptPermissions two
- * @run main/othervm -Djava.security.manager=allow -Djdk.net.hosts.file=TestHosts AcceptPermissions unbound
- */
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.security.Permission;
-import javax.security.auth.kerberos.ServicePermission;
-import sun.security.jgss.GSSUtil;
-import java.util.*;
-
-public class AcceptPermissions extends SecurityManager {
-
-    private static Map<Permission,String> perms = new HashMap<>();
-    @Override
-    public void checkPermission(Permission perm) {
-        if (!(perm instanceof ServicePermission)) {
-            return;
-        }
-        ServicePermission sp = (ServicePermission)perm;
-        if (!sp.getActions().equals("accept")) {
-            return;
-        }
-        // We only care about accept ServicePermission in this test
-        try {
-            super.checkPermission(sp);
-        } catch (SecurityException se) {
-            if (perms.containsKey(sp)) {
-                perms.put(sp, "checked");
-            } else {
-                throw se;   // We didn't expect this is needed
-            }
-        }
-    }
-
-    // Fills in permissions we are expecting
-    private static void initPerms(String... names) {
-        perms.clear();
-        for (String name: names) {
-            perms.put(new ServicePermission(
-                    name + "@" + OneKDC.REALM, "accept"), "expected");
-        }
-    }
-
-    // Checks if they are all checked
-    private static void checkPerms() {
-        for (Map.Entry<Permission,String> entry: perms.entrySet()) {
-            if (entry.getValue().equals("expected")) {
-                throw new RuntimeException(
-                        "Expected but not used: " + entry.getKey());
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new AcceptPermissions());
-        new OneKDC(null).writeJAASConf();
-        String moreEntries = "two {\n"
-                + " com.sun.security.auth.module.Krb5LoginModule required"
-                + "     principal=\"" + OneKDC.SERVER + "\" useKeyTab=true"
-                + "     isInitiator=false storeKey=true;\n"
-                + " com.sun.security.auth.module.Krb5LoginModule required"
-                + "     principal=\"" + OneKDC.BACKEND + "\" useKeyTab=true"
-                + "     isInitiator=false storeKey=true;\n"
-                + "};\n"
-                + "unbound {"
-                + " com.sun.security.auth.module.Krb5LoginModule required"
-                + "     principal=* useKeyTab=true"
-                + "     isInitiator=false storeKey=true;\n"
-                + "};\n";
-        Files.write(Paths.get(OneKDC.JAAS_CONF), moreEntries.getBytes(),
-                StandardOpenOption.APPEND);
-
-        Context c, s;
-
-        // In all cases, a ServicePermission on the acceptor name is needed
-        // for a handshake. For default principal with no predictable name,
-        // permission not needed (yet) for credentials creation.
-
-        // Named principal
-        initPerms(OneKDC.SERVER);
-        c = Context.fromJAAS("client");
-        s = Context.fromJAAS("server");
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        checkPerms();
-        initPerms(OneKDC.SERVER);
-        Context.handshake(c, s);
-        checkPerms();
-
-        // Named principal (even if there are 2 JAAS modules)
-        initPerms(OneKDC.SERVER);
-        c = Context.fromJAAS("client");
-        s = Context.fromJAAS(args[0]);
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        checkPerms();
-        initPerms(OneKDC.SERVER);
-        Context.handshake(c, s);
-        checkPerms();
-
-        // Default principal with a predictable name
-        initPerms(OneKDC.SERVER);
-        c = Context.fromJAAS("client");
-        s = Context.fromJAAS("server");
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
-        checkPerms();
-        initPerms(OneKDC.SERVER);
-        Context.handshake(c, s);
-        checkPerms();
-
-        // Default principal with no predictable name
-        initPerms();    // permission not needed for cred !!!
-        c = Context.fromJAAS("client");
-        s = Context.fromJAAS(args[0]);
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
-        checkPerms();
-        initPerms(OneKDC.SERVER);   // still needed for handshake !!!
-        Context.handshake(c, s);
-        checkPerms();
-    }
-}
diff --git a/test/jdk/sun/security/krb5/auto/BasicProc.java b/test/jdk/sun/security/krb5/auto/BasicProc.java
index 0ba0b907b77..a812de24af1 100644
--- a/test/jdk/sun/security/krb5/auto/BasicProc.java
+++ b/test/jdk/sun/security/krb5/auto/BasicProc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.Arrays;
-import java.util.PropertyPermission;
 import java.util.Set;
 
 import jdk.test.lib.Asserts;
@@ -45,8 +44,6 @@
 import org.ietf.jgss.Oid;
 import sun.security.krb5.Config;
 
-import javax.security.auth.PrivateCredentialPermission;
-
 /**
  * Run this test automatically and test Java GSS with embedded KDC.
  *
@@ -217,18 +214,8 @@ private static void once(String label, String lc, String ls, String lb)
 
         Proc pc = proc(lc)
                 .args("client", lc == null ? "j" : "n")
-                .perm(new javax.security.auth.kerberos.ServicePermission(
-                        "krbtgt/" + REALM + "@" + REALM, "initiate"))
-                .perm(new javax.security.auth.kerberos.ServicePermission(
-                        SERVER + "@" + REALM, "initiate"))
-                .perm(new javax.security.auth.kerberos.DelegationPermission(
-                        "\"" + SERVER + "@" + REALM + "\" " +
-                                "\"krbtgt/" + REALM + "@" + REALM + "\""))
                 .debug(label + "-C");
-        if (lc == null) {
-            // for Krb5LoginModule::promptForName
-            pc.perm(new PropertyPermission("user.name", "read"));
-        } else {
+        if (lc != null) {
             Files.copy(Paths.get("base.ccache"), Paths.get(label + ".ccache"));
             if (!Platform.isWindows()) {
                 Files.setPosixFilePermissions(Paths.get(label + ".ccache"),
@@ -243,30 +230,16 @@ private static void once(String label, String lc, String ls, String lb)
 
         Proc ps = proc(ls)
                 .args("server", ls == null ? "j" : "n")
-                .perm(new javax.security.auth.kerberos.ServicePermission(
-                        SERVER + "@" + REALM, "accept"))
-                .perm(new javax.security.auth.kerberos.ServicePermission(
-                        BACKEND + "@" + REALM, "initiate"))
                 .debug(label + "-S");
-        if (ls == null) {
-            ps.perm(new PrivateCredentialPermission(
-                    "javax.security.auth.kerberos.KeyTab * \"*\"", "read"))
-                .perm(new java.io.FilePermission(KTAB_S, "read"));
-        } else {
+        if (ls != null) {
             ps.env("KRB5_KTNAME", KTAB_S);
         }
         ps.start();
 
         Proc pb = proc(lb)
                 .args("backend", lb == null ? "j" : "n")
-                .perm(new javax.security.auth.kerberos.ServicePermission(
-                        BACKEND + "@" + REALM, "accept"))
                 .debug(label + "-B");
-        if (lb == null) {
-            pb.perm(new PrivateCredentialPermission(
-                    "javax.security.auth.kerberos.KeyTab * \"*\"", "read"))
-                .perm(new java.io.FilePermission(KTAB_B, "read"));
-        } else {
+        if (lb != null) {
             pb.env("KRB5_KTNAME", KTAB_B);
         }
         pb.start();
@@ -296,9 +269,7 @@ private static void once(String label, String lc, String ls, String lb)
      */
     private static Proc proc(String lib) throws Exception {
         Proc p = Proc.create("BasicProc")
-                .inheritProp("jdk.net.hosts.file")
-                .prop("java.security.manager", "")
-                .perm(new javax.security.auth.AuthPermission("doAs"));
+                .inheritProp("jdk.net.hosts.file");
         if (lib != null) {
             p.env("KRB5_CONFIG", CONF)
                     .env("KRB5_TRACE", Platform.isWindows() ? "CON" : "/dev/stderr")
@@ -311,14 +282,7 @@ private static Proc proc(String lib) throws Exception {
                 p.env(Platform.sharedLibraryPathVariableName(), lib.substring(0, pos));
             }
         } else {
-            p.perm(new java.util.PropertyPermission(
-                            "sun.security.krb5.principal", "read"))
-                            // For Krb5LoginModule::login.
-                    .perm(new javax.security.auth.AuthPermission(
-                            "modifyPrincipals"))
-                    .perm(new javax.security.auth.AuthPermission(
-                            "modifyPrivateCredentials"))
-                    .prop("sun.security.krb5.debug", "true")
+            p.prop("sun.security.krb5.debug", "true")
                     .prop("java.security.krb5.conf", CONF);
         }
         return p;
diff --git a/test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java b/test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java
index f3996e5436e..9bc68904394 100644
--- a/test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java
+++ b/test/jdk/sun/security/krb5/auto/HttpNegotiateServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
  *          user cancels the first one
  * @library /test/lib
  * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
- * @run main/othervm -Djava.security.manager=allow -Djdk.net.hosts.file=TestHosts HttpNegotiateServer
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts HttpNegotiateServer
  */
 
 import com.sun.net.httpserver.Headers;
@@ -317,10 +317,6 @@ static void test8077155() throws Exception {
         final String username = WEB_USER;
         final char[] password = WEB_PASS;
 
-        SecurityManager security = new SecurityManager();
-        Policy.setPolicy(new SecurityPolicy());
-        System.setSecurityManager(security);
-
         CallbackHandler callback = new CallbackHandler() {
             @Override
             public void handle(Callback[] pCallbacks)
@@ -519,22 +515,3 @@ public Result authenticate(HttpExchange exch) {
         }
     }
 }
-
-class SecurityPolicy extends Policy {
-
-    private static Permissions perms;
-
-    public SecurityPolicy() {
-        super();
-        if (perms == null) {
-            perms = new Permissions();
-            perms.add(new AllPermission());
-        }
-    }
-
-    @Override
-    public PermissionCollection getPermissions(CodeSource codesource) {
-        return perms;
-    }
-
-}
diff --git a/test/jdk/sun/security/krb5/auto/KeyPermissions.java b/test/jdk/sun/security/krb5/auto/KeyPermissions.java
deleted file mode 100644
index 89f034db809..00000000000
--- a/test/jdk/sun/security/krb5/auto/KeyPermissions.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8004488 8194486
- * @summary wrong permissions checked in krb5
- * @library /test/lib
- * @compile -XDignore.symbol.file KeyPermissions.java
- * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
- * @run main/othervm -Djava.security.manager=allow -Djdk.net.hosts.file=TestHosts KeyPermissions
- */
-
-import java.security.AccessControlException;
-import java.security.Permission;
-import javax.security.auth.PrivateCredentialPermission;
-import sun.security.jgss.GSSUtil;
-
-public class KeyPermissions extends SecurityManager {
-
-    @Override
-    public void checkPermission(Permission perm) {
-        if (perm instanceof PrivateCredentialPermission) {
-            if (!perm.getName().startsWith("javax.security.auth.kerberos.")) {
-                throw new AccessControlException(
-                        "I don't like this", perm);
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new KeyPermissions());
-        new OneKDC(null).writeJAASConf();
-        Context s = Context.fromJAAS("server");
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
-    }
-}
-
diff --git a/test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java b/test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java
index 5e2e2394ee8..39f2ad2aa08 100644
--- a/test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java
+++ b/test/jdk/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,10 @@
  * The principal can set using the system property sun.security.krb5.principal.
  * This property is checked during login. If this property is not set,
  * then the principal name from the configuration is used.
- * @run main/othervm/java.security.policy=principalSystemPropTest.policy
- * PrincipalSystemPropTest
+ * @run main/othervm PrincipalSystemPropTest
  */
 
-import java.io.File;
 import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.login.LoginContext;
diff --git a/test/jdk/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy b/test/jdk/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy
deleted file mode 100644
index 40105cf6f52..00000000000
--- a/test/jdk/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-grant {
-  	permission javax.security.auth.AuthPermission
-    	"createLoginContext.ValidPrincipalSystemPropTest";
-    	permission javax.security.auth.AuthPermission
-    	"createLoginContext.InvalidPrincipalSystemPropTest";
-    	permission javax.security.auth.AuthPermission
-    	"createLoginContext.NoPrincipalSystemPropTest";
-    	permission javax.security.auth.AuthPermission
-    	"createLoginContext.SelfPrincipalSystemPropTest";
-  	permission javax.security.auth.AuthPermission "doAs";
-  	permission javax.security.auth.AuthPermission "modifyPrincipals";
-  	permission javax.security.auth.AuthPermission "getSubject";
-  	permission java.util.PropertyPermission "*", "read,write";
-  	permission java.io.FilePermission "/-", "read,write,delete";
-  	permission java.io.FilePermission "*", "read,write,delete";
-  	permission java.lang.RuntimePermission "accessDeclaredMembers";
-  	permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-  	permission java.lang.RuntimePermission "accessClassInPackage.*";
-  	permission java.net.SocketPermission "*:*", 
-  		"listen,resolve,accept,connect";
-}; 
-
diff --git a/test/jdk/sun/security/krb5/runNameEquals.sh b/test/jdk/sun/security/krb5/runNameEquals.sh
index 302e1bb8c57..ecfd65a2fe4 100644
--- a/test/jdk/sun/security/krb5/runNameEquals.sh
+++ b/test/jdk/sun/security/krb5/runNameEquals.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ EXIT_STATUS=0
 
 if [ "${NATIVE}" = "true" ] ; then
     echo "Testing native provider"
-    ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+    ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -Dsun.security.jgss.native=true \
         ${TEST}
@@ -114,7 +114,7 @@ if [ "${NATIVE}" = "true" ] ; then
 fi
 
 echo "Testing java provider"
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -Djava.security.krb5.realm=R \
         -Djava.security.krb5.kdc=127.0.0.1 \
diff --git a/test/jdk/sun/security/mscapi/AccessKeyStore.java b/test/jdk/sun/security/mscapi/AccessKeyStore.java
deleted file mode 100644
index 813e6f5de89..00000000000
--- a/test/jdk/sun/security/mscapi/AccessKeyStore.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 6324295 6931562 8154113
- * @modules jdk.crypto.mscapi
- * @run main/othervm/java.security.policy==access.policy AccessKeyStore pass
- * @run main/othervm/java.security.policy==noaccess.policy AccessKeyStore fail
- * @summary Confirm that right permissions are granted to access keystores.
- */
-
-import java.security.Provider;
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-import java.security.interfaces.RSAKey;
-import java.util.Enumeration;
-
-public class AccessKeyStore {
-
-    public static void main(String[] args) throws Exception {
-
-        // Check for security manager and required arg(s)
-        if (System.getSecurityManager() == null) {
-            throw new Exception("Missing security manager");
-        }
-        if (args.length <= 0) {
-            throw new Exception("Missing expected test status");
-        }
-        boolean shouldPass = args[0].equalsIgnoreCase("pass");
-
-        Provider p = Security.getProvider("SunMSCAPI");
-        System.out.println("SunMSCAPI provider classname is " +
-            p.getClass().getName());
-
-        KeyStore keyStore = KeyStore.getInstance("Windows-MY", p);
-
-        /*
-         * If a SecurityManager exists then this will trigger a
-         * SecurityException if the following permission has not
-         * been granted:
-         *
-         *     SecurityPermission("authProvider.SunMSCAPI")
-         */
-        try {
-            keyStore.load(null, null);
-            if (!shouldPass) {
-                throw new Exception(
-                    "Expected KeyStore.load to throw a SecurityException");
-            }
-        } catch (SecurityException se) {
-            if (!shouldPass) {
-                System.out.println("Expected exception thrown: " + se);
-                return;
-            } else {
-                throw se;
-            }
-        }
-
-        int i = 0;
-        for (Enumeration<String> e = keyStore.aliases(); e.hasMoreElements(); ) {
-            String alias = e.nextElement();
-            displayEntry(keyStore, alias, i++);
-        }
-    }
-
-    private static void displayEntry(KeyStore keyStore, String alias,
-        int index) throws KeyStoreException, NoSuchAlgorithmException  {
-
-        if (keyStore.isKeyEntry(alias)) {
-            System.out.println("[" + index + "]\n    " + alias +
-                " [key-entry]\n");
-
-            try {
-
-                Key key = keyStore.getKey(alias, null);
-
-                if (key instanceof RSAKey) {
-                    System.out.println("    Key type: " + key.getAlgorithm() +
-                        " (" + ((RSAKey)key).getModulus().bitLength() +
-                        " bit)\n");
-                } else {
-                    System.out.println("    Key type: " + key.getAlgorithm() +
-                        "\n");
-                }
-
-            } catch (UnrecoverableKeyException e) {
-                System.out.println("    Key type: Unknown\n");
-            }
-
-            Certificate[] chain = keyStore.getCertificateChain(alias);
-            if (chain != null) {
-                System.out.println("    Certificate chain: ");
-                for (int i = 0; i < chain.length; i ++) {
-                    System.out.println("        ["+ (i + 1) + "]");
-                    displayCert(chain[i], "            ");
-                }
-            }
-
-        } else {
-            System.out.println("[" + index + "]\n    " + alias +
-                " [trusted-cert-entry]\n");
-            Certificate[] chain = keyStore.getCertificateChain(alias);
-            if (chain != null) {
-                System.out.println("    Certificate chain: ");
-                for (int i = 0; i < chain.length; i ++) {
-                    System.out.println("        ["+ (i + 1) + "]");
-                    displayCert(chain[i], "            ");
-                }
-            }
-        }
-        System.out.println("-------------------------------------------------");
-    }
-
-    private static void displayCert(Certificate cert, String tab) {
-        if (cert instanceof X509Certificate) {
-            X509Certificate x = (X509Certificate) cert;
-            System.out.println(
-                tab + "Owner: " + x.getSubjectDN().toString() + "\n" +
-                tab + "Issuer: " + x.getIssuerDN().toString() + "\n" +
-                tab + "Serial number: " + x.getSerialNumber().toString(16) +
-                "\n"+
-                tab + "Valid from: " + x.getNotBefore().toString() + "\n" +
-                tab + "     until: " + x.getNotAfter().toString());
-        } else {
-            System.out.println(tab + "[unknown certificate format]");
-        }
-        System.out.println();
-    }
-}
diff --git a/test/jdk/sun/security/mscapi/access.policy b/test/jdk/sun/security/mscapi/access.policy
deleted file mode 100644
index ca7599ea1af..00000000000
--- a/test/jdk/sun/security/mscapi/access.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    // This permission is required for the test to run to completion
-    permission java.security.SecurityPermission "authProvider.SunMSCAPI";
-};
diff --git a/test/jdk/sun/security/mscapi/noaccess.policy b/test/jdk/sun/security/mscapi/noaccess.policy
deleted file mode 100644
index 0d13abc6b2c..00000000000
--- a/test/jdk/sun/security/mscapi/noaccess.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    // This permission is required for the test to run to completion
-    //permission java.security.SecurityPermission "authProvider.SunMSCAPI";
-};
diff --git a/test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java b/test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java
index da547da752b..fe93dff5050 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/ReinitCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm ReinitCipher
- * @run main/othervm -Djava.security.manager=allow ReinitCipher sm
  */
 
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java b/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
index cf8e000fce7..a8f50dddb53 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestPKCS5PaddingError
- * @run main/othervm -Djava.security.manager=allow TestPKCS5PaddingError sm
  */
 
 import java.security.AlgorithmParameters;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java
index 6799b19d3e7..73039ba2f65 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipher.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestRSACipher
- * @run main/othervm -Djava.security.manager=allow TestRSACipher sm
  */
 
 import java.security.GeneralSecurityException;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java
index 0be916ebf9e..559c7680c06 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestRSACipherWrap.java
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestRSACipherWrap
- * @run main/othervm -Djava.security.manager=allow TestRSACipherWrap sm
  */
 
 import java.security.GeneralSecurityException;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java b/test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java
index fe6433d096e..2c553f7e452 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestRawRSACipher.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestRawRSACipher
- * @run main/othervm -Djava.security.manager=allow TestRawRSACipher sm
  */
 
 import java.security.GeneralSecurityException;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java
index 2395b329dd6..b818adfe589 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestSymmCiphers
- * @run main/othervm -Djava.security.manager=allow TestSymmCiphers sm
  */
 
 import java.io.ByteArrayOutputStream;
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java
index 7505c21a1ab..9290fe8d6eb 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestSymmCiphersNoPad
- * @run main/othervm -Djava.security.manager=allow TestSymmCiphersNoPad sm
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/IllegalPackageAccess.java b/test/jdk/sun/security/pkcs11/KeyAgreement/IllegalPackageAccess.java
deleted file mode 100644
index ec6234c6bdf..00000000000
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/IllegalPackageAccess.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2021, Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.AllPermission;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.Provider;
-import java.security.Security;
-import java.security.spec.X509EncodedKeySpec;
-
-/*
- * @test
- * @bug 8259319
- * @library /test/lib ..
- * @run main/othervm -Djava.security.manager=allow IllegalPackageAccess
- */
-
-public class IllegalPackageAccess extends PKCS11Test {
-
-    private static Policy policy = Policy.getPolicy();
-    private static RuntimePermission accessPerm =
-            new RuntimePermission("accessClassInPackage.com.sun.crypto.provider");
-
-    private static class MyPolicy extends Policy {
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            PermissionCollection perms = new Permissions();
-            perms.add(new AllPermission());
-            return perms;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (permission.equals(accessPerm)) {
-                return policy.implies(domain, permission);
-            }
-            return super.implies(domain, permission);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        main(new IllegalPackageAccess(), args);
-        System.out.println("TEST PASS - OK");
-    }
-
-    @Override
-    public void main(Provider p) throws Exception {
-        Policy.setPolicy(null);
-        Policy.setPolicy(new MyPolicy());
-        System.setSecurityManager(new SecurityManager());
-
-        // Remove all security providers so a fallback scheme
-        // that creates class instances is forced.
-        for (Provider provider : Security.getProviders()) {
-            Security.removeProvider(provider.getName());
-        }
-
-        KeyPair kp = KeyPairGenerator.getInstance("DH", p)
-                .generateKeyPair();
-        byte[] encPubKey = kp.getPublic().getEncoded();
-        KeyFactory kf = KeyFactory.getInstance("DH", p);
-
-        // Requires access to a SunJCE class that parses
-        // the encoded key.
-        kf.generatePublic(new X509EncodedKeySpec(encPubKey));
-
-        System.setSecurityManager(null);
-        Policy.setPolicy(policy);
-    }
-
-}
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java b/test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java
index 1246e13fb23..c4f8e189937 100644
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java
+++ b/test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm SupportedDHKeys
- * @run main/othervm -Djava.security.manager=allow SupportedDHKeys sm
  */
 
 import java.math.BigInteger;
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java
index 13b09d16dcf..560459c2b09 100644
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java
+++ b/test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm -Djdk.crypto.KeyAgreement.legacyKDF=true TestDH
- * @run main/othervm -Djava.security.manager=allow -Djdk.crypto.KeyAgreement.legacyKDF=true TestDH sm
  */
 
 import java.security.KeyPair;
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java
index 7f6f79e767b..810814ebd5d 100644
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java
+++ b/test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java
@@ -28,7 +28,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestInterop
- * @run main/othervm -Djava.security.manager=allow TestInterop sm
  */
 import java.math.BigInteger;
 import java.security.KeyFactory;
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java b/test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java
index 0639c06b7d8..27e6bcbc8a3 100644
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java
+++ b/test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestShort
- * @run main/othervm -Djava.security.manager=allow TestShort sm
  */
 
 import java.math.BigInteger;
diff --git a/test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java b/test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java
index af1734dcd80..b2a2c29e8af 100644
--- a/test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java
+++ b/test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm UnsupportedDHKeys
- * @run main/othervm -Djava.security.manager=allow UnsupportedDHKeys sm
  */
 
 import java.security.InvalidParameterException;
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java b/test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java
index c08c224c620..59f58ca525e 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/DESParity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm DESParity
- * @run main/othervm -Djava.security.manager=allow DESParity sm
  */
 
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
index 14dae5feece..69aa8f61266 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm HmacDefKeySizeTest
- * @run main/othervm -Djava.security.manager=allow HmacDefKeySizeTest sm
  */
 
 import java.security.InvalidKeyException;
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
index ccf86444564..15d0ee87fe4 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestKeyGenerator
- * @run main/othervm -Djava.security.manager=allow TestKeyGenerator sm
  */
 
 import java.security.InvalidParameterException;
diff --git a/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java
index f251c443c18..b05861ff3ae 100644
--- a/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java
+++ b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestDH2048
- * @run main/othervm -Djava.security.manager=allow TestDH2048 sm
  */
 
 import java.security.InvalidParameterException;
diff --git a/test/jdk/sun/security/pkcs11/KeyStore/Basic.java b/test/jdk/sun/security/pkcs11/KeyStore/Basic.java
index b6c7af91b57..e03eff07c95 100644
--- a/test/jdk/sun/security/pkcs11/KeyStore/Basic.java
+++ b/test/jdk/sun/security/pkcs11/KeyStore/Basic.java
@@ -33,7 +33,7 @@
  *    . 'list' lists the token aliases
  *    . 'basic' does not run with activcard,
  * @library /test/lib ..
- * @run testng/othervm -Djava.security.manager=allow Basic
+ * @run testng/othervm Basic
  */
 
 import java.io.*;
@@ -114,9 +114,8 @@ public void setUp() throws Exception {
 
     @Test
     public void testBasic() throws Exception {
-        String[] args = {"sm", "Basic.policy"};
         try {
-            main(new Basic(), args);
+            main(new Basic(), new String[0]);
         } catch (SkippedException se) {
             throw new SkipException("One or more tests are skipped");
         }
diff --git a/test/jdk/sun/security/pkcs11/KeyStore/Basic.policy b/test/jdk/sun/security/pkcs11/KeyStore/Basic.policy
deleted file mode 100644
index 27fbcef9f74..00000000000
--- a/test/jdk/sun/security/pkcs11/KeyStore/Basic.policy
+++ /dev/null
@@ -1,23 +0,0 @@
-grant codebase "file:${user.dir}${/}loader.jar" {
-    permission java.security.AllPermission;
-};
-
-grant {
-    permission java.util.PropertyPermission "*", "read,write";
-    permission java.lang.RuntimePermission "loadLibrary.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.*";
-    permission java.lang.RuntimePermission "getProtectionDomain";
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.security.SecurityPermission "putProviderProperty.*";
-
-    permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.security.SecurityPermission "setProperty.auth.login.defaultCallbackHandler";
-    permission java.security.SecurityPermission "authProvider.SunPKCS11-nss";
-
-    // for 'module' test
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.*";
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "modifyPublicCredentials";
-    permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
-    permission javax.security.auth.PrivateCredentialPermission "javax.security.auth.x500.X500PrivateCredential * \"*\"", "read";
-};
diff --git a/test/jdk/sun/security/pkcs11/Mac/MacKAT.java b/test/jdk/sun/security/pkcs11/Mac/MacKAT.java
index e4bed00c7ac..38f8948894d 100644
--- a/test/jdk/sun/security/pkcs11/Mac/MacKAT.java
+++ b/test/jdk/sun/security/pkcs11/Mac/MacKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm MacKAT
- * @run main/othervm -Djava.security.manager=allow MacKAT sm
  */
 
 import java.io.UnsupportedEncodingException;
diff --git a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
index 297c5b27a38..04df5dd56d1 100644
--- a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
+++ b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm MacSameTest
- * @run main/othervm -Djava.security.manager=allow MacSameTest sm
  * @key randomness
  */
 
diff --git a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
index 57ea24cdf8f..78e4b48cb4a 100644
--- a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
+++ b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm ReinitMac
- * @run main/othervm -Djava.security.manager=allow ReinitMac sm
  */
 
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java b/test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java
index 16b8cced733..7a7864cadb4 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/DigestKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm DigestKAT
- * @run main/othervm -Djava.security.manager=allow DigestKAT sm
  */
 
 import java.io.ByteArrayOutputStream;
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
index 90ed49b42f5..133f20cd2bb 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm ReinitDigest
- * @run main/othervm -Djava.security.manager=allow ReinitDigest sm
  */
 import java.security.MessageDigest;
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
index 58635671f30..79bdeb32f5c 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestCloning
- * @run main/othervm -Djava.security.manager=allow TestCloning sm
  */
 
 import java.security.MessageDigest;
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index 9cb29eb8507..237436094ac 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -54,12 +54,14 @@
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
 import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
 import jdk.test.lib.artifacts.Artifact;
 import jdk.test.lib.artifacts.ArtifactResolver;
 import jdk.test.lib.artifacts.ArtifactResolverException;
@@ -75,7 +77,6 @@ public abstract class PKCS11Test {
     static final char SEP = File.separatorChar;
     // directory corresponding to BASE in the /closed hierarchy
     static final String CLOSED_BASE;
-    private static final String DEFAULT_POLICY = BASE + SEP + ".." + SEP + "policy";
     private static final String PKCS11_REL_PATH = "sun/security/pkcs11";
     private static final char[] HEX_DIGITS = "0123456789abcdef".toCharArray();
     private static final SecureRandom srdm = new SecureRandom();
@@ -109,9 +110,6 @@ public abstract class PKCS11Test {
         String p1 = absBase.substring(0, k);
         String p2 = absBase.substring(k);
         CLOSED_BASE = p1 + "/../closed" + p2;
-
-        // set it as a system property to make it available in policy file
-        System.setProperty("closed.base", CLOSED_BASE);
     }
 
     static {
@@ -122,8 +120,6 @@ public abstract class PKCS11Test {
         }
     }
 
-    private boolean enableSM = false;
-
     public static Provider newPKCS11Provider() {
         ServiceLoader<Provider> sl = ServiceLoader.load(java.security.Provider.class);
         Iterator<Provider> iter = sl.iterator();
@@ -170,22 +166,6 @@ public static void main(PKCS11Test test) throws Exception {
     }
 
     public static void main(PKCS11Test test, String[] args) throws Exception {
-        if (args != null) {
-            if (args.length > 0) {
-                if ("sm".equals(args[0])) {
-                    test.enableSM = true;
-                } else {
-                    throw new RuntimeException("Unknown Command, use 'sm' as "
-                            + "first argument to enable security manager");
-                }
-            }
-            if (test.enableSM) {
-                System.setProperty("java.security.policy",
-                        (args.length > 1) ? BASE + SEP + args[1]
-                                : DEFAULT_POLICY);
-            }
-        }
-
         Provider[] oldProviders = Security.getProviders();
         try {
             System.out.println("Beginning test run " + test.getClass().getName() + "...");
@@ -496,14 +476,13 @@ public static String getNssConfig() throws Exception {
             return null;
         }
 
-        String base = getBase();
-
+        String nssConfigDir = copyNssFiles();
         String libfile = libdir + System.mapLibraryName(nss_library);
 
         String customDBdir = System.getProperty("CUSTOM_DB_DIR");
         String dbdir = (customDBdir != null) ?
                 customDBdir :
-                base + SEP + "nss" + SEP + "db";
+                nssConfigDir + SEP + "db";
         // NSS always wants forward slashes for the config path
         dbdir = dbdir.replace('\\', '/');
 
@@ -513,7 +492,7 @@ public static String getNssConfig() throws Exception {
         System.setProperty("pkcs11test.nss.db", dbdir);
         return (customConfig != null) ?
                 customConfig :
-                base + SEP + "nss" + SEP + customConfigName;
+                nssConfigDir + SEP + customConfigName;
     }
 
     // Generate a vector of supported elliptic curves of a given provider
@@ -782,7 +761,6 @@ private static Path fetchNssLib(Class<?> clazz, Path libraryName) {
                         + "\nPlease make sure the artifact is available.", e);
             }
         }
-        Policy.setPolicy(null); // Clear the policy created by JIB if any
         return path;
     }
 
@@ -796,6 +774,31 @@ private static Path findNSSLibrary(Path path, Path libraryName) throws IOExcepti
         }
     }
 
+    //Copy the nss config files to the current directory for tests. Returns the destination path
+    private static String copyNssFiles() throws Exception {
+        String nss = "nss";
+        String db = "db";
+        Path nssDirSource = Path.of(getBase()).resolve(nss);
+        Path nssDirDestination = Path.of(".").resolve(nss);
+
+        // copy files from nss directory
+        copyFiles(nssDirSource, nssDirDestination);
+        // copy files from nss/db directory
+        copyFiles(nssDirSource.resolve(db), nssDirDestination.resolve(db));
+        return nssDirDestination.toString();
+    }
+
+    private static void copyFiles(Path dirSource, Path dirDestination) throws IOException {
+        List<Path> sourceFiles = Arrays
+                .stream(dirSource.toFile().listFiles())
+                .filter(File::isFile)
+                .map(File::toPath)
+                .collect(Collectors.toList());
+        List<Path> destFiles = Utils.copyFiles(sourceFiles, dirDestination,
+                StandardCopyOption.REPLACE_EXISTING);
+        destFiles.forEach((Path file) -> file.toFile().setWritable(true));
+    }
+
     public abstract void main(Provider p) throws Exception;
 
     protected boolean skipTest(Provider p) {
@@ -807,25 +810,13 @@ private void premain(Provider p) throws Exception {
             return;
         }
 
-        // set a security manager and policy before a test case runs,
-        // and disable them after the test case finished
-        try {
-            if (enableSM) {
-                System.setSecurityManager(new SecurityManager());
-            }
-            long start = System.currentTimeMillis();
-            System.out.printf(
-                    "Running test with provider %s (security manager %s) ...%n",
-                    p.getName(), enableSM ? "enabled" : "disabled");
-            main(p);
-            long stop = System.currentTimeMillis();
-            System.out.println("Completed test with provider " + p.getName() +
-                    " (" + (stop - start) + " ms).");
-        } finally {
-            if (enableSM) {
-                System.setSecurityManager(null);
-            }
-        }
+        long start = System.currentTimeMillis();
+        System.out.printf(
+                "Running test with provider %s...%n", p.getName());
+        main(p);
+        long stop = System.currentTimeMillis();
+        System.out.println("Completed test with provider " + p.getName() +
+                " (" + (stop - start) + " ms).");
     }
 
     // Check support for a curve with a provided Vector of EC support
diff --git a/test/jdk/sun/security/pkcs11/Provider/Login.java b/test/jdk/sun/security/pkcs11/Provider/Login.java
index 69ac30371b2..4a360b61aef 100644
--- a/test/jdk/sun/security/pkcs11/Provider/Login.java
+++ b/test/jdk/sun/security/pkcs11/Provider/Login.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @bug 4850423
  * @summary login facilities for hardware tokens
  * @library /test/lib ..
- * @run testng/othervm -Djava.security.manager=allow Login
+ * @run testng/othervm Login
  */
 
 import jtreg.SkippedException;
@@ -56,9 +56,8 @@ public void setUp() throws Exception {
 
     @Test
     public void testLogin() throws Exception {
-        String[] args = new String[]{ "sm", "Login.policy"};
         try {
-            main(new Login(), args);
+            main(new Login(), new String[0]);
         } catch (SkippedException se) {
             throw new SkipException("One or more tests are skipped");
         }
diff --git a/test/jdk/sun/security/pkcs11/Provider/Login.policy b/test/jdk/sun/security/pkcs11/Provider/Login.policy
deleted file mode 100644
index af6c98d8ebe..00000000000
--- a/test/jdk/sun/security/pkcs11/Provider/Login.policy
+++ /dev/null
@@ -1,14 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "*", "read, write";
-    permission java.lang.RuntimePermission "loadLibrary.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.apple.*";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.*";
-    permission java.lang.RuntimePermission "getProtectionDomain";
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.security.SecurityPermission "putProviderProperty.*";
-
-
-    permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.security.SecurityPermission "setProperty.auth.login.defaultCallbackHandler";
-    permission java.security.SecurityPermission "authProvider.SunPKCS11-NSS";
-};
diff --git a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
index ddce6e8733d..073dd557cbd 100644
--- a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
+++ b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.security.*;
-import java.util.PropertyPermission;
 
 import jdk.test.lib.util.ForceGC;
 import jtreg.SkippedException;
@@ -42,7 +41,6 @@ public class MultipleLogins {
     private static final String KS_TYPE = "PKCS11";
     private static final int NUM_PROVIDERS = 20;
     private static final SunPKCS11[] providers = new SunPKCS11[NUM_PROVIDERS];
-    static final Policy DEFAULT_POLICY = Policy.getPolicy();
 
     public static void main(String[] args) throws Exception {
         String nssConfig = null;
@@ -63,11 +61,6 @@ public static void main(String[] args) throws Exception {
             providers[i] = (SunPKCS11)PKCS11Test.newPKCS11Provider();
         }
 
-        if (args.length > 0) {
-            Policy.setPolicy(new SimplePolicy());
-            System.setSecurityManager(new SecurityManager());
-        }
-
         for (int i =0; i < NUM_PROVIDERS; i++) {
             providers[i] = (SunPKCS11)providers[i].configure(nssConfig);
             Security.addProvider(providers[i]);
@@ -127,23 +120,6 @@ private static void test(SunPKCS11 p) throws Exception {
         }
     }
 
-    static final class SimplePolicy extends Policy {
-
-        final Permissions perms = new Permissions();
-        SimplePolicy() {
-            perms.add(new PropertyPermission("*", "read, write"));
-            perms.add(new SecurityPermission("authProvider.*"));
-            perms.add(new SecurityPermission("insertProvider.*"));
-            perms.add(new SecurityPermission("removeProvider.*"));
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return perms.implies(permission) ||
-                    DEFAULT_POLICY.implies(domain, permission);
-        }
-    }
-
     public static class PasswordCallbackHandler implements CallbackHandler {
         public void handle(Callback[] callbacks)
                 throws IOException, UnsupportedCallbackException {
diff --git a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh
index 56a4fd6b806..b30410d9845 100644
--- a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh
+++ b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 # @library /test/lib/
 # @build jdk.test.lib.util.ForceGC
 #        jdk.test.lib.Platform
+#        jdk.test.lib.Utils
 # @run shell MultipleLogins.sh
 
 # set a few environment variables so that the shell-script can run stand-alone
@@ -122,7 +123,7 @@ ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
         ${TESTSRC}${FS}MultipleLogins.java \
         ${TESTSRC}${FS}..${FS}PKCS11Test.java
 
-TEST_ARGS="${TESTVMOPTS} -classpath ${TESTCLASSPATH} \
+TEST_ARGS="${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSPATH} \
         --add-modules jdk.crypto.cryptoki \
         --add-exports jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED \
         -DCUSTOM_DB_DIR=${TESTCLASSES} \
@@ -134,8 +135,5 @@ TEST_ARGS="${TESTVMOPTS} -classpath ${TESTCLASSPATH} \
 # run test without security manager
 ${TESTJAVA}${FS}bin${FS}java ${TEST_ARGS} MultipleLogins || exit 10
 
-# run test with security manager
-${TESTJAVA}${FS}bin${FS}java ${TEST_ARGS} -Djava.security.manager=allow MultipleLogins useSimplePolicy || exit 11
-
 echo Done
 exit 0
diff --git a/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
index ab74358fb0f..29950d762e0 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm AddPrivateKey
- * @run main/othervm -Djava.security.manager=allow AddPrivateKey sm policy
  */
 
 import java.io.File;
@@ -63,11 +62,6 @@ public class AddPrivateKey extends SecmodTest {
     private static final byte[] DATA = generateData(DATA_LENGTH);
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-        }
-
         if (initSecmod() == false) {
             return;
         }
@@ -81,10 +75,6 @@ public static void main(String[] args) throws Exception {
         System.out.println();
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyStore ks = KeyStore.getInstance(PKCS11, p);
         ks.load(null, password);
         for (String alias : aliases(ks)) {
diff --git a/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java b/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
index 9792a80de8d..880adc954ea 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm AddTrustedCert
- * @run main/othervm -Djava.security.manager=allow AddTrustedCert sm policy
  */
 
 import java.io.File;
@@ -48,11 +47,6 @@
 public class AddTrustedCert extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-        }
-
         if (initSecmod() == false) {
             return;
         }
@@ -77,12 +71,6 @@ public static void main(String[] args) throws Exception {
         System.out.println(p);
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyStore ks = KeyStore.getInstance(PKCS11, p);
         ks.load(null, password);
         Collection<String> aliases = new TreeSet<>(Collections.list(
diff --git a/test/jdk/sun/security/pkcs11/Secmod/Crypto.java b/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
index d57794f1199..1b4c0883e80 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm Crypto
- * @run main/othervm -Djava.security.manager=allow Crypto sm policy
  */
 
 import java.io.File;
@@ -48,12 +47,6 @@ public static void main(String[] args) throws Exception {
         String configName = BASE + SEP + "nsscrypto.cfg";
         Provider p = getSunPKCS11(configName);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", p);
         KeyPair kp = kpg.generateKeyPair();
 
diff --git a/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
index f9f809f0d28..e89cafb920c 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm GetPrivateKey
- * @run main/othervm -Djava.security.manager=allow GetPrivateKey sm policy
  */
 
 import java.io.File;
@@ -47,11 +46,6 @@
 public class GetPrivateKey extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-        }
-
         if (initSecmod() == false) {
             return;
         }
@@ -62,10 +56,6 @@ public static void main(String[] args) throws Exception {
         System.out.println(p);
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyStore ks = KeyStore.getInstance(PKCS11, p);
         ks.load(null, password);
         Collection<String> aliases = new TreeSet<>(
diff --git a/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
index 1689d4c4ed9..d6c084c882d 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm JksSetPrivateKey
- * @run main/othervm -Djava.security.manager=allow JksSetPrivateKey sm policy
  */
 
 import java.io.File;
@@ -46,11 +45,6 @@
 public class JksSetPrivateKey extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-        }
-
         if (initSecmod() == false) {
             return;
         }
@@ -61,10 +55,6 @@ public static void main(String[] args) throws Exception {
         System.out.println(p);
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyStore ks = KeyStore.getInstance("PKCS11", p);
         ks.load(null, password);
         Collection<String> aliases = new TreeSet<>(Collections.list(ks.aliases()));
diff --git a/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java b/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
index ce9f8e9bb63..55c473ce90e 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library /test/lib ../
  * @modules jdk.crypto.cryptoki
  * @run main/othervm LoadKeystore
- * @run main/othervm -Djava.security.manager=allow LoadKeystore sm policy
  */
 
 import java.io.File;
@@ -43,11 +42,6 @@
 public class LoadKeystore extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-        }
-
         if (!initSecmod()) {
             return;
         }
@@ -59,10 +53,6 @@ public static void main(String[] args) throws Exception {
         System.out.println();
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setSecurityManager(new SecurityManager());
-        }
-
         try {
             System.out.println("Load keystore with wrong type");
             KeyStore.getInstance("unknown", p);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java b/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
index 81863f028f9..efe34478a9e 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TrustAnchors
- * @run main/othervm -Djava.security.manager=allow TrustAnchors sm policy
  */
 
 import java.io.File;
@@ -63,12 +62,6 @@ public static void main(String[] args) throws Exception {
         System.out.println(p);
         Security.addProvider(p);
 
-        if (args.length > 1 && "sm".equals(args[0])) {
-            System.setProperty("java.security.policy",
-                    BASE + File.separator + args[1]);
-            System.setSecurityManager(new SecurityManager());
-        }
-
         KeyStore ks = KeyStore.getInstance("PKCS11", p);
         ks.load(null, null);
         Collection<String> aliases = new TreeSet<>(Collections.list(ks.aliases()));
diff --git a/test/jdk/sun/security/pkcs11/Secmod/policy b/test/jdk/sun/security/pkcs11/Secmod/policy
deleted file mode 100644
index e4c95ca6dd5..00000000000
--- a/test/jdk/sun/security/pkcs11/Secmod/policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "authProvider.*";
-    permission java.io.FilePermission "${test.src}/-", "read";
-    permission java.io.FilePermission "${pkcs11test.nss.db}/-", "read";
-    permission java.io.FilePermission "${pkcs11test.nss.libdir}/-", "read";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java b/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java
index a014ae13a47..091b906171c 100644
--- a/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java
+++ b/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm Basic
- * @run main/othervm -Djava.security.manager=allow Basic sm
  */
 
 import java.security.NoSuchAlgorithmException;
diff --git a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
index e7e1374245c..f8375e4fe38 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm ByteBuffers
- * @run main/othervm -Djava.security.manager=allow ByteBuffers sm
  */
 
 import java.nio.ByteBuffer;
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSA.java b/test/jdk/sun/security/pkcs11/Signature/TestDSA.java
index 04fbdd00bf4..e7b937d6190 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSA.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestDSA
- * @run main/othervm -Djava.security.manager=allow TestDSA sm
  */
 
 import java.io.ByteArrayOutputStream;
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
index d2515fa0f5a..a9b43a647a9 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestDSAKeyLength
- * @run main/othervm -Djava.security.manager=allow TestDSAKeyLength sm
  */
 
 import java.security.InvalidKeyException;
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
index 14352c358da..7e6b498508f 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestRSAKeyLength
- * @run main/othervm -Djava.security.manager=allow TestRSAKeyLength sm
  */
 
 import java.security.InvalidKeyException;
diff --git a/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java b/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
index 4b4a6a20a4a..7884aa2ffed 100644
--- a/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
+++ b/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @library ../../../../java/security/testlibrary
  * @modules jdk.crypto.cryptoki
  * @run main/othervm ReadCertificates
- * @run main/othervm -Djava.security.manager=allow ReadCertificates sm policy
  */
 
 import java.io.File;
diff --git a/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java b/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
index d35310488d4..7bf45feeac0 100644
--- a/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
+++ b/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki java.base/sun.security.ec
  * @run main/othervm ReadPKCS12
- * @run main/othervm -Djava.security.manager=allow ReadPKCS12 sm policy
  */
 
 import java.io.BufferedReader;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestCurves.java b/test/jdk/sun/security/pkcs11/ec/TestCurves.java
index e3e43b72c3d..16648f9ffe3 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestCurves.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestCurves.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
  * @run main/othervm TestCurves
- * @run main/othervm -Djava.security.manager=allow TestCurves sm
  * @key randomness
  */
 
diff --git a/test/jdk/sun/security/pkcs11/ec/TestECDH.java b/test/jdk/sun/security/pkcs11/ec/TestECDH.java
index 49061f1288d..46146b42524 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestECDH.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestECDH.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @library ../../../../java/security/testlibrary
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestECDH
- * @run main/othervm -Djava.security.manager=allow TestECDH sm policy
  */
 
 import java.security.KeyFactory;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestECDH2.java b/test/jdk/sun/security/pkcs11/ec/TestECDH2.java
index 69ea7275193..ac745fbb68b 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestECDH2.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestECDH2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  *          jdk.crypto.cryptoki
  * @compile -XDignore.symbol.file TestECDH2.java
  * @run main/othervm TestECDH2
- * @run main/othervm -Djava.security.manager=allow TestECDH2 sm
  */
 
 import java.math.BigInteger;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestECDSA.java b/test/jdk/sun/security/pkcs11/ec/TestECDSA.java
index 59db0a3ed01..b9362bc0c01 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestECDSA.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestECDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestECDSA
- * @run main/othervm -Djava.security.manager=allow TestECDSA sm policy
  */
 
 import java.security.KeyFactory;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestECDSA2.java b/test/jdk/sun/security/pkcs11/ec/TestECDSA2.java
index 4b6cb6f14ed..daf24f4db96 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestECDSA2.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestECDSA2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  *          jdk.crypto.cryptoki
  * @compile -XDignore.symbol.file TestECDSA2.java
  * @run main/othervm TestECDSA2
- * @run main/othervm -Djava.security.manager=allow TestECDSA2 sm
  */
 
 import java.math.BigInteger;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java b/test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java
index 8e016f76d9b..0dc766dd418 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestECGenSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestECGenSpec
- * @run main/othervm -Djava.security.manager=allow TestECGenSpec sm
  */
 
 import java.security.AlgorithmParameters;
diff --git a/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java b/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
index 60066f118af..d23c302f38f 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestKeyFactory
- * @run main/othervm -Djava.security.manager=allow TestKeyFactory sm
  */
 
 import java.security.Key;
diff --git a/test/jdk/sun/security/pkcs11/ec/policy b/test/jdk/sun/security/pkcs11/ec/policy
deleted file mode 100644
index c850c16bc58..00000000000
--- a/test/jdk/sun/security/pkcs11/ec/policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.security.SecurityPermission "insertProvider.*";   
-    permission java.security.SecurityPermission "removeProvider.*";
-    permission java.io.FilePermission "${test.src}/-", "read";
-    permission java.io.FilePermission "${closed.base}/-", "read";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/policy b/test/jdk/sun/security/pkcs11/policy
deleted file mode 100644
index d5a78b6ba82..00000000000
--- a/test/jdk/sun/security/pkcs11/policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.util.PropertyPermission "test.provider.name", "read";
-};
diff --git a/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java b/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
index 9a44d8ff036..4fd4082f523 100644
--- a/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
+++ b/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm KeyWrap
- * @run main/othervm -Djava.security.manager=allow KeyWrap sm
  */
 
 import java.security.GeneralSecurityException;
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestCACerts.java b/test/jdk/sun/security/pkcs11/rsa/TestCACerts.java
index c95d27bc3d8..7652d32c70a 100644
--- a/test/jdk/sun/security/pkcs11/rsa/TestCACerts.java
+++ b/test/jdk/sun/security/pkcs11/rsa/TestCACerts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @library ../../../../java/security/testlibrary
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestCACerts
- * @run main/othervm -Djava.security.manager=allow TestCACerts sm TestCACerts.policy
  */
 
 // this test serves as our known answer test
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestCACerts.policy b/test/jdk/sun/security/pkcs11/rsa/TestCACerts.policy
deleted file mode 100644
index 37f028361bc..00000000000
--- a/test/jdk/sun/security/pkcs11/rsa/TestCACerts.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.security.SecurityPermission "insertProvider.*";
-    permission java.security.SecurityPermission "removeProvider.*";
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.io.FilePermission "${java.home}/lib/security/cacerts", "read";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java b/test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java
index 9f9ef5dcafa..f855aeb3e76 100644
--- a/test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java
+++ b/test/jdk/sun/security/pkcs11/rsa/TestKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestKeyFactory
- * @run main/othervm -Djava.security.manager=allow TestKeyFactory sm rsakeys.ks.policy
  */
 
 import java.io.*;
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java
index 62c05ad8cf6..07bd6e21bf7 100644
--- a/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java
+++ b/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,6 @@
  * @modules jdk.crypto.cryptoki
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator
- * @run main/othervm -Djava.security.manager=allow -Djava.security.debug=sunpkcs11 TestKeyPairGenerator
- *                                                   sm TestKeyPairGenerator.policy
  * @key randomness
  */
 
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy b/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy
deleted file mode 100644
index 3f076e14679..00000000000
--- a/test/jdk/sun/security/pkcs11/rsa/TestKeyPairGenerator.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.util.PropertyPermission "seed", "read";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestP11KeyFactoryGetRSAKeySpec.java b/test/jdk/sun/security/pkcs11/rsa/TestP11KeyFactoryGetRSAKeySpec.java
index cc9a07d3608..13aeedb33e4 100644
--- a/test/jdk/sun/security/pkcs11/rsa/TestP11KeyFactoryGetRSAKeySpec.java
+++ b/test/jdk/sun/security/pkcs11/rsa/TestP11KeyFactoryGetRSAKeySpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,7 +38,6 @@
  * @summary Also checks to ensure that sensitive RSA keys are correctly not exposed
  * @library /test/lib ..
  * @run main/othervm TestP11KeyFactoryGetRSAKeySpec
- * @run main/othervm -Djava.security.manager=allow TestP11KeyFactoryGetRSAKeySpec sm rsakeys.ks.policy
  * @run main/othervm -DCUSTOM_P11_CONFIG_NAME=p11-nss-sensitive.txt TestP11KeyFactoryGetRSAKeySpec
  * @modules jdk.crypto.cryptoki
  */
diff --git a/test/jdk/sun/security/pkcs11/rsa/TestSignatures.java b/test/jdk/sun/security/pkcs11/rsa/TestSignatures.java
index 2e2b9efca42..ec834d5299d 100644
--- a/test/jdk/sun/security/pkcs11/rsa/TestSignatures.java
+++ b/test/jdk/sun/security/pkcs11/rsa/TestSignatures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @key randomness
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestSignatures
- * @run main/othervm -Djava.security.manager=allow TestSignatures sm rsakeys.ks.policy
  */
 
 import java.io.File;
diff --git a/test/jdk/sun/security/pkcs11/rsa/rsakeys.ks.policy b/test/jdk/sun/security/pkcs11/rsa/rsakeys.ks.policy
deleted file mode 100644
index 6cc9a8f0248..00000000000
--- a/test/jdk/sun/security/pkcs11/rsa/rsakeys.ks.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.io.FilePermission "${test.src}/rsakeys.ks", "read";
-    permission java.util.PropertyPermission "test.provider.name", "read";
-};
diff --git a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
index 08b29fe6df1..4d263e04429 100644
--- a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+++ b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,6 @@
  * @modules jdk.crypto.cryptoki
  * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
  *      ClientJSSEServerJSSE
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
- *      -Djava.security.manager=allow ClientJSSEServerJSSE sm policy
  */
 
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/sslecc/policy b/test/jdk/sun/security/pkcs11/sslecc/policy
deleted file mode 100644
index f95da0407a7..00000000000
--- a/test/jdk/sun/security/pkcs11/sslecc/policy
+++ /dev/null
@@ -1,9 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.security.SecurityPermission "insertProvider.*";
-    permission java.security.SecurityPermission "removeProvider.*";
-    permission java.util.PropertyPermission "test.src", "read";
-    permission java.util.PropertyPermission "numThreads", "read";
-    permission java.io.FilePermission "${test.src}/*", "read";
-    permission java.net.SocketPermission "127.0.0.1:*", "listen,resolve,accept,connect";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
index 2083dadc5b2..977ae5338bd 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @modules java.base/sun.security.internal.spec
  *          jdk.crypto.cryptoki
  * @run main/othervm TestKeyMaterial
- * @run main/othervm -Djava.security.manager=allow TestKeyMaterial sm policy
  */
 
 import java.io.BufferedReader;
diff --git a/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java b/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
index 08a542b59ca..81a8c8eac9f 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @author Pasi Eronen
  * @modules jdk.crypto.cryptoki
  * @run main/othervm TestLeadingZeroesP11
- * @run main/othervm -Djava.security.manager=allow TestLeadingZeroesP11 sm
  */
 
 
diff --git a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
index 816e76697ce..52e2327cfc9 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  *          java.base/sun.security.internal.spec
  *          jdk.crypto.cryptoki
  * @run main/othervm TestMasterSecret
- * @run main/othervm -Djava.security.manager=allow TestMasterSecret sm TestMasterSecret.policy
  */
 
 import java.io.BufferedReader;
diff --git a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.policy b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.policy
deleted file mode 100644
index 4b98541ad7a..00000000000
--- a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.policy
+++ /dev/null
@@ -1,8 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.io.FilePermission "${test.src}/*", "read";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.internal.spec";
-    permission java.lang.RuntimePermission
-        "accessClassInPackage.sun.security.internal.interfaces";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/pkcs11/tls/TestPRF.java b/test/jdk/sun/security/pkcs11/tls/TestPRF.java
index d99c21d0e56..ada1716c98b 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestPRF.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestPRF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @modules java.base/sun.security.internal.spec
  *          jdk.crypto.cryptoki
  * @run main/othervm TestPRF
- * @run main/othervm -Djava.security.manager=allow TestPRF sm policy
  */
 
 import java.io.BufferedReader;
diff --git a/test/jdk/sun/security/pkcs11/tls/TestPremaster.java b/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
index ebae28c996c..9ee1dddb8e5 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @modules java.base/sun.security.internal.spec
  *          jdk.crypto.cryptoki
  * @run main/othervm TestPremaster
- * @run main/othervm -Djava.security.manager=allow TestPremaster sm policy
  */
 
 import java.security.Provider;
diff --git a/test/jdk/sun/security/pkcs11/tls/policy b/test/jdk/sun/security/pkcs11/tls/policy
deleted file mode 100644
index 6d161b9b2e5..00000000000
--- a/test/jdk/sun/security/pkcs11/tls/policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant {
-    permission java.lang.RuntimePermission "setSecurityManager";
-    permission java.io.FilePermission "${test.src}/*", "read";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.internal.spec";
-};
\ No newline at end of file
diff --git a/test/jdk/sun/security/provider/PolicyFile/Alias.java b/test/jdk/sun/security/provider/PolicyFile/Alias.java
deleted file mode 100644
index a03050e5856..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Alias.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4337761
- * @summary add principal "alias" grant syntax to policy file
- *
- * Note: the keystore password is "Alias.password".
- * Note: this test also covers 4501853 as well.
- *
- * @run main/othervm/policy=Alias.policy Alias
- */
-
-import java.security.*;
-import java.util.*;
-
-public class Alias {
-
-    public static void main(String[] args) {
-
-        Principal[] principals = new Principal[3];
-        principals[0] = new com.sun.security.auth.UnixPrincipal("unix");
-        principals[1] = new javax.security.auth.x500.X500Principal("cn=x509");
-        principals[2] = new javax.security.auth.x500.X500Principal
-                                        ("emailaddress=duke@sun");
-
-        java.net.URL url = null;
-        try {
-            url = new java.net.URL("http://alias");
-        } catch (java.net.MalformedURLException mue) {
-            System.out.println("test 1 failed");
-            throw new SecurityException(mue.getMessage());
-        }
-        CodeSource cs =
-            new CodeSource(url, (java.security.cert.Certificate[]) null);
-
-        ProtectionDomain pd = new ProtectionDomain
-                (cs,
-                null,
-                null,
-                principals);
-
-        PermissionCollection perms = Policy.getPolicy().getPermissions(pd);
-
-        if (perms.implies(new SecurityPermission("ALIAS"))) {
-            System.out.println("test succeeded");
-        } else {
-            System.out.println("test 2 failed");
-            throw new SecurityException("test failed");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/Alias.policy b/test/jdk/sun/security/provider/PolicyFile/Alias.policy
deleted file mode 100644
index 003c890e24c..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Alias.policy
+++ /dev/null
@@ -1,12 +0,0 @@
-keystore "file:${test.src}/Alias.keystore";
-
-grant {
-    permission java.security.SecurityPermission "getPolicy";
-};
-
-grant	codebase "http://alias",
-	principal "x509test person",
-	principal "duke",
-	principal com.sun.security.auth.UnixPrincipal "unix" {
-    permission java.security.SecurityPermission "ALIAS";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.java b/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.java
deleted file mode 100644
index 6cdf8c832f0..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4503866
- * @summary generalized permission name expansion in policy files
- *
- * Note: the keystore used is Alias.keystore - password is "Alias.password".
- *
- * @run main/othervm/policy=AliasExpansion.policy AliasExpansion
- */
-
-import javax.security.auth.*;
-
-public class AliasExpansion {
-
-    public static void main(String[] args) throws Exception {
-
-        PrivateCredentialPermission pcp = new PrivateCredentialPermission
-                ("java.lang.String javax.security.auth.x500.X500Principal " +
-                "\"CN=x509\"", "read");
-        SecurityManager sm = System.getSecurityManager();
-        sm.checkPermission(pcp);
-
-        java.security.SecurityPermission sp =
-                new java.security.SecurityPermission
-                        ("abcde javax.security.auth.x500.X500Principal " +
-                        "\"CN=x509\" fghij " +
-                        "javax.security.auth.x500.X500Principal " +
-                        "\"CN=x509\"");
-        sm.checkPermission(sp);
-
-        sp = new java.security.SecurityPermission
-                ("javax.security.auth.x500.X500Principal \"CN=x509\"");
-        sm.checkPermission(sp);
-
-        sp = new java.security.SecurityPermission
-                ("javax.security.auth.x500.X500Principal \"CN=x509\" abc");
-        sm.checkPermission(sp);
-
-        System.out.println("test passed");
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.policy b/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.policy
deleted file mode 100644
index 23cf8fd19e3..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/AliasExpansion.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-keystore "file:${test.src}/Alias.keystore";
-
-grant {
-    permission javax.security.auth.PrivateCredentialPermission
-	"java.lang.String ${{alias:x509test person}}", "read";
-    permission java.security.SecurityPermission
-	"abcde ${{alias:x509test person}} fghij ${{alias:x509test person}}";
-    permission java.security.SecurityPermission
-	"${{alias:x509test person}}";
-    permission java.security.SecurityPermission
-	"${{alias:x509test person}} abc";
-
-    // these three are erroneous but should not cause the
-    // test to fail.  they should simply cause notification output to be
-    // dumped to stderr.
-    permission java.security.SecurityPermission
-	"${{alias:notthere}}";
-    permission java.security.SecurityPermission
-	"${{unsupported}}";
-    permission java.security.SecurityPermission
-	"${{alias}}";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.java b/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.java
deleted file mode 100644
index a1fc10d6ef6..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8150468
- * @summary check that a badly formatted policy file is handled correctly
- * @run main/othervm -Djava.security.manager=allow BadPolicyFile
- */
-
-import java.io.File;
-import java.net.URI;
-import java.security.AccessControlException;
-import java.security.Policy;
-import java.security.URIParameter;
-
-public class BadPolicyFile {
-
-    public static void main(String[] args) throws Exception {
-        URI uri = new File(System.getProperty("test.src", "."),
-                           "BadPolicyFile.policy").toURI();
-        Policy.setPolicy(Policy.getInstance("JavaPolicy", new URIParameter(uri)));
-        System.setSecurityManager(new SecurityManager());
-        try {
-            String javahome = System.getProperty("java.home");
-            throw new Exception("Expected AccessControlException");
-        } catch (AccessControlException ace) {
-            System.out.println("Test PASSED");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.policy b/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.policy
deleted file mode 100644
index b5abfaf8f42..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/BadPolicyFile.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    // permission statement is missing trailing semi-colon
-    permission "java.util.PropertyPermission" "java.home", "read"
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.java b/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.java
deleted file mode 100644
index 6edbe40614a..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4495188
- * @summary static and policy permissions should not be checked separately
- *
- * @run main/othervm/policy=CombinedPerms.policy CombinedPerms
- */
-
-import java.security.*;
-import java.net.*;
-import java.util.*;
-
-public class CombinedPerms {
-
-    public static void main(String[] args) throws Exception {
-
-        String host = "localhost";
-
-        URL u = new URL("file:/tmp/duke");
-        CodeSource cs =
-            new CodeSource(u, (java.security.cert.Certificate[]) null);
-        Permissions p = new Permissions();
-        p.add(new SocketPermission(host, "connect"));
-        ProtectionDomain pd = new ProtectionDomain(cs, p, null, null);
-
-        if (pd.implies(new SocketPermission(host, "connect,accept"))) {
-            System.out.println("Test Passed");
-        } else {
-            throw new SecurityException("Test Failed");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.policy b/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.policy
deleted file mode 100644
index ea4a09c6c1d..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/CombinedPerms.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant codebase "file:/tmp/duke" {
-    permission java.net.SocketPermission "localhost", "accept";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/DefaultPolicy.java b/test/jdk/sun/security/provider/PolicyFile/DefaultPolicy.java
deleted file mode 100644
index e16cef02657..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/DefaultPolicy.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8159752
- * @summary Test that default policy permissions are always granted
- * @run main/othervm DefaultPolicy
- */
-
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Paths;
-import java.security.AllPermission;
-import java.security.CodeSigner;
-import java.security.CodeSource;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import java.security.URIParameter;
-
-public class DefaultPolicy {
-
-    public static void main(String[] args) throws Exception {
-
-        // Check policy with no java.security.policy property set
-        Policy p = Policy.getPolicy();
-        checkPolicy(p);
-
-        // Check policy with java.security.policy '=' option
-        System.setProperty("java.security.policy", "Extra.policy");
-        p.refresh();
-        checkPolicy(p);
-
-        // Check policy with java.security.policy override '==' option
-        System.setProperty("java.security.policy", "=Extra.policy");
-        p.refresh();
-        checkPolicy(p);
-
-        // Check Policy.getInstance
-        URI policyURI = Paths.get(System.getProperty("test.src"),
-                                  "Extra.policy").toUri();
-        p = Policy.getInstance("JavaPolicy", new URIParameter(policyURI));
-        checkPolicy(p);
-    }
-
-    private static void checkPolicy(Policy p) throws Exception {
-        // check if jdk.crypto.cryptoki module has been de-privileged
-        CodeSource cs =
-            new CodeSource(new URL("jrt:/jdk.crypto.cryptoki"), (CodeSigner[])null);
-        ProtectionDomain pd = new ProtectionDomain(cs, null, null, null);
-        if (p.implies(pd, new AllPermission())) {
-            throw new Exception("module should not be granted AllPermission");
-        }
-        if (!p.implies(pd, new RuntimePermission("loadLibrary.j2pkcs11"))) {
-            throw new Exception("module should be granted RuntimePermission");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/EmailAddress.java b/test/jdk/sun/security/provider/PolicyFile/EmailAddress.java
deleted file mode 100644
index f6975881c66..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/EmailAddress.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4702543
- * @summary X500Principal encodes EmailAddress incorrectly -
- *
- *      fix has compatibility ramifications for policy.
- *
- *      this test is related to the Alias.java test in the same directory.
- *      the email address encoding in EmailAddress.policy is the one
- *      taken from the persistent certificate stored in Alias.keystore,
- *      and which has the incorrect encoding.  the alias is 'duke',
- *      and the DN is:  "emailaddress=duke@sun".  the cert was generated
- *      by a 1.4 JDK, so it has the wrong encoding for "duke@sun"
- *      (UTF-8 string instead of IA5String, i believe).
- *
- *      administrators would have placed an incorrectly encoded DN entry
- *      like this in their policies.  the fix for the above bug
- *      would have broken their policy because the incorrect
- *      encoding would be compared to a properly encoded DN from
- *      the current call thread.  if you run this test without
- *      a fix for the compatibility issue, the debug output will
- *      show the differences in the encodings.
- *
- *      so in addition to fixing the encoding,
- *      the policy implementation was updated to read the
- *      incorrectly encoded DN strings, generate new X500Principals,
- *      and dump out new DN strings that had the correct encoding.
- *      thus access control checks would no longer fail.
- *
- * @run main/othervm/policy=EmailAddress.policy -Djava.security.debug=policy EmailAddress
- */
-
-import java.security.*;
-import java.util.*;
-
-public class EmailAddress {
-
-    public static void main(String[] args) {
-
-        Principal[] principals = new Principal[1];
-        principals[0] = new javax.security.auth.x500.X500Principal
-                                        ("emailaddress=duke@sun");
-
-        java.net.URL url = null;
-        try {
-            url = new java.net.URL("http://emailaddress");
-        } catch (java.net.MalformedURLException mue) {
-            System.out.println("test 1 failed");
-            throw new SecurityException(mue.getMessage());
-        }
-        CodeSource cs =
-            new CodeSource(url, (java.security.cert.Certificate[]) null);
-
-        ProtectionDomain pd = new ProtectionDomain
-                (cs,
-                null,
-                null,
-                principals);
-
-        PermissionCollection perms = Policy.getPolicy().getPermissions(pd);
-
-        if (perms.implies(new SecurityPermission("EMAILADDRESS"))) {
-            System.out.println("test succeeded");
-        } else {
-            System.out.println("test 2 failed");
-            throw new SecurityException("test failed");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/EmailAddress.policy b/test/jdk/sun/security/provider/PolicyFile/EmailAddress.policy
deleted file mode 100644
index 9fe47499a2d..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/EmailAddress.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-grant {
-    permission java.security.SecurityPermission "getPolicy";
-};
-
-grant	codebase "http://emailaddress",
-	principal javax.security.auth.x500.X500Principal
-                "1.2.840.113549.1.9.1=#0c0864756b654073756e" {
-    permission java.security.SecurityPermission "EMAILADDRESS";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/Extra.policy b/test/jdk/sun/security/provider/PolicyFile/Extra.policy
deleted file mode 100644
index 8188c8bf9b8..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Extra.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.net.SocketPermission "localhost:0", "listen";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java b/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java
deleted file mode 100644
index d50623e0c80..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4231980 4233913
- * @summary Make sure that when no system policy and user policy files exist,
- * the built-in default policy will be used, which - amongst other things -
- * grants standard extensions the AllPermission. This regression is for 2
- * bugs (listed above). This test is ignored for now, because it temporarily
- * removes the system policy file, which is not a safe thing to do (may
- * affect other tests that are run concurrently).
- *
- * @build SomeExtensionClass
- * @build GrantAllPermToExtWhenNoPolicy
- * @run shell/manual GrantAllPermToExtWhenNoPolicy.sh
- */
-
-import java.security.*;
-
-public class GrantAllPermToExtWhenNoPolicy {
-
-    public static void main(String[] args) throws Exception {
-
-        SomeExtensionClass sec = new SomeExtensionClass();
-        try {
-            sec.getUserName();
-        } catch (AccessControlException ace) {
-            throw new Exception("Cannot read user name");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh b/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh
deleted file mode 100644
index 54fe0a34a2b..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]; then
-   COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  Linux )
-    PATHSEP=":"
-    FILESEP="/"
-    ;;
-  Windows* )
-    PATHSEP=";"
-    FILESEP="\\"
-    ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
-esac
-
-# compile the test program
-cd ${TESTSRC}${FILESEP}
-rm GrantAllPermToExtWhenNoPolicy.class
-${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-    -d ${TESTSRC}${FILESEP} ${TESTSRC}${FILESEP}SomeExtensionClass.java
-${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-    -d ${TESTSRC}${FILESEP} ${TESTSRC}${FILESEP}GrantAllPermToExtWhenNoPolicy.java
-
-# create the extension JAR file
-cd ${TESTCLASSES}
-${COMPILEJAVA}${FILESEP}bin${FILESEP}jar cvf SomeExt.jar SomeExtensionClass*.class
-rm SomeExtensionClass.class
-
-# move the extension JAR file to the extension directory
-mv SomeExt.jar ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}ext
-
-# remove the system policy file
-mv \
- ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}java.policy \
- ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}tmp_pol
-
-# run the test program
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Djava.security.manager \
- GrantAllPermToExtWhenNoPolicy
-
-# save error status
-status=$?
-
-# restore system policy and remove extension JAR file
-mv ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}tmp_pol \
- ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}java.policy
-rm ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}ext${FILESEP}SomeExt.jar
-
-exit $status
diff --git a/test/jdk/sun/security/provider/PolicyFile/Modules.java b/test/jdk/sun/security/provider/PolicyFile/Modules.java
deleted file mode 100644
index 57516aa5c4a..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Modules.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8047771
- * @summary check permissions and principals from various modules
- * @modules java.desktop
- *          java.logging
- *          java.management
- *          java.security.jgss
- *          java.smartcardio
- *          java.sql
- *          java.xml
- *          jdk.attach
- *          jdk.jdi
- *          jdk.net
- *          jdk.security.auth
- *          jdk.security.jgss
- * @run main/othervm/java.security.policy==modules.policy Modules
- */
-
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import javax.security.auth.Subject;
-
-public class Modules {
-
-    private final static Permission[] perms = new Permission[] {
-        // java.base module
-        new java.io.SerializablePermission("enableSubstitution"),
-        new java.lang.reflect.ReflectPermission("suppressAccessChecks"),
-        new java.nio.file.LinkPermission("hard"),
-        new javax.net.ssl.SSLPermission("getSSLSessionContext"),
-        new javax.security.auth.AuthPermission("doAsPrivileged"),
-        new javax.security.auth.PrivateCredentialPermission("* * \"*\"",
-                                                            "read"),
-        // java.desktop module
-        new java.awt.AWTPermission("createRobot"),
-        new javax.sound.sampled.AudioPermission("play"),
-        // java.logging module
-        new java.util.logging.LoggingPermission("control", ""),
-        // java.management module
-        new java.lang.management.ManagementPermission("control"),
-        new javax.management.MBeanPermission("*", "getAttribute"),
-        new javax.management.MBeanServerPermission("createMBeanServer"),
-        new javax.management.MBeanTrustPermission("register"),
-        new javax.management.remote.SubjectDelegationPermission("*"),
-        // java.security.jgss module
-        new javax.security.auth.kerberos.DelegationPermission("\"*\" \"*\""),
-        new javax.security.auth.kerberos.ServicePermission("*", "accept"),
-        // java.sql module
-        new java.sql.SQLPermission("setLog"),
-        // java.smartcardio module
-        new javax.smartcardio.CardPermission("*", "*"),
-        // jdk.attach module (@jdk.Exported Permissions)
-        new com.sun.tools.attach.AttachPermission("attachVirtualMachine"),
-        // jdk.jdi module (@jdk.Exported Permissions)
-        new com.sun.jdi.JDIPermission("virtualMachineManager"),
-        // jdk.security.jgss module (@jdk.Exported Permissions)
-        new com.sun.security.jgss.InquireSecContextPermission("*"),
-    };
-
-    private final static Principal[] princs = new Principal[] {
-        // java.base module
-        new javax.security.auth.x500.X500Principal("CN=Duke"),
-        // java.management module
-        new javax.management.remote.JMXPrincipal("Duke"),
-        // java.security.jgss module
-        new javax.security.auth.kerberos.KerberosPrincipal("duke@openjdk.org"),
-        new com.sun.security.auth.UserPrincipal("Duke"),
-        new com.sun.security.auth.NTDomainPrincipal("openjdk.org"),
-        new com.sun.security.auth.NTSid(
-            "S-1-5-21-3623811015-3361044348-30300820-1013"),
-        new com.sun.security.auth.NTUserPrincipal("Duke"),
-        new com.sun.security.auth.UnixNumericUserPrincipal("0"),
-        new com.sun.security.auth.UnixPrincipal("duke"),
-    };
-
-    public static void main(String[] args) throws Exception {
-
-        for (Permission perm : perms) {
-            AccessController.checkPermission(perm);
-        }
-
-        Permission princPerm = new java.util.PropertyPermission("user.home",
-                                                                "read");
-        Set<Principal> princSet = new HashSet<>(Arrays.asList(princs));
-        Subject subject = new Subject(true, princSet, Collections.emptySet(),
-                                      Collections.emptySet());
-        PrivilegedAction<Void> pa = () -> {
-            AccessController.checkPermission(princPerm);
-            return null;
-        };
-        Subject.doAsPrivileged(subject, pa, null);
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.java b/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.java
deleted file mode 100644
index 7ec1009ee6b..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @author  Ram Marti
- * @bug 4350951
- *
- * @summary generalized "self" expansion in JAAS policy files
- *
- * @run main/othervm/policy=SelfExpansion.policy SelfExpansion
- */
-
-import java.security.*;
-import javax.security.auth.Subject;
-
-public class SelfExpansion {
-    public static void main(String[] args) throws Exception {
-        Subject s = new Subject();
-        s.getPrincipals().add
-                (new javax.security.auth.x500.X500Principal("CN=test"));
-        s.getPrivateCredentials().add(new String("test"));
-        try {
-            Subject.doAsPrivileged(s, new PrivilegedAction() {
-                public Object run() {
-                    java.util.Iterator i = Subject.getSubject
-                                (AccessController.getContext
-                                ()).getPrivateCredentials().iterator();
-                    return i.next();
-                }
-            }, null);
-            System.out.println("Test succeeded");
-        } catch (Exception e) {
-            System.out.println("Test failed");
-            e.printStackTrace();
-            throw e;
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.policy b/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.policy
deleted file mode 100644
index ac080f8dc35..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/SelfExpansion.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-grant {
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "modifyPrivateCredentials";
-    permission javax.security.auth.AuthPermission "doAsPrivileged";
-    permission javax.security.auth.AuthPermission "getSubject";
-};
-
-grant principal javax.security.auth.x500.X500Principal "CN=test" {
-    permission javax.security.auth.PrivateCredentialPermission "java.lang.String ${{self}}", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.java b/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.java
deleted file mode 100644
index 37689911b57..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4510424
- * @summary ${{self}} expansion fails for grants with wildcard principal names
- */
-
-import java.util.*;
-import java.security.*;
-import javax.security.auth.Subject.*;
-import javax.security.auth.x500.*;
-
-public class SelfWildcard {
-
-    private static final String SELF_ONE =
-        "javax.security.auth.x500.X500Principal \"CN=foo\"";
-    private static final String SELF_TWOTHREE =
-        "javax.security.auth.x500.X500Principal \"CN=foo\", " +
-        "javax.security.auth.x500.X500Principal \"CN=bar\"";
-    private static final String SELF_FOURFIVE =
-        "javax.security.auth.x500.X500Principal \"CN=foo\", " +
-        "javax.security.auth.x500.X500Principal \"CN=bar\", " +
-        "com.sun.security.auth.UnixPrincipal \"foobar\"";
-
-    public static void main(String[] args) throws Exception {
-        if (System.getProperty("test.src") == null) {
-            System.setProperty("test.src", ".");
-        }
-        System.setProperty("java.security.policy",
-                "file:${test.src}/SelfWildcard.policy");
-
-        Principal[] ps = {
-                new X500Principal("CN=foo"),
-                new X500Principal("CN=bar"),
-                new com.sun.security.auth.UnixPrincipal("foobar") };
-        ProtectionDomain pd = new ProtectionDomain
-                (new CodeSource(null, (java.security.cert.Certificate[]) null),
-                    null, null, ps);
-        PermissionCollection perms = Policy.getPolicy().getPermissions(pd);
-        System.out.println("perms = " + perms);
-        System.out.println();
-
-        Enumeration e = perms.elements();
-        while (e.hasMoreElements()) {
-            Permission p = (Permission)e.nextElement();
-            if (p instanceof UnresolvedPermission &&
-                p.toString().indexOf(SELF_ONE) < 0 &&
-                p.toString().indexOf(SELF_TWOTHREE) < 0 &&
-                p.toString().indexOf(SELF_FOURFIVE) < 0) {
-                throw new SecurityException("Test Failed");
-            }
-        }
-
-        System.out.println("Test Succeeded");
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.policy b/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.policy
deleted file mode 100644
index 1ff3ca6d419..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/SelfWildcard.policy
+++ /dev/null
@@ -1,23 +0,0 @@
-
-grant principal javax.security.auth.x500.X500Principal "CN=foo" {
-  permission OnePermission "${{self}}";
-};
-
-grant principal javax.security.auth.x500.X500Principal "CN=foo",
-    principal javax.security.auth.x500.X500Principal "CN=bar" {
-  permission TwoPermission "${{self}}";
-};
-
-grant principal javax.security.auth.x500.X500Principal * {
-  permission ThreePermission "${{self}}";
-};
-
-grant principal * * {
-  permission FourPermission "${{self}}";
-};
-
-grant principal javax.security.auth.x500.X500Principal *,
-    principal com.sun.security.auth.UnixPrincipal "foobar" {
-  permission FivePermission "${{self}}";
-};
-
diff --git a/test/jdk/sun/security/provider/PolicyFile/SomeExtensionClass.java b/test/jdk/sun/security/provider/PolicyFile/SomeExtensionClass.java
deleted file mode 100644
index 7f699c16122..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/SomeExtensionClass.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.security.*;
-
-public class SomeExtensionClass {
-
-    public String getUserName() {
-        String user = (String) AccessController.doPrivileged(
-                new PrivilegedAction() {
-            public Object run() {
-                return System.getProperty("user.name");
-            }
-        }
-        );
-        return user;
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy b/test/jdk/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy
deleted file mode 100644
index 1f826341ef0..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy
+++ /dev/null
@@ -1,6 +0,0 @@
-keystore "TokenStore.keystore", "JKS", "SUN";
-keystorePasswordURL "TokenStore.pwd";
-
-grant signedby "POLICY_URL_T_P" {
-    permission java.security.AllPermission;
-};                                            
diff --git a/test/jdk/sun/security/provider/PolicyFile/TokenStore.java b/test/jdk/sun/security/provider/PolicyFile/TokenStore.java
deleted file mode 100644
index 67c8205b1ad..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/TokenStore.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4919147
- * @summary Support for token-based KeyStores
- * @modules java.base/sun.security.provider
- */
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
-import java.security.Permission;
-import java.security.KeyStore;
-import java.security.cert.*;
-import sun.security.provider.*;
-
-public class TokenStore {
-
-    private static String DIR =
-                System.getProperty("test.classes", ".") + File.separatorChar;
-    private static final char[] storePassword = new char[]
-                { 'T', 'o', 'k', 'e', 'n', 'S', 't', 'o', 'r', 'e' };
-
-
-    // policy files that will get written
-    private static String NO_STORE_FILE =       DIR + "TokenStore.NoStore";
-    private static String URL_FILE =            DIR + "TokenStore.Url";
-    private static String URL_T_FILE =          DIR + "TokenStore.UrlT";
-    private static String URL_T_P_FILE =        DIR + "TokenStore.UrlTP";
-    private static String URL_PWD_FILE =        DIR + "TokenStore.UrlPwd";
-    private static String URL_T_P_PWD_FILE =    DIR + "TokenStore.UrlTPPwd";
-    private static String BADPASS_FILE =        DIR + "TokenStore.BadPass";
-
-    private static String RELPASS_FILE =
-                System.getProperty("test.src", ".") + File.separatorChar +
-                "TokenStore.RelPassPolicy";
-
-    // protection domains
-    private static ProtectionDomain NO_STORE_DOMAIN;
-    private static ProtectionDomain URL_DOMAIN;
-    private static ProtectionDomain URL_T_DOMAIN;
-    private static ProtectionDomain URL_T_P_DOMAIN;
-
-    // policy contents written to files
-    private static final String POLICY_NO_STORE =
-        "grant { permission java.security.AllPermission; };";
-
-    private static final String POLICY_URL =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\";"         +
-        "grant signedby \"POLICY_URL\" {"                               +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\", \"JKS\";"+
-        "grant signedby \"POLICY_URL_T\" {"                             +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T_P =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\","         +
-        "               \"JKS\", \"SUN\";"                              +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_PWD =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\";"         +
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.pwd\";"   +
-        "grant signedby \"POLICY_URL\" {"                               +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T_P_PWD =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\","         +
-        "               \"JKS\", \"SUN\";"                              +
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.pwd\";"   +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_BADPASS =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\","         +
-        "               \"JKS\", \"SUN\";"                              +
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.java\";"  +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static void init() throws Exception {
-
-        // first write policy files
-
-        PolicyParser pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_NO_STORE));
-        pp.write(new FileWriter(NO_STORE_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_URL));
-        pp.write(new FileWriter(URL_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_URL_T));
-        pp.write(new FileWriter(URL_T_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_URL_T_P));
-        pp.write(new FileWriter(URL_T_P_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_URL_PWD));
-        pp.write(new FileWriter(URL_PWD_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_URL_T_P_PWD));
-        pp.write(new FileWriter(URL_T_P_PWD_FILE, false));
-
-        pp = new PolicyParser();
-        pp.read(new StringReader(POLICY_BADPASS));
-        pp.write(new FileWriter(BADPASS_FILE, false));
-
-        // next load keystore data to build PD's
-
-        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-        ks.load(new FileInputStream
-                        (System.getProperty("test.src", ".") +
-                        File.separatorChar +
-                        "TokenStore.keystore"),
-                storePassword);
-
-        NO_STORE_DOMAIN = new ProtectionDomain
-                        (new CodeSource(new URL("file:/foo"),
-                            (java.security.cert.Certificate[]) null),
-                        null,  // perms
-                        null,  // class loader
-                        null);  // principals
-
-        Certificate[] chain = (Certificate[])
-                        ks.getCertificateChain("POLICY_URL");
-        URL_DOMAIN = new ProtectionDomain
-                        (new CodeSource(new URL("file:/foo"), chain),
-                        null,  // perms
-                        null,  // class loader
-                        null);  // principals
-
-        chain = (Certificate[])
-                        ks.getCertificateChain("POLICY_URL_T");
-        URL_T_DOMAIN = new ProtectionDomain
-                        (new CodeSource(new URL("file:/foo"), chain),
-                        null,  // perms
-                        null,  // class loader
-                        null);  // principals
-
-        chain = (Certificate[])
-                        ks.getCertificateChain("POLICY_URL_T_P");
-        URL_T_P_DOMAIN = new ProtectionDomain
-                        (new CodeSource(new URL("file:/foo"), chain),
-                        null,  // perms
-                        null,  // class loader
-                        null);  // principals
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        init();
-
-        // test no key store in policy
-
-        System.setProperty("java.security.policy", "=" + NO_STORE_FILE);
-        PolicyFile p = new PolicyFile();
-        checkPerm(p, NO_STORE_DOMAIN);
-
-        // test policy keystore + URL
-
-        System.setProperty("java.security.policy", "=" + URL_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_DOMAIN);
-
-        // test policy keystore + URL + type
-
-        System.setProperty("java.security.policy", "=" + URL_T_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_T_DOMAIN);
-
-        // test policy keystore + URL + type + provider
-
-        System.setProperty("java.security.policy", "=" + URL_T_P_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_T_P_DOMAIN);
-
-        // test policy keystore + URL + password
-
-        System.setProperty("java.security.policy", "=" + URL_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_DOMAIN);
-
-        // test policy keystore + URL + type + provider + password
-
-        System.setProperty("java.security.policy", "=" + URL_T_P_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_T_P_DOMAIN);
-
-        // test policy keystore + URL + type + provider + BAD password
-
-        System.setProperty("java.security.policy", "=" + BADPASS_FILE);
-        p = new PolicyFile();
-        try {
-            checkPerm(p, URL_T_P_DOMAIN);
-            throw new RuntimeException("expected SecurityException");
-        } catch (SecurityException se) {
-            // good
-            //se.printStackTrace();
-        }
-
-        // test policy keystore + URL + type + provider + RELATIVE password
-
-        System.setProperty("java.security.policy", "=" + RELPASS_FILE);
-        p = new PolicyFile();
-        checkPerm(p, URL_T_P_DOMAIN);
-    }
-
-    private static void checkPerm(PolicyFile p, ProtectionDomain pd)
-                throws Exception {
-        boolean foundIt = false;
-        Enumeration perms = p.getPermissions(pd).elements();
-        while (perms.hasMoreElements()) {
-            Permission perm = (Permission)perms.nextElement();
-            if (perm instanceof AllPermission) {
-                foundIt = true;
-                break;
-            }
-        }
-        if (!foundIt) {
-            throw new SecurityException("expected AllPermission");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/TokenStore.keystore b/test/jdk/sun/security/provider/PolicyFile/TokenStore.keystore
deleted file mode 100644
index 5f921a9d5bb..00000000000
Binary files a/test/jdk/sun/security/provider/PolicyFile/TokenStore.keystore and /dev/null differ
diff --git a/test/jdk/sun/security/provider/PolicyFile/TokenStore.pwd b/test/jdk/sun/security/provider/PolicyFile/TokenStore.pwd
deleted file mode 100644
index 759deb524c6..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/TokenStore.pwd
+++ /dev/null
@@ -1 +0,0 @@
-TokenStore
diff --git a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.java b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.java
deleted file mode 100644
index 59010365c25..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4409615
- * @summary KeyStore alias principal grant fails for trusted certificate entry
- *
- * this should always work:
- *              main/othervm/policy=TrustedCert.policy \
- *              -Dkeystore=TrustedCert.keystore1 -Dfoo=bar TrustedCert
- *
- * @run main/othervm/policy=TrustedCert.policy -Dkeystore=TrustedCert.keystore1 -Dfoo=bar TrustedCert
- */
-
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-
-public class TrustedCert {
-
-    public static void main(String[] args) {
-        System.out.println(
-            Subject.doAsPrivileged(
-                new Subject(true,
-                            Collections.singleton(new X500Principal("CN=Tim")),
-                            Collections.EMPTY_SET,
-                            Collections.EMPTY_SET),
-                new PrivilegedAction() {
-                    public Object run() {
-                        return System.getProperty("foo");
-                    }
-                },
-                null));
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore
deleted file mode 100644
index be6af8162cd..00000000000
Binary files a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore and /dev/null differ
diff --git a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore1 b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore1
deleted file mode 100644
index b3d450d5048..00000000000
Binary files a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.keystore1 and /dev/null differ
diff --git a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.policy b/test/jdk/sun/security/provider/PolicyFile/TrustedCert.policy
deleted file mode 100644
index 6ebd1abedf6..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/TrustedCert.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-keystore "file:${test.src}/${keystore}";
-
-grant {
-    permission javax.security.auth.AuthPermission "doAsPrivileged";
-    permission java.util.PropertyPermission "keystore", "read";
-};
-
-grant principal "Tim" {
-    permission java.util.PropertyPermission "foo", "read";
-};
-
diff --git a/test/jdk/sun/security/provider/PolicyFile/Utf8.java b/test/jdk/sun/security/provider/PolicyFile/Utf8.java
deleted file mode 100644
index 10205b1a933..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Utf8.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4667175
- * @summary Cannot parsing java.policy which includes some 2 bytes char
- *
- * @run main/othervm/policy=Utf8.policy -Dsun.security.policy.utf8=false Utf8
- */
-
-public class Utf8 {
-    public static void main(String[] args) throws Exception {
-        System.out.println("user name = " + System.getProperty("user.name"));
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/Utf8.policy b/test/jdk/sun/security/provider/PolicyFile/Utf8.policy
deleted file mode 100644
index 6a4cf73ed8a..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/Utf8.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "user.name", "read"; 
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/WildcardPrincipalName.java b/test/jdk/sun/security/provider/PolicyFile/WildcardPrincipalName.java
deleted file mode 100644
index d81149d036f..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/WildcardPrincipalName.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8008908
- * @summary wildcard principal names are not processed correctly
- * @run main/othervm/policy=wildcard.policy WildcardPrincipalName
- */
-
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import java.util.PropertyPermission;
-import java.util.Set;
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-
-public class WildcardPrincipalName {
-
-    public static void main(String[] args) throws Exception {
-
-        X500Principal duke = new X500Principal("CN=Duke");
-        PropertyPermission pp = new PropertyPermission("user.home", "read");
-        RunAsPrivilegedUserAction runAsPrivilegedUserAction
-            = new RunAsPrivilegedUserAction(duke,
-                                            new CheckPermissionAction(pp));
-        AccessController.doPrivileged(runAsPrivilegedUserAction);
-        System.out.println("test PASSED");
-    }
-
-    private static class RunAsPrivilegedUserAction
-        implements PrivilegedAction<Void> {
-        private final PrivilegedAction<Void> action;
-        private final Principal principal;
-
-        RunAsPrivilegedUserAction(Principal principal,
-                                  PrivilegedAction<Void> action) {
-            this.principal = principal;
-            this.action = action;
-        }
-
-        @Override public Void run() {
-            Set<Principal> principals = new HashSet<>();
-            Set<Object> publicCredentials = new HashSet<>();
-            Set<Object> privateCredentials = new HashSet<>();
-
-            principals.add(principal);
-            Subject subject = new Subject(true,
-                                          principals,
-                                          publicCredentials,
-                                          privateCredentials);
-
-            Subject.doAsPrivileged(subject, action, null);
-            return null;
-        }
-    }
-
-    private static class CheckPermissionAction
-        implements PrivilegedAction<Void> {
-        private final Permission permission;
-
-        CheckPermissionAction(Permission permission) {
-            this.permission = permission;
-        }
-
-        @Override public Void run() {
-            AccessController.checkPermission(permission);
-            return null;
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.java
deleted file mode 100644
index d3a35ebcdf8..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class GetInstance {
-    public static void main(String[] args) {
-        SecurityManager sm = System.getSecurityManager();
-        try {
-            sm.checkPermission(new NoArgPermission());
-            sm.checkPermission(new OneArgPermission("one"));
-            sm.checkPermission(new TwoArgPermission("two", "two"));
-            sm.checkPermission(new TwoArgNullActionsPermission
-                                                ("two",
-                                                (String)null));
-        } catch (Exception e) {
-            System.out.println("Test Failed");
-            e.printStackTrace();
-            throw new SecurityException("Test Failed");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.policy b/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.policy
deleted file mode 100644
index f202bf30d7a..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/GetInstance.policy
+++ /dev/null
@@ -1,6 +0,0 @@
-grant {
-    permission NoArgPermission;
-    permission OneArgPermission "one";
-    permission TwoArgPermission "two", "two";
-    permission TwoArgNullActionsPermission "two";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java
deleted file mode 100644
index ccc997a6a2e..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class NoArgPermission extends java.security.BasicPermission {
-    public NoArgPermission() { super("none"); }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java
deleted file mode 100644
index 1925680b337..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class OneArgPermission extends java.security.BasicPermission {
-    public OneArgPermission(String arg) { super(arg); }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java
deleted file mode 100644
index 3eb2caf83d2..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class TwoArgNullActionsPermission extends java.security.BasicPermission {
-    public TwoArgNullActionsPermission(String arg, String arg2) {
-        super(arg, null);
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java b/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java
deleted file mode 100644
index bc22bbe9d36..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class TwoArgPermission extends java.security.BasicPermission {
-    public TwoArgPermission(String arg, String arg2) { super(arg, arg2); }
-}
diff --git a/test/jdk/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/test/jdk/sun/security/provider/PolicyFile/getinstance/getinstance.sh
deleted file mode 100644
index c293a067afe..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/getinstance/getinstance.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @author  Ram Marti
-# @bug 4350951
-# @summary 4350951 assumes permission constructor with 2 string params
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]; then
-    COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  Linux )
-    PS=":"
-    FS="/"
-    ;;
-  Darwin )
-    PS=":"
-    FS="/"
-    ;;
-  AIX )
-    PS=":"
-    FS="/"
-    ;;
-  CYGWIN* )
-    PS=";"
-    FS="/"
-    ;;
-  Windows* )
-    PS=";"
-    FS="\\"
-    ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
-esac
-
-if [ ! -d ${TESTCLASSES}${FS}boot ]; then
-        mkdir -p ${TESTCLASSES}${FS}boot
-fi
-if [ ! -d ${TESTCLASSES}${FS}app ]; then
-        mkdir -p ${TESTCLASSES}${FS}app
-fi
-
-cd ${TESTSRC}${FS}
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}boot \
-        ${TESTSRC}${FS}NoArgPermission.java
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}boot \
-        ${TESTSRC}${FS}OneArgPermission.java
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}boot \
-        ${TESTSRC}${FS}TwoArgPermission.java
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}boot \
-        ${TESTSRC}${FS}TwoArgNullActionsPermission.java
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}app \
-        ${TESTSRC}${FS}GetInstance.java
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS}  \
--Xbootclasspath/a:"${TESTCLASSES}${FS}boot" \
--classpath "${TESTCLASSES}${FS}app" -Djava.security.manager \
--Djava.security.policy=GetInstance.policy \
-GetInstance
-
-# Save error status
-status1=$?
-
-# print error message
-if [ $status1 -ne 0 ]; then
-     echo "Failed on first test"
-fi
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS}  \
--classpath "${TESTCLASSES}${FS}boot${PS}${TESTCLASSES}${FS}app" \
--Djava.security.manager \
--Djava.security.policy=GetInstance.policy \
-GetInstance
-
-# Save error status
-status2=$?
-
-# print error message
-if [ $status2 -ne 0 ]; then
-     echo "Failed on second test"
-fi
-
-#
-# Exit ok?
-#
-if [ $status1 -ne 0 ]; then
-     exit $status1
-fi
-
-if [ $status2 -ne 0 ]; then
-     exit $status2
-fi
diff --git a/test/jdk/sun/security/provider/PolicyFile/modules.policy b/test/jdk/sun/security/provider/PolicyFile/modules.policy
deleted file mode 100644
index 3d376ccaea2..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/modules.policy
+++ /dev/null
@@ -1,61 +0,0 @@
-grant {
-    // java.base module
-    permission java.io.SerializablePermission "enableSubstitution";
-    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-    permission java.nio.file.LinkPermission "hard";
-    permission javax.net.ssl.SSLPermission "getSSLSessionContext";
-    permission javax.security.auth.AuthPermission "doAsPrivileged";
-    permission javax.security.auth.PrivateCredentialPermission "* * \"*\"",
-                                                               "read";
-    // java.desktop module
-    permission java.awt.AWTPermission "createRobot";
-    permission javax.sound.sampled.AudioPermission "play";
-    // java.logging module
-    permission java.util.logging.LoggingPermission "control", "";
-    // java.management module
-    permission java.lang.management.ManagementPermission "control";
-    permission javax.management.MBeanPermission "*", "getAttribute";
-    permission javax.management.MBeanServerPermission "createMBeanServer";
-    permission javax.management.MBeanTrustPermission "register";
-    permission javax.management.remote.SubjectDelegationPermission "*";
-    // java.security.jgss module
-    permission javax.security.auth.kerberos.DelegationPermission "\"*\" \"*\"";
-    permission javax.security.auth.kerberos.ServicePermission "*", "accept";
-    // java.sql module
-    permission java.sql.SQLPermission "setLog";
-    // java.smartcardio module
-    permission javax.smartcardio.CardPermission "*", "*";
-    // jdk.attach module (@jdk.Exported Permissions)
-    permission com.sun.tools.attach.AttachPermission "attachVirtualMachine";
-    // jdk.jdi module (@jdk.Exported Permissions)
-    permission com.sun.jdi.JDIPermission "virtualMachineManager";
-    // jdk.security.jgss module (@jdk.Exported Permissions)
-    permission com.sun.security.jgss.InquireSecContextPermission "*"; 
-};
-
-grant
-    // java.base module
-    principal javax.security.auth.x500.X500Principal "CN=Duke",
-    // java.management module
-    principal javax.management.remote.JMXPrincipal "Duke",
-    // java.security.jgss module
-    principal javax.security.auth.kerberos.KerberosPrincipal "duke@openjdk.org",
-    // jdk.security.auth module (@jdk.Exported Principals)
-    principal com.sun.security.auth.UserPrincipal "Duke",
-    principal com.sun.security.auth.NTDomainPrincipal "openjdk.org",
-    principal com.sun.security.auth.NTSid
-        "S-1-5-21-3623811015-3361044348-30300820-1013",
-    principal com.sun.security.auth.NTUserPrincipal "Duke",
-    principal com.sun.security.auth.UnixNumericUserPrincipal "0",
-    principal com.sun.security.auth.UnixPrincipal "duke" {
-    permission java.util.PropertyPermission "user.home", "read";
-};
-
-grant
-    // java.security.jgss module
-    principal javax.security.auth.kerberos.KerberosPrincipal "duke@openjdk.org"
-{
-    // test that ${{self}} expansion works 
-    permission javax.security.auth.kerberos.ServicePermission "${{self}}",
-                                                              "accept";
-};
diff --git a/test/jdk/sun/security/provider/PolicyFile/wildcard.policy b/test/jdk/sun/security/provider/PolicyFile/wildcard.policy
deleted file mode 100644
index 55e942db37a..00000000000
--- a/test/jdk/sun/security/provider/PolicyFile/wildcard.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-grant principal javax.security.auth.x500.X500Principal * {
-  permission java.util.PropertyPermission "user.home", "read";
-};
-
-grant {
-  permission javax.security.auth.AuthPermission "doAsPrivileged";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java b/test/jdk/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java
deleted file mode 100644
index 5bbcb4c6195..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @author Gary Ellison
- * @bug 4219343
- * @summary Property Expansion error test
- * @run main/othervm/policy=UnresolvedProperty.policy AvoidPropertyExpansionExceptions
- */
-
-import java.util.*;
-import java.security.*;
-
-public class AvoidPropertyExpansionExceptions {
-
-    public static void main(String[] args) throws Exception {
-      Policy p = Policy.getPolicy();
-      PermissionCollection pc = p.getPermissions(
-        new CodeSource(null, (java.security.cert.Certificate[]) null));
-      Enumeration e = pc.elements();
-      if (!e.hasMoreElements()) {
-        throw new Exception("Permission incorrectly ignored");
-      }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/BogusGrants.java b/test/jdk/sun/security/provider/PolicyParser/BogusGrants.java
deleted file mode 100644
index 06df206eddc..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/BogusGrants.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @author Gary Ellison
- * @bug 4233900
- * @summary Catch anomalies in Policy parsing
- * @modules java.base/sun.security.provider
- * @run main BogusGrants p001.policy p002.policy p003.policy p004.policy
- */
-
-import java.io.*;
-import java.util.Enumeration;
-import sun.security.provider.*;
-
-public class BogusGrants {
-
-   public static void main(String args[]) throws Exception {
-       String dir = System.getProperty("test.src", ".");
-       for (int i=0; i < args.length; i++) {
-           try {
-               PolicyParser pp = new PolicyParser(true);
-               String pfile =  new File(dir, args[i]).getPath();
-
-               pp.read(new FileReader(pfile));
-               Enumeration ge = pp.grantElements();
-               if (ge.hasMoreElements()) {
-                   throw new Exception("PolicyFile " + pfile + " grant entry should not parse but it did");
-               }
-           } catch
-               (sun.security.provider.PolicyParser.ParsingException p) {
-               System.out.println("Passed test " + i +
-                                  ": Bogus grant entry caught " +
-                                  p.getMessage());
-           }
-       }
-   }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/EncodeURL.java b/test/jdk/sun/security/provider/PolicyParser/EncodeURL.java
deleted file mode 100644
index f99eb5418e2..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/EncodeURL.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4797850
- * @modules java.base/sun.security.provider
- * @summary Security policy file does not grok hash mark in pathnames
- */
-
-import java.io.*;
-import java.util.*;
-import sun.security.provider.*;
-
-public class EncodeURL {
-
-    // java.ext.dirs input and encoding
-    private static final String extInput = "foo bar";
-    private static final String extAnswer = "foo%20bar";
-    private static final String policy0 =
-        "grant codebase \"${java.ext.dirs}\" { permission java.security.AllPermission; };";
-
-    // keystore inputs and encodings
-    private static final String prop1 = "http://foobar";
-    private static final String answer1 = "http://foobar/foo";
-    private static final String policy1 =
-        "keystore \"${prop1}/foo\"; grant { permission java.security.AllPermission; };";
-
-    private static final String prop2 = "foo#bar";
-    private static final String answer2 = "http://foo%23bar/foo";
-    private static final String policy2 =
-        "keystore \"http://${prop2}/foo\"; grant { permission java.security.AllPermission; };";
-
-    private static final String prop3 = "goofy:foo#bar";
-    private static final String answer3 = "http://goofy:foo%23bar/foo";
-    private static final String policy3 =
-        "keystore \"http://${prop3}/foo\"; grant { permission java.security.AllPermission; };";
-
-    public static void main(String[] args) throws Exception {
-
-        // make sure 'file' URLs created from java.ext.dirs
-        // are encoded
-
-        System.setProperty("java.ext.dirs", extInput);
-        PolicyParser pp = new PolicyParser(true);
-        pp.read(new StringReader(policy0));
-        Enumeration e = pp.grantElements();
-        while (e.hasMoreElements()) {
-            PolicyParser.GrantEntry ge =
-                                (PolicyParser.GrantEntry)e.nextElement();
-            if (ge.codeBase.indexOf("foo") >= 0 &&
-                ge.codeBase.indexOf(extAnswer) < 0) {
-                throw new SecurityException("test 0 failed: " +
-                        "expected " + extAnswer +
-                        " inside " + ge.codeBase);
-            }
-        }
-
-        // make sure keystore URL is properly encoded (or not)
-
-        System.setProperty("prop1", prop1);
-        pp = new PolicyParser(true);
-        pp.read(new StringReader(policy1));
-        if (!pp.getKeyStoreUrl().equals(answer1)) {
-            throw new SecurityException("test 1 failed: " +
-                "expected " + answer1 +
-                ", and got " + pp.getKeyStoreUrl());
-        }
-
-        System.setProperty("prop2", prop2);
-        pp = new PolicyParser(true);
-        pp.read(new StringReader(policy2));
-        if (!pp.getKeyStoreUrl().equals(answer2)) {
-            throw new SecurityException("test 2 failed: " +
-                "expected " + answer2 +
-                ", and got " + pp.getKeyStoreUrl());
-        }
-
-        System.setProperty("prop3", prop3);
-        pp = new PolicyParser(true);
-        pp.read(new StringReader(policy3));
-        if (!pp.getKeyStoreUrl().equals(answer3)) {
-            throw new SecurityException("test 3 failed: " +
-                "expected " + answer3 +
-                ", and got " + pp.getKeyStoreUrl());
-        }
-
-        System.out.println("test passed");
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java b/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java
deleted file mode 100644
index 464058a911a..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4308389
- * @summary Misleading (non-useful) error message while parsing
- *              security policy file if property expansion fails
- *              for an undefined property
- *
- * This test needs to be verified by reading the debug output.
- * It should output that the PolicyParser could not expand
- * the system property, "undefined".
- *
- * @run main/othervm/policy=ExpansionErrorMisleading.policy -Djava.security.debug=parser ExpansionErrorMisleading
- */
-
-public class ExpansionErrorMisleading {
-
-    public static void main(String[] args) {
-        // trigger a security check
-        try {
-            java.io.FileInputStream fis = new java.io.FileInputStream
-                ("/tmp/hello");
-        } catch (java.io.FileNotFoundException fnfe) {
-            // bad
-            System.out.println("Test Failed");
-            throw new SecurityException(fnfe.getMessage());
-        } catch (SecurityException se) {
-            // good
-            System.out.println("Test Succeeded");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy b/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy
deleted file mode 100644
index c9cdb1f865b..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.io.FilePermission "/${undefined}/hello", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirs.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirs.java
deleted file mode 100644
index 9a50d72ea0c..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirs.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4215035
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- * @run main ExtDirs
- */
-
-/*
- * @test
- * @bug 4215035
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- * @run main/othervm/policy=ExtDirs.policy ExtDirs
- */
-
-public class ExtDirs {
-    public static void main(String args[]) throws Exception {
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            System.out.println("Test Succeeded");
-        } catch (SecurityException se) {
-            se.printStackTrace();
-            System.out.println("Test Failed");
-            throw se;
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirs.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs.policy
deleted file mode 100644
index 086ccbb8d83..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirs.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant codebase "file:${test.classes}" {
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "user.home", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirs1.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs1.policy
deleted file mode 100644
index 086ccbb8d83..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirs1.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant codebase "file:${test.classes}" {
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "user.home", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirs2.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs2.policy
deleted file mode 100644
index 9cc22d30d04..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirs2.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant codebase "file:${test.classes}/*" {
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "user.home", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirs3.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirs3.policy
deleted file mode 100644
index 9268094e707..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirs3.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant codebase "file:${test.classes}/-" {
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "user.home", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsA.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsA.java
deleted file mode 100644
index d0ccd193e46..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirsA.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class ExtDirsA {
-    public void go() {
-        java.security.AccessController.doPrivileged
-                (new java.security.PrivilegedAction() {
-                public Object run() {
-                    System.out.println
-                        ("user.name = " + System.getProperty("user.name"));
-                    ExtDirsB b = new ExtDirsB();
-                    b.go();
-                    return null;
-                }
-        });
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsA/a.jar b/test/jdk/sun/security/provider/PolicyParser/ExtDirsA/a.jar
deleted file mode 100644
index f5ef5c04008..00000000000
Binary files a/test/jdk/sun/security/provider/PolicyParser/ExtDirsA/a.jar and /dev/null differ
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsB.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsB.java
deleted file mode 100644
index 141f1f0e938..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirsB.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-public class ExtDirsB {
-    public void go() {
-        System.out.println("user.home = " + System.getProperty("user.home"));
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsB/b.jar b/test/jdk/sun/security/provider/PolicyParser/ExtDirsB/b.jar
deleted file mode 100644
index 221bd634a8b..00000000000
Binary files a/test/jdk/sun/security/provider/PolicyParser/ExtDirsB/b.jar and /dev/null differ
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.java
deleted file mode 100644
index da0dacff23d..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4993819
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- * @run main/othervm/policy=ExtDirsChange.policy ExtDirsChange
- */
-
-import java.security.*;
-
-public class ExtDirsChange {
-    public static void main(String args[]) throws Exception {
-        System.out.println("java.policy.dirs: " +
-                System.getProperty("java.policy.dirs"));
-
-        // Uses default security policy and java.policy.dirs
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            throw new Exception("Test Failed (Setup problem)");
-        } catch (SecurityException se) {
-            System.out.println("Setup OK");
-        }
-
-        // Change java.policy.dirs and refresh policy
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                // Change java.policy.dirs
-                System.setProperty("java.policy.dirs",
-                        System.getProperty("test.classes"));
-                System.out.println("java.policy.dirs: " +
-                        System.getProperty("java.policy.dirs"));
-                return null;
-            }
-        });
-
-        // Continue to use default security policy
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            throw new Exception("Test Failed (Setup before refresh problem)");
-        } catch (SecurityException se) {
-            System.out.println("Setup before refresh OK");
-        }
-
-        // Refresh policy using updated java.policy.dirs
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                Policy.getPolicy().refresh();
-                return null;
-            }
-        });
-
-        // Test should now succeed
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            System.out.println("Test Succeeded");
-        } catch (SecurityException se) {
-            se.printStackTrace();
-            System.out.println("Test Failed");
-            throw se;
-        }
-
-        // Test with blank java.ext.dir
-        // Change java.policy.dirs and refresh policy
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                // Change java.policy.dirs
-                System.setProperty("java.policy.dirs", " ");
-                System.out.println("java.policy.dirs: " +
-                        System.getProperty("java.policy.dirs"));
-                Policy.getPolicy().refresh();
-                return null;
-            }
-        });
-
-        // Test with blank java.ext.dir
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            throw new Exception("Blank Test Failed");
-        } catch (SecurityException se) {
-            System.out.println("Blank Test OK");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.policy b/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.policy
deleted file mode 100644
index a158c66251b..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirsChange.policy
+++ /dev/null
@@ -1,17 +0,0 @@
-grant {
-    permission java.util.PropertyPermission "test.classes", "read";
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.security.SecurityPermission "setPolicy";
-};
-
-grant codebase "file:${test.classes}/*" {
-    permission java.util.PropertyPermission "java.policy.dirs", "read, write";
-    permission java.util.PropertyPermission "user.name", "write";
-    permission java.util.PropertyPermission "user.home", "write";
-};
-
-grant codebase "file:${java.policy.dirs}" {
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "user.home", "read";
-};
-
diff --git a/test/jdk/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java b/test/jdk/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java
deleted file mode 100644
index 30f570340e3..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4993819
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- * @run main ExtDirsDefaultPolicy
- */
-
-/*
- * @test
- * @bug 4993819
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- *
- * @run main/othervm/policy=ExtDirs1.policy ExtDirsDefaultPolicy
- */
-
-/*
- * @test
- * @bug 4993819
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- *
- * @run main/othervm/policy=ExtDirs2.policy ExtDirsDefaultPolicy
- */
-
-/*
- * @test
- * @bug 4993819
- * @summary standard extensions path is hard-coded in default
- *      system policy file
- *
- * @run main/othervm/policy=ExtDirs3.policy ExtDirsDefaultPolicy
- */
-
-public class ExtDirsDefaultPolicy {
-    public static void main(String args[]) throws Exception {
-        try {
-            ExtDirsA a = new ExtDirsA();
-            a.go();
-            System.out.println("Test Succeeded");
-        } catch (SecurityException se) {
-            se.printStackTrace();
-            System.out.println("Test Failed");
-            throw se;
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java
deleted file mode 100644
index 54eabc3a228..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4373996
- * @summary parser incorrectly ignores a principal if the principal name
- *      expands to nothing.
- * @run main/manual PrincipalExpansionError
- */
-
-/*
- * This test is a bit complicated.
- * 1) PrincipalExpansionError.java
- *         the test itself.  this test creates a Subject with a
- *         UnixPrincipal("TestPrincipal") and calls doAs
- *         with a PrincipalExpansionErrorAction.
- * 2) PrincipalExpansionErrorAction
- *         this action tries to read the file, /testfile
- * 3) to run the test:
- *         a) jtreg -verbose:all -testjdk:<your_jdk>/build/sparc
- *                 PrincipalExpansionError.java
- *         b) PrincipalExpansionError is compiled and put into
- *                 the "test.classes" directory
- *         c) PrincipalExpansionErrorAction is compiled and put into
- *                 the "test.classes"/apackage directory
- *                 (since it belongs to the 'apackage' package
- *         d) the PrincipalExpansionError shell script moves
- *                 test.classes/apackage to test.src/apackage.
- *                 this guarantees that the test will run
- *                 with codebase test.classes, and the action
- *                 will run with codebase test.src.
- *         e) the test is executed.  permissions to read the file,
- *                 /testfile, were granted to the PrincipalExpansionError.
- *                 the policy entry for PrincipalExpansionErrorAction
- *                 running as UnixPrincipal("TestPrincipal")
- *                 was also granted the file permission,
- *                 but it has a bogus second UnixPrincipal with
- *                 a name that can't be property-expanded.
- *
- *                 the old behavior of the code would ignore the
- *                 bogus entry and incorrectly grants the file permission
- *                 to UnixPrincipal("TestPrincipal").
- *                 the new behavior correctly ignores the entire
- *                 policy entry.
- *                 Please note that the jtreg needs to be granted
- *                 allpermissions for this test to succeed. If the codebase
- *                 for jtreg changes, the PrincipalExpansionError.policy
- *                 needs to be updated.
- *         f) original @ tags:
- *                 compile PrincipalExpansionErrorAction.java
- *                 run shell PrincipalExpansionError.sh
- *                 run main/othervm/policy=PrincipalExpansionError.policy
- *                         -Djava.security.debug=access,domain,failure
- *                         PrincipalExpansionError
- */
-
-import javax.security.auth.*;
-import com.sun.security.auth.*;
-import java.util.Set;
-import apackage.PrincipalExpansionErrorAction;
-
-public class PrincipalExpansionError {
-
-    public static void main(String[] args) {
-
-        Subject s = new Subject();
-
-        try {
-            Set principals = s.getPrincipals();
-            principals.add(new UnixPrincipal("TestPrincipal"));
-        } catch (SecurityException se) {
-            // test incorrectly set up
-            throw new SecurityException
-                ("PrincipalExpansionError test incorrectly set up:" + se);
-        }
-
-        try {
-            Subject.doAs(s, new PrincipalExpansionErrorAction());
-
-            // test failed
-            System.out.println("PrincipalExpansionError test failed");
-            throw new SecurityException("PrincipalExpansionError test failed");
-
-        } catch (java.security.PrivilegedActionException pae) {
-            Exception e = pae.getException();
-
-            if (e instanceof java.io.FileNotFoundException) {
-                System.out.println
-                    ("PrincipalExpansionError test failed (file not found)");
-                java.io.FileNotFoundException fnfe =
-                        (java.io.FileNotFoundException)e;
-                throw new SecurityException("PrincipalExpansionError " +
-                        "test failed (file not found)");
-            } else {
-                // i don't know???
-                System.out.println("what happened?");
-                pae.printStackTrace();
-            }
-        } catch (SecurityException se) {
-                // good!  test succeeded
-                System.out.println("PrincipalExpansionError test succeeded");
-                se.printStackTrace();
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.policy b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.policy
deleted file mode 100644
index c3b06c0387f..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.policy
+++ /dev/null
@@ -1,21 +0,0 @@
-// granted to jtreg
-grant codebase "file:/net/koori.sfbay/-" {
-    permission java.security.AllPermission;
-};
-
-// granted to the test class
-grant codebase "file:${test.classes}/" {
-    permission javax.security.auth.AuthPermission "modifyPrincipals";
-    permission javax.security.auth.AuthPermission "doAs";
-    permission java.io.FilePermission "/testFile", "read";
-};
-
-// granted to the test action
-// -- the test moves the compiled action into the src directory
-// -- via the shell script.  this way we can ensure different
-// -- codebases for the test and the action
-grant codebase "file:${test.src}/",
-      principal com.sun.security.auth.UnixPrincipal "TestPrincipal",
-      principal com.sun.security.auth.UnixPrincipal "${bad.property}" {
-    permission java.io.FilePermission "/testFile", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.sh b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.sh
deleted file mode 100644
index 6917a4bb61c..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-/bin/rm -rf ${TESTSRC}/apackage
-/bin/mv ${TESTCLASSES}/apackage ${TESTSRC}
diff --git a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java
deleted file mode 100644
index ed22f3a1ed4..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package apackage;
-
-public class PrincipalExpansionErrorAction implements
-        java.security.PrivilegedExceptionAction {
-
-    public Object run() throws Exception {
-
-        // try something that will trigger a security check
-        java.io.FileInputStream fis = new java.io.FileInputStream ("/testFile");
-        return fis;
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/TokenStore.java b/test/jdk/sun/security/provider/PolicyParser/TokenStore.java
deleted file mode 100644
index 9e0d74d99de..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/TokenStore.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4919147
- * @summary Support for token-based KeyStores
- * @modules java.base/sun.security.provider
- */
-
-import java.io.*;
-import java.util.*;
-import sun.security.provider.*;
-
-public class TokenStore {
-
-    private static final String POLICY_NO_STORE =
-        "grant { permission java.security.AllPermission; };";
-
-    private static final String POLICY_URL =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\";"         +
-        "grant signedby \"POLICY_URL\" {"                               +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\", \"JKS\";"+
-        "grant signedby \"POLICY_URL_T\" {"                             +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T_P =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\","         +
-        "               \"JKS\", \"SUN\";"                              +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_PWD =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\";"         +
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.pwd\";"   +
-        "grant signedby \"POLICY_URL\" {"                               +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_URL_T_P_PWD =
-        "keystore \"file:${test.src}${/}TokenStore.keystore\","         +
-        "               \"JKS\", \"SUN\";"                              +
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.pwd\";"   +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    private static final String POLICY_PASS_NO_STORE =
-        "keystorePasswordURL \"file:${test.src}${/}TokenStore.pwd\";"   +
-        "grant signedby \"POLICY_URL_T_P\" {"                           +
-        "    permission java.security.AllPermission;"                   +
-        "};"                                                            ;
-
-    public static void main(String[] args) throws Exception {
-
-        // test no key store in policy
-
-        PolicyParser p = new PolicyParser();
-        p.read(new StringReader(POLICY_NO_STORE));
-        doNoStore(p);
-        StringWriter sw = new StringWriter();
-        p.write(sw);
-        PolicyParser newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doNoStore(p);
-
-        // test policy keystore + URL
-
-        p = new PolicyParser();
-        p.read(new StringReader(POLICY_URL));
-        doURL(p, true);
-        sw = new StringWriter();
-        p.write(sw);
-        newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doURL(p, true);
-
-        // test policy keystore + URL + type
-
-        p = new PolicyParser();
-        p.read(new StringReader(POLICY_URL_T));
-        doURL_T(p, true);
-        sw = new StringWriter();
-        p.write(sw);
-        newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doURL_T(p, true);
-
-        // test policy keystore + URL + type + provider
-
-        p = new PolicyParser();
-        p.read(new StringReader(POLICY_URL_T_P));
-        doURL_T_P(p, true);
-        sw = new StringWriter();
-        p.write(sw);
-        newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doURL_T_P(p, true);
-
-        // test policy keystore + URL + password
-
-        p = new PolicyParser();
-        p.read(new StringReader(POLICY_URL_PWD));
-        doURL(p, false);
-        doPwd(p);
-        sw = new StringWriter();
-        p.write(sw);
-        newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doURL(p, false);
-        doPwd(p);
-
-        // test policy keystore + URL + type + provider + password
-
-        p = new PolicyParser();
-        p.read(new StringReader(POLICY_URL_T_P_PWD));
-        doURL_T_P(p, false);
-        doPwd(p);
-        sw = new StringWriter();
-        p.write(sw);
-        newP = new PolicyParser();
-        newP.read(new StringReader(sw.toString()));
-        doURL_T_P(p, false);
-        doPwd(p);
-
-        // test policy password with no keystore
-        p = new PolicyParser();
-        try {
-            p.read(new StringReader(POLICY_PASS_NO_STORE));
-            throw new SecurityException("expected parsing exception");
-        } catch (PolicyParser.ParsingException pe) {
-            // good
-        }
-
-    }
-
-    private static void checkPerm(PolicyParser p) throws Exception {
-        Enumeration e = p.grantElements();
-        boolean foundOne = false;
-        while (e.hasMoreElements()) {
-            PolicyParser.GrantEntry ge = (PolicyParser.GrantEntry)
-                                        e.nextElement();
-            if (ge.permissionEntries == null) {
-                throw new SecurityException("expected non-null perms");
-            } else {
-                foundOne = true;
-            }
-        }
-        if (!foundOne) {
-            throw new SecurityException("expected non-null grant entries");
-        }
-    }
-
-    private static void doNoStore(PolicyParser p) throws Exception {
-        if (p.getKeyStoreUrl() != null ||
-            p.getKeyStoreType() != null ||
-            p.getKeyStoreProvider() != null ||
-            p.getStorePassURL() != null) {
-            throw new SecurityException("expected null keystore");
-        }
-        checkPerm(p);
-    }
-
-    private static void doURL(PolicyParser p, boolean checkPwd)
-                throws  Exception {
-        if (p.getKeyStoreUrl() == null ||
-            !(p.getKeyStoreUrl().endsWith("TokenStore.keystore")) ||
-            p.getKeyStoreType() != null ||
-            p.getKeyStoreProvider() != null) {
-            throw new SecurityException("invalid keystore values");
-        }
-        if (checkPwd) {
-            if (p.getStorePassURL() != null) {
-                throw new SecurityException("invalid keystore values");
-            }
-        }
-        checkPerm(p);
-    }
-
-    private static void doURL_T(PolicyParser p, boolean checkPwd)
-                throws Exception {
-        if (p.getKeyStoreUrl() == null ||
-            !(p.getKeyStoreUrl().endsWith("TokenStore.keystore")) ||
-            p.getKeyStoreType() == null ||
-            !(p.getKeyStoreType().equals("JKS")) ||
-            p.getKeyStoreProvider() != null) {
-            throw new SecurityException("invalid keystore values");
-        }
-        if (checkPwd) {
-            if (p.getStorePassURL() != null) {
-                throw new SecurityException("invalid keystore values");
-            }
-        }
-        checkPerm(p);
-    }
-
-    private static void doURL_T_P(PolicyParser p, boolean checkPwd)
-                throws Exception {
-        if (p.getKeyStoreUrl() == null ||
-            !(p.getKeyStoreUrl().endsWith("TokenStore.keystore")) ||
-            p.getKeyStoreType() == null ||
-            !(p.getKeyStoreType().equals("JKS")) ||
-            p.getKeyStoreProvider() == null ||
-            !(p.getKeyStoreProvider().equals("SUN"))) {
-            throw new SecurityException("invalid keystore values");
-        }
-        if (checkPwd) {
-            if (p.getStorePassURL() != null) {
-                throw new SecurityException("invalid keystore values");
-            }
-        }
-        checkPerm(p);
-    }
-
-    private static void doPwd(PolicyParser p) throws Exception {
-        if (p.getStorePassURL() == null ||
-            !(p.getStorePassURL().endsWith("TokenStore.pwd"))) {
-            throw new SecurityException("invalid password values");
-        }
-    }
-}
diff --git a/test/jdk/sun/security/provider/PolicyParser/UnresolvedProperty.policy b/test/jdk/sun/security/provider/PolicyParser/UnresolvedProperty.policy
deleted file mode 100644
index ebb36af8f16..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/UnresolvedProperty.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// @test
-// @author Gary Ellison
-// @bug 4219343
-// @summary Property Expansion error test
-//
-
-grant {
-    permission java.security.SecurityPermission "getPolicy";
-    permission java.io.FilePermission "${bogus.propertyName}/-", "read";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/p001.policy b/test/jdk/sun/security/provider/PolicyParser/p001.policy
deleted file mode 100644
index 11ff00c9487..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/p001.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant Codebase "http://java.sun.com/dupcb.jar" Codebase "http://java.sun.com/dupcb.jar" {
-      permission java.security.SecurityPermission "bogusPolicyParser";
-};
diff --git a/test/jdk/sun/security/provider/PolicyParser/p002.policy b/test/jdk/sun/security/provider/PolicyParser/p002.policy
deleted file mode 100644
index 52c8b24d4df..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/p002.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant Codebase "http://java.sun.com/dupsb.jar" SignedBy "gfe" SignedBy "garysign" {
-      permission java.security.SecurityPermission "bogusPolicyParser";
-};
-
diff --git a/test/jdk/sun/security/provider/PolicyParser/p003.policy b/test/jdk/sun/security/provider/PolicyParser/p003.policy
deleted file mode 100644
index 06553c84af7..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/p003.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant Codebase "http://java.sun.com/bogussb0.jar" SignedBy "gfe, ,garysign" {
-      permission java.security.SecurityPermission "bogusPolicyParser";
-};
-
diff --git a/test/jdk/sun/security/provider/PolicyParser/p004.policy b/test/jdk/sun/security/provider/PolicyParser/p004.policy
deleted file mode 100644
index 7e65f2d12e9..00000000000
--- a/test/jdk/sun/security/provider/PolicyParser/p004.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant Codebase "http://java.sun.com/bogussb1.jar" SignedBy "gfe,,garysign" {
-      permission java.security.SecurityPermission "bogusPolicyParser";
-};
diff --git a/test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java b/test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java
index 1c6d515e4f0..2e1aca0ea14 100644
--- a/test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java
+++ b/test/jdk/sun/security/provider/SecureRandom/StrongSecureRandom.java
@@ -41,7 +41,6 @@ public class StrongSecureRandom {
     private static final String os = System.getProperty("os.name", "unknown");
 
     private static void testDefaultEgd() throws Exception {
-        // No SecurityManager installed.
         String s = Security.getProperty("securerandom.source");
 
         System.out.println("Testing:  default EGD: " + s);
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
new file mode 100644
index 00000000000..5a2ef1233f2
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.test.lib.json.JSONValue;
+import jtreg.SkippedException;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.Provider;
+import java.security.Security;
+
+/*
+ * @test
+ * @bug 8342442
+ * @library /test/lib
+ */
+
+/// This test runs on `internalProjection.json`-style files generated
+/// by NIST's ACVP Server. See [https://github.com/usnistgov/ACVP-Server].
+///
+/// The files are either put into the `data` directory or another
+/// directory specified by the `test.acvp.data` test property.
+/// The test walks through the directory recursively and looks for
+/// file names equal to or ending with `internalProjection.json` and
+/// runs tests on them.
+///
+/// Set the `test.acvp.alg` test property to only test the specified algorithm.
+///
+/// Sample files can be downloaded from
+/// [https://github.com/usnistgov/ACVP-Server/tree/master/gen-val/json-files].
+///
+/// By default, the test uses system-preferred implementations.
+/// If you want to test a specific provider, set the
+/// `test.acvp.provider` test property. The provider must be
+/// registered.
+///
+/// Tests for each algorithm must be compliant to its specification linked from
+/// [https://github.com/usnistgov/ACVP?tab=readme-ov-file#supported-algorithms].
+///
+/// Example:
+/// ```
+/// jtreg -Dtest.acvp.provider=SunJCE \
+///       -Dtest.acvp.alg=ML-KEM \
+///       -Dtest.acvp.data=/path/to/json-files/ \
+///       -jdk:/path/to/jdk Launcher.java
+/// ```
+public class Launcher {
+
+    private static final String ONLY_ALG
+            = System.getProperty("test.acvp.alg");
+
+    private static final Provider PROVIDER;
+
+    private static int count = 0;
+    private static int invalidTest = 0;
+    private static int unsupportedTest = 0;
+
+    static {
+        var provProp = System.getProperty("test.acvp.provider");
+        if (provProp != null) {
+            var p = Security.getProvider(provProp);
+            if (p == null) {
+                System.err.println(provProp + " is not a registered provider name");
+                throw new RuntimeException(provProp + " is not a registered provider name");
+            }
+            PROVIDER = p;
+        } else {
+            PROVIDER = null;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        var testDataProp = System.getProperty("test.acvp.data");
+        Path dataPath = testDataProp != null
+                ? Path.of(testDataProp)
+                : Path.of(System.getProperty("test.src"), "data");
+        System.out.println("Data path: " + dataPath);
+
+        if (PROVIDER != null) {
+            System.out.println("Provider: " + PROVIDER.getName());
+        }
+        if (ONLY_ALG != null) {
+            System.out.println("Algorithm: " + ONLY_ALG);
+        }
+
+        try (var stream = Files.walk(dataPath)) {
+            stream.filter(Files::isRegularFile)
+                    .filter(p -> p.getFileName().toString()
+                            .endsWith("internalProjection.json"))
+                    .forEach(Launcher::run);
+        }
+
+        if (count > 0) {
+            System.out.println();
+            System.out.println("Test completed: " + count);
+            System.out.println("Invalid tests: " + invalidTest);
+            System.out.println("Unsupported tests: " + unsupportedTest);
+        } else {
+            throw new SkippedException("No supported test found");
+        }
+    }
+
+    static void run(Path test) {
+        try {
+            JSONValue kat;
+            try {
+                kat = JSONValue.parse(Files.readString(test));
+            } catch (Exception e) {
+                System.out.println("Warning: cannot parse " + test + ". Skipped");
+                invalidTest++;
+                return;
+            }
+            var alg = kat.get("algorithm").asString();
+            if (ONLY_ALG != null && !alg.equals(ONLY_ALG)) {
+                return;
+            }
+            System.out.println(">>> Testing " + test + "...");
+            switch (alg) {
+                case "ML-DSA" -> {
+                    ML_DSA_Test.run(kat, PROVIDER);
+                    count++;
+                }
+                case "ML-KEM" -> {
+                    ML_KEM_Test.run(kat, PROVIDER);
+                    count++;
+                }
+                case "SHA2-256", "SHA2-224", "SHA3-256", "SHA3-224" -> {
+                    SHA_Test.run(kat, PROVIDER);
+                    count++;
+                }
+                default -> {
+                    System.out.println("Skipped unsupported algorithm: " + alg);
+                    unsupportedTest++;
+                }
+            }
+        } catch (RuntimeException re) {
+            throw re;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
new file mode 100644
index 00000000000..6d402516410
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.json.JSONValue;
+import jdk.test.lib.security.FixedSecureRandom;
+
+import java.security.*;
+import java.security.spec.EncodedKeySpec;
+import java.security.spec.NamedParameterSpec;
+
+import static jdk.test.lib.Utils.toByteArray;
+
+// JSON spec at https://pages.nist.gov/ACVP/draft-celi-acvp-ml-dsa.html
+public class ML_DSA_Test {
+
+    public static void run(JSONValue kat, Provider provider) throws Exception {
+        var mode = kat.get("mode").asString();
+        switch (mode) {
+            case "keyGen" -> keyGenTest(kat, provider);
+            case "sigGen" -> sigGenTest(kat, provider);
+            case "sigVer" -> sigVerTest(kat, provider);
+            default -> throw new UnsupportedOperationException("Unknown mode: " + mode);
+        }
+    }
+
+    static void keyGenTest(JSONValue kat, Provider p) throws Exception {
+        var g = p == null
+                ? KeyPairGenerator.getInstance("ML-DSA")
+                : KeyPairGenerator.getInstance("ML-DSA", p);
+        var f = p == null
+                ? KeyFactory.getInstance("ML-DSA")
+                : KeyFactory.getInstance("ML-DSA", p);
+        for (var t : kat.get("testGroups").asArray()) {
+            var pname = t.get("parameterSet").asString();
+            var np = new NamedParameterSpec(pname);
+            System.out.println(">> " + pname);
+            for (var c : t.get("tests").asArray()) {
+                System.out.print(c.get("tcId").asString() + " ");
+                g.initialize(np, new FixedSecureRandom(toByteArray(c.get("seed").asString())));
+                var kp = g.generateKeyPair();
+                var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
+                var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
+                Asserts.assertEqualsByteArray(pk, toByteArray(c.get("pk").asString()));
+                Asserts.assertEqualsByteArray(sk, toByteArray(c.get("sk").asString()));
+            }
+            System.out.println();
+        }
+    }
+
+    static void sigGenTest(JSONValue kat, Provider p) throws Exception {
+        var s = p == null
+                ? Signature.getInstance("ML-DSA")
+                : Signature.getInstance("ML-DSA", p);
+        for (var t : kat.get("testGroups").asArray()) {
+            var pname = t.get("parameterSet").asString();
+            var det = Boolean.parseBoolean(t.get("deterministic").asString());
+            System.out.println(">> " + pname + " sign");
+            for (var c : t.get("tests").asArray()) {
+                System.out.print(Integer.parseInt(c.get("tcId").asString()) + " ");
+                var sk = new PrivateKey() {
+                    public String getAlgorithm() { return pname; }
+                    public String getFormat() { return "RAW"; }
+                    public byte[] getEncoded() { return toByteArray(c.get("sk").asString()); }
+                };
+                var sr = new FixedSecureRandom(
+                        det ? new byte[32] : toByteArray(c.get("rnd").asString()));
+                s.initSign(sk, sr);
+                s.update(toByteArray(c.get("message").asString()));
+                var sig = s.sign();
+                Asserts.assertEqualsByteArray(
+                        sig, toByteArray(c.get("signature").asString()));
+            }
+            System.out.println();
+        }
+    }
+
+    static void sigVerTest(JSONValue kat, Provider p) throws Exception {
+        var s = p == null
+                ? Signature.getInstance("ML-DSA")
+                : Signature.getInstance("ML-DSA", p);
+        for (var t : kat.get("testGroups").asArray()) {
+            var pname = t.get("parameterSet").asString();
+            var pk = new PublicKey() {
+                public String getAlgorithm() { return pname; }
+                public String getFormat() { return "RAW"; }
+                public byte[] getEncoded() { return toByteArray(t.get("pk").asString()); }
+            };
+            System.out.println(">> " + pname + " verify");
+            for (var c : t.get("tests").asArray()) {
+                System.out.print(c.get("tcId").asString() + " ");
+                // Only ML-DSA sigVer has negative tests
+                var expected = Boolean.parseBoolean(c.get("testPassed").asString());
+                var actual = true;
+                try {
+                    s.initVerify(pk);
+                    s.update(toByteArray(c.get("message").asString()));
+                    actual = s.verify(toByteArray(c.get("signature").asString()));
+                } catch (InvalidKeyException | SignatureException e) {
+                    actual = false;
+                }
+                Asserts.assertEQ(expected, actual);
+            }
+            System.out.println();
+        }
+    }
+}
diff --git a/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java b/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
new file mode 100644
index 00000000000..5b707bee6d8
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.json.JSONValue;
+import jdk.test.lib.security.FixedSecureRandom;
+
+import javax.crypto.KEM;
+import java.security.*;
+import java.security.spec.EncodedKeySpec;
+import java.security.spec.NamedParameterSpec;
+
+import static jdk.test.lib.Utils.toByteArray;
+
+// JSON spec at https://pages.nist.gov/ACVP/draft-celi-acvp-ml-kem.html
+public class ML_KEM_Test {
+
+    public static void run(JSONValue kat, Provider provider) throws Exception {
+        var mode = kat.get("mode").asString();
+        switch (mode) {
+            case "keyGen" -> keyGenTest(kat, provider);
+            case "encapDecap" -> encapDecapTest(kat, provider);
+            default -> throw new UnsupportedOperationException("Unknown mode: " + mode);
+        }
+    }
+
+    static void keyGenTest(JSONValue kat, Provider p) throws Exception {
+        var g = p == null
+                ? KeyPairGenerator.getInstance("ML-KEM")
+                : KeyPairGenerator.getInstance("ML-KEM", p);
+        var f = p == null
+                ? KeyFactory.getInstance("ML-KEM")
+                : KeyFactory.getInstance("ML-KEM", p);
+        for (var t : kat.get("testGroups").asArray()) {
+            var pname = t.get("parameterSet").asString();
+            var np = new NamedParameterSpec(pname);
+            System.out.println(">> " + pname);
+            for (var c : t.get("tests").asArray()) {
+                System.out.print(c.get("tcId").asString() + " ");
+                g.initialize(np, new FixedSecureRandom(
+                        toByteArray(c.get("d").asString()), toByteArray(c.get("z").asString())));
+                var kp = g.generateKeyPair();
+                var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
+                var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
+                Asserts.assertEqualsByteArray(pk, toByteArray(c.get("ek").asString()));
+                Asserts.assertEqualsByteArray(sk, toByteArray(c.get("dk").asString()));
+            }
+            System.out.println();
+        }
+    }
+
+    static void encapDecapTest(JSONValue kat, Provider p) throws Exception {
+        var g = p == null
+                ? KEM.getInstance("ML-KEM")
+                : KEM.getInstance("ML-KEM", p);
+        for (var t : kat.get("testGroups").asArray()) {
+            var pname = t.get("parameterSet").asString();
+            var function = t.get("function").asString();
+            System.out.println(">> " + pname + " " + function);
+            if (function.equals("encapsulation")) {
+                for (var c : t.get("tests").asArray()) {
+                    System.out.print(c.get("tcId").asString() + " ");
+                    var ek = new PublicKey() {
+                        public String getAlgorithm() { return pname; }
+                        public String getFormat() { return "RAW"; }
+                        public byte[] getEncoded() { return toByteArray(c.get("ek").asString()); }
+                    };
+                    var e = g.newEncapsulator(
+                            ek, new FixedSecureRandom(toByteArray(c.get("m").asString())));
+                    var enc = e.encapsulate();
+                    Asserts.assertEqualsByteArray(
+                            enc.encapsulation(), toByteArray(c.get("c").asString()));
+                    Asserts.assertEqualsByteArray(
+                            enc.key().getEncoded(), toByteArray(c.get("k").asString()));
+                }
+                System.out.println();
+            } else if (function.equals("decapsulation")) {
+                var dk = new PrivateKey() {
+                    public String getAlgorithm() { return pname; }
+                    public String getFormat() { return "RAW"; }
+                    public byte[] getEncoded() { return toByteArray(t.get("dk").asString()); }
+                };
+                for (var c : t.get("tests").asArray()) {
+                    System.out.print(c.get("tcId").asString() + " ");
+                    var d = g.newDecapsulator(dk);
+                    var k = d.decapsulate(toByteArray(c.get("c").asString()));
+                    Asserts.assertEqualsByteArray(k.getEncoded(), toByteArray(c.get("k").asString()));
+                }
+                System.out.println();
+            }
+        }
+    }
+}
diff --git a/test/jdk/sun/security/provider/acvp/SHA_Test.java b/test/jdk/sun/security/provider/acvp/SHA_Test.java
new file mode 100644
index 00000000000..3e5d4bb2521
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/SHA_Test.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.json.JSONValue;
+
+import java.security.*;
+import java.util.Arrays;
+
+import static jdk.test.lib.Utils.toByteArray;
+
+// JSON spec at https://pages.nist.gov/ACVP/draft-celi-acvp-sha.html
+// and https://pages.nist.gov/ACVP/draft-celi-acvp-sha3.html
+public class SHA_Test {
+
+    public static void run(JSONValue kat, Provider provider) throws Exception {
+        var alg = kat.get("algorithm").asString();
+        if (alg.startsWith("SHA2-")) alg = "SHA-" + alg.substring(5);
+        var md = provider == null ? MessageDigest.getInstance(alg)
+                : MessageDigest.getInstance(alg, provider);
+        for (var t : kat.get("testGroups").asArray()) {
+            var testType = t.get("testType").asString();
+            switch (testType) {
+                case "AFT" -> {
+                    for (var c : t.get("tests").asArray()) {
+                        System.out.print(c.get("tcId").asString() + " ");
+                        var msg = toByteArray(c.get("msg").asString());
+                        var len = Integer.parseInt(c.get("len").asString());
+                        if (msg.length * 8 == len) {
+                            Asserts.assertEqualsByteArray(md.digest(msg),
+                                    toByteArray(c.get("md").asString()));
+                        } else {
+                            System.out.print("bits ");
+                        }
+                    }
+                }
+                case "MCT" -> {
+                    var mctVersion = t.get("mctVersion").asString();
+                    var trunc = mctVersion.equals("alternate");
+                    for (var c : t.get("tests").asArray()) {
+                        System.out.print(c.get("tcId").asString() + " ");
+                        var SEED = toByteArray(c.get("msg").asString());
+                        var INITIAL_SEED_LENGTH = Integer.parseInt(c.get("len").asString());
+                        if (SEED.length * 8 == INITIAL_SEED_LENGTH) {
+                            for (var r : c.get("resultsArray").asArray()) {
+                                if (alg.startsWith("SHA3-")) {
+                                    var MD = SEED;
+                                    for (var i = 0; i < 1000; i++) {
+                                        if (trunc) {
+                                            MD = Arrays.copyOf(MD, INITIAL_SEED_LENGTH / 8);
+                                        }
+                                        MD = md.digest(MD);
+                                    }
+                                    Asserts.assertEqualsByteArray(MD,
+                                            toByteArray(r.get("md").asString()));
+                                    SEED = MD;
+                                } else {
+                                    var A = SEED;
+                                    var B = SEED;
+                                    var C = SEED;
+                                    byte[] MD = null;
+                                    for (var i = 0; i < 1000; i++) {
+                                        var MSG = concat(A, B, C);
+                                        if (trunc) {
+                                            MSG = Arrays.copyOf(MSG, INITIAL_SEED_LENGTH / 8);
+                                        }
+                                        MD = md.digest(MSG);
+                                        A = B;
+                                        B = C;
+                                        C = MD;
+                                    }
+                                    Asserts.assertEqualsByteArray(MD,
+                                            toByteArray(r.get("md").asString()));
+                                    SEED = MD;
+                                }
+                            }
+                        } else {
+                            System.out.print("bits ");
+                        }
+                    }
+                }
+                case "LDT" -> {
+                    for (var c : t.get("tests").asArray()) {
+                        System.out.print(c.get("tcId").asString() + " ");
+                        var lm = c.get("largeMsg");
+                        var ct = toByteArray(lm.get("content").asString());
+                        var flen = Long.parseLong(lm.get("fullLength").asString());
+                        var clen = Long.parseLong(lm.get("contentLength").asString());
+                        var cc = 0L;
+                        while (cc < flen) {
+                            md.update(ct);
+                            cc += clen;
+                        }
+                        Asserts.assertEqualsByteArray(md.digest(),
+                                toByteArray(c.get("md").asString()));
+                    }
+                }
+                default -> throw new UnsupportedOperationException(
+                        "Unknown testType: " + testType);
+            }
+            System.out.println();
+        }
+    }
+
+    /////////////
+
+    static byte[] concat(byte[]... input) {
+        var sum = 0;
+        for (var i : input) {
+            sum += i.length;
+        }
+        var out = new byte[sum];
+        sum = 0;
+        for (var i : input) {
+            System.arraycopy(i, 0, out, sum, i.length);
+            sum += i.length;
+        }
+        return out;
+    }
+}
diff --git a/test/jdk/sun/security/provider/acvp/data/acvp.md b/test/jdk/sun/security/provider/acvp/data/acvp.md
new file mode 100644
index 00000000000..68e073b038f
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/data/acvp.md
@@ -0,0 +1,9 @@
+# Automated Cryptographic Validation Test System Sample JSON files v1.1.0.36
+
+## License
+
+NIST-developed software is provided by NIST as a public service. You may use, copy, and distribute copies of the software in any medium, provided that you keep intact this entire notice. You may improve, modify, and create derivative works of the software or any portion of the software, and you may copy and distribute such modifications or works. Modified works should carry a notice stating that you changed the software and should note the date and nature of any such change. Please explicitly acknowledge the National Institute of Standards and Technology as the source of the software.
+
+NIST-developed software is expressly provided "AS IS." NIST MAKES NO WARRANTY OF ANY KIND, EXPRESS, IMPLIED, IN FACT, OR ARISING BY OPERATION OF LAW, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND DATA ACCURACY. NIST NEITHER REPRESENTS NOR WARRANTS THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT ANY DEFECTS WILL BE CORRECTED. NIST DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF THE SOFTWARE OR THE RESULTS THEREOF, INCLUDING BUT NOT LIMITED TO THE CORRECTNESS, ACCURACY, RELIABILITY, OR USEFULNESS OF THE SOFTWARE.
+
+You are solely responsible for determining the appropriateness of using and distributing the software and you assume all risks associated with its use, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and the unavailability or interruption of operation. This software is not intended to be used in any situation where a failure could cause risk of injury or damage to property. The software developed by NIST employees is not subject to copyright protection within the United States.
diff --git a/test/jdk/sun/security/smartcardio/TestChannel.java b/test/jdk/sun/security/smartcardio/TestChannel.java
index 2315b405367..0b66bb384de 100644
--- a/test/jdk/sun/security/smartcardio/TestChannel.java
+++ b/test/jdk/sun/security/smartcardio/TestChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @author Andreas Sterbenz
  * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestChannel
- * @run main/othervm/manual/java.security.policy==test.policy TestChannel
  */
 
 // This test requires special hardware.
diff --git a/test/jdk/sun/security/smartcardio/TestControl.java b/test/jdk/sun/security/smartcardio/TestControl.java
index d725f42c6a0..55a728b9783 100644
--- a/test/jdk/sun/security/smartcardio/TestControl.java
+++ b/test/jdk/sun/security/smartcardio/TestControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @author Andreas Sterbenz
  * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestControl
- * @run main/othervm/manual/java.security.policy==test.policy TestControl
  */
 
 // This test requires special hardware.
diff --git a/test/jdk/sun/security/smartcardio/TestDefault.java b/test/jdk/sun/security/smartcardio/TestDefault.java
index 8fe7ce8ec62..ae474a7ca8a 100644
--- a/test/jdk/sun/security/smartcardio/TestDefault.java
+++ b/test/jdk/sun/security/smartcardio/TestDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @author Andreas Sterbenz
  * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestDefault
- * @run main/othervm/manual/java.security.policy==test.policy TestDefault
  */
 
 // This test requires special hardware.
diff --git a/test/jdk/sun/security/smartcardio/TestDirect.java b/test/jdk/sun/security/smartcardio/TestDirect.java
index 77c46fbf4b6..82c5030fda8 100644
--- a/test/jdk/sun/security/smartcardio/TestDirect.java
+++ b/test/jdk/sun/security/smartcardio/TestDirect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Make sure that direct protocol is available
  * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestDirect
- * @run main/othervm/manual/java.security.policy==test.policy TestDirect
  */
 
 // This test requires special hardware.
diff --git a/test/jdk/sun/security/smartcardio/test.policy b/test/jdk/sun/security/smartcardio/test.policy
deleted file mode 100644
index 989a7180257..00000000000
--- a/test/jdk/sun/security/smartcardio/test.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant codebase "file:${test.classes}/*" {
-    permission javax.smartcardio.CardPermission "*", "connect,getBasicChannel,reset,transmitControl";
-};
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java
deleted file mode 100644
index af9ad60296a..00000000000
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This class may have some race conditions that I haven't
- * accounted for.  I've tried to put in sufficient sleeps and triggers
- * that should cause everything to run correctly.
- *
- * This was hackish, but to make sure that there were no problems
- * with permissions.
- *
- * Create a client, server, and interested party thread.  The
- * client and interested threads should receive the same
- * session notification.
- */
-package com;
-
-import java.net.*;
-import java.io.*;
-import javax.net.ssl.*;
-import java.security.cert.*;
-import java.security.*;
-
-public class NotifyHandshakeTest implements HandshakeCompletedListener {
-
-    static String pathToStores = "../../../../javax/net/ssl/etc";
-    static String keyStoreFile = "keystore";
-    static String trustStoreFile = "truststore";
-    static String passwd = "passphrase";
-    volatile static int serverPort = 0;
-
-    public boolean set;
-    SSLSession sess;
-
-    static public int triggerState = 0;
-
-    static public void trigger() {
-        triggerState++;
-    }
-
-    public void handshakeCompleted(HandshakeCompletedEvent event) {
-        set = true;
-        sess = event.getSession();
-        trigger();
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-            "/" + keyStoreFile;
-        String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-            "/" + trustStoreFile;
-
-        System.setProperty("javax.net.ssl.keyStore", keyFilename);
-        System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-        System.setProperty("javax.net.ssl.trustStore", trustFilename);
-        System.setProperty("javax.net.ssl.trustStorePassword", passwd);
-
-        SSLSocketFactory sslsf =
-                (SSLSocketFactory)SSLSocketFactory.getDefault();
-        SSLServerSocketFactory sslssf =
-                (SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
-
-        /*
-         * Start off the Server, give time to initialize.
-         */
-        SSLServerSocket sslss =
-            (SSLServerSocket)sslssf.createServerSocket(serverPort);
-        sslss.setSoTimeout(30000);  // 30 seconds
-        serverPort = sslss.getLocalPort();
-        Server server = new Server(sslss);
-        server.start();
-
-        System.out.println("Server started...");
-
-        /*
-         * Create the socket.
-         */
-        SSLSocket socket =
-            (SSLSocket)sslsf.createSocket("localhost", serverPort);
-
-        /*
-         * Create a second thread also interested in this socket
-         */
-        edu.NotifyHandshakeTestHeyYou heyYou =
-            new edu.NotifyHandshakeTestHeyYou(socket);
-        heyYou.start();
-        while (triggerState < 1) {
-            Thread.sleep(500);
-        }
-        System.out.println("HeyYou thread ready...");
-
-        NotifyHandshakeTest listener = new NotifyHandshakeTest();
-        socket.addHandshakeCompletedListener(listener);
-
-        System.out.println("Client starting handshake...");
-        socket.startHandshake();
-        System.out.println("Client done handshaking...");
-
-        InputStream is = socket.getInputStream();
-        if ((byte)is.read() != (byte)0x77) {
-            throw new Exception("problem reading byte");
-        }
-
-        /*
-         * Wait for HeyYou and the client to get a slice, so
-         * they can receive their SSLSessions.
-         */
-        while (triggerState < 3) {
-            Thread.sleep(500);
-        }
-
-        /*
-         * Grab the variables before reaping the thread.
-         */
-        boolean heyYouSet = heyYou.set;
-        AccessControlContext heyYouACC = heyYou.acc;
-        SSLSession  heyYouSess = heyYou.ssls;
-
-        heyYou.interrupt();
-        heyYou.join();
-        server.join();
-
-        socket.close();
-
-        if (!heyYouSet) {
-            throw new Exception("HeyYou's wasn't set");
-        }
-        if (!listener.set) {
-            throw new Exception("This' wasn't set");
-        }
-
-        if (heyYouACC.equals(AccessController.getContext())) {
-            throw new Exception("Access Control Contexts were the same");
-        }
-
-        if (!heyYouSess.equals(listener.sess)) {
-            throw new Exception("SSLSessions were not equal");
-        }
-
-        System.out.println("Everything Passed");
-    }
-
-    static class Server extends Thread {
-
-        SSLServerSocket ss;
-
-        Server(SSLServerSocket ss) {
-            this.ss = ss;
-        }
-
-        public void run() {
-            try {
-                System.out.println("Server accepting socket...");
-                SSLSocket s = (SSLSocket) ss.accept();
-                System.out.println(
-                    "Server accepted socket...starting handshake");
-                s.startHandshake();
-                System.out.println("Server done handshaking");
-                OutputStream os = s.getOutputStream();
-                os.write(0x77);
-                os.flush();
-                System.out.println("Server returning");
-            } catch (Exception e) {
-                System.out.println("Server died");
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy
deleted file mode 100644
index b426b173f79..00000000000
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-
-grant codeBase "file:com.jar" {
-    permission java.net.SocketPermission "localhost", "accept, resolve,connect";
-    permission java.util.PropertyPermission
-	"test.src", "read";
-    permission java.util.PropertyPermission
-	"javax.net.ssl.keyStore", "write";
-    permission java.util.PropertyPermission
-	"javax.net.ssl.keyStorePassword", "write";
-    permission java.util.PropertyPermission
-	"javax.net.ssl.trustStore", "write";
-    permission java.util.PropertyPermission
-	"javax.net.ssl.trustStorePassword", "write";
-};
-
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
deleted file mode 100644
index 259059ff762..00000000000
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4673442
-# @summary remove doPrivileged when creatingting the NotifyHandshakeThread
-# @run shell NotifyHandshakeTest.sh
-# @author Brad Wetmore
-#
-# To run independently:  sh NotifyHandshakeTest.sh
-
-if [ "${TESTJAVA}" = "" ]
-then
-        echo "TESTJAVA not set.  Test cannot execute.  Failed."
-        exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]; then
-        COMPILEJAVA="${TESTJAVA}"
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
-        TESTSRC="."
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Linux | Darwin | AIX )
-        FILESEP="/"
-        PATHSEP=":"
-        ;;
-
-    CYGWIN* )
-        FILESEP="/"
-        PATHSEP=";"
-        ;;
-
-    Windows* )
-        FILESEP="\\"
-        PATHSEP=";"
-        ;;
-esac
-
-set -ex
-
-#
-# Compile the tests, package into their respective jars
-#
-${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
-    ${TESTSRC}${FILESEP}NotifyHandshakeTest.java \
-    ${TESTSRC}${FILESEP}NotifyHandshakeTestHeyYou.java
-${COMPILEJAVA}${FILESEP}bin${FILESEP}jar ${TESTTOOLVMOPTS} -cvf com.jar \
-    com${FILESEP}NotifyHandshakeTest*.class
-${COMPILEJAVA}${FILESEP}bin${FILESEP}jar ${TESTTOOLVMOPTS} -cvf edu.jar \
-    edu${FILESEP}NotifyHandshakeTestHeyYou.class
-
-#
-# Don't want the original class files to be used, because
-# we want the jar files with the associated contexts to
-# be used.
-#
-rm -rf com edu
-
-#
-# This is the only thing we really care about as far as
-# test status goes.
-#
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
-    -Dtest.src=${TESTSRC} \
-    -classpath "com.jar${PATHSEP}edu.jar" \
-    -Djava.security.manager \
-    -Djava.security.policy=${TESTSRC}${FILESEP}NotifyHandshakeTest.policy \
-    com.NotifyHandshakeTest
-retval=$?
-
-rm com.jar edu.jar
-
-exit $retval
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java
deleted file mode 100644
index 0f743917327..00000000000
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package edu;
-
-import javax.net.ssl.*;
-import java.security.*;
-
-public class NotifyHandshakeTestHeyYou extends Thread
-        implements HandshakeCompletedListener {
-
-    public AccessControlContext acc;
-    public SSLSession ssls;
-
-    SSLSocket socket;
-
-    public boolean set;
-
-    public NotifyHandshakeTestHeyYou(SSLSocket socket) {
-        this.socket = socket;
-        socket.addHandshakeCompletedListener(this);
-        acc = AccessController.getContext();
-        com.NotifyHandshakeTest.trigger();
-    }
-
-    public void handshakeCompleted(HandshakeCompletedEvent event) {
-        set = true;
-        ssls = event.getSession();
-        com.NotifyHandshakeTest.trigger();
-    }
-
-
-    public void run() {
-        try {
-            System.out.println("Going to sleep for 1000 seconds...");
-            Thread.sleep(100000);
-        } catch (InterruptedException e) {
-            // swallow
-        }
-    }
-
-}
diff --git a/test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java b/test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
index 9c9a8590ac7..e87c147ab16 100644
--- a/test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
+++ b/test/jdk/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,16 +109,13 @@ public static void main(String[] args) throws Throwable {
         signWithJarSignerAPI(JAR_NAME);
         verify(SIGNED_JAR);
 
-        // test Permission granted
+        // test version.Main output
         File keypass = new File("keypass");
         try (FileOutputStream fos = new FileOutputStream(keypass)) {
             fos.write(KEYPASS.getBytes());
         }
         String[] cmd = {
                 "-classpath", SIGNED_JAR,
-                "-Djava.security.manager",
-                "-Djava.security.policy=" +
-                TEST_SRC + File.separator + POLICY_FILE,
                 "version.Main"};
         ProcessTools.executeTestJava(cmd)
             .shouldHaveExitValue(0)
diff --git a/test/jdk/sun/security/tools/jarsigner/multiRelease/SignedJar.policy b/test/jdk/sun/security/tools/jarsigner/multiRelease/SignedJar.policy
deleted file mode 100644
index f39efb57dee..00000000000
--- a/test/jdk/sun/security/tools/jarsigner/multiRelease/SignedJar.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-keystore "file:keystore.jks";
-keystorePasswordURL "file:keypass";
-
-grant signedBy "JavaTest" {
-    permission java.lang.RuntimePermission "setIO";
-};
-
-grant signedBy "other" {
-    permission java.lang.RuntimePermission "setFactory";
-};
diff --git a/test/jdk/sun/security/util/DerInputBuffer/Allow.policy b/test/jdk/sun/security/util/DerInputBuffer/Allow.policy
deleted file mode 100644
index c5e6b667413..00000000000
--- a/test/jdk/sun/security/util/DerInputBuffer/Allow.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-grant { 
-    // "standard" properies that can be read by anyone
-    // Needed to get access to package private constructor and
-    // to be able to call it.
-
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.x509";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.util";
-    permission java.lang.RuntimePermission "accessDeclaredMembers";
-    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-
-};
diff --git a/test/jdk/sun/security/util/FilePermCompat/CompatImpact.java b/test/jdk/sun/security/util/FilePermCompat/CompatImpact.java
deleted file mode 100644
index edf48e0d6b0..00000000000
--- a/test/jdk/sun/security/util/FilePermCompat/CompatImpact.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8164705 8168410
- * @summary check compatibility after FilePermission change
- * @library /test/lib
- * @run main CompatImpact prepare
- * @run main CompatImpact builtin
- * @run main/othervm -Djdk.security.filePermCompat=true CompatImpact mine
- * @run main/fail CompatImpact mine
- * @run main CompatImpact dopriv
- */
-
-import jdk.test.lib.process.Proc;
-
-import java.io.File;
-import java.io.FilePermission;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.security.SecurityPermission;
-
-public class CompatImpact {
-
-    public static void main(String[] args) throws Exception {
-        switch (args[0]) {
-            // copy class files to future classpath
-            case "prepare":
-                // cp in .
-                String cp = System.getProperty("test.classes");
-                Files.copy(Paths.get(cp, "CompatImpact.class"),
-                        Paths.get("CompatImpact.class"));
-                Files.copy(Paths.get(cp, "CompatImpact$MP.class"),
-                        Paths.get("CompatImpact$MP.class"));
-                Files.write(Paths.get("f"), new byte[10]);
-                // cp in ./sub
-                Files.createDirectory(Paths.get("sub"));
-                Files.copy(Paths.get(cp, "CompatImpact.class"),
-                        Paths.get("sub", "CompatImpact.class"));
-                Files.copy(Paths.get(cp, "CompatImpact$MP.class"),
-                        Paths.get("sub", "CompatImpact$MP.class"));
-                Files.write(Paths.get("sub", "f"), new byte[10]);
-                // cp in ./inner
-                Files.createDirectory(Paths.get("inner"));
-                Files.copy(Paths.get(cp, "CompatImpact$DoPrivInner.class"),
-                        Paths.get("inner", "CompatImpact$DoPrivInner.class"));
-                break;
-            // default policy always covered, user-defined depends on
-            // system property jdk.security.filePermCompact.
-            case "builtin":
-            case "mine":
-                cp = System.getProperty("test.classes");
-                Proc p;
-                String failed = "";
-                String testcase = "";
-                String cwd = System.getProperty("user.dir");
-
-                // Granting a FilePermission on an absolute path
-                testcase = "PonA";
-                p = p(args[0], cwd + "/f")
-                        .args("f", cwd + "/f")
-                        .debug(testcase)
-                        .start();
-                if (p.waitFor() != 0) {
-                    Files.copy(Paths.get(testcase + ".stderr"), System.out);
-                    failed += testcase + " ";
-                }
-
-                // Granting a FilePermission on a relative path
-                testcase = "PonR";
-                p = p(args[0], "f")
-                        .args("f", cwd + "/f")
-                        .debug(testcase)
-                        .start();
-                if (p.waitFor() != 0) {
-                    Files.copy(Paths.get(testcase + ".stderr"), System.out);
-                    failed += testcase + " ";
-                }
-
-                // Reading file on classpath, not cwd
-                testcase = "cp";
-                String cprel = Paths.get(cwd).relativize(Paths.get(cp))
-                        .normalize().toString();
-                p = p(args[0], "x")
-                        .args(cp + "/f", cprel + "/f")
-                        .debug(testcase)
-                        .start();
-                if (p.waitFor() != 0) {
-                    Files.copy(Paths.get(testcase + ".stderr"), System.out);
-                    failed += testcase + " ";
-                }
-
-                // Reading file on classpath, cwd
-                testcase = "cpHere";
-                p = p(args[0], "x")
-                        .args(cwd + "/f", "f", "RES")
-                        .cp(".")   // Must! cancel the old CLASSPATH.
-                        .debug(testcase)
-                        .start();
-                if (p.waitFor() != 0) {
-                    Files.copy(Paths.get(testcase + ".stderr"), System.out);
-                    failed += testcase + " ";
-                }
-
-                // Reading file on classpath, cwd
-                testcase = "cpSub";
-                p = p(args[0], "x")
-                        .args(cwd + "/sub/f", "sub/f", "RES")
-                        .cp("sub")   // Must! There's CLASSPATH.
-                        .debug(testcase)
-                        .start();
-                if (p.waitFor() != 0) {
-                    Files.copy(Paths.get(testcase + ".stderr"), System.out);
-                    failed += testcase + " ";
-                }
-
-                if (!failed.isEmpty()) {
-                    throw new Exception(failed + "failed");
-                }
-                break;
-            // test <policy_type> <grant> <read...>
-            case "test":
-                if (args[1].equals("mine")) {
-                    Policy.setPolicy(new MP(args[2]));
-                }
-                Exception e = null;
-                for (int i = 3; i < args.length; i++) {
-                    try {
-                        System.out.println(args[i]);
-                        if (args[i].equals("RES")) {
-                            CompatImpact.class.getResourceAsStream("f")
-                                    .close();
-                        } else {
-                            new File(args[i]).exists();
-                        }
-                    } catch (Exception e2) {
-                        e = e2;
-                        e2.printStackTrace(System.out);
-                    }
-                }
-                if (e != null) {
-                    System.err.println("====================");
-                    throw e;
-                }
-                break;
-            // doPrivWithPerm test launcher
-            case "dopriv":
-                cwd = System.getProperty("user.dir");
-                // caller (CompatImpact doprivouter, no permission) in sub,
-                // executor (DoPrivInner, AllPermission) in inner.
-                p = Proc.create("CompatImpact")
-                        .args("doprivouter")
-                        .prop("java.security.manager", "")
-                        .grant(new File("inner"))
-                        .perm(new AllPermission())
-                        .cp("sub", "inner")
-                        .debug("doPriv")
-                        .args(cwd)
-                        .start();
-                if (p.waitFor() != 0) {
-                    throw new Exception("dopriv test fails");
-                }
-                break;
-            // doprivouter <cwd>
-            case "doprivouter":
-                DoPrivInner.main(args);
-                break;
-            default:
-                throw new Exception("unknown " + args[0]);
-        }
-    }
-
-    // Call by CompatImpact doprivouter, with AllPermission
-    public static class DoPrivInner {
-        public static void main(String[] args) throws Exception {
-            AccessController.doPrivileged((PrivilegedAction<Boolean>)
-                            () -> new File("x").exists(),
-                    null,
-                    new FilePermission(args[1] + "/x", "read"));
-            AccessController.doPrivileged((PrivilegedAction<Boolean>)
-                            () -> new File(args[1] + "/x").exists(),
-                    null,
-                    new FilePermission("x", "read"));
-            try {
-                AccessController.doPrivileged((PrivilegedAction<Boolean>)
-                                () -> new File("x").exists(),
-                        null,
-                        new FilePermission("y", "read"));
-                throw new Exception("Should not read");
-            } catch (SecurityException se) {
-                // Expected
-            }
-        }
-    }
-
-    // Return a Proc object for different policy types
-    private static Proc p(String type, String f) throws Exception {
-        Proc p = Proc.create("CompatImpact")
-                .prop("java.security.manager", "")
-                .inheritProp("jdk.security.filePermCompat");
-        p.args("test", type);
-        switch (type) {
-            case "builtin":
-                // For builtin policy, reading access to f can be
-                // granted as a permission
-                p.perm(new FilePermission(f, "read"));
-                p.args("-");
-                break;
-            case "mine":
-                // For my policy, f is passed into test and new MP(f)
-                // will be set as new policy
-                p.perm(new SecurityPermission("setPolicy"));
-                p.perm(new SecurityPermission("getPolicy"));
-                p.args(f);
-                break;
-            default:
-                throw new Exception("unknown " + type);
-        }
-        return p;
-    }
-
-    // My own Policy impl, with only one granted permission, also not smart
-    // enough to know whether ProtectionDomain grants any permission
-    static class MP extends Policy {
-        static final Policy DEFAULT_POLICY = Policy.getPolicy();
-        final PermissionCollection pc;
-
-        MP(String f) {
-            FilePermission p = new FilePermission(f, "read");
-            pc = p.newPermissionCollection();
-            pc.add(p);
-        }
-        @Override
-        public PermissionCollection getPermissions(CodeSource codesource) {
-            return pc;
-        }
-
-        @Override
-        public PermissionCollection getPermissions(ProtectionDomain domain) {
-            return pc;
-        }
-
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            return pc.implies(permission) || DEFAULT_POLICY.implies(domain, permission);
-        }
-    }
-}
diff --git a/test/jdk/sun/security/util/FilePermCompat/Flag.java b/test/jdk/sun/security/util/FilePermCompat/Flag.java
deleted file mode 100644
index eb52fc6f774..00000000000
--- a/test/jdk/sun/security/util/FilePermCompat/Flag.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8164705 8209901
- * @library /test/lib
- * @summary check jdk.filepermission.canonicalize
- */
-
-import jdk.test.lib.process.Proc;
-import java.io.File;
-import java.io.FilePermission;
-import java.lang.*;
-import java.nio.file.Path;
-
-public class Flag {
-    public static void main(String[] args) throws Exception {
-
-        if (args.length == 0) {
-            String policy = Path.of(
-                    System.getProperty("test.src"), "flag.policy").toString();
-
-            // effectively true
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .prop("jdk.io.permissionsUseCanonicalPath", "true")
-                    .args("run", "true", "true")
-                    .start()
-                    .waitFor(0);
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .secprop("jdk.io.permissionsUseCanonicalPath", "true")
-                    .args("run", "true", "true")
-                    .start()
-                    .waitFor(0);
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .secprop("jdk.io.permissionsUseCanonicalPath", "false")
-                    .prop("jdk.io.permissionsUseCanonicalPath", "true")
-                    .args("run", "true", "true")
-                    .start()
-                    .waitFor(0);
-
-            // effectively false
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .prop("jdk.io.permissionsUseCanonicalPath", "false")
-                    .args("run", "false", "true")
-                    .start()
-                    .waitFor(0);
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .secprop("jdk.io.permissionsUseCanonicalPath", "false")
-                    .args("run", "false", "true")
-                    .start()
-                    .waitFor(0);
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .secprop("jdk.io.permissionsUseCanonicalPath", "true")
-                    .prop("jdk.io.permissionsUseCanonicalPath", "false")
-                    .args("run", "false", "true")
-                    .start()
-                    .waitFor(0);
-            Proc.create("Flag")
-                    .prop("java.security.manager", "")
-                    .prop("java.security.policy", policy)
-                    .args("run", "false", "true")
-                    .start()
-                    .waitFor(0);
-        } else {
-            run(args);
-        }
-    }
-
-    static void run(String[] args) throws Exception {
-
-        boolean test1;
-        boolean test2;
-
-        String here = System.getProperty("user.dir");
-        File abs = new File(here, "x");
-        FilePermission fp1 = new FilePermission("x", "read");
-        FilePermission fp2 = new FilePermission(abs.toString(), "read");
-        test1 = fp1.equals(fp2);
-
-        try {
-            System.getSecurityManager().checkPermission(fp2);
-            test2 = true;
-        } catch (SecurityException se) {
-            test2 = false;
-        }
-
-        if (test1 != Boolean.parseBoolean(args[1]) ||
-                test2 != Boolean.parseBoolean(args[2])) {
-            throw new Exception("Test failed: " + test1 + " " + test2);
-        }
-    }
-}
diff --git a/test/jdk/sun/security/util/FilePermCompat/flag.policy b/test/jdk/sun/security/util/FilePermCompat/flag.policy
deleted file mode 100644
index 70e052a5ac9..00000000000
--- a/test/jdk/sun/security/util/FilePermCompat/flag.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-    permission java.io.FilePermission "x", "read";
-    permission java.util.PropertyPermission "user.dir", "read";
-};
diff --git a/test/jdk/sun/security/util/Pem/encoding.sh b/test/jdk/sun/security/util/Pem/encoding.sh
index 7f8b142caf8..ef670b3aee5 100644
--- a/test/jdk/sun/security/util/Pem/encoding.sh
+++ b/test/jdk/sun/security/util/Pem/encoding.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,6 @@
 # jtreg does not like -Dfile.encoding=UTF-16 inside a @run main line,
 # therefore a shell test is written.
 
-$TESTJAVA/bin/java $TESTVMOPTS -cp $TESTCLASSES \
+$TESTJAVA/bin/java $TESTVMOPTS $TESTJAVAOPTS -cp $TESTCLASSES \
         -Dfile.encoding=UTF-16 \
         PemEncoding $TESTSRC/../HostnameChecker/cert5.crt
diff --git a/test/jdk/sun/security/util/Resources/Format.java b/test/jdk/sun/security/util/Resources/Format.java
index 3cc8cd0125e..5071130187f 100644
--- a/test/jdk/sun/security/util/Resources/Format.java
+++ b/test/jdk/sun/security/util/Resources/Format.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @author Charlie Lai
  * @bug 4394746
  * @summary     Resources should not be loaded until necessar
- * @run main/othervm/policy=Format.policy -Djava.security.auth.login.config=file:${test.src}/Format.config Format
+ * @run main/othervm -Djava.security.auth.login.config=file:${test.src}/Format.config Format
  *
  */
 
@@ -117,13 +117,7 @@ public static void main(String[] args) {
             System.out.println("Test 8: " + npe.getMessage());
         }
 
-        try {
-            Subject.getSubject(null);
-            throw new SecurityException("test 9 failed");
-        } catch (NullPointerException npe) {
-            // good
-            System.out.println("Test 9: " + npe.getMessage());
-        }
+        // test 9 was on Subject.getSubject(null);
 
         try {
             Subject.doAs(null, (java.security.PrivilegedAction)null);
diff --git a/test/jdk/sun/security/util/Resources/Format.policy b/test/jdk/sun/security/util/Resources/Format.policy
deleted file mode 100644
index cb9dbed32cc..00000000000
--- a/test/jdk/sun/security/util/Resources/Format.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    permission java.security.AllPermission;
-};
diff --git a/test/jdk/sun/security/util/Resources/Usages.java b/test/jdk/sun/security/util/Resources/Usages.java
index cd36f6794a2..7b08ce4a616 100644
--- a/test/jdk/sun/security/util/Resources/Usages.java
+++ b/test/jdk/sun/security/util/Resources/Usages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,8 +130,6 @@ public class Usages {
                             List.of(MGR_GETSTRING)),
                     new Pair("java.base/share/classes/sun/security/provider/PolicyParser.java",
                             List.of(LOC_GETNONLOC, NEW_LOC)),
-                    new Pair("java.base/share/classes/sun/security/provider/PolicyFile.java",
-                            List.of(MGR_GETSTRING, LOC_GETNONLOC, LOC_GETNONLOC_POLICY)),
                     new Pair("java.base/share/classes/javax/security/auth/",
                             List.of(MGR_GETSTRING)))
     );
@@ -170,11 +168,6 @@ private static void check(ListResourceBundle res, List<Pair> fnps) {
                                     Matcher m = p.matcher(content);
                                     while (m.find()) {
                                         String arg = m.group(1);
-                                        // Special case in PolicyFile.java:
-                                        if (arg.startsWith("POLICY + \"")) {
-                                            arg = "java.security.policy"
-                                                    + arg.substring(10);
-                                        }
                                         if (!keys.contains(arg)) {
                                             throw new RuntimeException(
                                                     "Not found: " + arg);
diff --git a/test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java b/test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java
index 0af0df34cc7..a32383421e8 100644
--- a/test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java
+++ b/test/jdk/sun/security/util/Resources/customSysClassLoader/BootMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Ensure that security messages can be formatted during system class
  *   loader initialization.
  * @build CustomClassLoader
- * @run main/othervm/java.security.policy=error.policy -Djava.security.manager -Djava.system.class.loader=CustomClassLoader BootMessages
+ * @run main/othervm -Djava.system.class.loader=CustomClassLoader BootMessages
  */
 
 public class BootMessages {
diff --git a/test/jdk/sun/security/util/Resources/customSysClassLoader/error.policy b/test/jdk/sun/security/util/Resources/customSysClassLoader/error.policy
deleted file mode 100644
index 28e6b109184..00000000000
--- a/test/jdk/sun/security/util/Resources/customSysClassLoader/error.policy
+++ /dev/null
@@ -1,5 +0,0 @@
-grant { 
-    permission java.lang.RuntimePermission "createClassLoader";
-    permission java.lang.RuntimePermission "";
-};
-
diff --git a/test/jdk/sun/security/util/Resources/early/malformed.policy b/test/jdk/sun/security/util/Resources/early/malformed.policy
deleted file mode 100644
index 7fba879b0eb..00000000000
--- a/test/jdk/sun/security/util/Resources/early/malformed.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-    xyz;
-}
diff --git a/test/jdk/sun/security/validator/certreplace.sh b/test/jdk/sun/security/validator/certreplace.sh
index 78b27e8f99f..79c97328092 100644
--- a/test/jdk/sun/security/validator/certreplace.sh
+++ b/test/jdk/sun/security/validator/certreplace.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -85,4 +85,4 @@ $KT -delete -alias user
 
 EXTRAOPTS="--add-exports java.base/sun.security.validator=ALL-UNNAMED"
 $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$JAVA ${TESTVMOPTS} ${EXTRAOPTS} CertReplace certreplace.jks certreplace.certs
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRAOPTS} CertReplace certreplace.jks certreplace.certs
diff --git a/test/jdk/sun/security/validator/samedn.sh b/test/jdk/sun/security/validator/samedn.sh
index a38d6e70990..912bbcd40c7 100644
--- a/test/jdk/sun/security/validator/samedn.sh
+++ b/test/jdk/sun/security/validator/samedn.sh
@@ -82,5 +82,5 @@ $KT -delete -alias user
 
 EXTRAOPTS="--add-exports java.base/sun.security.validator=ALL-UNNAMED"
 $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$JAVA ${TESTVMOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn1.certs || exit 1
-$JAVA ${TESTVMOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn2.certs || exit 2
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn1.certs || exit 1
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn2.certs || exit 2
diff --git a/test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java b/test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java
index b0d85f2a11a..20beb8db639 100644
--- a/test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java
+++ b/test/jdk/sun/security/x509/AVA/AVAEqualsHashCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Verify equals()/hashCode() contract honored
  * @modules java.base/sun.security.util
  *          java.base/sun.security.x509
- * @run main/othervm/policy=Allow.policy AVAEqualsHashCode
  */
 
 import java.io.*;
diff --git a/test/jdk/sun/security/x509/AVA/Allow.policy b/test/jdk/sun/security/x509/AVA/Allow.policy
deleted file mode 100644
index c5e6b667413..00000000000
--- a/test/jdk/sun/security/x509/AVA/Allow.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-grant { 
-    // "standard" properies that can be read by anyone
-    // Needed to get access to package private constructor and
-    // to be able to call it.
-
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.x509";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.security.util";
-    permission java.lang.RuntimePermission "accessDeclaredMembers";
-    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-
-};
diff --git a/test/jdk/sun/util/locale/provider/Bug8152817.java b/test/jdk/sun/util/locale/provider/Bug8152817.java
deleted file mode 100644
index 3f694e2425f..00000000000
--- a/test/jdk/sun/util/locale/provider/Bug8152817.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8152817 8174269
- * @summary Make sure that resource bundles in the jdk.localedata module are
- *          loaded under a security manager.
- * @modules jdk.localedata
- * @run main/othervm -Djava.security.manager=allow
- *      -Djava.security.debug=access,failure,codebase=jrt:/jdk.localedata Bug8152817
- */
-
-import java.text.DateFormatSymbols;
-import java.time.chrono.HijrahChronology;
-import java.time.format.TextStyle;
-import java.util.Calendar;
-import java.util.Locale;
-
-public class Bug8152817 {
-    public static void main(String[] args) throws Exception {
-        System.setSecurityManager(new SecurityManager());
-
-        DateFormatSymbols syms = DateFormatSymbols.getInstance(Locale.GERMAN);
-        String s = syms.getMonths()[Calendar.OCTOBER];
-        if (!"Oktober".equals(s)) {
-            throw new RuntimeException("Test failed: " + s);
-        }
-
-        s = HijrahChronology.INSTANCE.getDisplayName(TextStyle.FULL, Locale.GERMAN);
-        if (!s.contains("Hidschri-Kalender (Umm al-Qura)")) {
-            throw new RuntimeException("Test failed: " + s);
-        }
-    }
-}
diff --git a/test/jdk/tools/jlink/ImageFileCreatorTest.java b/test/jdk/tools/jlink/ImageFileCreatorTest.java
index 84f77340f42..b6466c6a4d9 100644
--- a/test/jdk/tools/jlink/ImageFileCreatorTest.java
+++ b/test/jdk/tools/jlink/ImageFileCreatorTest.java
@@ -34,11 +34,12 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
+
+import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.internal.Archive;
+import jdk.tools.jlink.internal.ExecutableImage;
 import jdk.tools.jlink.internal.ImageFileCreator;
 import jdk.tools.jlink.internal.ImagePluginStack;
-import jdk.tools.jlink.internal.ExecutableImage;
-import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.plugin.ResourcePool;
 
 
@@ -223,6 +224,6 @@ public void storeFiles(ResourcePool content) {
         ImagePluginStack stack = new ImagePluginStack(noopBuilder, Collections.emptyList(),
                 null, false);
 
-        ImageFileCreator.create(archives, ByteOrder.nativeOrder(), stack);
+        ImageFileCreator.create(archives, ByteOrder.nativeOrder(), stack, false, null);
     }
 }
diff --git a/test/jdk/tools/jlink/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java
index e85d8f0d984..686dd194ada 100644
--- a/test/jdk/tools/jlink/IntegrationTest.java
+++ b/test/jdk/tools/jlink/IntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.ByteOrder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -38,20 +37,18 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.Function;
-import jdk.tools.jlink.internal.Jlink;
-import jdk.tools.jlink.internal.JlinkTask;
+
 import jdk.tools.jlink.builder.DefaultImageBuilder;
-import jdk.tools.jlink.internal.Platform;
-import jdk.tools.jlink.plugin.ResourcePool;
-import jdk.tools.jlink.plugin.ResourcePoolBuilder;
-import jdk.tools.jlink.plugin.Plugin;
 import jdk.tools.jlink.internal.ExecutableImage;
+import jdk.tools.jlink.internal.Jlink;
 import jdk.tools.jlink.internal.Jlink.JlinkConfiguration;
 import jdk.tools.jlink.internal.Jlink.PluginsConfiguration;
+import jdk.tools.jlink.internal.JlinkTask;
+import jdk.tools.jlink.internal.Platform;
 import jdk.tools.jlink.internal.PostProcessor;
-import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin;
-import jdk.tools.jlink.internal.plugins.DefaultStripDebugPlugin;
-
+import jdk.tools.jlink.plugin.Plugin;
+import jdk.tools.jlink.plugin.ResourcePool;
+import jdk.tools.jlink.plugin.ResourcePoolBuilder;
 import tests.Helper;
 import tests.JImageGenerator;
 
@@ -74,8 +71,6 @@
  */
 public class IntegrationTest {
 
-    private static final List<Integer> ordered = new ArrayList<>();
-
     public static class MyPostProcessor implements PostProcessor, Plugin {
 
         public static final String NAME = "mypostprocessor";
@@ -162,7 +157,7 @@ private static void test() throws Exception {
         limits.add("java.management");
         JlinkConfiguration config = new Jlink.JlinkConfiguration(output,
                 mods,
-                JlinkTask.newModuleFinder(modulePaths, limits, mods));
+                JlinkTask.newModuleFinder(modulePaths, limits, mods), false, false, false);
 
         List<Plugin> lst = new ArrayList<>();
 
diff --git a/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java b/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
index 8b2dee1b45a..c7af8865a79 100644
--- a/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
+++ b/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,16 @@
  * questions.
  */
 
-import jdk.test.lib.compiler.CompilerUtils;
-import tests.JImageGenerator;
-
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import jdk.test.lib.compiler.CompilerUtils;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
+import tests.JImageGenerator;
+
+
 /*
  * @test
  * @summary Make sure that modules can be linked using jlink
@@ -54,10 +56,6 @@ public class JLinkDedupTestBatchSizeOne {
     private static final Path SRC_DIR = Paths.get(TEST_SRC, "dedup", "src");
     private static final Path MODS_DIR = Paths.get("mods");
 
-    private static final String MODULE_PATH =
-            Paths.get(JAVA_HOME, "jmods").toString() +
-                    File.pathSeparator + MODS_DIR.toString();
-
     // the names of the modules in this test
     private static String[] modules = new String[]{"m1", "m2", "m3", "m4"};
 
@@ -69,8 +67,13 @@ private static boolean hasJmods() {
         return true;
     }
 
-    public static void compileAll() throws Throwable {
-        if (!hasJmods()) return;
+    private static String modulePath(boolean linkableRuntime) {
+        return (linkableRuntime ? "" : (Paths.get(JAVA_HOME, "jmods").toString() +
+                                        File.pathSeparator)) + MODS_DIR.toString();
+    }
+
+    public static void compileAll(boolean linkableRuntime) throws Throwable {
+        if (!linkableRuntime && !hasJmods()) return;
 
         for (String mn : modules) {
             Path msrc = SRC_DIR.resolve(mn);
@@ -80,11 +83,15 @@ public static void compileAll() throws Throwable {
     }
 
     public static void main(String[] args) throws Throwable {
-        compileAll();
+        boolean linkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+        System.out.println("Running test on " +
+                            (linkableRuntime ? "enabled" : "disabled") +
+                            " capability of linking from the run-time image.");
+        compileAll(linkableRuntime);
         Path image = Paths.get("bug8311591");
 
         JImageGenerator.getJLinkTask()
-                .modulePath(MODULE_PATH)
+                .modulePath(modulePath(linkableRuntime))
                 .output(image.resolve("out-jlink-dedup"))
                 .addMods("m1")
                 .addMods("m2")
diff --git a/test/jdk/tools/jlink/JLinkHelpCapabilityTest.java b/test/jdk/tools/jlink/JLinkHelpCapabilityTest.java
new file mode 100644
index 00000000000..50f570251d2
--- /dev/null
+++ b/test/jdk/tools/jlink/JLinkHelpCapabilityTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.spi.ToolProvider;
+
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
+
+/*
+ * @test
+ * @summary Test jlink --help for capability output
+ * @modules jdk.jlink/jdk.tools.jlink.internal
+ * @requires vm.compMode != "Xcomp"
+ * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest
+ */
+public class JLinkHelpCapabilityTest {
+    static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")
+        .orElseThrow(() ->
+            new RuntimeException("jlink tool not found")
+        );
+
+    public static void main(String[] args) throws Exception {
+        boolean runtimeLinkCap = LinkableRuntimeImage.isLinkableRuntime();
+        String capabilities = String.format("Linking from run-time image %s",
+                                            runtimeLinkCap ? "enabled" : "disabled");
+        {
+            // Verify capability in --help output
+            StringWriter writer = new StringWriter();
+            PrintWriter pw = new PrintWriter(writer);
+            JLINK_TOOL.run(pw, pw, "--help");
+            String output = writer.toString().trim();
+            String lines[] = output.split("\n");
+            String capabilitiesMsg = null;
+            boolean seenCap = false;
+            for (int i = 0; i < lines.length; i++) {
+                if (lines[i].startsWith("Capabilities:")) {
+                    seenCap = true;
+                    continue; // skip 'Capabilities:'
+                }
+                if (!seenCap) {
+                    continue;
+                } else {
+                    // Line after capabilities is the message we care about
+                    capabilitiesMsg = lines[i].trim();
+                    break;
+                }
+            }
+            System.out.println("DEBUG: Capabilities:");
+            System.out.println("DEBUG:   " + capabilitiesMsg);
+            if (!capabilities.equals(capabilitiesMsg)) {
+                System.err.println(output);
+                throw new AssertionError("'--help': Capabilities mismatch. Expected: '" +
+                                         capabilities +"' but got '" + capabilitiesMsg + "'");
+            }
+        }
+    }
+}
diff --git a/test/jdk/tools/jlink/JLinkToolProviderTest.java b/test/jdk/tools/jlink/JLinkToolProviderTest.java
index 7ec222bc157..cb1f2f90c43 100644
--- a/test/jdk/tools/jlink/JLinkToolProviderTest.java
+++ b/test/jdk/tools/jlink/JLinkToolProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,12 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.security.AccessControlException;
 import java.util.spi.ToolProvider;
 
 /*
  * @test
  * @modules jdk.jlink
- * @build JLinkToolProviderTest
- * @run main/othervm/java.security.policy=toolprovider.policy JLinkToolProviderTest
+ * @run main JLinkToolProviderTest
  */
 public class JLinkToolProviderTest {
     static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")
@@ -41,15 +39,7 @@ public class JLinkToolProviderTest {
     private static void checkJlinkOptions(String... options) {
         StringWriter writer = new StringWriter();
         PrintWriter pw = new PrintWriter(writer);
-
-        try {
-            JLINK_TOOL.run(pw, pw, options);
-            throw new AssertionError("SecurityException should have been thrown!");
-        } catch (AccessControlException ace) {
-            if (! ace.getPermission().getClass().getName().contains("JlinkPermission")) {
-                throw new AssertionError("expected JlinkPermission check failure");
-            }
-        }
+        JLINK_TOOL.run(pw, pw, options);
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/tools/jlink/SecurityTest.java b/test/jdk/tools/jlink/SecurityTest.java
deleted file mode 100644
index a42eb4dbc5e..00000000000
--- a/test/jdk/tools/jlink/SecurityTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @summary Test JlinkPermission
- * @author Jean-Francois Denise
- * @modules jdk.jlink/jdk.tools.jlink.internal
- * @run main/othervm -Djava.security.manager=allow SecurityTest
- */
-
-import java.security.AccessControlException;
-import jdk.tools.jlink.internal.Jlink;
-
-public class SecurityTest {
-
-    public static void main(String[] args) throws Exception {
-        new Jlink();
-        System.setSecurityManager(new SecurityManager());
-        try {
-            new Jlink();
-            throw new Exception("Call should have failed");
-        } catch (AccessControlException ex) {
-            // expected exception
-        }
-    }
-}
diff --git a/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java b/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java
index 46912a68033..1fba932798d 100644
--- a/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java
+++ b/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  jlink should use the version from java.base.jmod to find modules
  * @bug 8185130
  * @summary jlink should throw error if target image and current JDK versions don't match
+ * @requires jlink.packagedModules
  * @modules java.base/jdk.internal.module
  * @library /test/lib
  * @build jdk.test.lib.process.* CheckRuntimeVersion
diff --git a/test/jdk/tools/jlink/plugins/CDSPluginTest.java b/test/jdk/tools/jlink/plugins/CDSPluginTest.java
index d50b1c88a21..c9766183297 100644
--- a/test/jdk/tools/jlink/plugins/CDSPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/CDSPluginTest.java
@@ -26,6 +26,7 @@
 import jdk.test.lib.JDKToolFinder;
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.*;
+import jdk.test.whitebox.WhiteBox;
 
 import tests.Helper;
 
@@ -44,11 +45,12 @@
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
  * @build tests.*
- * @run main CDSPluginTest
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. CDSPluginTest
  */
 
 public class CDSPluginTest {
-
     public static void main(String[] args) throws Throwable {
 
         if (!Platform.isDefaultCDSArchiveSupported())
@@ -75,12 +77,19 @@ public static void main(String[] args) throws Throwable {
         }
         subDir += "server" + sep;
 
+        WhiteBox wb = WhiteBox.getWhiteBox();
+        boolean COMPACT_HEADERS = Platform.is64bit() &&
+                                  wb.getBooleanVMFlag("UseCompactObjectHeaders") &&
+                                  wb.isDefaultVMFlag("UseCompactObjectHeaders");
+
+        String suffix = COMPACT_HEADERS ? "_coh.jsa" : ".jsa";
+
         if (Platform.isAArch64() || Platform.isX64()) {
             helper.checkImage(image, module, null, null,
-                      new String[] { subDir + "classes.jsa", subDir + "classes_nocoops.jsa" });
+                      new String[] { subDir + "classes" + suffix, subDir + "classes_nocoops" + suffix });
         } else {
             helper.checkImage(image, module, null, null,
-                      new String[] { subDir + "classes.jsa" });
+                      new String[] { subDir + "classes" + suffix });
         }
     }
 }
diff --git a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
index 5d06288fb59..1acad93f5d3 100644
--- a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
@@ -21,6 +21,9 @@
  * questions.
  */
 
+import static java.lang.constant.ConstantDescs.CD_Object;
+import static java.lang.constant.ConstantDescs.CD_int;
+
 import java.io.IOException;
 import java.lang.classfile.ClassFile;
 import java.lang.constant.MethodTypeDesc;
@@ -32,16 +35,15 @@
 import java.util.stream.Collectors;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageValidator;
 import tests.Result;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import static java.lang.constant.ConstantDescs.CD_Object;
-import static java.lang.constant.ConstantDescs.CD_int;
 
 /*
  * @test
@@ -63,12 +65,20 @@ public class GenerateJLIClassesPluginTest {
 
     @BeforeTest
     public static void setup() throws Exception {
-        helper = Helper.newHelper();
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+        System.out.println("DEBUG: Tests run on " +
+                           (isLinkableRuntime ? "enabled" : "disabled") +
+                           " capability of linking from the run-time image.");
+        System.out.println("DEBUG: default module-path, 'jmods', " +
+                           (Helper.jdkHasPackagedModules() ? "" : "NOT ") +
+                           "present.");
+        helper = Helper.newHelper(isLinkableRuntime);
         if (helper == null) {
+            // In case of no linkable run-time image and also no packaged
+            // modules, helper will be null.
             System.err.println("Test not run");
             return;
         }
-        helper.generateDefaultModules();
     }
 
     @Test
@@ -79,7 +89,6 @@ public static void testSpecies()  throws IOException {
         String fileString = "[SPECIES_RESOLVE] java.lang.invoke.BoundMethodHandle$Species_" + species + " (salvaged)\n";
         Files.write(baseFile, fileString.getBytes(Charset.defaultCharset()));
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("generate-jli-file"))
                 .option("--generate-jli-classes=@" + baseFile.toString())
                 .addMods("java.base")
@@ -105,7 +114,6 @@ public static void testInvalidSignatures() throws IOException {
             fileString = "[LF_RESOLVE] java.lang.invoke.DirectMethodHandle$Holder invokeVirtual L_L (success)\n";
             Files.write(failFile, fileString.getBytes(Charset.defaultCharset()));
             Result result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir("invalid-signature"))
                     .option("--generate-jli-classes=@" + failFile.toString())
                     .addMods("java.base")
@@ -118,7 +126,6 @@ public static void testInvalidSignatures() throws IOException {
     @Test
     public static void nonExistentTraceFile() throws IOException {
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("non-existent-tracefile"))
                 .option("--generate-jli-classes=@NON_EXISTENT_FILE")
                 .addMods("java.base")
@@ -134,7 +141,6 @@ public static void testInvokers() throws IOException {
         Path invokersTrace = Files.createTempFile("invokers", "trace");
         Files.writeString(invokersTrace, fileString, Charset.defaultCharset());
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("jli-invokers"))
                 .option("--generate-jli-classes=@" + invokersTrace.toString())
                 .addMods("java.base")
@@ -183,4 +189,5 @@ private static List<String> classFilesForSpecies(Collection<String> species) {
                 .map(s -> "/java.base/java/lang/invoke/BoundMethodHandle$Species_" + s + ".class")
                 .collect(Collectors.toList());
     }
+
 }
diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
index 2a0c43d3168..e2dd3403c83 100644
--- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
@@ -22,25 +22,27 @@
  */
 
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import jdk.tools.jlink.plugin.PluginException;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import jdk.tools.jlink.internal.TaskHelper;
 import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
+import jdk.tools.jlink.plugin.PluginException;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageValidator;
 import tests.Result;
 
+
 /*
  * @test
  * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
  *      8179071 8202537 8221432 8222098 8251317 8258794 8265315
- *      8296248 8306116 8174269 8333582
+ *      8296248 8306116 8174269
  * @summary IncludeLocalesPlugin tests
  * @author Naoto Sato
  * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
@@ -59,14 +61,14 @@
  */
 public class IncludeLocalesPluginTest {
 
-    private final static String moduleName = "IncludeLocalesTest";
+    private static final String moduleName = "IncludeLocalesTest";
     private static Helper helper;
-    private final static int INCLUDE_LOCALES_OPTION = 0;
-    private final static int ADDMODS_OPTION         = 1;
-    private final static int EXPECTED_LOCATIONS     = 2;
-    private final static int UNEXPECTED_PATHS       = 3;
-    private final static int AVAILABLE_LOCALES      = 4;
-    private final static int ERROR_MESSAGE          = 5;
+    private static final int INCLUDE_LOCALES_OPTION = 0;
+    private static final int ADDMODS_OPTION         = 1;
+    private static final int EXPECTED_LOCATIONS     = 2;
+    private static final int UNEXPECTED_PATHS       = 3;
+    private static final int AVAILABLE_LOCALES      = 4;
+    private static final int ERROR_MESSAGE          = 5;
 
     private static int errors;
 
@@ -413,11 +415,18 @@ public class IncludeLocalesPluginTest {
     };
 
     public static void main(String[] args) throws Exception {
-        helper = Helper.newHelper();
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+        System.out.println("Running test on " +
+                           (isLinkableRuntime ? "enabled" : "disabled") +
+                           " capability of linking from the run-time image.");
+        System.out.println("Default module-path, 'jmods', " +
+                           (Helper.jdkHasPackagedModules() ? "" : "NOT ") +
+                           "present.");
+
+        helper = Helper.newHelper(isLinkableRuntime);
         if (helper == null) {
             throw new RuntimeException("Helper could not be initialized");
         }
-        helper.generateDefaultModules();
 
         for (Object[] data : testData) {
             // create image for each test data
@@ -425,14 +434,12 @@ public static void main(String[] args) throws Exception {
             if (data[INCLUDE_LOCALES_OPTION].toString().isEmpty()) {
                 System.out.println("Invoking jlink with no --include-locales option");
                 result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir(moduleName))
                     .addMods((String) data[ADDMODS_OPTION])
                     .call();
             } else {
                 System.out.println("Invoking jlink with \"" + data[INCLUDE_LOCALES_OPTION] + "\"");
                 result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir(moduleName))
                     .addMods((String) data[ADDMODS_OPTION])
                     .option((String) data[INCLUDE_LOCALES_OPTION])
diff --git a/test/jdk/tools/jlink/runtimeImage/AbstractLinkableRuntimeTest.java b/test/jdk/tools/jlink/runtimeImage/AbstractLinkableRuntimeTest.java
new file mode 100644
index 00000000000..e7d5340e3b0
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/AbstractLinkableRuntimeTest.java
@@ -0,0 +1,705 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
+import tests.Helper;
+import tests.JImageGenerator;
+import tests.JImageGenerator.JLinkTask;
+import tests.JImageValidator;
+
+public abstract class AbstractLinkableRuntimeTest {
+
+    protected static final boolean DEBUG = true;
+
+    public void run() throws Exception {
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+        Helper helper = Helper.newHelper(isLinkableRuntime);
+        if (helper == null) {
+            System.err.println(AbstractLinkableRuntimeTest.class.getSimpleName() +
+                               ": Test not run");
+            return;
+        }
+        runTest(helper, isLinkableRuntime);
+        System.out.println(getClass().getSimpleName() + " PASSED!");
+    }
+
+    /**
+     * Main test entry point that actual tests ought to override.
+     *
+     * @param helper The jlink helper
+     * @param isLinkableRuntime {@code true} iff the JDK build under test already
+     *                          includes the linkable runtime capability in jlink.
+     * @throws Exception
+     */
+    abstract void runTest(Helper helper, boolean isLinkableRuntime) throws Exception;
+
+    /**
+     * Ensure 'java --list-modules' lists the correct set of modules in the given
+     * image.
+     *
+     * @param jlinkImage
+     * @param expectedModules
+     */
+    protected void verifyListModules(Path image,
+            List<String> expectedModules) throws Exception {
+        OutputAnalyzer out = runJavaCmd(image, List.of("--list-modules"));
+        List<String> actual = parseListMods(out.getStdout());
+        Collections.sort(actual);
+        if (!expectedModules.equals(actual)) {
+            throw new AssertionError("Different modules! Expected " + expectedModules + " got: " + actual);
+        }
+    }
+
+    protected OutputAnalyzer runJavaCmd(Path image, List<String> options) throws Exception {
+        Path targetJava = image.resolve("bin").resolve(getJava());
+        List<String> cmd = new ArrayList<>();
+        cmd.add(targetJava.toString());
+        for (String opt: options) {
+            cmd.add(opt);
+        }
+        List<String> javaCmd = Collections.unmodifiableList(cmd);
+        OutputAnalyzer out;
+        try {
+            out = ProcessTools.executeCommand(javaCmd.toArray(new String[0]));
+        } catch (Throwable e) {
+            throw new Exception("Process failed to execute", e);
+        }
+        if (out.getExitValue() != 0) {
+            if (DEBUG) {
+                System.err.println("Process stdout was: ");
+                System.err.println(out.getStdout());
+                System.err.println("Process stderr was: ");
+                System.err.println(out.getStderr());
+            }
+            throw new AssertionError("'" + javaCmd.stream().collect(Collectors.joining(" ")) + "'"
+                    + " expected to succeed!");
+        }
+        return out;
+    }
+
+    protected Path createJavaImageRuntimeLink(BaseJlinkSpec baseSpec) throws Exception {
+        return createJavaImageRuntimeLink(baseSpec, Collections.emptySet() /* exclude all jmods */);
+    }
+
+    protected Path createJavaImageRuntimeLink(BaseJlinkSpec baseSpec, Set<String> excludedJmods) throws Exception {
+        // Be sure we have a JDK without JMODs
+        Path runtimeJlinkImage = createRuntimeLinkImage(baseSpec, excludedJmods);
+
+        // On Windows jvm.dll is in 'bin' after the jlink
+        Path libjvm = Path.of((isWindows() ? "bin" : "lib"), "server", System.mapLibraryName("jvm"));
+        JlinkSpecBuilder builder = new JlinkSpecBuilder();
+        // And expect libjvm (not part of the jimage) to be present in the resulting image
+        builder.expectedFile(libjvm.toString())
+               .helper(baseSpec.getHelper())
+               .name(baseSpec.getName())
+               .validatingModule(baseSpec.getValidatingModule())
+               .imagePath(runtimeJlinkImage)
+               .expectedLocation("/java.base/java/lang/String.class");
+        for (String m: baseSpec.getModules()) {
+            builder.addModule(m);
+        }
+        for (String extra: baseSpec.getExtraOptions()) {
+            builder.extraJlinkOpt(extra);
+        }
+        return jlinkUsingImage(builder.build());
+    }
+
+    protected Path jlinkUsingImage(JlinkSpec spec) throws Exception {
+        return jlinkUsingImage(spec, new RuntimeLinkOutputAnalyzerHandler());
+    }
+
+    protected Path jlinkUsingImage(JlinkSpec spec, OutputAnalyzerHandler handler) throws Exception {
+        return jlinkUsingImage(spec, handler, new DefaultSuccessExitPredicate());
+    }
+
+    protected Path jlinkUsingImage(JlinkSpec spec, OutputAnalyzerHandler handler, Predicate<OutputAnalyzer> exitChecker) throws Exception {
+        String generatedImage = "target-run-time-" + spec.getName();
+        Path targetImageDir = spec.getHelper().createNewImageDir(generatedImage);
+        Path targetJlink = spec.getImageToUse().resolve("bin").resolve(getJlink());
+        String[] jlinkCmdArray = new String[] {
+                targetJlink.toString(),
+                "--output", targetImageDir.toString(),
+                "--verbose",
+                "--add-modules", spec.getModules().stream().collect(Collectors.joining(","))
+        };
+        List<String> jlinkCmd = new ArrayList<>();
+        jlinkCmd.addAll(Arrays.asList(jlinkCmdArray));
+        if (spec.getExtraJlinkOpts() != null && !spec.getExtraJlinkOpts().isEmpty()) {
+            jlinkCmd.addAll(spec.getExtraJlinkOpts());
+        }
+        if (spec.getModulePath() != null) {
+            for (String mp: spec.getModulePath()) {
+                jlinkCmd.add("--module-path");
+                jlinkCmd.add(mp);
+            }
+        }
+        jlinkCmd = Collections.unmodifiableList(jlinkCmd); // freeze
+        System.out.println("DEBUG: run-time image based jlink command: " +
+                           jlinkCmd.stream().collect(Collectors.joining(" ")));
+        OutputAnalyzer analyzer = null;
+        try {
+            analyzer = ProcessTools.executeProcess(jlinkCmd.toArray(new String[0]));
+        } catch (Throwable t) {
+            throw new AssertionError("Executing process failed!", t);
+        }
+        if (!exitChecker.test(analyzer)) {
+            if (DEBUG) {
+                System.err.println("Process stdout was: ");
+                System.err.println(analyzer.getStdout());
+                System.err.println("Process stderr was: ");
+                System.err.println(analyzer.getStderr());
+            }
+            // if the exit checker failed, we expected the other outcome
+            // i.e. fail for success and success for fail.
+            boolean successExit = analyzer.getExitValue() == 0;
+            String msg = String.format("Expected jlink to %s given a jmodless image. Exit code was: %d",
+                                       (successExit ? "fail" : "pass"), analyzer.getExitValue());
+            throw new AssertionError(msg);
+        }
+        handler.handleAnalyzer(analyzer); // Give tests a chance to process in/output
+
+        // validate the resulting image; Includes running 'java -version', only do this
+        // if the jlink succeeded.
+        if (analyzer.getExitValue() == 0) {
+            JImageValidator validator = new JImageValidator(spec.getValidatingModule(), spec.getExpectedLocations(),
+                    targetImageDir.toFile(), spec.getUnexpectedLocations(), Collections.emptyList(), spec.getExpectedFiles());
+            validator.validate(); // This doesn't validate locations
+            if (!spec.getExpectedLocations().isEmpty() || !spec.getUnexpectedLocations().isEmpty()) {
+                JImageValidator.validate(targetImageDir.resolve("lib").resolve("modules"), spec.getExpectedLocations(), spec.getUnexpectedLocations());
+            }
+        }
+        return targetImageDir;
+    }
+
+    /**
+     * Prepares the test for execution. This assumes the current runtime
+     * supports linking from it. However, since the 'jmods' dir might be present
+     * (default jmods module path), the 'jmods' directory needs to get removed
+     * to provoke actual linking from the run-time image.
+     *
+     * @param baseSpec
+     * @return A path to a JDK that is capable for linking from the run-time
+     *         image.
+     * @throws Exception
+     */
+    protected Path createRuntimeLinkImage(BaseJlinkSpec baseSpec) throws Exception {
+        return createRuntimeLinkImage(baseSpec, Collections.emptySet() /* exclude all jmods */);
+    }
+
+    /**
+     * Prepares the test for execution. Creates a JDK with a jlink that has the
+     * capability to link from the run-time image (if needed). It further
+     * ensures that if packaged modules ('jmods' dir) are present, to remove
+     * them entirely or as specified in the {@link excludedJmodFiles} set. If
+     * that set is empty, all packaged modules will be removed. Note that with
+     * packaged modules present no run-time image based linking would be done.
+     *
+     * @param baseSpec
+     *            The specification for the custom - run-time image link capable
+     *            - JDK to create via jlink (if any)
+     * @param excludedJmods
+     *            The set of jmod files to exclude in the base JDK. Empty set if
+     *            all JMODs should be removed.
+     * @return A path to a JDK, including jdk.jlink, that has the run-time image
+     * link capability.
+     *
+     * @throws Exception
+     */
+    protected Path createRuntimeLinkImage(BaseJlinkSpec baseSpec,
+                                          Set<String> excludedJmodFiles) throws Exception {
+        // Depending on the shape of the JDK under test, we either only filter
+        // jmod files or create a run-time image link capable JDK on-the-fly.
+        Path from = null;
+        Path runtimeJlinkImage = null;
+        String finalName = baseSpec.getName() + "-jlink";
+        if (baseSpec.isLinkableRuntime()) {
+            // The build is already run-time image link capable
+            String javaHome = System.getProperty("java.home");
+            from = Path.of(javaHome);
+        } else {
+            // Create a run-time image capable JDK using --generate-linkable-runtime
+            Path tempRuntimeImage = Path.of(finalName + "-tmp");
+            JLinkTask task = JImageGenerator.getJLinkTask();
+            task.output(tempRuntimeImage)
+                .addMods("jdk.jlink") // jdk.jlink module is always needed for the test
+                .option("--generate-linkable-runtime");
+            if (baseJDKhasPackagedModules()) {
+                Path jmodsPath = tempRuntimeImage.resolve("jmods");
+                task.option("--keep-packaged-modules=" + jmodsPath);
+            }
+            for (String module: baseSpec.getModules()) {
+                task.addMods(module);
+            }
+            task.call().assertSuccess();
+            from = tempRuntimeImage;
+        }
+
+        // Create the target directory
+        runtimeJlinkImage = baseSpec.getHelper().createNewImageDir(finalName);
+
+        // Remove JMODs as needed for the test
+        copyJDKTreeWithoutSpecificJmods(from, runtimeJlinkImage, excludedJmodFiles);
+        // Verify the base image is actually without desired packaged modules
+        if (excludedJmodFiles.isEmpty()) {
+            if (Files.exists(runtimeJlinkImage.resolve("jmods"))) {
+                throw new AssertionError("Must not contain 'jmods' directory");
+            }
+        } else {
+            Path basePath = runtimeJlinkImage.resolve("jmods");
+            for (String jmodFile: excludedJmodFiles) {
+                Path unexpectedFile = basePath.resolve(Path.of(jmodFile));
+                if (Files.exists(unexpectedFile)) {
+                    throw new AssertionError("Must not contain jmod: " + unexpectedFile);
+                }
+            }
+        }
+        return runtimeJlinkImage;
+    }
+
+    private boolean baseJDKhasPackagedModules() {
+        Path jmodsPath = Path.of(System.getProperty("java.home"), "jmods");
+        return jmodsPath.toFile().exists();
+    }
+
+    private void copyJDKTreeWithoutSpecificJmods(Path from,
+                                                 Path to,
+                                                 Set<String> excludedJmods) throws Exception {
+        if (Files.exists(to)) {
+            throw new AssertionError("Expected target dir '" + to + "' to exist");
+        }
+        FileVisitor<Path> fileVisitor = null;
+        if (excludedJmods.isEmpty()) {
+            fileVisitor = new ExcludeAllJmodsFileVisitor(from, to);
+        } else {
+            fileVisitor = new FileExcludingFileVisitor(excludedJmods,
+                                                       from,
+                                                       to);
+        }
+        Files.walkFileTree(from, fileVisitor);
+    }
+
+    private List<String> parseListMods(String output) throws Exception {
+        List<String> outputLines = new ArrayList<>();
+        try (Scanner lineScan = new Scanner(output)) {
+            while (lineScan.hasNextLine()) {
+                outputLines.add(lineScan.nextLine());
+            }
+        }
+        return outputLines.stream()
+                .map(a -> { return a.split("@", 2)[0];})
+                .filter(a -> !a.isBlank())
+                .collect(Collectors.toList());
+    }
+
+    private String getJlink() {
+        return getBinary("jlink");
+    }
+
+    private String getJava() {
+        return getBinary("java");
+    }
+
+    private String getBinary(String binary) {
+        return isWindows() ? binary + ".exe" : binary;
+    }
+
+    protected static boolean isWindows() {
+        return System.getProperty("os.name").startsWith("Windows");
+    }
+
+    static class ExcludeAllJmodsFileVisitor extends SimpleFileVisitor<Path> {
+        private final Path root;
+        private final Path destination;
+
+        private ExcludeAllJmodsFileVisitor(Path root,
+                                           Path destination) {
+            this.destination = destination;
+            this.root = root;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir,
+                BasicFileAttributes attrs) throws IOException {
+            Objects.requireNonNull(dir);
+            Path relative = root.relativize(dir);
+            if (relative.getFileName().equals(Path.of("jmods"))) {
+                return FileVisitResult.SKIP_SUBTREE;
+            }
+            // Create dir in destination location
+            Path targetDir = destination.resolve(relative);
+            if (!Files.exists(targetDir)) {
+                Files.createDirectory(targetDir);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                throws IOException {
+            Path relative = root.relativize(file);
+            Files.copy(file, destination.resolve(relative), StandardCopyOption.REPLACE_EXISTING);
+            return FileVisitResult.CONTINUE;
+        }
+    }
+
+    static class FileExcludingFileVisitor extends SimpleFileVisitor<Path> {
+
+        private final Set<String> filesToExclude;
+        private final Path root;
+        private final Path destination;
+
+        private FileExcludingFileVisitor(Set<String> filesToExclude,
+                                         Path root,
+                                         Path destination) {
+            this.filesToExclude = filesToExclude;
+            this.destination = destination;
+            this.root = root;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir,
+                BasicFileAttributes attrs) throws IOException {
+            Objects.requireNonNull(dir);
+            Path relative = root.relativize(dir);
+            // Create dir in destination location
+            Path targetDir = destination.resolve(relative);
+            if (!Files.exists(targetDir)) {
+                Files.createDirectory(targetDir);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                throws IOException {
+            Path relative = root.relativize(file);
+            // Skip files as determined by the exclude set
+            String fileName = file.getFileName().toString();
+            if (!filesToExclude.contains(fileName)) {
+                Files.copy(file, destination.resolve(relative), StandardCopyOption.REPLACE_EXISTING);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+    }
+
+    static class BaseJlinkSpec {
+        final Helper helper;
+        final String name;
+        final String validatingModule;
+        final List<String> modules;
+        final List<String> extraOptions;
+        final boolean isLinkableRuntime;
+
+        BaseJlinkSpec(Helper helper, String name, String validatingModule,
+                List<String> modules, List<String> extraOptions, boolean isLinkableRuntime) {
+            this.helper = helper;
+            this.name = name;
+            this.modules = modules;
+            this.extraOptions = extraOptions;
+            this.validatingModule = validatingModule;
+            this.isLinkableRuntime = isLinkableRuntime;
+        }
+
+        public String getValidatingModule() {
+            return validatingModule;
+        }
+
+        public Helper getHelper() {
+            return helper;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public List<String> getModules() {
+            return modules;
+        }
+
+        public List<String> getExtraOptions() {
+            return extraOptions;
+        }
+
+        public boolean isLinkableRuntime() {
+            return isLinkableRuntime;
+        }
+    }
+
+    static class BaseJlinkSpecBuilder {
+        Helper helper;
+        String name;
+        String validatingModule;
+        List<String> modules = new ArrayList<>();
+        List<String> extraOptions = new ArrayList<>();
+        boolean isLinkableRuntime;
+
+        BaseJlinkSpecBuilder addModule(String module) {
+            modules.add(module);
+            return this;
+        }
+
+        BaseJlinkSpecBuilder addExtraOption(String option) {
+            extraOptions.add(option);
+            return this;
+        }
+
+        BaseJlinkSpecBuilder setLinkableRuntime() {
+            isLinkableRuntime = true;
+            return this;
+        }
+
+        BaseJlinkSpecBuilder helper(Helper helper) {
+            this.helper = helper;
+            return this;
+        }
+
+        BaseJlinkSpecBuilder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        BaseJlinkSpecBuilder validatingModule(String module) {
+            this.validatingModule = module;
+            return this;
+        }
+
+        BaseJlinkSpec build() {
+            if (name == null) {
+                throw new IllegalStateException("Name must be set");
+            }
+            if (helper == null) {
+                throw new IllegalStateException("helper must be set");
+            }
+            if (modules.isEmpty()) {
+                throw new IllegalStateException("modules must be set");
+            }
+            if (validatingModule == null) {
+                throw new IllegalStateException("the module which should get validated must be set");
+            }
+            return new BaseJlinkSpec(helper, name, validatingModule, modules, extraOptions, isLinkableRuntime);
+        }
+    }
+
+    static class JlinkSpec {
+        final Path imageToUse;
+        final Helper helper;
+        final String name;
+        final List<String> modules;
+        final String validatingModule;
+        final List<String> expectedLocations;
+        final List<String> unexpectedLocations;
+        final String[] expectedFiles;
+        final List<String> extraJlinkOpts;
+        final List<String> modulePath;
+
+        JlinkSpec(Path imageToUse, Helper helper, String name, List<String> modules,
+                String validatingModule, List<String> expectedLocations,
+                List<String> unexpectedLocations, String[] expectedFiles,
+                List<String> extraJlinkOpts,
+                List<String> modulePath) {
+            this.imageToUse = imageToUse;
+            this.helper = helper;
+            this.name = name;
+            this.modules = modules;
+            this.validatingModule = validatingModule;
+            this.expectedLocations = expectedLocations;
+            this.unexpectedLocations = unexpectedLocations;
+            this.expectedFiles = expectedFiles;
+            this.extraJlinkOpts = extraJlinkOpts;
+            this.modulePath = modulePath;
+        }
+
+        public Path getImageToUse() {
+            return imageToUse;
+        }
+
+        public Helper getHelper() {
+            return helper;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public List<String> getModules() {
+            return modules;
+        }
+
+        public String getValidatingModule() {
+            return validatingModule;
+        }
+
+        public List<String> getExpectedLocations() {
+            return expectedLocations;
+        }
+
+        public List<String> getUnexpectedLocations() {
+            return unexpectedLocations;
+        }
+
+        public String[] getExpectedFiles() {
+            return expectedFiles;
+        }
+
+        public List<String> getExtraJlinkOpts() {
+            return extraJlinkOpts;
+        }
+
+        public List<String> getModulePath() {
+            return modulePath;
+        }
+    }
+
+    static class JlinkSpecBuilder {
+        Path imageToUse;
+        Helper helper;
+        String name;
+        List<String> modules = new ArrayList<>();
+        String validatingModule;
+        List<String> expectedLocations = new ArrayList<>();
+        List<String> unexpectedLocations = new ArrayList<>();
+        List<String> expectedFiles = new ArrayList<>();
+        List<String> extraJlinkOpts = new ArrayList<>();
+        List<String> modulePath = new ArrayList<>();
+
+        JlinkSpec build() {
+            if (imageToUse == null) {
+                throw new IllegalStateException("No image to use for jlink specified!");
+            }
+            if (helper == null) {
+                throw new IllegalStateException("No helper specified!");
+            }
+            if (name == null) {
+                throw new IllegalStateException("No name for the image location specified!");
+            }
+            if (validatingModule == null) {
+                throw new IllegalStateException("No module specified for after generation validation!");
+            }
+            return new JlinkSpec(imageToUse,
+                                 helper,
+                                 name,
+                                 modules,
+                                 validatingModule,
+                                 expectedLocations,
+                                 unexpectedLocations,
+                                 expectedFiles.toArray(new String[0]),
+                                 extraJlinkOpts,
+                                 modulePath);
+        }
+
+        JlinkSpecBuilder imagePath(Path image) {
+            this.imageToUse = image;
+            return this;
+        }
+
+        JlinkSpecBuilder helper(Helper helper) {
+            this.helper = helper;
+            return this;
+        }
+
+        JlinkSpecBuilder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        JlinkSpecBuilder addModule(String module) {
+            modules.add(module);
+            return this;
+        }
+
+        JlinkSpecBuilder validatingModule(String module) {
+            this.validatingModule = module;
+            return this;
+        }
+
+        JlinkSpecBuilder addModulePath(String modulePath) {
+            this.modulePath.add(modulePath);
+            return this;
+        }
+
+        JlinkSpecBuilder expectedLocation(String location) {
+            expectedLocations.add(location);
+            return this;
+        }
+
+        JlinkSpecBuilder unexpectedLocation(String location) {
+            unexpectedLocations.add(location);
+            return this;
+        }
+
+        JlinkSpecBuilder expectedFile(String file) {
+            expectedFiles.add(file);
+            return this;
+        }
+
+        JlinkSpecBuilder extraJlinkOpt(String opt) {
+            extraJlinkOpts.add(opt);
+            return this;
+        }
+    }
+
+    static abstract class OutputAnalyzerHandler {
+
+        public abstract void handleAnalyzer(OutputAnalyzer out);
+
+    }
+
+    static class RuntimeLinkOutputAnalyzerHandler extends OutputAnalyzerHandler {
+
+        @Override
+        public void handleAnalyzer(OutputAnalyzer out) {
+            out.shouldContain("Linking based on the current run-time image");
+        }
+
+    }
+
+    static class DefaultSuccessExitPredicate implements Predicate<OutputAnalyzer> {
+
+        @Override
+        public boolean test(OutputAnalyzer t) {
+            return t.getExitValue() == 0;
+        }
+
+    }
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/AddOptionsTest.java b/test/jdk/tools/jlink/runtimeImage/AddOptionsTest.java
new file mode 100644
index 00000000000..1ffe1240d07
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/AddOptionsTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Scanner;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+/*
+ * @test
+ * @summary Test --add-options jlink plugin when linking from the run-time image
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g AddOptionsTest
+ */
+public class AddOptionsTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        AddOptionsTest test = new AddOptionsTest();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .addExtraOption("--add-options")
+                .addExtraOption("-Xlog:gc=info:stderr -XX:+UseParallelGC")
+                .name("java-base-with-opts")
+                .addModule("java.base")
+                .validatingModule("java.base")
+                .helper(helper);
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path finalImage = createJavaImageRuntimeLink(builder.build());
+        verifyListModules(finalImage, List.of("java.base"));
+        verifyParallelGCInUse(finalImage);
+    }
+
+    private void verifyParallelGCInUse(Path finalImage) throws Exception {
+        OutputAnalyzer analyzer = runJavaCmd(finalImage, List.of("--version"));
+        boolean foundMatch = false;
+        try (Scanner lineScan = new Scanner(analyzer.getStderr())) {
+            while (lineScan.hasNextLine()) {
+                String line = lineScan.nextLine();
+                if (line.endsWith("Using Parallel")) {
+                    foundMatch = true;
+                    break;
+                }
+            }
+        }
+        if (!foundMatch) {
+            throw new AssertionError("Expected Parallel GC in place for jlinked image");
+        }
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/BasicJlinkMissingJavaBase.java b/test/jdk/tools/jlink/runtimeImage/BasicJlinkMissingJavaBase.java
new file mode 100644
index 00000000000..b0d2a2d66f5
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/BasicJlinkMissingJavaBase.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Set;
+
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Test basic linking from the run-time image with java.base.jmod missing
+ *          but java.xml.jmod present. It should link from the run-time image without errors.
+ * @requires (jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g BasicJlinkMissingJavaBase
+ */
+public class BasicJlinkMissingJavaBase extends AbstractLinkableRuntimeTest {
+
+    @Override
+    public void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        Path finalImage = createJavaXMLRuntimeLink(helper, "java-xml", isLinkableRuntime);
+        verifyListModules(finalImage, List.of("java.base", "java.xml"));
+    }
+
+    private Path createJavaXMLRuntimeLink(Helper helper, String name, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder();
+        builder.helper(helper)
+               .name(name)
+               .addModule("java.xml")
+               .validatingModule("java.xml");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Set<String> excludedJmods = Set.of("java.base.jmod");
+        return createJavaImageRuntimeLink(builder.build(), excludedJmods);
+    }
+
+    public static void main(String[] args) throws Exception {
+        BasicJlinkMissingJavaBase test = new BasicJlinkMissingJavaBase();
+        test.run();
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/BasicJlinkTest.java b/test/jdk/tools/jlink/runtimeImage/BasicJlinkTest.java
new file mode 100644
index 00000000000..b97ebff9b49
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/BasicJlinkTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Test basic linking from the run-time image
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g BasicJlinkTest false
+ */
+public class BasicJlinkTest extends AbstractLinkableRuntimeTest {
+
+    @Override
+    public void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        Path finalImage = createJavaBaseRuntimeLink(helper, "java-base", isLinkableRuntime);
+        verifyListModules(finalImage, List.of("java.base"));
+    }
+
+    private Path createJavaBaseRuntimeLink(Helper helper, String name, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder();
+        builder.helper(helper)
+               .name(name)
+               .addModule("java.base")
+               .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        return createJavaImageRuntimeLink(builder.build());
+    }
+
+    public static void main(String[] args) throws Exception {
+        BasicJlinkTest test = new BasicJlinkTest();
+        test.run();
+    }
+
+}
diff --git a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java b/test/jdk/tools/jlink/runtimeImage/CapturingHandler.java
similarity index 70%
rename from test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java
rename to test/jdk/tools/jlink/runtimeImage/CapturingHandler.java
index 6766c77c4c7..b6b6105394d 100644
--- a/test/jdk/java/util/ResourceBundle/modules/security/src/m1/p1/resources/MyResources.java
+++ b/test/jdk/tools/jlink/runtimeImage/CapturingHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,22 @@
  * questions.
  */
 
-package p1.resources;
+import jdk.test.lib.process.OutputAnalyzer;
 
-import java.util.ListResourceBundle;
+class CapturingHandler extends AbstractLinkableRuntimeTest.OutputAnalyzerHandler {
+
+    private OutputAnalyzer output;
+
+    public String stdErr() {
+        return output.getStderr();
+    }
+
+    public OutputAnalyzer analyzer() {
+        return output;
+    }
 
-public class MyResources extends ListResourceBundle {
     @Override
-    public Object[][] getContents() {
-        return new Object[][] {
-            { "msg", "m1" }
-        };
+    public void handleAnalyzer(OutputAnalyzer out) {
+        this.output = out;
     }
-}
+}
\ No newline at end of file
diff --git a/test/jdk/tools/jlink/runtimeImage/CustomModuleJlinkTest.java b/test/jdk/tools/jlink/runtimeImage/CustomModuleJlinkTest.java
new file mode 100644
index 00000000000..369bccfecfc
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/CustomModuleJlinkTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Test jmod-less jlink with a custom module
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g CustomModuleJlinkTest
+ */
+public class CustomModuleJlinkTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        CustomModuleJlinkTest test = new CustomModuleJlinkTest();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        String customModule = "leaf1";
+        helper.generateDefaultJModule(customModule);
+
+        // create a base image for linking from the run-time image
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+            .helper(helper)
+            .name("cmod-jlink")
+            .addModule("java.base")
+            .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path jlinkImage = createRuntimeLinkImage(builder.build());
+
+        // Next jlink using the run-time image for java.base, but take
+        // the custom module from the module path.
+        Path finalImage = jlinkUsingImage(new JlinkSpecBuilder()
+                                                .imagePath(jlinkImage)
+                                                .helper(helper)
+                                                .name(customModule)
+                                                .addModulePath(helper.defaultModulePath(false))
+                                                .expectedLocation(String.format("/%s/%s/com/foo/bar/X.class", customModule, customModule))
+                                                .addModule(customModule)
+                                                .validatingModule(customModule)
+                                                .build());
+        // Expected only the transitive closure of "leaf1" module in the --list-modules
+        // output of the java launcher.
+        List<String> expectedModules = List.of("java.base", customModule);
+        verifyListModules(finalImage, expectedModules);
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/GenerateJLIClassesTest.java b/test/jdk/tools/jlink/runtimeImage/GenerateJLIClassesTest.java
new file mode 100644
index 00000000000..533a8db30d0
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/GenerateJLIClassesTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import tests.Helper;
+
+/*
+ * @test
+ * @summary Verify JLI class generation in run-time image link mode
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g GenerateJLIClassesTest
+ */
+public class GenerateJLIClassesTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        GenerateJLIClassesTest test = new GenerateJLIClassesTest();
+        test.run();
+    }
+
+    /*
+     * java.lang.invoke.BoundMethodHandle$Species_* classes get generated
+     * by the GenerateJLiClassesPlugin. This test ensures that potentially
+     * generated JLI classes from the run-time image don't populate to the
+     * target image in the run-time image based link mode.
+     */
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        Path baseFile = Files.createTempFile("base", "trace");
+        String species = "LLLLLLLLLLLLLLLLLLL";
+        String fileString = "[SPECIES_RESOLVE] java.lang.invoke.BoundMethodHandle$Species_" + species + " (salvaged)\n";
+        Files.write(baseFile, fileString.getBytes(StandardCharsets.UTF_8));
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .addModule("java.base")
+                .name("jlink.jli-jmodless")
+                .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+
+        Path runtimeLinkableImage = createRuntimeLinkImage(builder.build());
+        // Finally attempt another jmodless link reducing modules to java.base only,
+        // and asking for specific jli classes.
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(runtimeLinkableImage)
+                                .name("java.base-jli-derived")
+                                .addModule("java.base")
+                                .extraJlinkOpt("--generate-jli-classes=@" + baseFile.toString())
+                                .expectedLocation("/java.base/java/lang/invoke/BoundMethodHandle$Species_" + species + ".class")
+                                .expectedLocation("/java.base/java/lang/invoke/BoundMethodHandle$Species_L.class")
+                                .unexpectedLocation("/java.base/java/lang/invoke/BoundMethodHandle$Species_" + species.substring(1) + ".class")
+                                .unexpectedLocation("/java.base/java/lang/invoke/BoundMethodHandle$Species_LL.class")
+                                .validatingModule("java.base")
+                                .build());
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/JImageHelper.java b/test/jdk/tools/jlink/runtimeImage/JImageHelper.java
new file mode 100644
index 00000000000..ba92e1f35f2
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/JImageHelper.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import jdk.internal.jimage.BasicImageReader;
+import jdk.internal.jimage.ImageLocation;
+
+/**
+ *
+ * JDK Modular image iterator
+ */
+public class JImageHelper {
+
+    private JImageHelper() {
+        // Don't instantiate
+    }
+
+    public static List<String> listContents(Path jimage) throws IOException {
+        try(BasicImageReader reader = BasicImageReader.open(jimage)) {
+            List<String> entries = new ArrayList<>();
+            for (String s : reader.getEntryNames()) {
+                entries.add(s);
+            }
+            Collections.sort(entries);
+            return entries;
+        }
+    }
+
+    public static byte[] getLocationBytes(String location, Path jimage) throws IOException {
+        try(BasicImageReader reader = BasicImageReader.open(jimage)) {
+            ImageLocation il = reader.findLocation(location);
+            byte[] r = reader.getResource(il);
+            if (r == null) {
+                throw new IllegalStateException(String.format("bytes for %s not found!", location));
+            }
+            return r;
+        }
+    }
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java b/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java
new file mode 100644
index 00000000000..d923358aed9
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Test reproducibility of linking an java.se image using the run-time
+ *          image.
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g JavaSEReproducibleTest
+ */
+public class JavaSEReproducibleTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        JavaSEReproducibleTest test = new JavaSEReproducibleTest();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        String javaSeModule = "java.se";
+        // create a java.se using jmod-less approach
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .addModule(javaSeModule)
+                .validatingModule(javaSeModule);
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        builder.name("java-se-repro1");
+        Path javaSEJmodLess1 = createJavaImageRuntimeLink(builder.build());
+
+        // create another java.se version using jmod-less approach
+        builder.name("java-se-repro2");
+        Path javaSEJmodLess2 = createJavaImageRuntimeLink(builder.build());
+        if (Files.mismatch(javaSEJmodLess1.resolve("lib").resolve("modules"),
+                           javaSEJmodLess2.resolve("lib").resolve("modules")) != -1L) {
+            throw new RuntimeException("jlink producing inconsistent result for " + javaSeModule + " (jmod-less)");
+        }
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/KeepPackagedModulesFailTest.java b/test/jdk/tools/jlink/runtimeImage/KeepPackagedModulesFailTest.java
new file mode 100644
index 00000000000..8094579ecd5
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/KeepPackagedModulesFailTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Verify that jlink with an empty module path, but trying to use
+ *          --keep-packaged-modules fails as expected.
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g KeepPackagedModulesFailTest
+ */
+public class KeepPackagedModulesFailTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        KeepPackagedModulesFailTest test = new KeepPackagedModulesFailTest();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        // create a base image for linking from the run-time image
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .name("jlink-fail")
+                .addModule("java.base")
+                .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path baseImage = createRuntimeLinkImage(builder.build());
+
+        CapturingHandler handler = new CapturingHandler();
+        Predicate<OutputAnalyzer> exitFailPred = new Predicate<>() {
+
+            @Override
+            public boolean test(OutputAnalyzer t) {
+                return t.getExitValue() != 0; // expect failure
+            }
+        };
+        // Attempt a jlink using the run-time image and also using option
+        // --keep-packaged-modules, which should fail.
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(baseImage)
+                                .name("java-base-jlink-keep-packaged-target")
+                                .addModule("java.base")
+                                .extraJlinkOpt("--keep-packaged-modules=foo")
+                                .validatingModule("java.base")
+                                .build(), handler, exitFailPred);
+        OutputAnalyzer analyzer = handler.analyzer();
+        if (analyzer.getExitValue() == 0) {
+            throw new AssertionError("Expected jlink to have failed!");
+        }
+        analyzer.stdoutShouldContain("Error");
+        analyzer.stdoutShouldContain("--keep-packaged-modules");
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/ModifiedFilesExitTest.java b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesExitTest.java
new file mode 100644
index 00000000000..709494b6256
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesExitTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+/*
+ * @test
+ * @summary Verify jlink fails by default when linking from the run-time image
+ *          and files have been modified
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g ModifiedFilesExitTest
+ */
+public class ModifiedFilesExitTest extends ModifiedFilesTest {
+
+    public static void main(String[] args) throws Exception {
+        ModifiedFilesExitTest test = new ModifiedFilesExitTest();
+        test.run();
+    }
+
+    @Override
+    String initialImageName() {
+        return "java-base-jlink-with-mod-exit";
+    }
+
+    @Override
+    void testAndAssert(Path modifiedFile, Helper helper, Path initialImage)
+            throws Exception {
+        CapturingHandler handler = new CapturingHandler();
+        Predicate<OutputAnalyzer> exitFailPred = new Predicate<>() {
+
+            @Override
+            public boolean test(OutputAnalyzer t) {
+                return t.getExitValue() != 0; // expect failure
+            }
+        };
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(initialImage)
+                                .name("java-base-jlink-with-mod-exit-target")
+                                .addModule("java.base")
+                                .validatingModule("java.base")
+                                .build(), handler, exitFailPred);
+        OutputAnalyzer analyzer = handler.analyzer();
+        if (analyzer.getExitValue() == 0) {
+            throw new AssertionError("Expected jlink to fail due to modified file!");
+        }
+        analyzer.stdoutShouldContain(modifiedFile.toString() + " has been modified");
+        // Verify the error message is reasonable
+        analyzer.stdoutShouldNotContain("jdk.tools.jlink.internal.RunImageLinkException");
+        analyzer.stdoutShouldNotContain("java.lang.IllegalArgumentException");
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/ModifiedFilesTest.java b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesTest.java
new file mode 100644
index 00000000000..305fdd39171
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+
+import tests.Helper;
+
+public abstract class ModifiedFilesTest extends AbstractLinkableRuntimeTest {
+
+    abstract String initialImageName();
+    abstract void testAndAssert(Path modifiedFile, Helper helper, Path initialImage) throws Exception;
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .name(initialImageName())
+                .addModule("java.base")
+                .validatingModule("java.base")
+                .helper(helper);
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path initialImage = createRuntimeLinkImage(builder.build());
+
+        Path netPropertiesFile = modifyFileInImage(initialImage);
+
+        testAndAssert(netPropertiesFile, helper, initialImage);
+    }
+
+    protected Path modifyFileInImage(Path jmodLessImg)
+            throws IOException, AssertionError {
+        // modify net.properties config file
+        Path netPropertiesFile = jmodLessImg.resolve("conf").resolve("net.properties");
+        Properties props = new Properties();
+        try (InputStream is = Files.newInputStream(netPropertiesFile)) {
+            props.load(is);
+        }
+        String prevVal = (String)props.put("java.net.useSystemProxies", Boolean.TRUE.toString());
+        if (prevVal == null || Boolean.getBoolean(prevVal) != false) {
+            throw new AssertionError("Expected previous value to be false!");
+        }
+        try (OutputStream out = Files.newOutputStream(netPropertiesFile)) {
+            props.store(out, "Modified net.properties file!");
+        }
+        return netPropertiesFile;
+    }
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/ModifiedFilesWarningTest.java b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesWarningTest.java
new file mode 100644
index 00000000000..f52691dd859
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/ModifiedFilesWarningTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+/*
+ * @test
+ * @summary Verify warnings are being produced when linking from the run-time
+ *          image and files have been modified
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g ModifiedFilesWarningTest
+ */
+public class ModifiedFilesWarningTest extends ModifiedFilesTest {
+
+    protected static final String IGNORE_MODIFIED_RUNTIME_OPT = "--ignore-modified-runtime";
+
+    public static void main(String[] args) throws Exception {
+        ModifiedFilesWarningTest test = new ModifiedFilesWarningTest();
+        test.run();
+    }
+
+    @Override
+    String initialImageName() {
+        return "java-base-jlink-with-mod-warn";
+    }
+
+    @Override
+    void testAndAssert(Path modifiedFile, Helper helper, Path initialImage) throws Exception {
+        CapturingHandler handler = new CapturingHandler();
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(initialImage)
+                                .name("java-base-jlink-with-mod-warn-target")
+                                .addModule("java.base")
+                                .validatingModule("java.base")
+                                .extraJlinkOpt(IGNORE_MODIFIED_RUNTIME_OPT) // only generate a warning
+                                .build(), handler);
+        OutputAnalyzer out = handler.analyzer();
+        // verify we get the warning message
+        out.stdoutShouldMatch("Warning: .* has been modified");
+        out.stdoutShouldNotContain("java.lang.IllegalArgumentException");
+        out.stdoutShouldNotContain("jdk.tools.jlink.internal.RunImageLinkException");
+    }
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/MultiHopTest.java b/test/jdk/tools/jlink/runtimeImage/MultiHopTest.java
new file mode 100644
index 00000000000..88f91f238bd
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/MultiHopTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Verify that a jlink using the run-time image cannot include jdk.jlink
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g MultiHopTest
+ */
+public class MultiHopTest extends AbstractLinkableRuntimeTest {
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        Path jdkJlinkJmodless = createJDKJlinkJmodLess(helper, "jdk.jlink-multi-hop1", isLinkableRuntime);
+        CapturingHandler handler = new CapturingHandler();
+        Predicate<OutputAnalyzer> exitFailPred = new Predicate<>() {
+
+            @Override
+            public boolean test(OutputAnalyzer a) {
+                return a.getExitValue() != 0; // expect failure
+            }
+        };
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(jdkJlinkJmodless)
+                                .name("jdk-jlink-multi-hop1-target")
+                                .addModule("jdk.jlink")
+                                .validatingModule("java.base")
+                                .build(), handler, exitFailPred);
+        OutputAnalyzer analyzer = handler.analyzer();
+        if (analyzer.getExitValue() == 0) {
+            throw new AssertionError("Expected jlink to fail due to including jdk.jlink");
+        }
+        String expectedMsg = "This JDK does not contain packaged modules " +
+                             "and cannot be used to create another image with " +
+                             "the jdk.jlink module";
+        analyzer.stdoutShouldContain(expectedMsg);
+        analyzer.stdoutShouldNotContain("Exception"); // ensure error message is sane
+    }
+
+    private Path createJDKJlinkJmodLess(Helper helper, String name, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder();
+        builder.helper(helper)
+               .name(name)
+               .addModule("jdk.jlink")
+               .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        return createRuntimeLinkImage(builder.build());
+    }
+
+    public static void main(String[] args) throws Exception {
+        MultiHopTest test = new MultiHopTest();
+        test.run();
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/PackagedModulesVsRuntimeImageLinkTest.java b/test/jdk/tools/jlink/runtimeImage/PackagedModulesVsRuntimeImageLinkTest.java
new file mode 100644
index 00000000000..9910be5f919
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/PackagedModulesVsRuntimeImageLinkTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import tests.Helper;
+import tests.JImageGenerator;
+
+
+/*
+ * @test
+ * @summary Compare packaged-modules jlink with a run-time image based jlink to
+ *          produce the same result
+ * @requires (jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g PackagedModulesVsRuntimeImageLinkTest
+ */
+public class PackagedModulesVsRuntimeImageLinkTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        PackagedModulesVsRuntimeImageLinkTest test = new PackagedModulesVsRuntimeImageLinkTest();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        // create a java.se using jmod-less approach
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .name("java-se-jmodless")
+                .addModule("java.se")
+                .validatingModule("java.se");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path javaSEruntimeLink = createJavaImageRuntimeLink(builder.build());
+
+        // create a java.se using packaged modules (jmod-full)
+        Path javaSEJmodFull = JImageGenerator.getJLinkTask()
+                .output(helper.createNewImageDir("java-se-jmodfull"))
+                .addMods("java.se").call().assertSuccess();
+
+        compareRecursively(javaSEruntimeLink, javaSEJmodFull);
+    }
+
+    // Visit all files in the given directories checking that they're byte-by-byte identical
+    private static void compareRecursively(Path javaSEJmodLess,
+            Path javaSEJmodFull) throws IOException, AssertionError {
+        FilesCapturingVisitor jmodFullVisitor = new FilesCapturingVisitor(javaSEJmodFull);
+        FilesCapturingVisitor jmodLessVisitor = new FilesCapturingVisitor(javaSEJmodLess);
+        Files.walkFileTree(javaSEJmodFull, jmodFullVisitor);
+        Files.walkFileTree(javaSEJmodLess, jmodLessVisitor);
+        List<String> jmodFullFiles = jmodFullVisitor.filesVisited();
+        List<String> jmodLessFiles = jmodLessVisitor.filesVisited();
+        Collections.sort(jmodFullFiles);
+        Collections.sort(jmodLessFiles);
+
+        if (jmodFullFiles.size() != jmodLessFiles.size()) {
+            throw new AssertionError(String.format("Size of files different for jmod-less (%d) vs jmod-full (%d) java.se jlink", jmodLessFiles.size(), jmodFullFiles.size()));
+        }
+        String jimageFile = Path.of("lib").resolve("modules").toString();
+        // Compare all files except the modules image
+        for (int i = 0; i < jmodFullFiles.size(); i++) {
+            String jmodFullPath = jmodFullFiles.get(i);
+            String jmodLessPath = jmodLessFiles.get(i);
+            if (!jmodFullPath.equals(jmodLessPath)) {
+                throw new AssertionError(String.format("jmod-full path (%s) != jmod-less path (%s)", jmodFullPath, jmodLessPath));
+            }
+            if (jmodFullPath.equals(jimageFile)) {
+                continue;
+            }
+            Path a = javaSEJmodFull.resolve(Path.of(jmodFullPath));
+            Path b = javaSEJmodLess.resolve(Path.of(jmodLessPath));
+            if (Files.mismatch(a, b) != -1L) {
+                handleFileMismatch(a, b);
+            }
+        }
+        // Compare jimage contents by iterating its entries and comparing their
+        // paths and content bytes
+        //
+        // Note: The files aren't byte-by-byte comparable (probably due to string hashing
+        // and offset differences in container bytes)
+        Path jimageJmodLess = javaSEJmodLess.resolve(Path.of("lib")).resolve(Path.of("modules"));
+        Path jimageJmodFull = javaSEJmodFull.resolve(Path.of("lib")).resolve(Path.of("modules"));
+        List<String> jimageContentJmodLess = JImageHelper.listContents(jimageJmodLess);
+        List<String> jimageContentJmodFull = JImageHelper.listContents(jimageJmodFull);
+        if (jimageContentJmodLess.size() != jimageContentJmodFull.size()) {
+            throw new AssertionError(String.format("Size of jimage content differs for jmod-less (%d) v. jmod-full (%d)", jimageContentJmodLess.size(), jimageContentJmodFull.size()));
+        }
+        for (int i = 0; i < jimageContentJmodFull.size(); i++) {
+            if (!jimageContentJmodFull.get(i).equals(jimageContentJmodLess.get(i))) {
+                throw new AssertionError(String.format("Jimage content differs at index %d: jmod-full was: '%s' jmod-less was: '%s'",
+                                                       i,
+                                                       jimageContentJmodFull.get(i),
+                                                       jimageContentJmodLess.get(i)
+                                                       ));
+            }
+            String loc = jimageContentJmodFull.get(i);
+            if (isTreeInfoResource(loc)) {
+                // Skip container bytes as those are offsets to the content
+                // of the container which might be different between jlink runs.
+                continue;
+            }
+            byte[] resBytesFull = JImageHelper.getLocationBytes(loc, jimageJmodFull);
+            byte[] resBytesLess = JImageHelper.getLocationBytes(loc, jimageJmodLess);
+            if (resBytesFull.length != resBytesLess.length || Arrays.mismatch(resBytesFull, resBytesLess) != -1) {
+                throw new AssertionError("Content bytes mismatch for " + loc);
+            }
+        }
+    }
+
+    private static boolean isTreeInfoResource(String path) {
+        return path.startsWith("/packages") || path.startsWith("/modules");
+    }
+
+    private static void handleFileMismatch(Path a, Path b) {
+        throw new AssertionError("Files mismatch: " + a + " vs. " + b);
+    }
+
+    static class FilesCapturingVisitor extends SimpleFileVisitor<Path> {
+        private final Path basePath;
+        private final List<String> filePaths = new ArrayList<>();
+        public FilesCapturingVisitor(Path basePath) {
+            this.basePath = basePath;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
+            Path relative = basePath.relativize(path);
+            filePaths.add(relative.toString());
+            return FileVisitResult.CONTINUE;
+        }
+
+        List<String> filesVisited() {
+            return filePaths;
+        }
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/PatchedJDKModuleJlinkTest.java b/test/jdk/tools/jlink/runtimeImage/PatchedJDKModuleJlinkTest.java
new file mode 100644
index 00000000000..3baa824e049
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/PatchedJDKModuleJlinkTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Predicate;
+import java.util.spi.ToolProvider;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import tests.Helper;
+
+
+/*
+ * @test
+ * @summary Test run-time link with --patch-module. Expect failure.
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g PatchedJDKModuleJlinkTest
+ */
+public class PatchedJDKModuleJlinkTest extends AbstractLinkableRuntimeTest {
+
+    @Override
+    public void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        String imageName = "java-base-patched";
+        Path runtimeLinkImage = createRuntimeLinkImage(helper, imageName + "-base", isLinkableRuntime);
+
+        // Prepare patched module content
+        Path patchSource = Path.of("java-base-patch-src");
+        Path pkg = patchSource.resolve("java", "lang");
+        Path extraClass = pkg.resolve("MyJlinkPatchInteger.java");
+        String source = """
+                package java.lang;
+                public class MyJlinkPatchInteger {
+                    public int add(int a, int b) {
+                        return a + b;
+                    }
+                }
+                """;
+        Files.createDirectories(pkg);
+        Files.writeString(extraClass, source);
+        Path patchClasses = Path.of("java-base-patch-classes");
+        Files.createDirectories(patchClasses);
+        ToolProvider javac = ToolProvider.findFirst("javac")
+                                         .orElseThrow(() -> new AssertionError("javac not found"));
+        javac.run(System.out, System.err, new String[] {
+                "-d", patchClasses.toString(),
+                "--patch-module=java.base=" + patchSource.toAbsolutePath().toString(),
+                extraClass.toAbsolutePath().toString()
+        });
+
+        // Perform a run-time image link expecting a failure
+        CapturingHandler handler = new CapturingHandler();
+        Predicate<OutputAnalyzer> exitFailPred = new Predicate<>() {
+
+            @Override
+            public boolean test(OutputAnalyzer t) {
+                return t.getExitValue() != 0; // expect failure
+            }
+        };
+        jlinkUsingImage(new JlinkSpecBuilder()
+                                .helper(helper)
+                                .imagePath(runtimeLinkImage)
+                                .name(imageName + "-derived")
+                                .addModule("java.base")
+                                .validatingModule("java.base")
+                                .extraJlinkOpt("-J--patch-module=java.base=" +
+                                               patchClasses.toAbsolutePath().toString())
+                                .build(), handler, exitFailPred);
+        OutputAnalyzer analyzer = handler.analyzer();
+        if (analyzer.getExitValue() == 0) {
+            throw new AssertionError("Expected jlink to fail due to patched module!");
+        }
+        analyzer.stdoutShouldContain("MyJlinkPatchInteger.class not found in the modules image.");
+        analyzer.stdoutShouldContain("--patch-module is not supported");
+        // Verify the error message is reasonable
+        analyzer.stdoutShouldNotContain("jdk.tools.jlink.internal.RunImageLinkException");
+        analyzer.stdoutShouldNotContain("java.lang.IllegalArgumentException");
+    }
+
+    private Path createRuntimeLinkImage(Helper helper, String name, boolean isLinkableRuntime) throws Exception {
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .name(name)
+                .addModule("java.base")
+                .validatingModule("java.base")
+                .helper(helper);
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        return createRuntimeLinkImage(builder.build());
+    }
+
+    public static void main(String[] args) throws Exception {
+        PatchedJDKModuleJlinkTest test = new PatchedJDKModuleJlinkTest();
+        test.run();
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/SystemModulesTest.java b/test/jdk/tools/jlink/runtimeImage/SystemModulesTest.java
new file mode 100644
index 00000000000..fac8cac112d
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/SystemModulesTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import tests.Helper;
+import tests.JImageValidator;
+
+
+/*
+ * @test
+ * @summary Test appropriate handling of generated SystemModules* classes in run-time image link mode
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g SystemModulesTest
+ */
+public class SystemModulesTest extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        SystemModulesTest test = new SystemModulesTest();
+        test.run();
+    }
+
+    /*
+     * SystemModule classes are module specific. If the jlink is based on the
+     * modules image, then earlier generated SystemModule classes shall not get
+     * propagated.
+     */
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        // create an image with a module containing a main entrypoint (jdk.httpserver),
+        // thus producing the SystemModules$0.class. Add jdk.jdwp.agent as a module which
+        // isn't resolved by default, so as to generate SystemModules$default.class
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .name("httpserver-jlink-jmodless-derived")
+                .addModule("jdk.httpserver")
+                .addModule("jdk.jdwp.agent")
+                .validatingModule("java.base");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path javaseJmodless = createJavaImageRuntimeLink(builder.build());
+        // Verify that SystemModules$0.class etc. are there, due to httpserver and jdwp.agent
+        JImageValidator.validate(javaseJmodless.resolve("lib").resolve("modules"),
+                                    List.of("/java.base/jdk/internal/module/SystemModules$default.class",
+                                            "/java.base/jdk/internal/module/SystemModules$0.class",
+                                            "/java.base/jdk/internal/module/SystemModules$all.class"),
+                                    Collections.emptyList());
+    }
+
+}
diff --git a/test/jdk/tools/jlink/runtimeImage/SystemModulesTest2.java b/test/jdk/tools/jlink/runtimeImage/SystemModulesTest2.java
new file mode 100644
index 00000000000..6be4ad7321c
--- /dev/null
+++ b/test/jdk/tools/jlink/runtimeImage/SystemModulesTest2.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2024, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import tests.Helper;
+import tests.JImageValidator;
+
+
+/*
+ * @test
+ * @summary Test disabled SystemModulesPlugin in run-time image link mode. Expect
+ *          generated classes to not be there.
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @library ../../lib /test/lib
+ * @enablePreview
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jimage
+ * @build tests.* jdk.test.lib.process.OutputAnalyzer
+ *        jdk.test.lib.process.ProcessTools
+ * @run main/othervm -Xmx1g SystemModulesTest2
+ */
+public class SystemModulesTest2 extends AbstractLinkableRuntimeTest {
+
+    public static void main(String[] args) throws Exception {
+        SystemModulesTest2 test = new SystemModulesTest2();
+        test.run();
+    }
+
+    @Override
+    void runTest(Helper helper, boolean isLinkableRuntime) throws Exception {
+        // See SystemModulesTest which enables the system-modules plugin. With
+        // it disabled, we expect for the generated classes to not be there.
+        BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder()
+                .helper(helper)
+                .name("jlink-jmodless-sysmod2")
+                .addModule("jdk.httpserver")
+                .validatingModule("java.base")
+                .addExtraOption("--disable-plugin")
+                .addExtraOption("system-modules");
+        if (isLinkableRuntime) {
+            builder.setLinkableRuntime();
+        }
+        Path runtimeImageLinkTarget = createJavaImageRuntimeLink(builder.build());
+        JImageValidator.validate(runtimeImageLinkTarget.resolve("lib").resolve("modules"),
+                                    Collections.emptyList(),
+                                    List.of("/java.base/jdk/internal/module/SystemModules$all.class",
+                                            "/java.base/jdk/internal/module/SystemModules$default.class",
+                                            "/java.base/jdk/internal/module/SystemModules$0.class"));
+    }
+
+}
diff --git a/test/jdk/tools/jlink/toolprovider.policy b/test/jdk/tools/jlink/toolprovider.policy
deleted file mode 100644
index e89913b9f24..00000000000
--- a/test/jdk/tools/jlink/toolprovider.policy
+++ /dev/null
@@ -1,2 +0,0 @@
-grant {
-};
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/DirectoryContentVerifierTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/DirectoryContentVerifierTest.java
index 1d2b2e3f498..79af67d3e9a 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/DirectoryContentVerifierTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/DirectoryContentVerifierTest.java
@@ -39,15 +39,6 @@
 import jdk.jpackage.test.TKit.DirectoryContentVerifier;
 import static jdk.jpackage.test.TKit.assertAssert;
 
-/*
- * @test
- * @summary Test TKit.DirectoryContentVerifier from jpackage test library
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @compile DirectoryContentVerifierTest.java
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.test.DirectoryContentVerifierTest
- */
 public class DirectoryContentVerifierTest {
 
     enum AssertType {
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
new file mode 100644
index 00000000000..a2cde44f009
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.UnaryOperator;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Annotations.Parameters;
+
+public class JavaAppDescTest {
+
+    public JavaAppDescTest(JavaAppDesc expectedAppDesc, JavaAppDesc actualAppDesc) {
+        this.expectedAppDesc = expectedAppDesc;
+        this.actualAppDesc = actualAppDesc;
+    }
+
+    @Test
+    public void test() {
+        TKit.assertEquals(expectedAppDesc.toString(), actualAppDesc.toString(), null);
+        TKit.assertTrue(expectedAppDesc.equals(actualAppDesc), null);
+    }
+
+    @Test
+    @Parameter({"Foo", "Foo.class"})
+    @Parameter({"com.bar.A", "com/bar/A.class"})
+    @Parameter({"module/com.bar.A", "com/bar/A.class"})
+    public static void testClassFilePath(String... args) {
+        var appDesc = args[0];
+        var expectedClassFilePath = Path.of(args[1]);
+        TKit.assertEquals(expectedClassFilePath.toString(), JavaAppDesc.parse(
+                appDesc).classFilePath().toString(), null);
+    }
+
+    @Parameters
+    public static List<Object[]> input() {
+        return List.of(new Object[][] {
+            createTestCase("", "hello.jar:Hello"),
+            createTestCase("foo.jar*", "foo.jar*hello.jar:Hello"),
+            createTestCase("Bye", "hello.jar:Bye"),
+            createTestCase("bye.jar:", "bye.jar:Hello"),
+            createTestCase("duke.jar:com.other/com.other.foo.bar.Buz!@3.7", appDesc -> {
+                return appDesc
+                        .setBundleFileName("duke.jar")
+                        .setModuleName("com.other")
+                        .setClassName("com.other.foo.bar.Buz")
+                        .setWithMainClass(true)
+                        .setModuleVersion("3.7");
+            }),
+        });
+    }
+
+    private static JavaAppDesc[] createTestCase(String inputAppDesc, String expectedAppDescStr) {
+        return createTestCase(inputAppDesc, appDesc -> {
+            return stripDefaultSrcJavaPath(JavaAppDesc.parse(expectedAppDescStr));
+        });
+    }
+
+    private static JavaAppDesc stripDefaultSrcJavaPath(JavaAppDesc appDesc) {
+        var defaultAppDesc = HelloApp.createDefaltAppDesc();
+        if (appDesc.srcJavaPath().equals(defaultAppDesc.srcJavaPath())) {
+            appDesc.setSrcJavaPath(null);
+        }
+        return appDesc;
+    }
+
+    private static JavaAppDesc[] createTestCase(String appDesc, UnaryOperator<JavaAppDesc> config) {
+        var actualAppDesc = stripDefaultSrcJavaPath(JavaAppDesc.parse(appDesc));
+
+        var expectedAppDesc = config.apply(stripDefaultSrcJavaPath(HelloApp.createDefaltAppDesc()));
+
+        return new JavaAppDesc[] {expectedAppDesc, actualAppDesc};
+    }
+
+    private final JavaAppDesc expectedAppDesc;
+    private final JavaAppDesc actualAppDesc;
+}
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
new file mode 100644
index 00000000000..3f55c3c50ae
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+import jdk.jpackage.test.Annotations.Parameters;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Functional.ThrowingRunnable;
+import static jdk.jpackage.test.Functional.ThrowingRunnable.toRunnable;
+import static jdk.jpackage.test.Functional.ThrowingSupplier.toSupplier;
+
+public class TKitTest {
+
+    @Parameters
+    public static Collection<Object[]> assertTestsData() {
+        List<MethodCallConfig> data = new ArrayList<>();
+
+        var assertFunc = MethodCallConfig.build("assertTrue", boolean.class, String.class);
+        data.addAll(List.of(assertFunc.args(true).pass().expectLog("assertTrue()").createForMessage("Catbird")));
+        data.addAll(List.of(assertFunc.args(false).fail().expectLog("Failed").createForMessage("Catbird")));
+
+        assertFunc = MethodCallConfig.build("assertFalse", boolean.class, String.class);
+        data.addAll(List.of(assertFunc.args(false).pass().expectLog("assertFalse()").createForMessage("Stork")));
+        data.addAll(List.of(assertFunc.args(true).fail().expectLog("Failed").createForMessage("Stork")));
+
+        assertFunc = MethodCallConfig.build("assertEquals", String.class, String.class, String.class);
+        data.addAll(List.of(assertFunc.args("a", "a").pass().expectLog("assertEquals(a)").createForMessage("Crow")));
+        data.addAll(List.of(assertFunc.args("a", "b").fail().expectLog("Expected [a]. Actual [b]").createForMessage("Crow")));
+
+        assertFunc = MethodCallConfig.build("assertEquals", long.class, long.class, String.class);
+        data.addAll(List.of(assertFunc.args(7, 7).pass().expectLog("assertEquals(7)").createForMessage("Owl")));
+        data.addAll(List.of(assertFunc.args(7, 10).fail().expectLog("Expected [7]. Actual [10]").createForMessage("Owl")));
+
+        assertFunc = MethodCallConfig.build("assertNotEquals", String.class, String.class, String.class);
+        data.addAll(List.of(assertFunc.args("a", "b").pass().expectLog("assertNotEquals(a, b)").createForMessage("Tit")));
+        data.addAll(List.of(assertFunc.args("a", "a").fail().expectLog("Unexpected [a] value").createForMessage("Tit")));
+
+        assertFunc = MethodCallConfig.build("assertNotEquals", long.class, long.class, String.class);
+        data.addAll(List.of(assertFunc.args(7, 10).pass().expectLog("assertNotEquals(7, 10)").createForMessage("Duck")));
+        data.addAll(List.of(assertFunc.args(7, 7).fail().expectLog("Unexpected [7] value").createForMessage("Duck")));
+
+        assertFunc = MethodCallConfig.build("assertNull", Object.class, String.class);
+        data.addAll(List.of(assertFunc.args((Object) null).pass().expectLog("assertNull()").createForMessage("Ibis")));
+        data.addAll(List.of(assertFunc.args("v").fail().expectLog("Unexpected not null value [v]").createForMessage("Ibis")));
+
+        assertFunc = MethodCallConfig.build("assertNotNull", Object.class, String.class);
+        data.addAll(List.of(assertFunc.args("v").pass().expectLog("assertNotNull(v)").createForMessage("Pigeon")));
+        data.addAll(List.of(assertFunc.args((Object) null).fail().expectLog("Unexpected null value").createForMessage("Pigeon")));
+
+        assertFunc = MethodCallConfig.build("assertStringListEquals", List.class, List.class, String.class);
+        data.addAll(List.of(assertFunc.args(List.of(), List.of()).pass().expectLog(
+                "assertStringListEquals()").createForMessage("Gull")));
+
+        data.addAll(List.of(assertFunc.args(List.of("a", "b"), List.of("a", "b")).pass().expectLog(
+                "assertStringListEquals()",
+                "assertStringListEquals(1, a)",
+                "assertStringListEquals(2, b)").createForMessage("Pelican")));
+
+        assertFunc.fail().withAutoExpectLogPrefix(false);
+        for (var msg : new String[] { "Raven", null }) {
+            data.addAll(List.of(assertFunc.args(List.of("a"), List.of("a", "b"), msg).expectLog(
+                    concatMessages("TRACE: assertStringListEquals()", msg),
+                    "TRACE: assertStringListEquals(1, a)",
+                    concatMessages("ERROR: Actual list is longer than expected by 1 elements", msg)
+            ).create()));
+
+            data.addAll(List.of(assertFunc.args(List.of("n", "m"), List.of("n"), msg).expectLog(
+                    concatMessages("TRACE: assertStringListEquals()", msg),
+                    "TRACE: assertStringListEquals(1, n)",
+                    concatMessages("ERROR: Actual list is shorter than expected by 1 elements", msg)
+            ).create()));
+
+            data.addAll(List.of(assertFunc.args(List.of("a", "b"), List.of("n", "m"), msg).expectLog(
+                    concatMessages("TRACE: assertStringListEquals()", msg),
+                    concatMessages("ERROR: (1) Expected [a]. Actual [n]", msg)
+            ).create()));
+        }
+
+        return data.stream().map(v -> {
+            return new Object[]{v};
+        }).toList();
+    }
+
+    public record MethodCallConfig(Method method, Object[] args, boolean expectFail, String[] expectLog) {
+        @Override
+        public String toString() {
+            return String.format("%s%s%s", method.getName(), Arrays.toString(args), expectFail ? "!" : "");
+        }
+
+        static Builder build(String name, Class<?> ... parameterTypes) {
+            return new Builder(name, parameterTypes);
+        }
+
+        private static class Builder {
+            Builder(Method method) {
+                Objects.requireNonNull(method);
+                this.method = method;
+            }
+
+            Builder(String name, Class<?> ... parameterTypes) {
+                method = toSupplier(() -> TKit.class.getMethod(name, parameterTypes)).get();
+            }
+
+            MethodCallConfig create() {
+                String[] effectiveExpectLog;
+                if (!withAutoExpectLogPrefix) {
+                    effectiveExpectLog = expectLog;
+                } else {
+                    var prefix = expectFail ? "ERROR: " : "TRACE: ";
+                    effectiveExpectLog = Stream.of(expectLog).map(line -> {
+                        return prefix + line;
+                    }).toArray(String[]::new);
+                }
+                return new MethodCallConfig(method, args, expectFail, effectiveExpectLog);
+            }
+
+            MethodCallConfig[] createForMessage(String msg) {
+                return Arrays.asList(msg, null).stream().map(curMsg -> {
+                    var builder = new Builder(method);
+                    builder.expectFail = expectFail;
+                    builder.withAutoExpectLogPrefix = withAutoExpectLogPrefix;
+                    builder.args = Stream.concat(Stream.of(args), Stream.of(curMsg)).toArray();
+                    builder.expectLog = Arrays.copyOf(expectLog, expectLog.length);
+                    builder.expectLog[0] = concatMessages(builder.expectLog[0], curMsg);
+                    return builder.create();
+                }).toArray(MethodCallConfig[]::new);
+            }
+
+            Builder fail() {
+                expectFail = true;
+                return this;
+            }
+
+            Builder pass() {
+                expectFail = false;
+                return this;
+            }
+
+            Builder args(Object ... v) {
+                args = v;
+                return this;
+            }
+
+            Builder expectLog(String expectLogFirstStr, String ... extra) {
+                expectLog = Stream.concat(Stream.of(expectLogFirstStr), Stream.of(extra)).toArray(String[]::new);
+                return this;
+            }
+
+            Builder withAutoExpectLogPrefix(boolean v) {
+                withAutoExpectLogPrefix = v;
+                return this;
+            }
+
+            private final Method method;
+            private Object[] args = new Object[0];
+            private boolean expectFail;
+            private String[] expectLog;
+            private boolean withAutoExpectLogPrefix = true;
+        }
+    }
+
+    public TKitTest(MethodCallConfig methodCall) {
+        this.methodCall = methodCall;
+    }
+
+    @Test
+    public void test() {
+        runAssertWithExpectedLogOutput(() -> {
+            methodCall.method.invoke(null, methodCall.args);
+        }, methodCall.expectFail, methodCall.expectLog);
+    }
+
+    private static void runAssertWithExpectedLogOutput(ThrowingRunnable action,
+            boolean expectFail, String... expectLogStrings) {
+        runWithExpectedLogOutput(() -> {
+            TKit.assertAssert(!expectFail, toRunnable(action));
+        }, expectLogStrings);
+    }
+
+    private static void runWithExpectedLogOutput(ThrowingRunnable action,
+            String... expectLogStrings) {
+        final var buf = new ByteArrayOutputStream();
+        try (PrintStream ps = new PrintStream(buf, true, StandardCharsets.UTF_8)) {
+            TKit.withExtraLogStream(action, ps);
+        } finally {
+            toRunnable(() -> {
+                var output = new BufferedReader(new InputStreamReader(
+                        new ByteArrayInputStream(buf.toByteArray()),
+                        StandardCharsets.UTF_8)).lines().map(line -> {
+                            // Skip timestamp
+                            return line.substring(LOG_MSG_TIMESTAMP_LENGTH);
+                        }).toList();
+                if (output.size() == 1 && expectLogStrings.length == 1) {
+                    TKit.assertEquals(expectLogStrings[0], output.get(0), null);
+                } else {
+                    TKit.assertStringListEquals(List.of(expectLogStrings), output, null);
+                }
+            }).run();
+        }
+    }
+
+    private static String concatMessages(String msg, String msg2) {
+        if (msg2 != null && !msg2.isBlank()) {
+            return msg + ": " + msg2;
+        }
+        return msg;
+    }
+
+    private final MethodCallConfig methodCall;
+
+    private static final int LOG_MSG_TIMESTAMP_LENGTH = "[HH:mm:ss.SSS] ".length();
+}
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TestSuite.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TestSuite.java
new file mode 100644
index 00000000000..f9dda851414
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TestSuite.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @summary Unit tests for jpackage test library
+ * @library /test/jdk/tools/jpackage/helpers
+ * @library /test/jdk/tools/jpackage/helpers-test
+ * @build jdk.jpackage.test.*
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.TestSuite
+ */
+
+public final class TestSuite {
+    public static void main(String args[]) throws Throwable {
+        final var pkgName = TestSuite.class.getPackageName();
+        final var javaSuffix = ".java";
+        final var testSrcNameSuffix = "Test" + javaSuffix;
+
+        final var unitTestDir = TKit.TEST_SRC_ROOT.resolve(Path.of("helpers-test", pkgName.split("\\.")));
+
+        final List<String> runTestArgs = new ArrayList<>();
+        runTestArgs.addAll(List.of(args));
+
+        try (var javaSources = Files.list(unitTestDir)) {
+            runTestArgs.addAll(javaSources.filter(path -> {
+                return path.getFileName().toString().endsWith(testSrcNameSuffix);
+            }).map(path -> {
+                var filename = path.getFileName().toString();
+                return String.join(".", pkgName, filename.substring(0, filename.length() - javaSuffix.length()));
+            }).map(testClassName -> {
+                return "--jpt-run=" + testClassName;
+            }).toList());
+        }
+
+        Main.main(runTestArgs.toArray(String[]::new));
+    }
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Functional.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Functional.java
index 87718c1394c..a57caa92cb2 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Functional.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Functional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,12 +151,16 @@ public ExceptionBox(Throwable throwable) {
     @SuppressWarnings("unchecked")
     public static RuntimeException rethrowUnchecked(Throwable throwable) throws
             ExceptionBox {
-        if (throwable instanceof RuntimeException) {
-            throw (RuntimeException)throwable;
+        if (throwable instanceof RuntimeException err) {
+            throw err;
         }
 
-        if (throwable instanceof InvocationTargetException) {
-            throw new ExceptionBox(throwable.getCause());
+        if (throwable instanceof Error err) {
+            throw err;
+        }
+
+        if (throwable instanceof InvocationTargetException err) {
+            throw rethrowUnchecked(err.getCause());
         }
 
         throw new ExceptionBox(throwable);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
index 3bd3b42d595..bc722e7acd9 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
@@ -22,7 +22,6 @@
  */
 package jdk.jpackage.test;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -57,15 +56,10 @@ public final class HelloApp {
 
     private JarBuilder prepareSources(Path srcDir) throws IOException {
         final String srcClassName = appDesc.srcClassName();
-
-        final String qualifiedClassName = appDesc.className();
-
-        final String className = qualifiedClassName.substring(
-                qualifiedClassName.lastIndexOf('.') + 1);
+        final String className = appDesc.shortClassName();
         final String packageName = appDesc.packageName();
 
-        final Path srcFile = srcDir.resolve(Path.of(String.join(
-                File.separator, qualifiedClassName.split("\\.")) + ".java"));
+        final Path srcFile = srcDir.resolve(appDesc.classNameAsPath(".java"));
         Files.createDirectories(srcFile.getParent());
 
         JarBuilder jarBuilder = createJarBuilder().addSourceFile(srcFile);
@@ -351,7 +345,7 @@ public static AppOutputVerifier assertMainLauncher(JPackageCommand cmd,
     }
 
 
-    public final static class AppOutputVerifier {
+    public static final class AppOutputVerifier {
         AppOutputVerifier(Path helloAppLauncher) {
             this.launcherPath = helloAppLauncher;
             this.outputFilePath = TKit.workDir().resolve(OUTPUT_FILENAME);
@@ -493,13 +487,13 @@ public static AppOutputVerifier assertApp(Path helloAppLauncher) {
         return new AppOutputVerifier(helloAppLauncher);
     }
 
-    final static String OUTPUT_FILENAME = "appOutput.txt";
+    static final String OUTPUT_FILENAME = "appOutput.txt";
 
     private final JavaAppDesc appDesc;
 
     private static final Path HELLO_JAVA = TKit.TEST_SRC_ROOT.resolve(
             "apps/Hello.java");
 
-    private final static String CLASS_NAME = HELLO_JAVA.getFileName().toString().split(
+    private static final String CLASS_NAME = HELLO_JAVA.getFileName().toString().split(
             "\\.", 2)[0];
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index d4219704934..9b25c9058d1 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -897,8 +897,9 @@ public JPackageCommand setAppLayoutAsserts(AppLayoutAssert ... asserts) {
     }
 
     public JPackageCommand excludeAppLayoutAsserts(AppLayoutAssert... asserts) {
-        return setAppLayoutAsserts(Stream.of(asserts).filter(Predicate.not(
-                appLayoutAsserts::contains)).toArray(AppLayoutAssert[]::new));
+        var asSet = Set.of(asserts);
+        return setAppLayoutAsserts(appLayoutAsserts.stream().filter(Predicate.not(
+                asSet::contains)).toArray(AppLayoutAssert[]::new));
     }
 
     JPackageCommand assertAppLayout() {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaAppDesc.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaAppDesc.java
index 5b49b01a443..3cc2458ce2a 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaAppDesc.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaAppDesc.java
@@ -22,8 +22,9 @@
  */
 package jdk.jpackage.test;
 
-import java.io.File;
 import java.nio.file.Path;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 
 public final class JavaAppDesc {
@@ -73,9 +74,18 @@ public String className() {
         return qualifiedClassName;
     }
 
+    public String shortClassName() {
+        return qualifiedClassName.substring(qualifiedClassName.lastIndexOf('.') + 1);
+    }
+
+    Path classNameAsPath(String extension) {
+        final String[] pathComponents = qualifiedClassName.split("\\.");
+        pathComponents[pathComponents.length - 1] = shortClassName() + extension;
+        return Stream.of(pathComponents).map(Path::of).reduce(Path::resolve).get();
+    }
+
     public Path classFilePath() {
-        return Path.of(qualifiedClassName.replace(".", File.separator)
-                + ".class");
+        return classNameAsPath(".class");
     }
 
     public String moduleName() {
@@ -124,6 +134,48 @@ public boolean isWithMainClass() {
         return withMainClass;
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 79 * hash + Objects.hashCode(this.srcJavaPath);
+        hash = 79 * hash + Objects.hashCode(this.qualifiedClassName);
+        hash = 79 * hash + Objects.hashCode(this.moduleName);
+        hash = 79 * hash + Objects.hashCode(this.bundleFileName);
+        hash = 79 * hash + Objects.hashCode(this.moduleVersion);
+        hash = 79 * hash + (this.withMainClass ? 1 : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final JavaAppDesc other = (JavaAppDesc) obj;
+        if (this.withMainClass != other.withMainClass) {
+            return false;
+        }
+        if (!Objects.equals(this.qualifiedClassName, other.qualifiedClassName)) {
+            return false;
+        }
+        if (!Objects.equals(this.moduleName, other.moduleName)) {
+            return false;
+        }
+        if (!Objects.equals(this.bundleFileName, other.bundleFileName)) {
+            return false;
+        }
+        if (!Objects.equals(this.moduleVersion, other.moduleVersion)) {
+            return false;
+        }
+        return Objects.equals(this.srcJavaPath, other.srcJavaPath);
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index 8068e1d858f..63afb6cf9f7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -259,7 +259,7 @@ static PackageHandlers createPkgPackageHandlers() {
     }
 
     static void verifyBundleStructure(JPackageCommand cmd) {
-        Path bundleRoot;
+        final Path bundleRoot;
         if (cmd.isImagePackageType()) {
             bundleRoot = cmd.outputBundle();
         } else {
@@ -268,8 +268,26 @@ static void verifyBundleStructure(JPackageCommand cmd) {
         }
 
         TKit.assertDirectoryContent(bundleRoot).match(Path.of("Contents"));
-        TKit.assertDirectoryContent(bundleRoot.resolve("Contents")).match(
-                cmd.isRuntime() ? RUNTIME_BUNDLE_CONTENTS : APP_BUNDLE_CONTENTS);
+
+        final var contentsDir = bundleRoot.resolve("Contents");
+        final var expectedContentsItems = cmd.isRuntime() ? RUNTIME_BUNDLE_CONTENTS : APP_BUNDLE_CONTENTS;
+
+        var contentsVerifier = TKit.assertDirectoryContent(contentsDir);
+        if (!cmd.hasArgument("--app-content")) {
+            contentsVerifier.match(expectedContentsItems);
+        } else {
+            // Additional content added to the bundle.
+            // Verify there is no period (.) char in the names of additional directories if any.
+            contentsVerifier.contains(expectedContentsItems);
+            contentsVerifier = contentsVerifier.removeAll(expectedContentsItems);
+            contentsVerifier.match(contentsVerifier.items().stream().filter(path -> {
+                if (Files.isDirectory(contentsDir.resolve(path))) {
+                    return !path.getFileName().toString().contains(".");
+                } else {
+                    return true;
+                }
+            }).collect(toSet()));
+        }
     }
 
     static String getBundleName(JPackageCommand cmd) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
index 7882d4cd92d..6f486425e73 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -22,9 +22,7 @@
  */
 package jdk.jpackage.test;
 
-import java.awt.Desktop;
 import java.awt.GraphicsEnvironment;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -788,7 +786,7 @@ private static Map<PackageType, PackageHandlers> createDefaultPackageHandlers()
     private Map<PackageType, PackageHandlers> packageHandlers;
     private boolean ignoreBundleOutputDir;
 
-    private static final File BUNDLE_OUTPUT_DIR;
+    private static final Path BUNDLE_OUTPUT_DIR;
 
     static {
         final String propertyName = "output";
@@ -796,9 +794,9 @@ private static Map<PackageType, PackageHandlers> createDefaultPackageHandlers()
         if (val == null) {
             BUNDLE_OUTPUT_DIR = null;
         } else {
-            BUNDLE_OUTPUT_DIR = new File(val).getAbsoluteFile();
+            BUNDLE_OUTPUT_DIR = Path.of(val).toAbsolutePath();
 
-            if (!BUNDLE_OUTPUT_DIR.isDirectory()) {
+            if (!Files.isDirectory(BUNDLE_OUTPUT_DIR)) {
                 throw new IllegalArgumentException(String.format("Invalid value of %s sytem property: [%s]. Should be existing directory",
                         TKit.getConfigPropertyName(propertyName),
                         BUNDLE_OUTPUT_DIR));
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
index ca1224aafd7..28c58a4db3d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -23,7 +23,6 @@
 package jdk.jpackage.test;
 
 import java.io.Closeable;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -61,6 +60,7 @@
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.test.Functional.ExceptionBox;
 import jdk.jpackage.test.Functional.ThrowingConsumer;
 import jdk.jpackage.test.Functional.ThrowingRunnable;
@@ -68,8 +68,6 @@
 
 public final class TKit {
 
-    private static final String OS = System.getProperty("os.name").toLowerCase();
-
     public static final Path TEST_SRC_ROOT = Functional.identity(() -> {
         Path root = Path.of(System.getProperty("test.src"));
 
@@ -108,14 +106,21 @@ static void withExtraLogStream(ThrowingRunnable action) {
             ThrowingRunnable.toRunnable(action).run();
         } else {
             try (PrintStream logStream = openLogStream()) {
-                extraLogStream = logStream;
-                ThrowingRunnable.toRunnable(action).run();
-            } finally {
-                extraLogStream = null;
+                withExtraLogStream(action, logStream);
             }
         }
     }
 
+    static void withExtraLogStream(ThrowingRunnable action, PrintStream logStream) {
+        var oldExtraLogStream = extraLogStream;
+        try {
+            extraLogStream = logStream;
+            ThrowingRunnable.toRunnable(action).run();
+        } finally {
+            extraLogStream = oldExtraLogStream;
+        }
+    }
+
     static void runTests(List<TestInstance> tests) {
         if (currentTest != null) {
             throw new IllegalStateException(
@@ -176,23 +181,19 @@ static String getCurrentDefaultAppName() {
     }
 
     public static boolean isWindows() {
-        return (OS.contains("win"));
+        return OperatingSystem.isWindows();
     }
 
     public static boolean isOSX() {
-        return (OS.contains("mac"));
+        return OperatingSystem.isMacOS();
     }
 
     public static boolean isLinux() {
-        return ((OS.contains("nix") || OS.contains("nux")));
+        return OperatingSystem.isLinux();
     }
 
     public static boolean isLinuxAPT() {
-        if (!isLinux()) {
-            return false;
-        }
-        File aptFile = new File("/usr/bin/apt-get");
-        return aptFile.exists();
+        return isLinux() && Files.exists(Path.of("/usr/bin/apt-get"));
     }
 
     private static String addTimestamp(String msg) {
@@ -599,7 +600,7 @@ public static void assertEquals(long expected, long actual, String msg) {
                     msg));
         }
 
-        traceAssert(String.format("assertEquals(%d): %s", expected, msg));
+        traceAssert(concatMessages(String.format("assertEquals(%d)", expected), msg));
     }
 
     public static void assertNotEquals(long expected, long actual, String msg) {
@@ -609,8 +610,8 @@ public static void assertNotEquals(long expected, long actual, String msg) {
                     msg));
         }
 
-        traceAssert(String.format("assertNotEquals(%d, %d): %s", expected,
-                actual, msg));
+        traceAssert(concatMessages(String.format("assertNotEquals(%d, %d)", expected,
+                actual), msg));
     }
 
     public static void assertEquals(String expected, String actual, String msg) {
@@ -622,7 +623,7 @@ public static void assertEquals(String expected, String actual, String msg) {
                     msg));
         }
 
-        traceAssert(String.format("assertEquals(%s): %s", expected, msg));
+        traceAssert(concatMessages(String.format("assertEquals(%s)", expected), msg));
     }
 
     public static void assertNotEquals(String expected, String actual, String msg) {
@@ -630,8 +631,8 @@ public static void assertNotEquals(String expected, String actual, String msg) {
         if ((actual != null && !actual.equals(expected))
                 || (expected != null && !expected.equals(actual))) {
 
-            traceAssert(String.format("assertNotEquals(%s, %s): %s", expected,
-                actual, msg));
+            traceAssert(concatMessages(String.format("assertNotEquals(%s, %s)", expected,
+                actual), msg));
             return;
         }
 
@@ -645,7 +646,7 @@ public static void assertNull(Object value, String msg) {
                     value), msg));
         }
 
-        traceAssert(String.format("assertNull(): %s", msg));
+        traceAssert(concatMessages("assertNull()", msg));
     }
 
     public static void assertNotNull(Object value, String msg) {
@@ -654,7 +655,7 @@ public static void assertNotNull(Object value, String msg) {
             error(concatMessages("Unexpected null value", msg));
         }
 
-        traceAssert(String.format("assertNotNull(%s): %s", value, msg));
+        traceAssert(concatMessages(String.format("assertNotNull(%s)", value), msg));
     }
 
     public static void assertTrue(boolean actual, String msg) {
@@ -674,7 +675,7 @@ public static void assertTrue(boolean actual, String msg, Runnable onFail) {
             error(concatMessages("Failed", msg));
         }
 
-        traceAssert(String.format("assertTrue(): %s", msg));
+        traceAssert(concatMessages("assertTrue()", msg));
     }
 
     public static void assertFalse(boolean actual, String msg, Runnable onFail) {
@@ -686,7 +687,7 @@ public static void assertFalse(boolean actual, String msg, Runnable onFail) {
             error(concatMessages("Failed", msg));
         }
 
-        traceAssert(String.format("assertFalse(): %s", msg));
+        traceAssert(concatMessages("assertFalse()", msg));
     }
 
     public static void assertPathExists(Path path, boolean exists) {
@@ -786,7 +787,7 @@ public void match(Set<Path> expected) {
                         baseDir, format(comm.common), format(comm.unique1), format(comm.unique2)));
             } else if (!comm.unique1.isEmpty()) {
                 error(String.format(
-                        "assertDirectoryContentEquals%s: Expected %s. Unexpected %s",
+                        "assertDirectoryContentEquals(%s): Expected %s. Unexpected %s",
                         baseDir, format(comm.common), format(comm.unique1)));
             } else if (!comm.unique2.isEmpty()) {
                 error(String.format(
@@ -818,12 +819,20 @@ public void contains(Set<Path> expected) {
             }
         }
 
-        public DirectoryContentVerifier removeAll(Path ... paths) {
+        public DirectoryContentVerifier removeAll(Collection<Path> paths) {
             Set<Path> newContent = new HashSet<>(content);
-            newContent.removeAll(List.of(paths));
+            newContent.removeAll(paths);
             return new DirectoryContentVerifier(baseDir, newContent);
         }
 
+        public DirectoryContentVerifier removeAll(Path ... paths) {
+            return removeAll(List.of(paths));
+        }
+
+        public Set<Path> items() {
+            return content;
+        }
+
         private DirectoryContentVerifier(Path baseDir, Set<Path> contents) {
             this.baseDir = baseDir;
             this.content = contents;
@@ -858,7 +867,7 @@ public static void assertStringListEquals(List<String> expected,
             List<String> actual, String msg) {
         currentTest.notifyAssert();
 
-        traceAssert(String.format("assertStringListEquals(): %s", msg));
+        traceAssert(concatMessages("assertStringListEquals()", msg));
 
         String idxFieldFormat = Functional.identity(() -> {
             int listSize = expected.size();
@@ -888,7 +897,7 @@ public static void assertStringListEquals(List<String> expected,
                     expectedStr));
         });
 
-        if (expected.size() < actual.size()) {
+        if (actual.size() > expected.size()) {
             // Actual string list is longer than expected
             error(concatMessages(String.format(
                     "Actual list is longer than expected by %d elements",
@@ -898,7 +907,7 @@ public static void assertStringListEquals(List<String> expected,
         if (actual.size() < expected.size()) {
             // Actual string list is shorter than expected
             error(concatMessages(String.format(
-                    "Actual list is longer than expected by %d elements",
+                    "Actual list is shorter than expected by %d elements",
                     expected.size() - actual.size()), msg));
         }
     }
diff --git a/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java b/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
index 5829aba23cc..69e1cd6c42a 100644
--- a/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
+++ b/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
@@ -28,6 +28,7 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
+import jdk.internal.util.Architecture;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
@@ -73,7 +74,7 @@ private static void verifyHostArch(JPackageCommand cmd) throws Exception {
                     "/installer-gui-script/options/@hostArchitectures",
                     doc, XPathConstants.STRING);
 
-        if ("aarch64".equals(System.getProperty("os.arch"))) {
+        if (Architecture.isAARCH64()) {
             TKit.assertEquals(v, "arm64",
                     "Check value of \"hostArchitectures\" attribute");
         } else {
diff --git a/test/jdk/tools/jpackage/share/AddLShortcutTest.java b/test/jdk/tools/jpackage/share/AddLShortcutTest.java
index 92784abd5cc..5b55d906cf1 100644
--- a/test/jdk/tools/jpackage/share/AddLShortcutTest.java
+++ b/test/jdk/tools/jpackage/share/AddLShortcutTest.java
@@ -22,8 +22,6 @@
  */
 
 import java.nio.file.Path;
-import java.io.File;
-import java.util.Map;
 import java.lang.invoke.MethodHandles;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.FileAssociations;
@@ -109,6 +107,6 @@ public void test() {
         packageTest.run();
     }
 
-    private final static Path GOLDEN_ICON = TKit.TEST_SRC_ROOT.resolve(Path.of(
+    private static final Path GOLDEN_ICON = TKit.TEST_SRC_ROOT.resolve(Path.of(
             "resources", "icon" + TKit.ICON_SUFFIX));
 }
diff --git a/test/jdk/tools/jpackage/share/AddLauncherTest.java b/test/jdk/tools/jpackage/share/AddLauncherTest.java
index ae774b86f3a..af0efc4fb86 100644
--- a/test/jdk/tools/jpackage/share/AddLauncherTest.java
+++ b/test/jdk/tools/jpackage/share/AddLauncherTest.java
@@ -22,7 +22,6 @@
  */
 
 import java.nio.file.Path;
-import java.io.File;
 import java.util.Map;
 import java.lang.invoke.MethodHandles;
 import jdk.jpackage.test.PackageTest;
@@ -229,11 +228,11 @@ public void testMainLauncherIsModular(boolean mainLauncherIsModular) {
         TKit.assertEquals(ExpectedCN, mainClass,
                 String.format("Check value of app.mainclass=[%s]" +
                 "in NonModularAppLauncher cfg file is as expected", ExpectedCN));
-        TKit.assertTrue(classpath.startsWith("$APPDIR" + File.separator
-                + nonModularAppDesc.jarFileName()),
+        TKit.assertTrue(classpath.startsWith(Path.of("$APPDIR",
+                nonModularAppDesc.jarFileName()).toString()),
                 "Check app.classpath value in ModularAppLauncher cfg file");
     }
 
-    private final static Path GOLDEN_ICON = TKit.TEST_SRC_ROOT.resolve(Path.of(
+    private static final Path GOLDEN_ICON = TKit.TEST_SRC_ROOT.resolve(Path.of(
             "resources", "icon" + TKit.ICON_SUFFIX));
 }
diff --git a/test/jdk/tools/jpackage/share/InOutPathTest.java b/test/jdk/tools/jpackage/share/InOutPathTest.java
index 8ea70a06034..f8cb983bd16 100644
--- a/test/jdk/tools/jpackage/share/InOutPathTest.java
+++ b/test/jdk/tools/jpackage/share/InOutPathTest.java
@@ -72,11 +72,20 @@ public static Collection input() {
             data.addAll(additionalContentInput(packageTypes, "--app-content"));
         }
 
-        data.addAll(List.of(new Object[][]{
-            {PackageType.IMAGE.toString(), wrap(cmd -> {
-                additionalContent(cmd, "--app-content", cmd.outputBundle());
-            }, "--app-content same as output bundle")},
-        }));
+        if (!TKit.isOSX()) {
+            data.addAll(List.of(new Object[][]{
+                {PackageType.IMAGE.toString(), wrap(cmd -> {
+                    additionalContent(cmd, "--app-content", cmd.outputBundle());
+                }, "--app-content same as output bundle")},
+            }));
+        } else {
+            var contentsFolder = "Contents/MacOS";
+            data.addAll(List.of(new Object[][]{
+                {PackageType.IMAGE.toString(), wrap(cmd -> {
+                    additionalContent(cmd, "--app-content", cmd.outputBundle().resolve(contentsFolder));
+                }, String.format("--app-content same as the \"%s\" folder in the output bundle", contentsFolder))},
+            }));
+        }
 
         if (TKit.isOSX()) {
             data.addAll(additionalContentInput(PackageType.MAC_DMG.toString(),
@@ -172,6 +181,16 @@ private static void runTest(Set<PackageType> packageTypes,
             if (isAppImageValid(cmd)) {
                 verifyAppImage(cmd);
             }
+
+            if (cmd.hasArgument("--app-content")) {
+                // `--app-content` can be set to the app image directory which
+                // should not exist before jpackage is executed:
+                //  jpackage --name Foo --dest output --app-content output/Foo
+                // Verify the directory exists after jpackage execution.
+                // At least this will catch the case when the value of
+                // `--app-content` option refers to a path unrelated to jpackage I/O.
+                TKit.assertDirectoryExists(Path.of(cmd.getArgumentValue("--app-content")));
+            }
         } else {
             new PackageTest()
                     .forTypes(packageTypes)
diff --git a/test/jdk/tools/launcher/MainClassCantBeLoadedTest.java b/test/jdk/tools/launcher/MainClassCantBeLoadedTest.java
index fe3e13744c0..a5090d7ba56 100644
--- a/test/jdk/tools/launcher/MainClassCantBeLoadedTest.java
+++ b/test/jdk/tools/launcher/MainClassCantBeLoadedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,68 +85,6 @@ void testLoadingClassWithMissingSuper() throws Exception {
             System.err.println(trExecution);
     }
 
-    @Test
-    void testFailToInitializeMainClass() throws Exception {
-        if (!isEnglishLocale()) {
-            return;
-        }
-
-        File cwd = new File(".");
-        File srcDir = new File(cwd, "src");
-        if (srcDir.exists()) {
-            recursiveDelete(srcDir);
-        }
-        srcDir.mkdirs();
-
-        /* we want to generate class C that will resolve additional class
-         */
-        ArrayList<String> scratchpad = new ArrayList<>();
-        scratchpad.add("public class C {");
-        scratchpad.add("    public static void main(String... args) {");
-        scratchpad.add("        try {");
-        scratchpad.add("            System.out.println(\"loading of restricted class\");");
-        scratchpad.add("        } catch (Exception e) {");
-        scratchpad.add("            java.security.Provider p = new com.sun.crypto.provider.SunJCE();");
-        scratchpad.add("            p.toString();");
-        scratchpad.add("        }");
-        scratchpad.add("    }");
-        scratchpad.add("}");
-        createFile(new File(srcDir, "C.java"), scratchpad);
-
-
-        // Compile and execute C should succeed
-        TestResult trCompilation = doExec(javacCmd,
-            "--add-exports", "java.base/com.sun.crypto.provider=ALL-UNNAMED",
-            "-d", "out",
-            new File(srcDir, "C.java").toString());
-        if (!trCompilation.isOK()) {
-            System.err.println(trCompilation);
-            throw new RuntimeException("Error: compiling");
-        }
-
-        TestResult trExecution = doExec(javaCmd,
-            "--add-exports", "java.base/com.sun.crypto.provider=ALL-UNNAMED",
-            "-cp", "out", "C");
-        if (!trExecution.isOK()) {
-            System.err.println(trExecution);
-            throw new RuntimeException("Error: executing");
-        }
-
-        // Execute C with security manager will fail with AccessControlException
-        trExecution = doExec(javaCmd,
-            "-Djava.security.manager",
-            "--add-exports", "java.base/com.sun.crypto.provider=ALL-UNNAMED",
-            "-cp", "out", "C");
-
-        // then this error message should be generated
-        trExecution.contains("Error: Unable to initialize main class C");
-        trExecution.contains("Caused by: java.security.AccessControlException: " +
-            "access denied (\"java.lang.RuntimePermission\"" +
-            " \"accessClassInPackage.com.sun.crypto.provider\")");
-        if (!trExecution.testStatus)
-            System.err.println(trExecution);
-    }
-
     public static void main(String[] args) throws Exception {
         MainClassCantBeLoadedTest a = new MainClassCantBeLoadedTest();
         a.run(args);
diff --git a/test/jdk/tools/launcher/MiscTests.java b/test/jdk/tools/launcher/MiscTests.java
index 6db62f91cd8..034f72eb8ff 100644
--- a/test/jdk/tools/launcher/MiscTests.java
+++ b/test/jdk/tools/launcher/MiscTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6856415 8154212 8154470
+ * @bug 8154212 8154470
  * @summary Miscellaneous tests, Exceptions
  * @modules jdk.compiler
  *          jdk.zipfs
@@ -65,45 +65,6 @@ static void testWithClassPathSetViaProperty() throws IOException {
         }
     }
 
-    /**
-     * 6856415: Checks to ensure that proper exceptions are thrown by java
-     */
-    static void test6856415() throws IOException {
-
-        final String mainClass = "Foo6856415";
-
-        List<String> scratch = new ArrayList<>();
-        scratch.add("public class Foo6856415 {");
-        scratch.add("public static void main(String... args) {");
-        scratch.add("java.security.Provider p = new sun.security.pkcs11.SunPKCS11();");
-        scratch.add("java.security.Security.insertProviderAt(p, 1);");
-        scratch.add("}");
-        scratch.add("}");
-        createFile(new File(mainClass + ".java"), scratch);
-
-        compile(mainClass + ".java",
-                "--add-modules=jdk.crypto.cryptoki",
-                "--add-exports=jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED");
-
-        File testJar = new File("Foo.jar");
-        testJar.delete();
-        String jarArgs[] = {
-            (debug) ? "cvfe" : "cfe",
-            testJar.getAbsolutePath(),
-            mainClass,
-            mainClass + ".class"
-        };
-        createJar(jarArgs);
-
-        TestResult tr = doExec(javaCmd,
-                "-Djava.security.manager", "-jar", testJar.getName(), "foo.bak");
-        if (!tr.contains("java.security.AccessControlException:" +
-                " access denied (\"java.lang.RuntimePermission\"" +
-                " \"accessClassInPackage.sun.security.pkcs11\")")) {
-            System.out.println(tr);
-        }
-    }
-
     static void testJLDEnv() {
         final Map<String, String> envToSet = new HashMap<>();
         envToSet.put("_JAVA_LAUNCHER_DEBUG", "true");
@@ -123,7 +84,6 @@ static void testJLDEnv() {
 
     public static void main(String... args) throws IOException {
         testWithClassPathSetViaProperty();
-        test6856415();
         testJLDEnv();
         if (testExitValue != 0) {
             throw new Error(testExitValue + " tests failed");
diff --git a/test/jdk/tools/launcher/Settings.java b/test/jdk/tools/launcher/Settings.java
index 2b581be5b26..fe5a9c3b157 100644
--- a/test/jdk/tools/launcher/Settings.java
+++ b/test/jdk/tools/launcher/Settings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 /*
  * @test
- * @bug 6994753 7123582 8305950 8281658 8310201 8311653
+ * @bug 6994753 7123582 8305950 8281658 8310201 8311653 8343804
  * @summary tests -XshowSettings options
  * @modules jdk.compiler
  *          jdk.zipfs
@@ -80,6 +80,7 @@ static void checkNotContains(TestResult tr, String str) {
     private static final String SYSTEM_SETTINGS = "Operating System Metrics:";
     private static final String METRICS_NOT_AVAILABLE_MSG = "No metrics available for this platform";
     private static final String STACKSIZE_SETTINGS = "Stack Size:";
+    private static final String TIMEZONE_SETTINGS = "default timezone";
     private static final String TZDATA_SETTINGS = "tzdata version";
     private static final String ERR_MSG = "Unrecognized showSettings option:";
 
@@ -96,6 +97,7 @@ static void containsAllOptions(TestResult tr) {
         checkNotContains(tr, SEC_SUMMARY_PROPS_SETTINGS);
         checkContains(tr, SEC_PROVIDER_SETTINGS);
         checkContains(tr, SEC_TLS_SETTINGS);
+        checkContains(tr, TIMEZONE_SETTINGS);
         checkContains(tr, TZDATA_SETTINGS);
         if (System.getProperty("os.name").contains("Linux")) {
             checkContains(tr, SYSTEM_SETTINGS);
@@ -119,6 +121,7 @@ static void containsDefaultOptions(TestResult tr) {
         checkContains(tr, SEC_SUMMARY_PROPS_SETTINGS);
         checkContains(tr, SEC_PROVIDER_SETTINGS);
         checkContains(tr, SEC_TLS_SETTINGS);
+        checkContains(tr, TIMEZONE_SETTINGS);
         checkContains(tr, TZDATA_SETTINGS);
         if (System.getProperty("os.name").contains("Linux")) {
             checkContains(tr, SYSTEM_SETTINGS);
@@ -190,6 +193,7 @@ static void runTestOptionLocale() throws IOException {
         checkContains(tr, LOCALE_SETTINGS);
         checkContains(tr, AVAILABLE_LOCALES);
         checkNotContains(tr, LOCALE_SUMMARY_SETTINGS);
+        checkContains(tr, TIMEZONE_SETTINGS);
         checkContains(tr, TZDATA_SETTINGS);
     }
 
diff --git a/test/jdk/tools/launcher/modules/basic/LauncherErrors.java b/test/jdk/tools/launcher/modules/basic/LauncherErrors.java
index dd5157fa612..bd87f528294 100644
--- a/test/jdk/tools/launcher/modules/basic/LauncherErrors.java
+++ b/test/jdk/tools/launcher/modules/basic/LauncherErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,10 +67,10 @@ public void compileTestModule() throws Exception {
     }
 
     /*
-     * Run jdk.test2.Main without security manager.
+     * Launch java using --module and expect the launched main to succeed.
      */
     @Test
-    public void test() throws Exception {
+    public void testNoFailure() throws Exception {
         String dir = MODS_DIR.toString();
         String mid = TEST_MODULE + "/" + MAIN_CLASS;
 
@@ -81,19 +81,21 @@ public void test() throws Exception {
     }
 
     /*
-     * Run jdk.test2.Main with security manager such that main class will
-     * fail to initialize.
+     * Launch java using --module but pass a main class name that doesn't
+     * belong to the module being launched. Expect the launch to fail
+     * with an expected exception.
      */
     @Test
     public void testErrorMessage() throws Exception {
         String dir = MODS_DIR.toString();
-        String mid = TEST_MODULE + "/" + MAIN_CLASS;
+        String wrongMainClass = MAIN_CLASS + "IntentionallyWrong";
+        String mid = TEST_MODULE + "/" + wrongMainClass;
 
-        ProcessTools.executeTestJava("-Djava.security.manager", "--module-path", dir, "--module", mid)
+        ProcessTools.executeTestJava("--module-path", dir, "--module", mid)
                     .outputTo(System.out)
                     .errorTo(System.out)
-                    .shouldContain("Error: Unable to load main class " + MAIN_CLASS + " in module " + TEST_MODULE)
-                    .shouldContain("Caused by: java.security.AccessControlException")
+                    .shouldContain("Error: Could not find or load main class " + wrongMainClass
+                            + " in module " + TEST_MODULE)
                     .shouldNotHaveExitValue(0);
 
     }
diff --git a/test/jdk/tools/launcher/modules/basic/src/test2/jdk/test2/Main.java b/test/jdk/tools/launcher/modules/basic/src/test2/jdk/test2/Main.java
index 5ce5bffc4b9..3a2932aa46e 100644
--- a/test/jdk/tools/launcher/modules/basic/src/test2/jdk/test2/Main.java
+++ b/test/jdk/tools/launcher/modules/basic/src/test2/jdk/test2/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,6 @@
 
 public class Main {
     public static void main(String... args) {
-        try {
-            System.out.println("Hello world");
-        } catch (Exception e) {
-            // verifier loads SunJCE class
-            java.security.Provider p = new com.sun.crypto.provider.SunJCE();
-            System.out.println(p.toString());
-        }
+        System.out.println("Hello world");
     }
 }
diff --git a/test/jdk/tools/lib/tests/Helper.java b/test/jdk/tools/lib/tests/Helper.java
index 0acf6ec8bf3..337d767b0b2 100644
--- a/test/jdk/tools/lib/tests/Helper.java
+++ b/test/jdk/tools/lib/tests/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,20 +64,30 @@ public class Helper {
     private final Map<String, List<String>> moduleDependencies = new HashMap<>();
     private final List<String> bootClasses;
     private final FileSystem fs;
+    private final boolean linkableRuntime;
+    private static final Path JDK_HOME = Paths.get(System.getProperty("test.jdk"));
 
     public static Helper newHelper() throws IOException {
-        Path jdkHome = Paths.get(System.getProperty("test.jdk"));
-        if (!Files.exists(jdkHome.resolve("jmods"))) {
+        return newHelper(false);
+    }
+
+    public static Helper newHelper(boolean linkableRuntime) throws IOException {
+        if (!linkableRuntime && !jdkHasPackagedModules()) {
             // Skip test if the jmods directory is missing (e.g. exploded image)
             System.err.println("Test not run, NO jmods directory");
             return null;
         }
-        return new Helper(jdkHome);
+        return new Helper(JDK_HOME, linkableRuntime);
+    }
+
+    public static boolean jdkHasPackagedModules() {
+        return Files.exists(JDK_HOME.resolve("jmods"));
     }
 
-    private Helper(Path jdkHome) throws IOException {
+    private Helper(Path jdkHome, boolean linkableRuntime) throws IOException {
+        this.linkableRuntime = linkableRuntime;
         this.stdjmods = jdkHome.resolve("jmods").normalize();
-        if (!Files.exists(stdjmods)) {
+        if (!linkableRuntime && !Files.exists(stdjmods)) {
             throw new IOException("Standard jMods do not exist.");
         }
         this.fs = FileSystems.getFileSystem(URI.create("jrt:/"));
@@ -140,7 +150,8 @@ public String defaultModulePath() {
     }
 
     public String defaultModulePath(boolean includeStdMods) {
-        return (includeStdMods? stdjmods.toAbsolutePath().toString() : "") + File.pathSeparator
+        String standardMods = linkableRuntime ? "" : stdjmods.toAbsolutePath().toString() + File.pathSeparator;
+        return (includeStdMods? standardMods : "")
                 + jmods.toAbsolutePath().toString() + File.pathSeparator
                 + jars.toAbsolutePath().toString() + File.pathSeparator
                 + explodedmodsclasses.toAbsolutePath().toString();
@@ -184,7 +195,7 @@ public Result generateDefaultJModule(String moduleName, List<String> classNames,
         generateGarbage(jmodsclasses.resolve(moduleName));
 
         Path jmodFile = jmods.resolve(moduleName + ".jmod");
-        JModTask task = JImageGenerator.getJModTask()
+        JModTask task = JImageGenerator.getJModTask(linkableRuntime)
                 .jmod(jmodFile)
                 .addJmods(stdjmods)
                 .addJmods(jmods.toAbsolutePath())
diff --git a/test/jdk/tools/lib/tests/JImageGenerator.java b/test/jdk/tools/lib/tests/JImageGenerator.java
index 330547148d0..b872ca4f584 100644
--- a/test/jdk/tools/lib/tests/JImageGenerator.java
+++ b/test/jdk/tools/lib/tests/JImageGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -159,7 +159,11 @@ private static void copy(InputStream in, OutputStream out) throws IOException {
     }
 
     public static JModTask getJModTask() {
-        return new JModTask();
+        return getJModTask(false);
+    }
+
+    public static JModTask getJModTask(boolean linkableRuntime) {
+        return new JModTask(linkableRuntime);
     }
 
     public static JLinkTask getJLinkTask() {
@@ -350,11 +354,16 @@ public static class JModTask {
         private final List<Path> jars = new ArrayList<>();
         private final List<Path> jmods = new ArrayList<>();
         private final List<String> options = new ArrayList<>();
+        private final boolean linkableRuntime;
         private Path output;
         private String hashModules;
         private String mainClass;
         private String moduleVersion;
 
+        private JModTask(boolean linkableRuntime) {
+            this.linkableRuntime = linkableRuntime;
+        }
+
         public JModTask addNativeLibraries(Path cp) {
             this.libs.add(cp);
             return this;
@@ -414,7 +423,7 @@ private String modulePath() {
             // This is expect FIRST jmods THEN jars, if you change this, some tests could fail
             String jmods = toPath(this.jmods);
             String jars = toPath(this.jars);
-            return jmods + File.pathSeparator + jars;
+            return linkableRuntime ? jars : jmods + File.pathSeparator + jars;
         }
 
         private String toPath(List<Path> paths) {
diff --git a/test/jdk/tools/sincechecker/TEST.properties b/test/jdk/tools/sincechecker/TEST.properties
new file mode 100644
index 00000000000..27f669ef4ca
--- /dev/null
+++ b/test/jdk/tools/sincechecker/TEST.properties
@@ -0,0 +1,4 @@
+modules = \
+    jdk.compiler/com.sun.tools.javac.api \
+    jdk.compiler/com.sun.tools.javac.util \
+    jdk.compiler/com.sun.tools.javac.code
diff --git a/test/jdk/tools/sincechecker/modules/java_base/CheckSince_javaBase.java b/test/jdk/tools/sincechecker/modules/java.base/JavaBaseCheckSince.java
similarity index 81%
rename from test/jdk/tools/sincechecker/modules/java_base/CheckSince_javaBase.java
rename to test/jdk/tools/sincechecker/modules/java.base/JavaBaseCheckSince.java
index 6d0b9d0e932..64d5bf2465f 100644
--- a/test/jdk/tools/sincechecker/modules/java_base/CheckSince_javaBase.java
+++ b/test/jdk/tools/sincechecker/modules/java.base/JavaBaseCheckSince.java
@@ -24,11 +24,7 @@
 /*
  * @test
  * @bug 8331051
- * @summary Test for `@since` for java.base module
- * @library /test/lib
- *          /test/jdk/tools/sincechecker
- * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.util
- *          jdk.compiler/com.sun.tools.javac.code
+ * @summary Test for `@since` in java.base module
+ * @library /test/lib /test/jdk/tools/sincechecker
  * @run main SinceChecker java.base --exclude java.lang.classfile
  */
diff --git a/test/jdk/tools/sincechecker/modules/java.compiler/JavaCompilerCheckSince.java b/test/jdk/tools/sincechecker/modules/java.compiler/JavaCompilerCheckSince.java
new file mode 100644
index 00000000000..c843c962d27
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/java.compiler/JavaCompilerCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8341399
+ * @summary Test for `@since` in java.compiler module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker java.compiler
+ */
diff --git a/test/jdk/tools/sincechecker/modules/java.net.http/JavaNetHttpCheckSince.java b/test/jdk/tools/sincechecker/modules/java.net.http/JavaNetHttpCheckSince.java
new file mode 100644
index 00000000000..389bb456439
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/java.net.http/JavaNetHttpCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343442
+ * @summary Test for `@since` in java.net.http module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker java.net.http
+ */
diff --git a/test/jdk/tools/sincechecker/modules/jdk.compiler/JdkCompilerCheckSince.java b/test/jdk/tools/sincechecker/modules/jdk.compiler/JdkCompilerCheckSince.java
new file mode 100644
index 00000000000..5eb819786e9
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/jdk.compiler/JdkCompilerCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8341399
+ * @summary Test for `@since` in jdk.compiler module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.compiler
+ */
diff --git a/test/jdk/tools/sincechecker/modules/jdk.httpserver/JdkHttpServerCheckSince.java b/test/jdk/tools/sincechecker/modules/jdk.httpserver/JdkHttpServerCheckSince.java
new file mode 100644
index 00000000000..0c846995359
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/jdk.httpserver/JdkHttpServerCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343442
+ * @summary Test for `@since` in jdk.httpserver module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.httpserver
+ */
diff --git a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java b/test/jdk/tools/sincechecker/modules/jdk.javadoc/JdkJavadocCheckSince.java
similarity index 80%
rename from test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java
rename to test/jdk/tools/sincechecker/modules/jdk.javadoc/JdkJavadocCheckSince.java
index 05219fc5482..0e68d8213e9 100644
--- a/test/jdk/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java
+++ b/test/jdk/tools/sincechecker/modules/jdk.javadoc/JdkJavadocCheckSince.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,10 @@
  * questions.
  */
 
-/**
- *
+/*
+ * @test
+ * @bug 8341399
+ * @summary Test for `@since` in jdk.javadoc module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.javadoc
  */
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-public interface Receiver extends Remote {
-    public void receive(Object obj) throws RemoteException;
-}
diff --git a/test/jdk/tools/sincechecker/modules/jdk.jdeps/JdkJdepsCheckSince.java b/test/jdk/tools/sincechecker/modules/jdk.jdeps/JdkJdepsCheckSince.java
new file mode 100644
index 00000000000..68439c49e24
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/jdk.jdeps/JdkJdepsCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8341399
+ * @summary Test for `@since` in jdk.jdeps module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.jdeps
+ */
diff --git a/test/jdk/tools/sincechecker/modules/jdk.jshell/JdkJshellCheckSince.java b/test/jdk/tools/sincechecker/modules/jdk.jshell/JdkJshellCheckSince.java
new file mode 100644
index 00000000000..09f762cfeba
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/jdk.jshell/JdkJshellCheckSince.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8341399
+ * @summary Test for `@since` in jdk.jshell module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.jshell
+ */
diff --git a/test/jdk/java/util/ServiceLoader/security/SecurityTest.java b/test/jdk/tools/sincechecker/modules/jdk.net/JdkNetCheckSince.java
similarity index 82%
rename from test/jdk/java/util/ServiceLoader/security/SecurityTest.java
rename to test/jdk/tools/sincechecker/modules/jdk.net/JdkNetCheckSince.java
index e959e3efa2a..b0c5462106e 100644
--- a/test/jdk/java/util/ServiceLoader/security/SecurityTest.java
+++ b/test/jdk/tools/sincechecker/modules/jdk.net/JdkNetCheckSince.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,10 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @build test/*
- * @run testng/othervm -Djava.security.manager=allow test/p.Tests
- * @summary Tests to exercise ServiceLoader with a security manager
+ * @bug 8343442
+ * @summary Test for `@since` in jdk.net module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.net
  */
diff --git a/test/jdk/java/lang/SecurityManager/modules/m/module-info.java b/test/jdk/tools/sincechecker/modules/jdk.sctp/JdkSctpCheckSince.java
similarity index 81%
rename from test/jdk/java/lang/SecurityManager/modules/m/module-info.java
rename to test/jdk/tools/sincechecker/modules/jdk.sctp/JdkSctpCheckSince.java
index cf46bcc808e..921bd5eefc2 100644
--- a/test/jdk/java/lang/SecurityManager/modules/m/module-info.java
+++ b/test/jdk/tools/sincechecker/modules/jdk.sctp/JdkSctpCheckSince.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,5 +21,10 @@
  * questions.
  */
 
-module m {
-}
+/*
+ * @test
+ * @bug 8343442
+ * @summary Test for `@since` in jdk.sctp module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.sctp
+ */
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 4f00846116c..775b95959c6 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -138,6 +138,7 @@ public Map<String, String> call() {
         map.put("jdk.containerized", this::jdkContainerized);
         map.put("vm.flagless", this::isFlagless);
         map.put("jdk.foreign.linker", this::jdkForeignLinker);
+        map.put("jlink.packagedModules", this::packagedModules);
         vmGC(map); // vm.gc.X = true/false
         vmGCforCDS(map); // may set vm.gc
         vmOptFinalFlags(map);
@@ -715,6 +716,21 @@ private String jdkContainerized() {
         return "" + "true".equalsIgnoreCase(isEnabled);
     }
 
+    private String packagedModules() {
+        // Some jlink tests require packaged modules being present (jmods).
+        // For a runtime linkable image build packaged modules aren't present
+        try {
+            Path jmodsDir = Path.of(System.getProperty("java.home"), "jmods");
+            if (jmodsDir.toFile().exists()) {
+                return Boolean.TRUE.toString();
+            } else {
+                return Boolean.FALSE.toString();
+            }
+        } catch (Throwable t) {
+            return Boolean.FALSE.toString();
+        }
+    }
+
     /**
      * Checks if we are in <i>almost</i> out-of-box configuration, i.e. the flags
      * which JVM is started with don't affect its behavior "significantly".
diff --git a/test/langtools/jdk/javadoc/doclet/5093723/DocumentedClass.java b/test/langtools/jdk/javadoc/doclet/5093723/DocumentedClass.java
deleted file mode 100644
index 659cbb77f40..00000000000
--- a/test/langtools/jdk/javadoc/doclet/5093723/DocumentedClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2009 Google, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/** A documented class. */
-public class DocumentedClass extends UndocumentedClass {
-  /** {@link #method} */
-  public void m1() {}
-  /** {@link #publicMethod} */
-  public void m2() {}
-  /** {@link #protectedMethod} */
-  public void m3() {}
-  /** {@link #privateMethod} */
-  public void m4() {}
-}
diff --git a/test/langtools/jdk/javadoc/doclet/5093723/T5093723.java b/test/langtools/jdk/javadoc/doclet/5093723/T5093723.java
index f27b716ded1..9f0ed70e25a 100644
--- a/test/langtools/jdk/javadoc/doclet/5093723/T5093723.java
+++ b/test/langtools/jdk/javadoc/doclet/5093723/T5093723.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Google, Inc.  All Rights Reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,30 +24,85 @@
 
 /*
  * @test
- * @bug      5093723
+ * @bug      5093723 8202617
  * @summary  REGRESSION: ClassCastException in SingleIndexWriter
- * @library  ../../lib
+ *           Check that links to undocumented members are not generated
+ * @library  /tools/lib ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
- * @build    javadoc.tester.*
+ * @build    toolbox.ToolBox javadoc.tester.*
  * @run main T5093723
  */
 
 import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
 
 public class T5093723 extends JavadocTester {
 
+    ToolBox tb = new ToolBox();
+
     public static void main(String... args) throws Exception {
         var tester = new T5093723();
         tester.runTests();
     }
 
     @Test
-    public void test() {
-        setAutomaticCheckLinks(false); // @ignore JDK-8202617
+    public void test(Path base) throws IOException {
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /** A documented class. */
+                public class DocumentedClass extends UndocumentedClass {
+                  /** {@link #method} */
+                  public void m1() {}
+                  /** {@link #publicMethod} */
+                  public void m2() {}
+                  /** {@link #protectedMethod} */
+                  public void m3() {}
+                  /** {@link #privateMethod} */
+                  public void m4() {}
+                }
+                """, """
+                package p;
+                class UndocumentedClass {
+                    void method() {}
+                    public void publicMethod() {}
+                    protected void protectedMethod() {}
+                    private void privateMethod() {}
+                }
+                """);
+
         javadoc("-d", "out",
                 "-Xdoclint:none",
-                testSrc("DocumentedClass.java"),
-                testSrc("UndocumentedClass.java"));
+                "-sourcepath",
+                src.toString(),
+                "p");
         checkExit(Exit.OK);
+
+        checkOutput("p/DocumentedClass.html",
+                true,
+                "<div class=\"block\"><code>UndocumentedClass.method()</code></div>",
+                "<div class=\"block\"><code>UndocumentedClass.privateMethod()</code></div>");
+
+        checkOutput("p/DocumentedClass.html",
+                false,
+                "<div class=\"block\"><a href=\"#method()\"><code>method()</code></a></div>",
+                "<div class=\"block\"><a href=\"#privateMethod()\"><code>privateMethod()</code></a></div>");
+
+        checkOutput(Output.OUT, true,
+                "warning: reference not accessible: privateMethod()",
+                "/** {@link #privateMethod} */",
+                "warning: reference not accessible: method()",
+                "/** {@link #method} */");
+
+        checkOutput(Output.OUT, false,
+                "warning: reference not accessible: publicMethod()",
+                "warning: reference not accessible: protectedMethod()",
+                "/** {@link #publicMethod} */",
+                "/** {@link #protectedMethod} */");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/5093723/UndocumentedClass.java b/test/langtools/jdk/javadoc/doclet/5093723/UndocumentedClass.java
deleted file mode 100644
index b31dea6aa51..00000000000
--- a/test/langtools/jdk/javadoc/doclet/5093723/UndocumentedClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2009 Google, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-class UndocumentedClass {
-    void method() {}
-    public void publicMethod() {}
-    protected void protectedMethod() {}
-    private void privateMethod() {}
-}
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java b/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java
index 9e72fca9b5b..098676cff52 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8213957 8213958
+ * @bug 8213957 8213958 8340565
  * @summary Test use of at-index in package-iinfo and doc-files
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -121,6 +121,23 @@ public class C { }
                 <a href="p/q/package-summary.html#test.property.1" class="search-tag-link">test.property.1</a>""",
             """
                 <a href="p/q/doc-files/extra.html#test.property.2" class="search-tag-link">test.property.2</a>""");
+
+        checkOrder("search-tags.html",
+            """
+                <div class="col-first even-row-color">test.name.1</div>
+                <div class="col-second even-row-color">additional info</div>
+                <div class="col-last even-row-color">
+                <div class="block"><code><a href="p/q/package-summary.html#test.name.1">package p.q</a></code></div>""",
+            """
+                <div class="col-first odd-row-color">test.name.2</div>
+                <div class="col-second odd-row-color">additional info</div>
+                <div class="col-last odd-row-color">
+                <div class="block"><a href="p/q/doc-files/extra.html#test.name.2"><code>package p.q: </code>Extra</a></div>""",
+            """
+                <div class="col-first even-row-color">test.name.3</div>
+                <div class="col-second even-row-color">additional info</div>
+                <div class="col-last even-row-color">
+                <div class="block"><a href="index.html#test.name.3">Overview</a></div>""");
     }
 }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
index 1707eb52532..bc0f59cdc01 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8202462
+ * @bug 8202462 8340565
  * @summary {@index} may cause duplicate labels
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -33,7 +33,6 @@
 
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import builder.ClassBuilder;
 import builder.ClassBuilder.MethodBuilder;
@@ -84,6 +83,21 @@ public void test(Path base) throws Exception {
                 "<h2>Method Summary</h2>\n",
                 """
                     <div class="block">test description with search_phrase_a</div>""");
+
+        checkOrder("search-tags.html",
+                """
+                    <h1>Search Tags</h1>""",
+                """
+                    <div class="caption"><span>Search Tags Summary</span></div>
+                    <div class="summary-table three-column-summary">
+                    <div class="table-header col-first">Search Tag</div>
+                    <div class="table-header col-second">Description</div>
+                    <div class="table-header col-last">Defined In</div>""",
+                """
+                    <div class="col-first even-row-color">search_phrase_a</div>
+                    <div class="col-second even-row-color">class a</div>
+                    <div class="col-last even-row-color">
+                    <div class="block"><code><a href="pkg/A.html#search_phrase_a">pkg.A.func(A)</a></code></div>""");
     }
 
     @Test
@@ -130,5 +144,13 @@ public void testDuplicateReferences(Path base) throws Exception {
                     This is a class. Here is <span id="foo" class="search-tag-result">foo</span>.""",
                 """
                     This is a method. Here is <span id="foo-1" class="search-tag-result">foo</span>.""");
+
+        checkOrder("search-tags.html",
+                """
+                    <div class="col-first even-row-color">foo</div>
+                    <div class="col-second even-row-color">first</div>
+                    <div class="col-last even-row-color">
+                    <div class="block"><code><a href="pkg/A.html#foo">class pkg.A</a></code>, <code\
+                    ><a href="pkg/A.html#foo-1">pkg.A.m()</a></code></div>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
index 559f7b08d38..ab1142f6a23 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4638588 4635809 6256068 6270645 8025633 8026567 8162363 8175200
- *      8192850 8182765 8220217 8224052 8237383
+ *      8192850 8182765 8220217 8224052 8237383 8341904
  * @summary Test to make sure that members are inherited properly in the Javadoc.
  *          Verify that inheritance labels are correct.
  * @library ../../lib
@@ -152,8 +152,7 @@ interface in pkg">BaseInterface</a></code></dd>
                                                               throws <span class="exceptions">java.lang.IllegalArgumentException,
                     java.lang.InterruptedException,
                     java.lang.IllegalStateException</span></div>
-                    <div class="block">Returns some value with an <span id="inheritedsearchtag" clas\
-                    s="search-tag-result">inherited search tag</span>.</div>""");
+                    <div class="block">Returns some value with an inherited search tag.</div>""");
 
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
                 """
@@ -218,10 +217,8 @@ interface in pkg">BaseInterface</a></code></dd>
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField"}""",
                 """
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentMethod(String)","u":"parentMethod(T)"}""");
-        checkOutput("tag-search-index.js", true,
-                """
-                    {"l":"inherited search tag","h":"pkg2.UndocumentedGenericParent.parentMethod(Str\
-                    ing)","u":"pkg2/DocumentedNonGenericChild.html#inheritedsearchtag"}""");
+        // Search tags from inherited doc comments are not added to the index (8341904).
+        checkOutput("tag-search-index.js", true, "tagSearchIndex = []");
 
     }
 
@@ -246,8 +243,7 @@ public void testSplitIndex() {
                                                               throws <span class="exceptions">java.lang.IllegalArgumentException,
                     java.lang.InterruptedException,
                     java.lang.IllegalStateException</span></div>
-                    <div class="block">Returns some value with an <span id="inheritedsearchtag" clas\
-                    s="search-tag-result">inherited search tag</span>.</div>""");
+                    <div class="block">Returns some value with an inherited search tag.</div>""");
 
         checkOutput("index-files/index-9.html", true,
                 """
@@ -270,10 +266,8 @@ public void testSplitIndex() {
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField"}""",
                 """
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentMethod(String)","u":"parentMethod(T)"}""");
-        checkOutput("tag-search-index.js", true,
-                """
-                    {"l":"inherited search tag","h":"pkg2.UndocumentedGenericParent.parentMethod(Str\
-                    ing)","u":"pkg2/DocumentedNonGenericChild.html#inheritedsearchtag"}""");
+        // Search tags from inherited doc comments are not added to the index (8341904).
+        checkOutput("tag-search-index.js", true, "tagSearchIndex = []");
     }
 
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/DocumentedNonGenericChild.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/DocumentedNonGenericChild.java
index 74063aef210..1e341059494 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/DocumentedNonGenericChild.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/DocumentedNonGenericChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,4 +25,9 @@
 
 public abstract class DocumentedNonGenericChild extends UndocumentedGenericParent<String, InterruptedException, IllegalArgumentException> {
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void parentMethod2() {}
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/UndocumentedGenericParent.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/UndocumentedGenericParent.java
index b82c81ec9f1..c148626d2b7 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/UndocumentedGenericParent.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/pkg2/UndocumentedGenericParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,4 +38,9 @@ abstract class UndocumentedGenericParent<T, E extends Throwable, F extends Throw
      * @throws IllegalStateException illegal state
      */
     protected abstract T parentMethod(T t) throws F, E, IllegalStateException;
+
+    /**
+     * Method with systemProperty tag. {@systemProperty parent.system.prop}.
+     */
+    public abstract void parentMethod2();
 }
diff --git a/test/langtools/jdk/jshell/AnalyzeSnippetTest.java b/test/langtools/jdk/jshell/AnalyzeSnippetTest.java
index 3e2e1a839e2..a9b0315e960 100644
--- a/test/langtools/jdk/jshell/AnalyzeSnippetTest.java
+++ b/test/langtools/jdk/jshell/AnalyzeSnippetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8182270
+ * @bug 8182270 8341176
  * @summary test non-eval Snippet analysis
  * @build KullaTesting TestingInputStream
  * @run testng AnalyzeSnippetTest
@@ -32,8 +32,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.List;
+import java.util.stream.Stream;
 import jdk.jshell.Snippet;
 import jdk.jshell.DeclarationSnippet;
+import jdk.jshell.Diag;
 import org.testng.annotations.Test;
 
 import jdk.jshell.JShell;
@@ -52,6 +54,7 @@
 import jdk.jshell.TypeDeclSnippet;
 import jdk.jshell.VarSnippet;
 import static jdk.jshell.Snippet.SubKind.*;
+import jdk.jshell.SourceCodeAnalysis.SnippetWrapper;
 
 @Test
 public class AnalyzeSnippetTest {
@@ -141,6 +144,49 @@ public void testErroneous() {
                 SubKind.UNKNOWN_SUBKIND);
     }
 
+    public void testDiagnosticsForSourceSnippet() {
+        Snippet sn;
+        sn = assertSnippet("unknown()", UNKNOWN_SUBKIND);
+        assertDiagnostics(sn, "0-7:compiler.err.cant.resolve.location.args");
+        sn = assertSnippet("new String(null, )", UNKNOWN_SUBKIND);
+        assertDiagnostics(sn, "17-17:compiler.err.illegal.start.of.expr");
+        sn = assertSnippet("1 + ", UNKNOWN_SUBKIND);
+        assertDiagnostics(sn, "3-3:compiler.err.premature.eof");
+        sn = assertSnippet("class C {", UNKNOWN_SUBKIND);
+        assertDiagnostics(sn, "9-9:compiler.err.premature.eof");
+        sn = assertSnippet("class C {}", CLASS_SUBKIND);
+        assertDiagnostics(sn);
+        sn = assertSnippet("void t() { throw new java.io.IOException(); }", METHOD_SUBKIND);
+        assertDiagnostics(sn, "11-43:compiler.err.unreported.exception.need.to.catch.or.throw");
+        sn = assertSnippet("void t() { unknown(); }", METHOD_SUBKIND);
+        assertDiagnostics(sn, "11-18:compiler.err.cant.resolve.location.args");
+        sn = assertSnippet("import unknown.unknown;", SINGLE_TYPE_IMPORT_SUBKIND);
+        assertDiagnostics(sn, "7-22:compiler.err.doesnt.exist");
+    }
+
+    public void testSnippetWrapper() {
+        SourceCodeAnalysis analysis = state.sourceCodeAnalysis();
+        Snippet sn;
+        String code = "unknown()";
+        sn = assertSnippet(code, UNKNOWN_SUBKIND);
+        SnippetWrapper wrapper = analysis.wrapper(sn);
+        String wrapped = wrapper.wrapped();
+        assertEquals(wrapped, """
+                              package REPL;
+
+                              class $JShell$DOESNOTMATTER {
+                                  public static java.lang.Object do_it$() throws java.lang.Throwable {
+                                      return unknown();
+                                  }
+                              }
+                              """);
+        for (int pos = 0; pos < code.length(); pos++) {
+            int wrappedPos = wrapper.sourceToWrappedPosition(pos);
+            assertEquals(wrapped.charAt(wrappedPos), code.charAt(pos));
+            assertEquals(wrapper.wrappedToSourcePosition(wrappedPos), pos);
+        }
+    }
+
     public void testNoStateChange() {
         assertSnippet("int a = 5;", SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND);
         assertSnippet("a", SubKind.UNKNOWN_SUBKIND);
@@ -159,4 +205,14 @@ private Snippet assertSnippet(String input, SubKind sk) {
         assertEquals(sn.subKind(), sk);
         return sn;
     }
+
+    private String diagToString(Diag d) {
+        return d.getStartPosition() + "-" + d.getEndPosition() + ":" + d.getCode();
+    }
+
+    private void assertDiagnostics(Snippet s, String... expectedDiags) {
+        List<String> actual = state.diagnostics(s).map(this::diagToString).toList();
+        List<String> expected = List.of(expectedDiags);
+        assertEquals(actual, expected);
+    }
 }
diff --git a/test/langtools/tools/doclint/tool/RunTest.java b/test/langtools/tools/doclint/tool/RunTest.java
index 86691111bce..8c7bc225c38 100644
--- a/test/langtools/tools/doclint/tool/RunTest.java
+++ b/test/langtools/tools/doclint/tool/RunTest.java
@@ -27,7 +27,8 @@
  * @summary Supplementary test cases needed for doclint
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  *          jdk.compiler/com.sun.tools.javac.api
- * @run main/othervm -Djava.security.manager=allow RunTest
+ * @library /test/lib
+ * @run main/othervm RunTest
  */
 
 import java.io.ByteArrayOutputStream;
@@ -36,7 +37,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URI;
-import java.security.Permission;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -49,34 +49,13 @@
 import jdk.javadoc.internal.doclint.DocLint;
 import jdk.javadoc.internal.doclint.DocLint.BadArgs;
 
-public class RunTest {
-    static class SimpleSecurityManager extends SecurityManager {
-        boolean allowExit = false;
-
-        @Override
-        public void checkExit(int status) {
-            if (!allowExit)
-                throw new SecurityException("System.exit(" + status + ")");
-        }
-        @Override
-        public void checkPermission(Permission perm) { }
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
-    }
+public class RunTest {
 
     public static void main(String... args) throws Exception {
-        // if no security manager already installed, install one to
-        // prevent System.exit
-        SimpleSecurityManager secmgr = null;
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(secmgr = new SimpleSecurityManager() { });
-        }
-
-        try {
-            new RunTest().run();
-        } finally {
-            if (secmgr != null)
-                secmgr.allowExit = true;
-        }
+        new RunTest().run();
     }
 
     void run() throws Exception {
@@ -91,19 +70,23 @@ void run() throws Exception {
 
     void testMain() {
         System.err.println("test main(String[])");
-        testMain(true, "-help");
-        testMain(false, "-unknownOption");
+        testMain(0, "-help");
+        testMain(1, "-unknownOption");
     }
 
-    void testMain(boolean expectOK, String... args) {
+    void testMain(int expectExitValue, String option) {
+        List<String> args = List.of(
+                "--add-exports=jdk.javadoc/jdk.javadoc.internal.doclint=ALL-UNNAMED",
+                DocLint.class.getName(),
+                option);
         try {
-            DocLint.main(args);
-            if (!expectOK)
-                error("expected SecurityException (from System.exit) not thrown");
-        } catch (SecurityException e) {
-            System.err.println(e);
-            if (expectOK)
-                error("unexpected SecurityException caught");
+            OutputAnalyzer oa = ProcessTools.executeTestJava(args);
+            oa.reportDiagnosticSummary();
+            if (oa.getExitValue() != expectExitValue) {
+                error("unexpected exit value: " + oa.getExitValue());
+            }
+        } catch (Exception e) {
+            error("unexpected Exception caught: " + e);
         }
     }
 
diff --git a/test/langtools/tools/javac/annotations/ParameterArrayLimit.java b/test/langtools/tools/javac/annotations/ParameterArrayLimit.java
new file mode 100644
index 00000000000..6e782dd0b83
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/ParameterArrayLimit.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Check if error is thrown if annotation array exceeds limit
+ * @library /tools/lib
+ * @run main ParameterArrayLimit
+ */
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import javax.tools.*;
+
+import com.sun.source.util.JavacTask;
+
+public class ParameterArrayLimit {
+
+    public static void main(String[] args) throws IOException {
+
+        int[] values = new int[]{65536, 65537, 512000};
+        String[] retPolicies = {"RUNTIME", "CLASS"};
+
+        for (var value : values) {
+            Path tmpDir = Paths.get(System.getProperty("java.io.tmpdir"));
+
+            for (String retPolicy : retPolicies) {
+                String className = MessageFormat.format("ClassAnnotationWithLength_{0,number,#}_{1}.java",
+                        value,
+                        retPolicy);
+                Path out = tmpDir.resolve(className);
+                createAnnotationFile(out, value, retPolicy, false);
+                checkParamArrayWarning(className, out);
+            }
+
+            for (String retPolicy : retPolicies) {
+                String className = MessageFormat.format("TypeAnnotationWithLength_{0,number,#}_{1}.java",
+                        value,
+                        retPolicy);
+                Path out = tmpDir.resolve(className);
+                createAnnotationFile(out, value, retPolicy, true);
+                checkParamArrayWarning(className, out);
+            }
+        }
+    }
+
+    private static void checkParamArrayWarning(String className, Path out) throws IOException {
+        JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
+        DiagnosticCollector<JavaFileObject> d = new DiagnosticCollector<>();
+        JavacTask task = (JavacTask) javaCompiler.getTask(
+                null,
+                null,
+                d,
+                null,
+                null,
+                Collections.singletonList(
+                        SimpleJavaFileObject.forSource(
+                                URI.create("myfo:/" + className),
+                                Files.readString(out)
+                        )));
+        task.call();
+
+        List<Diagnostic<? extends JavaFileObject>> diagnosticList = d.getDiagnostics();
+        if (diagnosticList.isEmpty()) {
+            throw new RuntimeException("No diagnostic found");
+        }
+
+        for (Diagnostic<? extends JavaFileObject> diagnostic : diagnosticList) {
+            if (!(diagnostic.getKind() == Diagnostic.Kind.ERROR
+                    && diagnostic.getCode()
+                    .equals("compiler.err.annotation.array.too.large"))) {
+                throw new RuntimeException("Unexpected diagnostic: " + diagnostic.getMessage(null));
+            }
+        }
+    }
+
+    private static void createAnnotationFile(Path out, int value, String retPolicy, boolean isTypeAnnotation) throws IOException {
+        StringBuilder sb = new StringBuilder();
+
+        if (isTypeAnnotation) {
+            sb.append(MessageFormat.format("""
+                    import java.lang.annotation.*;
+                    @Retention(RetentionPolicy.{0})
+                    @Target(ElementType.TYPE_USE)
+                    @interface TypeAnno '{'
+                        long[] arr();
+                    '}'
+                    """, retPolicy));
+            sb.append(MessageFormat.format("""
+                                public class TypeAnnotationWithLength_{0,number,#}_{1}'{'
+                                @TypeAnno(arr = '{'
+                    """, value, retPolicy));
+        } else {
+            sb.append(MessageFormat.format("""
+                    import java.lang.annotation.*;
+                    @Retention(RetentionPolicy.{0})
+                    @interface MyCustomAnno '{'
+                        String value() default "default value";
+                        long[] arr();
+                        int count() default 0;
+                    '}'
+                    """, retPolicy));
+            sb.append(MessageFormat.format("""
+                                public class ClassAnnotationWithLength_{0,number,#}_{1}'{'
+                                @MyCustomAnno(value = "custom", count = 42, arr = '{'
+                    """, value, retPolicy));
+        }
+
+        sb.append("-1,".repeat(Math.max(0, value - 1)));
+        sb.append("-1})");
+
+        sb.append("""
+                     static int x = 3;
+
+                     public void myAnnotatedMethod() { }
+                }
+                """);
+
+        try (BufferedWriter bufferedWriter = Files.newBufferedWriter(out)) {
+            bufferedWriter.write(sb.toString());
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.java b/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.java
deleted file mode 100644
index a212cd9a5c6..00000000000
--- a/test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import javax.tools.ToolProvider;
-
-/**
- * @test
- * @bug 8154190
- * @summary Test javax.tools.ToolProvider running with security manager
- * @modules java.compiler
- *          jdk.compiler
- * @run main/othervm -Djava.security.manager=allow ToolProviderTest
- */
-
-// run in other vm to ensure the initialization code path is exercised.
-public class ToolProviderTest {
-    public static void main(String... args) {
-        // The following code allows the test to be skipped when run on
-        // an exploded image.
-        // See https://bugs.openjdk.org/browse/JDK-8155858
-        Path javaHome = Paths.get(System.getProperty("java.home"));
-        Path image = javaHome.resolve("lib").resolve("modules");
-        Path modules = javaHome.resolve("modules");
-        if (!Files.exists(image) && Files.exists(modules)) {
-            System.err.println("Test running on exploded image");
-            System.err.println("Test skipped!");
-            return;
-        }
-
-        System.setSecurityManager(new SecurityManager());
-
-        Objects.requireNonNull(ToolProvider.getSystemDocumentationTool());
-        Objects.requireNonNull(ToolProvider.getSystemJavaCompiler());
-        if (ToolProvider.getSystemToolClassLoader() != null) {
-            throw new AssertionError("unexpected value for getSystemToolClassLoader");
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 329e716a780..e158366a171 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -16,6 +16,7 @@ compiler.err.limit.code                                 # Code
 compiler.err.limit.code.too.large.for.try.stmt          # Gen
 compiler.err.limit.dimensions                           # Gen
 compiler.err.limit.locals                               # Code
+compiler.err.annotation.array.too.large                 # Code
 compiler.err.limit.parameters                           # Gen
 compiler.err.limit.pool                                 # Gen,JavaCompiler
 compiler.err.limit.pool.in.class                        # UNUSED?
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index e3ed1c3e8af..090c4e298fd 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -240,25 +240,6 @@ public void testCodeSource(Path base) throws IOException {
         checkEqual("stdout", log.trim(), file.toAbsolutePath().toUri().toURL().toString());
     }
 
-    @Test
-    public void testSecurityManager(Path base) throws IOException {
-        Path sourceFile = base.resolve("HelloWorld.java");
-        tb.writeJavaFiles(base,
-                "class HelloWorld {\n" +
-                        "    public static void main(String... args) {\n" +
-                        "        System.out.println(\"Hello World!\");\n" +
-                        "    }\n" +
-                        "}");
-
-        String log = new JavaTask(tb)
-                .vmOptions("-Djava.security.manager=default")
-                .className(sourceFile.toString())
-                .run(Task.Expect.FAIL)
-                .getOutput(Task.OutputKind.STDERR);
-        checkContains("stderr", log,
-                "error: cannot use source-code launcher with a security manager enabled");
-    }
-
     @Test
     public void testSystemProperty(Path base) throws IOException {
         tb.writeJavaFiles(base,
diff --git a/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.java b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.java
new file mode 100644
index 00000000000..f0754c3cf73
--- /dev/null
+++ b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.java
@@ -0,0 +1,12 @@
+/*
+ * /nodynamiccopyright/
+ */
+
+import java.lang.invoke.VarHandle;
+
+class PolymorphicMethodTest<V> {
+    VarHandle vh;
+    V method(Object obj) {
+        return (V)vh.getAndSet(this, obj);
+    }
+}
diff --git a/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.out
new file mode 100644
index 00000000000..71abb004318
--- /dev/null
+++ b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest.out
@@ -0,0 +1,2 @@
+PolymorphicMethodTest.java:10:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.lang.Object, V
+1 warning
diff --git a/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest_Source23.out b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest_Source23.out
new file mode 100644
index 00000000000..5694d9ea4f6
--- /dev/null
+++ b/test/langtools/tools/javac/mandatoryWarnings/unchecked/PolymorphicMethodTest_Source23.out
@@ -0,0 +1,2 @@
+- compiler.warn.source.no.system.modules.path: 23, (compiler.misc.source.no.system.modules.path: 23)
+1 warning
diff --git a/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java
index 434889cb8ec..759c4090e1c 100644
--- a/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java
+++ b/test/langtools/tools/javac/mandatoryWarnings/unchecked/Test.java
@@ -42,4 +42,6 @@
  * @compile/ref=Test4b.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 1 A.java B.java
  * @compile/ref=Test4c.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 2 A.java B.java
  * @compile/ref=Test4d.out -XDrawDiagnostics -nowarn -Xlint:unchecked -Xmaxwarns 3 A.java B.java
+ * @compile/ref=PolymorphicMethodTest.out -XDrawDiagnostics -Xlint:unchecked PolymorphicMethodTest.java
+ * @compile/ref=PolymorphicMethodTest_Source23.out -XDrawDiagnostics -Xlint:unchecked -source 23 PolymorphicMethodTest.java
  */
diff --git a/test/langtools/tools/javac/plugin/AutostartPlugins.java b/test/langtools/tools/javac/plugin/AutostartPlugins.java
index eeac5e0ecc6..5eb5b16bad5 100644
--- a/test/langtools/tools/javac/plugin/AutostartPlugins.java
+++ b/test/langtools/tools/javac/plugin/AutostartPlugins.java
@@ -30,7 +30,7 @@
  *           jdk.compiler/com.sun.tools.javac.main
  *           jdk.jlink
  *  @build toolbox.ToolBox toolbox.JavacTask toolbox.JarTask
- *  @run main AutostartPlugins
+ *  @run main/othervm AutostartPlugins
  */
 
 import java.io.IOException;
diff --git a/test/langtools/tools/javac/plugin/InternalAPI.java b/test/langtools/tools/javac/plugin/InternalAPI.java
index 523c9365c99..70bb024ede9 100644
--- a/test/langtools/tools/javac/plugin/InternalAPI.java
+++ b/test/langtools/tools/javac/plugin/InternalAPI.java
@@ -31,7 +31,7 @@
  *           jdk.compiler/com.sun.tools.javac.main
  *           jdk.jlink
  *  @build toolbox.ToolBox toolbox.JavacTask toolbox.JarTask
- *  @run main InternalAPI
+ *  @run main/othervm InternalAPI
  */
 
 import java.io.IOException;
diff --git a/test/langtools/tools/javac/processing/6348193/T6348193.java b/test/langtools/tools/javac/processing/6348193/T6348193.java
index cc6400a1b38..db3ecd5cb94 100644
--- a/test/langtools/tools/javac/processing/6348193/T6348193.java
+++ b/test/langtools/tools/javac/processing/6348193/T6348193.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,11 @@
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
  * @compile -proc:none T6348193.java
- * @run main/othervm -Djava.security.manager=allow T6348193
+ * @run main/othervm T6348193
  */
 
 import java.io.*;
 import java.net.*;
-import java.security.*;
 import java.util.*;
 import javax.annotation.processing.*;
 import javax.lang.model.element.*;
@@ -51,23 +50,17 @@ enum NoGoodBad { NO, GOOD, BAD};
     public static final String myName = T6348193.class.getName();
 
     public static void main(String... args) throws IOException {
-        if (System.getSecurityManager() != null)
-            throw new AssertionError("unexpected security manager");
 
-        for (NoYes secMgr: EnumSet.allOf(NoYes.class))
-            for (NoGoodBad config: EnumSet.allOf(NoGoodBad.class))
-                for (NoYes proc: EnumSet.allOf(NoYes.class))
-                    test(secMgr, config, proc);
+        for (NoGoodBad config: EnumSet.allOf(NoGoodBad.class))
+            for (NoYes proc: EnumSet.allOf(NoYes.class))
+                test(config, proc);
     }
 
     private static File processed = new File("processed");
 
-    public static void test(NoYes secMgr, NoGoodBad config, NoYes proc) throws IOException {
+    public static void test(NoGoodBad config, NoYes proc) throws IOException {
         if (verbose)
-            System.err.println("secMgr:" + secMgr + " config:" + config + " proc:" + proc);
-
-        if (secMgr == NoYes.YES && System.getSecurityManager() == null)
-            System.setSecurityManager(new NoLoaderSecurityManager());
+            System.err.println("config:" + config + " proc:" + proc);
 
         installConfigFile(config);
 
@@ -95,16 +88,9 @@ public static void test(NoYes secMgr, NoGoodBad config, NoYes proc) throws IOExc
             boolean ok = t.getTask(out, null, dl, args, null, files).call();
 
             if (config == NoGoodBad.GOOD || proc == NoYes.YES) {
-                if (secMgr == NoYes.YES) {
-                    if (dl.last == null)
-                        throw new AssertionError("Security manager installed, and processors present, "
-                                                 + " but no diagnostic received");
-                }
-                else {
-                    if (!processed.exists())
-                        throw new AssertionError("No security manager installed, and processors present, "
-                                                 + " but no processing occurred");
-                }
+                if (!processed.exists())
+                    throw new AssertionError("Processors present, "
+                                             + " but no processing occurred");
             }
             else if (config == NoGoodBad.BAD) {
                 // TODO: should verify that no compiler crash occurred
@@ -169,21 +155,4 @@ public void report(Diagnostic<? extends JavaFileObject> message) {
 
         Diagnostic<? extends JavaFileObject> last;
     }
-
-    static class NoLoaderSecurityManager extends SecurityManager
-    {
-        public void checkCreateClassLoader() {
-            throw new SecurityException("Not today, thanks you!");
-        }
-
-        public void checkPropertyAccess(String key) { /*OK*/ }
-
-        public void checkDelete(String file) { /*OK*/ }
-        public void checkPermission(Permission perm) { /*OK*/ }
-        public void checkRead(FileDescriptor fd) { /*OK*/ }
-        public void checkRead(String file) { /*OK*/ }
-        public void checkRead(String file, Object context) { /*OK*/ }
-        public void checkWrite(String file) { /*OK*/ }
-
-    }
 }
diff --git a/test/langtools/tools/javac/sealed/SealedCompilationTests.java b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
index 5ad70d102d6..dee64fd0865 100644
--- a/test/langtools/tools/javac/sealed/SealedCompilationTests.java
+++ b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1178,6 +1178,39 @@ void test () {
                         I[] i = (I[]) c;
                     }
                 }
+                """,
+                """
+                class Test {
+                    sealed interface I permits C1 {}
+                    non-sealed class C1 implements I {}
+                    class C2 extends C1 {}
+                    class C3 {}
+                    I m(int s, C3 c3) {
+                        I i = (I)c3;
+                    }
+                }
+                """,
+                """
+                class Test {
+                    sealed interface I permits C1 {}
+                    non-sealed class C1 implements I {}
+                    class C2 extends C1 {}
+                    class C3 {}
+                    I m(int s, C3 c3) {
+                        I i = (C1)c3;
+                    }
+                }
+                """,
+                """
+                class Test {
+                    sealed interface I permits C1 {}
+                    non-sealed class C1 implements I {}
+                    class C2 extends C1 {}
+                    class C3 {}
+                    I m(int s, C3 c3) {
+                        I i = (C2)c3;
+                    }
+                }
                 """
         )) {
             assertFail("compiler.err.prob.found.req", s);
diff --git a/test/jdk/sun/security/util/Resources/early/EarlyResources.java b/test/lib-test/jdk/test/lib/security/FixedSecureRandomTest.java
similarity index 54%
rename from test/jdk/sun/security/util/Resources/early/EarlyResources.java
rename to test/lib-test/jdk/test/lib/security/FixedSecureRandomTest.java
index 3ee0a9f576c..bdebc9e0a8c 100644
--- a/test/jdk/sun/security/util/Resources/early/EarlyResources.java
+++ b/test/lib-test/jdk/test/lib/security/FixedSecureRandomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,39 +20,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import jdk.test.lib.security.FixedSecureRandom;
+
 /*
  * @test
- * @bug 8194251
- * @summary Ensure that messages can be formatted before resources are loaded
  * @library /test/lib
- * @build jdk.test.lib.process.*
- * @run main EarlyResources
+ * @summary ensure FixedSecureRandom works as expected
  */
-
-import java.io.*;
-import java.nio.file.*;
-import java.util.*;
-import jdk.test.lib.process.*;
-
-public class EarlyResources {
-
+public class FixedSecureRandomTest {
     public static void main(String[] args) throws Exception {
-
-        String testSrc = System.getProperty("test.src");
-        String fs = File.separator;
-        String policyPath = testSrc + fs + "malformed.policy";
-
-        OutputAnalyzer out = ProcessTools.executeTestJava(
-            "-Djava.security.manager",
-            "-Djava.security.policy=" + policyPath,
-            "EarlyResources$TestMain");
-
-        out.shouldHaveExitValue(0);
-    }
-
-    public static class TestMain {
-        public static void main(String[] args) {
-            System.out.println(new Date().toString());
-        }
+        var fsr = new FixedSecureRandom(new byte[] {1, 2, 3},
+                new byte[] {4, 5, 6});
+        var b1 = new byte[2];
+        fsr.nextBytes(b1);
+        Asserts.assertEqualsByteArray(b1, new byte[] {1, 2});
+        Asserts.assertTrue(fsr.hasRemaining());
+        fsr.nextBytes(b1);
+        Asserts.assertEqualsByteArray(b1, new byte[] {3, 4});
+        Asserts.assertTrue(fsr.hasRemaining());
+        fsr.nextBytes(b1);
+        Asserts.assertEqualsByteArray(b1, new byte[] {5, 6});
+        Asserts.assertFalse(fsr.hasRemaining());
+        Utils.runAndCheckException(() -> fsr.nextBytes(b1),
+                IllegalStateException.class);
     }
 }
diff --git a/test/jdk/java/lang/reflect/Nestmates/testPkg/Host.java b/test/lib/jdk/test/lib/Unit.java
similarity index 75%
rename from test/jdk/java/lang/reflect/Nestmates/testPkg/Host.java
rename to test/lib/jdk/test/lib/Unit.java
index 4f769c7e6b8..2870cb99939 100644
--- a/test/jdk/java/lang/reflect/Nestmates/testPkg/Host.java
+++ b/test/lib/jdk/test/lib/Unit.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +22,15 @@
  * questions.
  */
 
-package testPkg;
+package jdk.test.lib;
 
-// Host class with single member
-public class Host {
-    public static class Member {
+public enum Unit {
+    B(1), K(1024), M(1024 * 1024), G(1024 * 1024 * 1024);
+    public final long size;
+    Unit(long size) {
+        this.size = size;
+    }
+    public long size() {
+        return size;
     }
 }
diff --git a/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java b/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
index 38748ec432b..fd76df92ef6 100644
--- a/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,6 +145,7 @@ public class CDSArchiveUtils {
     public static int dynamicArchiveHeaderSize()    { return dynamicArchiveHeaderSize;    }
     public static int cdsFileMapRegionSize()        { return cdsFileMapRegionSize;        }
     public static long alignment()                  { return alignment;                   }
+    public static int num_regions()                 { return num_regions;                 }
 
 
 
@@ -495,9 +496,14 @@ public static File deleteBytesAtTheEnd(File orgFile, String newFileName) throws
     }
 
     // used region size
-    public static long usedRegionSizeAligned(File archiveFile, int region) throws Exception {
+    public static long usedRegionSize(File archiveFile, int region) throws Exception {
         long offset = spOffset + cdsFileMapRegionSize * region + spUsedOffset;
-        long used = readInt(archiveFile, offset, sizetSize);
+        return readInt(archiveFile, offset, sizetSize);
+    }
+
+    // used region size
+    public static long usedRegionSizeAligned(File archiveFile, int region) throws Exception {
+        long used = usedRegionSize(archiveFile, region);
         return alignUpWithAlignment(used);
     }
 }
diff --git a/test/lib/jdk/test/lib/process/Proc.java b/test/lib/jdk/test/lib/process/Proc.java
index 0c294e465ab..2fe802fed6c 100644
--- a/test/lib/jdk/test/lib/process/Proc.java
+++ b/test/lib/jdk/test/lib/process/Proc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,6 @@
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.Permission;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
@@ -57,11 +54,9 @@
  *        .args("x")            // with args
  *        .env("env", "value")  // and an environment variable
  *        .prop("key","value")  // and a system property
- *        .grant(file)          // grant codes in this codebase
- *        .perm(perm)           // with the permission
  *        .start();             // and start
  *
- * create/start must be called, args/env/prop/perm can be called zero or
+ * create/start must be called, args/env/prop can be called zero or
  * multiple times between create and start.
  *
  * The controller can call inheritIO to share its I/O to the process.
@@ -133,11 +128,6 @@ public class Proc {
 
     final private static String PREFIX = "PROCISFUN:";
 
-    // policy file
-    final private StringBuilder perms = new StringBuilder();
-    // temporary saving the grant line in a policy file
-    final private StringBuilder grant = new StringBuilder();
-
     // The following methods are called by controllers
 
     // Creates a Proc by the Java class name, launcher is an optional
@@ -215,61 +205,7 @@ public Proc addcp(String... s) {
         addcp = true;
         return cp(s);
     }
-    // Adds a permission to policy. Can be called multiple times.
-    // All perm() calls after a series of grant() calls are grouped into
-    // a single grant block. perm() calls before any grant() call are grouped
-    // into a grant block with no restriction.
-    // Please note that in order to make permissions effective, also call
-    // prop("java.security.manager", "").
-    public Proc perm(Permission p) {
-        if (grant.length() != 0) {      // Right after grant(s)
-            if (perms.length() != 0) {  // Not first block
-                perms.append("};\n");
-            }
-            perms.append("grant ").append(grant).append(" {\n");
-            grant.setLength(0);
-        } else {
-            if (perms.length() == 0) {  // First block w/o restriction
-                perms.append("grant {\n");
-            }
-        }
-        if (p.getActions().isEmpty()) {
-            String s = String.format("%s \"%s\"",
-                    p.getClass().getCanonicalName(),
-                    p.getName()
-                            .replace("\\", "\\\\").replace("\"", "\\\""));
-            perms.append("    permission ").append(s).append(";\n");
-        } else {
-            String s = String.format("%s \"%s\", \"%s\"",
-                    p.getClass().getCanonicalName(),
-                    p.getName()
-                            .replace("\\", "\\\\").replace("\"", "\\\""),
-                    p.getActions());
-            perms.append("    permission ").append(s).append(";\n");
-        }
-        return this;
-    }
 
-    // Adds a grant option to policy. If called in a row, a single grant block
-    // with all options will be created. If there are perm() call(s) between
-    // grant() calls, they belong to different grant blocks
-
-    // grant on a principal
-    public Proc grant(Principal p) {
-        grant.append("principal ").append(p.getClass().getName())
-                .append(" \"").append(p.getName()).append("\", ");
-        return this;
-    }
-    // grant on a codebase
-    public Proc grant(File f) {
-        grant.append("codebase \"").append(f.toURI()).append("\", ");
-        return this;
-    }
-    // arbitrary grant
-    public Proc grant(String v) {
-        grant.append(v).append(", ");
-        return this;
-    }
     // Compile as well
     public Proc compile() {
         compile = true;
@@ -355,12 +291,6 @@ public Proc start() throws IOException {
         for (Entry<String,String> e: prop.entrySet()) {
             cmd.add("-D" + e.getKey() + "=" + e.getValue());
         }
-        if (perms.length() > 0) {
-            Path p = Paths.get(getId("policy")).toAbsolutePath();
-            perms.append("};\n");
-            Files.write(p, perms.toString().getBytes());
-            cmd.add("-Djava.security.policy=" + p.toString());
-        }
         cmd.add(clazz);
         for (String s: args) {
             cmd.add(s);
diff --git a/test/lib/jdk/test/lib/security/FixedSecureRandom.java b/test/lib/jdk/test/lib/security/FixedSecureRandom.java
new file mode 100644
index 00000000000..cfe8ccc212f
--- /dev/null
+++ b/test/lib/jdk/test/lib/security/FixedSecureRandom.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.test.lib.security;
+
+import java.io.ByteArrayOutputStream;
+import java.security.SecureRandom;
+
+/// A custom implementation of `SecureRandom` that outputs a
+/// predefined sequence of bytes.
+///
+/// The `FixedSecureRandom` class is designed for testing and
+/// controlled environments where predictable output is required.
+/// Upon creation, the class is initialized with a fixed byte array.
+/// Each call to `nextBytes()` will return these bytes in sequence,
+/// ensuring that the output matches the provided input exactly.
+/// An `IllegalStateException` will be thrown when the predefined
+/// bytes are exhausted.
+public class FixedSecureRandom extends SecureRandom {
+
+    private byte[] buffer;
+    private int offset;
+
+    // Multiple segments of ordered predefined bytes can be
+    // provided for convenience. For example, ML-KEM.KeyGen
+    // requires 2 blocks of 32-byte random data.
+    public FixedSecureRandom(byte[]... data) {
+        var os = new ByteArrayOutputStream();
+        for (byte[] b : data) {
+            os.writeBytes(b);
+        }
+        buffer = os.toByteArray();
+        offset = 0;
+    }
+
+    @Override
+    public void nextBytes(byte[] bytes) {
+        if (bytes.length > buffer.length - offset) {
+            throw new IllegalStateException("Not enough bytes");
+        }
+        System.arraycopy(buffer, offset, bytes, 0, bytes.length);
+        offset += bytes.length;
+    }
+
+    /// {@return whether there are remaining used bytes}
+    ///
+    /// This method is useful to detect whether an algorithm
+    /// implementation has indeed consumed the required number
+    /// of bytes correctly.
+    public boolean hasRemaining() {
+        return offset != buffer.length;
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 8883e8332d5..0db7c46c6cf 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -55,11 +55,6 @@ private WhiteBox() {}
    * untrusted code.
    */
   public synchronized static WhiteBox getWhiteBox() {
-    @SuppressWarnings("removal")
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null) {
-      sm.checkPermission(new WhiteBoxPermission("getInstance"));
-    }
     return instance;
   }
 
@@ -540,15 +535,19 @@ public void clearInlineCaches(boolean preserve_static_stubs) {
   public native void destroyMetaspaceTestContext(long context);
   public native void purgeMetaspaceTestContext(long context);
   public native void printMetaspaceTestContext(long context);
-  public native long getTotalCommittedWordsInMetaspaceTestContext(long context);
-  public native long getTotalUsedWordsInMetaspaceTestContext(long context);
+  public native long getTotalCommittedBytesInMetaspaceTestContext(long context);
+  public native long getTotalUsedBytesInMetaspaceTestContext(long context);
   public native long createArenaInTestContext(long context, boolean is_micro);
   public native void destroyMetaspaceTestArena(long arena);
-  public native long allocateFromMetaspaceTestArena(long arena, long word_size);
-  public native void deallocateToMetaspaceTestArena(long arena, long p, long word_size);
+  public native long allocateFromMetaspaceTestArena(long arena, long size);
+  public native void deallocateToMetaspaceTestArena(long arena, long p, long size);
 
   public native long maxMetaspaceAllocationSize();
 
+  // Word size measured in bytes
+  public native long wordSize();
+  public native long rootChunkWordSize();
+
   // Don't use these methods directly
   // Use jdk.test.whitebox.gc.GC class instead.
   public native boolean isGCSupported(int name);
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromTest.java
index 520c1ad5a9b..b627c4de089 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class AllocFromTest extends CLayouts {
 
     Arena arena = Arena.ofConfined();
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
index d9b268a1846..a70861a0dda 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class AllocTest extends CLayouts {
 
     Arena arena = Arena.ofConfined();
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java b/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java
index f779d52151c..6a1dd05b615 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class BulkOps {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverConstant.java
index 8f758477cbe..a725b427038 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverConstant.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverConstant extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNew.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNew.java
index d74ac8fbcee..c0d16f9818d 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNew.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNew extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNewHeap.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNewHeap.java
index 94c220292a0..e869a92c4d8 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNewHeap.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNewHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNewHeap extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
index da7d15483e8..668a6ab8e30 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
@@ -51,7 +51,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstant extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantAsType.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantAsType.java
index 547e3bc298f..e7c08512db3 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantAsType.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantAsType.java
@@ -54,7 +54,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgs = { "-XX:-TieredCompilation" })
+@Fork(value = 3, jvmArgs = { "-XX:-TieredCompilation", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstantAsType extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantFP.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantFP.java
index 4a24512b22d..7bc39f5e372 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantFP.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantFP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = {"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstantFP {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantHeap.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantHeap.java
index e123e5baf1a..baaa1909718 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantHeap.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstantHeap extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantMapped.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantMapped.java
index ee4a4f3c60b..409b837ee8b 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantMapped.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantMapped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstantMapped extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantShared.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantShared.java
index 9504439bda1..2c1a5672749 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantShared.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantShared.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverNonConstantShared extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedBuffer.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedBuffer.java
index 99cf83b75e5..c9060adc18b 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedBuffer.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverPollutedBuffer {
 
     static final int ELEM_SIZE = 1_000_000;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedSegments.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedSegments.java
index 4ad60297a32..b0fddeeb8da 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedSegments.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverPollutedSegments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
 public class LoopOverPollutedSegments extends JavaLayouts {
 
     static final int ELEM_SIZE = 1_000_000;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java
new file mode 100644
index 00000000000..392ac6d667b
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.foreign;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.CompilerControl;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
+import jdk.internal.misc.Unsafe;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
+public class LoopOverRandom extends JavaLayouts {
+    static final int SEED = 0;
+
+    static final long ELEM_SIZE = ValueLayout.JAVA_INT.byteSize();
+    static final int ELEM_COUNT = 1_000;
+    static final long ALLOC_SIZE = ELEM_COUNT * ELEM_SIZE;
+
+    static final Unsafe unsafe = Utils.unsafe;
+
+    Arena arena;
+    MemorySegment segment;
+    int[] indices;
+
+    static final MemorySegment ALL = MemorySegment.NULL.reinterpret(Long.MAX_VALUE);
+
+    @Setup
+    public void setup() {
+        indices = new Random(SEED).ints(0, ELEM_COUNT).limit(ELEM_COUNT).toArray();
+        arena = Arena.ofConfined();
+        segment = arena.allocate(ALLOC_SIZE);
+        for (int i = 0; i < ELEM_COUNT; i++) {
+            segment.setAtIndex(ValueLayout.JAVA_INT, i, i);
+        }
+    }
+
+    @TearDown
+    public void tearDown() {
+        arena.close();
+    }
+
+    @Benchmark
+    public long segment_loop() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_COUNT; i++) {
+            sum += segment.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED, indices[i]);
+            target_dontInline();
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public long segment_loop_all() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_COUNT; i++) {
+            sum += ALL.get(ValueLayout.JAVA_INT_UNALIGNED, segment.address() + indices[i] * ELEM_SIZE);
+            target_dontInline();
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public long segment_loop_asUnchecked() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_COUNT; i++) {
+            sum += asUnchecked(segment).getAtIndex(ValueLayout.JAVA_INT_UNALIGNED, indices[i]);
+            target_dontInline();
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public long unsafe_loop() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_COUNT; i++) {
+            sum += unsafe.getInt(segment.address() + indices[i] * ELEM_SIZE);
+            target_dontInline();
+        }
+        return sum;
+    }
+
+    MemorySegment asUnchecked(MemorySegment segment) {
+        return MemorySegment.ofAddress(segment.address()).reinterpret(Long.MAX_VALUE);
+    }
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void target_dontInline() {
+        // this method was intentionally left blank
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentCopyUnsafe.java b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentCopyUnsafe.java
index ffdff6e64ef..a0b57b5662c 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentCopyUnsafe.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentCopyUnsafe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class MemorySegmentCopyUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentGetUnsafe.java b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentGetUnsafe.java
index 11cb1e98889..b18696a1424 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentGetUnsafe.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentGetUnsafe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class MemorySegmentGetUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java
index 72fdded386f..09e5a1e3e77 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java
@@ -44,7 +44,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class MemorySegmentZeroUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/ParallelSum.java b/test/micro/org/openjdk/bench/java/lang/foreign/ParallelSum.java
index 3d00674f89e..42c6e481a72 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/ParallelSum.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ParallelSum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(3)
+@Fork(value = 3, jvmArgs = {"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class ParallelSum extends JavaLayouts {
 
     final static int CARRIER_SIZE = 4;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
index eb19fc56ac2..96cf62cc5f6 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
@@ -38,6 +38,7 @@
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -74,6 +75,20 @@ public void arraysFill() {
         Arrays.fill(array, (byte) 0);
     }
 
+    @Benchmark
+    public void arraysFillLoop() {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = 0;
+        }
+    }
+
+    @Benchmark
+    public void bufferFillLoop() {
+        for (int i = 0; i < array.length; i++) {
+            buffer.put(i, (byte)0);
+        }
+    }
+
     @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void heapSegmentFillJava() {
@@ -86,6 +101,13 @@ public void heapSegmentFillUnsafe() {
         heapSegment.fill((byte) 0);
     }
 
+    @Benchmark
+    public void heapSegmentFillLoop() {
+        for (long i = 0; i < heapSegment.byteSize(); i++) {
+            heapSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        }
+    }
+
     @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void nativeSegmentFillJava() {
@@ -98,6 +120,13 @@ public void nativeSegmentFillUnsafe() {
         nativeSegment.fill((byte) 0);
     }
 
+    @Benchmark
+    public void nativeSegmentFillLoop() {
+        for (long i = 0; i < nativeSegment.byteSize(); i++) {
+            nativeSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        }
+    }
+
     @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void unalignedSegmentFillJava() {
@@ -110,4 +139,11 @@ public void unalignedSegmentFillUnsafe() {
         unalignedSegment.fill((byte) 0);
     }
 
+    @Benchmark
+    public void unalignedSegmentFillLoop() {
+        for (long i = 0; i < unalignedSegment.byteSize(); i++) {
+            unalignedSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        }
+    }
+
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/UnrolledAccess.java b/test/micro/org/openjdk/bench/java/lang/foreign/UnrolledAccess.java
index 197dcf99e28..a52f9181350 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/UnrolledAccess.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/UnrolledAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
-@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class UnrolledAccess extends JavaLayouts {
 
     static final Unsafe U = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
index 9054c0dbd1e..0b29f925c7c 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
@@ -1,7 +1,31 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package org.openjdk.bench.java.lang.foreign.xor;
 
 import org.openjdk.bench.java.lang.foreign.Utils;
 import jdk.internal.misc.Unsafe;
+import org.openjdk.jmh.annotations.Fork;
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.FunctionDescriptor;
@@ -14,6 +38,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.openjdk.bench.java.lang.foreign.CLayouts.*;
 
+@Fork(value = 3, jvmArgs = {"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class GetArrayUnsafeXorOpImpl implements XorOp {
 
     static final Unsafe UNSAFE = Utils.unsafe;
diff --git a/test/micro/org/openjdk/bench/java/lang/reflect/ClazzWithSecurityManager.java b/test/micro/org/openjdk/bench/java/lang/reflect/ClazzWithSecurityManager.java
deleted file mode 100644
index e41971b3507..00000000000
--- a/test/micro/org/openjdk/bench/java/lang/reflect/ClazzWithSecurityManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.bench.java.lang.reflect;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Policy;
-import java.security.URIParameter;
-import java.util.concurrent.TimeUnit;
-
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-/**
- * Reflection benchmark
- */
-@State(Scope.Benchmark)
-@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
-@Fork(3)
-public class ClazzWithSecurityManager extends Clazz {
-
-    @SuppressWarnings("removal")
-    @Setup
-    public void setup() throws IOException, NoSuchAlgorithmException, URISyntaxException {
-        URI policyFile = ClazzWithSecurityManager.class.getResource("/jmh-security.policy").toURI();
-        Policy.setPolicy(Policy.getInstance("JavaPolicy", new URIParameter(policyFile)));
-        System.setSecurityManager(new SecurityManager());
-    }
-}
diff --git a/test/micro/org/openjdk/bench/java/security/ProtectionDomainBench.java b/test/micro/org/openjdk/bench/java/security/ProtectionDomainBench.java
index cf302d83e9b..61228acda30 100644
--- a/test/micro/org/openjdk/bench/java/security/ProtectionDomainBench.java
+++ b/test/micro/org/openjdk/bench/java/security/ProtectionDomainBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,12 +122,6 @@ void work() throws ClassNotFoundException {
         }
     }
 
-    @Benchmark
-    @Fork(value = 3, jvmArgs={"-Djava.security.manager=allow"})
-    public void withSecurityManager()  throws ClassNotFoundException {
-        work();
-    }
-
     @Benchmark
     @Fork(value = 3)
     public void noSecurityManager()  throws ClassNotFoundException {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java
index cd83ab86034..91e09c2a077 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFMRPar {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java
index a1973a45831..639d4290089 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFMRSeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java
index 2b804551dbf..119f3917da3 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFlatMapInfinitySeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java
index 31c1f047c12..cb5e1443f1d 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFlatMapSeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java
index b7c60af6cdd..de0be6d86f1 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMapPar {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java
index 1dbbbd05009..1c6f7acdfa5 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMapSeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java
index 12f5c98702b..0f8e1ef2fad 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMiscPar {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java
index a60d02af7b6..c6382111287 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMiscSeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java
index 6742ee98590..097ffa283b5 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherReducePar {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java
index 7356fdb979b..b460143d32b 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherReduceSeq {
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java
index f0b3fef4438..f93ca5454c7 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherWhileOrdered {
diff --git a/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java b/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
index 30ee9dc53b7..e98a3b37f55 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
@@ -29,6 +29,7 @@
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
@@ -45,6 +46,11 @@
 @Fork(value = 3)
 public class InterfaceCalls {
 
+    // Whether to step iteratively through the list of interfaces, or
+    // to select one in an unpredictable way.
+    @Param({"false", "true"})
+    private boolean randomized;
+
     interface FirstInterface {
         public int getIntFirst();
     }
@@ -241,44 +247,54 @@ public int testIfaceExtCall(Blackhole bh) {
      */
     @Benchmark
     public int test1stInt2Types() {
-        FirstInterface ai = as[l];
-        l = 1 - l;
+        FirstInterface ai = as[step(2)];
         return ai.getIntFirst();
     }
 
     @Benchmark
     public int test1stInt3Types() {
-        FirstInterface ai = as[l];
-        l = ++ l % 3;
+        FirstInterface ai = as[step(3)];
         return ai.getIntFirst();
     }
 
     @Benchmark
     public int test1stInt5Types() {
-        FirstInterface ai = as[l];
-        l = ++ l % asLength;
+        FirstInterface ai = as[step(asLength)];
         return ai.getIntFirst();
     }
 
     @Benchmark
     public int test2ndInt2Types() {
-        SecondInterface ai = (SecondInterface) as[l];
-        l = 1 - l;
+        SecondInterface ai = (SecondInterface) as[step(2)];
         return ai.getIntSecond();
     }
 
     @Benchmark
     public int test2ndInt3Types() {
-        SecondInterface ai = (SecondInterface) as[l];
-        l = ++ l % 3;
+        SecondInterface ai = (SecondInterface) as[step(3)];
         return ai.getIntSecond();
     }
 
     @Benchmark
     public int test2ndInt5Types() {
-        SecondInterface ai = (SecondInterface) as[l];
-        l = ++ l % asLength;
+        SecondInterface ai = (SecondInterface) as[step(asLength)];
         return ai.getIntSecond();
     }
 
+    int step(int range) {
+        if (randomized) {
+            l = scramble(l);
+        } else {
+            l++;
+        }
+        return (l & Integer.MAX_VALUE) % range;
+    }
+
+    static final int scramble(int n) {
+        int x = n;
+        x ^= x << 13;
+        x ^= x >>> 17;
+        x ^= x << 5;
+        return x == 0 ? 1 : x;
+    }
 }